Merge pull request #9 from martinbudden/e3d_tab_formatting

Tabs used instead of spaces in module e3d_resistor.

core.scad

@@ -25,3 +25,15 @@ include <global_defs.scad>
 // Global functions and modules
 //
 use <utils/core/global.scad>
+
+module use_stl(name) {               //! Import an STL to make a build platter
+    stl(name);
+
+    import(str("../stls/", name, ".stl"));
+}
+
+module use_dxf(name) {               //! Import a DXF to make a build panel
+    dxf(name);
+
+    import(str("../dxfs/", name, ".dxf"));
+}

gallery/readme.md

@@ -6,6 +6,13 @@ Arduino thermostat to control a beer fridge to use it as an environmental chambe
 ![](ArduinoThermostat.png)
 
 
+<a name="TOP"></a>
+## FilamentDryBox
+A small fan oven with a spool holder to keep the filament warm and dry.
+
+![](FilamentDryBox.png)
+
+
 <a name="TOP"></a>
 ## HydraBot
 Current state of HydraRaptor after being modified for laser engraving.
@@ -68,6 +75,13 @@ Mains isolated and variable supply with metering.
 ![](Mains_Box.png)
 
 
+<a name="TOP"></a>
+## SunBot
+A solar tracker to keep solar powerbanks pointing at the sun.
+
+![](SunBot.png)
+
+
 <a name="TOP"></a>
 ## Turntable
 WiFi enabled remote control turntable for photography

lib.scad

@@ -61,10 +61,12 @@ include <vitamins/light_strips.scad>
 include <vitamins/spools.scad>
 include <vitamins/mains_sockets.scad>
 include <vitamins/ldrs.scad>
+include <vitamins/geared_steppers.scad>
 
 use <vitamins/jack.scad>
 use <vitamins/meter.scad>
 use <vitamins/fuseholder.scad>
+use <vitamins/hygrometer.scad>
 
 use <vitamins/opengrab.scad>
 use <vitamins/wire.scad>

libtest.scad

@@ -34,6 +34,7 @@ use <tests/d_connectors.scad>
 use <tests/displays.scad>
 use <tests/fans.scad>
 use <tests/fuseholder.scad>
+use <tests/geared_steppers.scad>
 use <tests/hot_ends.scad>
 use <tests/iecs.scad>
 use <tests/inserts.scad>
@@ -90,6 +91,7 @@ use <tests/strap_handle.scad>
 use <tests/ssr_shroud.scad>
 use <tests/psu_shroud.scad>
 use <tests/flat_hinge.scad>
+use <tests/pcb_mount.scad>
 
 x5 = 800;
 
@@ -300,6 +302,12 @@ steppers_y = batteries_y + 70;
 translate([x3, veroboard_y])
     veroboard_test();
 
+translate([x3 + 70, veroboard_y + 30])
+    geared_steppers();
+
+translate([x3 + 140, veroboard_y + 20])
+    pcb_mounts();
+
 translate([x3, d_connectors_y])
     d_connectors();
 
@@ -309,7 +317,10 @@ translate([x3, iecs_y])
 translate([x3 + 15, modules_y])
     microview();
 
-translate([x3 + 40, modules_y])
+translate([x3 + 60, modules_y])
+    hygrometer();
+
+translate([x3 + 90, modules_y])
     modules();
 
 translate([x3, ssrs_y]) {

printed/butt_box.scad

@@ -27,6 +27,10 @@
 //! A list specifies the internal dimensions, screw type, top, bottom and side sheet types and the block
 //! maximum spacing.
 //!
+//!  * An optional name can be specified to allow more then one box in a project.
+//!  * An optional list of fixing blocks to be omitted can be given.
+//!  * Star washers can be omitted by setting the 11th parameter to false.
+//!
 //! Uses [fixing blocks](#fixing_block) and [corner blocks](#corner_block).
 //
 
@@ -34,17 +38,24 @@ use <fixing_block.scad>
 use <corner_block.scad>
 use <../utils/maths.scad>
 
-function bbox_screw(type)     = type[0]; //! Screw type for corner blocks
-function bbox_sheets(type)    = type[1]; //! Sheet type for the sides
-function bbox_base_sheet(type)= type[2]; //! Sheet type for the base
-function bbox_top_sheet(type) = type[3]; //! Sheet type for the top
-function bbox_span(type)      = type[4]; //! Maximum span between fixing blocks
-function bbox_width(type)     = type[5]; //! Internal width
-function bbox_depth(type)     = type[6]; //! Internal depth
-function bbox_height(type)    = type[7]; //! Internal height
+function bbox_screw(type)      = type[0]; //! Screw type for corner blocks
+function bbox_sheets(type)     = type[1]; //! Sheet type for the sides
+function bbox_base_sheet(type) = type[2]; //! Sheet type for the base
+function bbox_top_sheet(type)  = type[3]; //! Sheet type for the top
+function bbox_span(type)       = type[4]; //! Maximum span between fixing blocks
+function bbox_width(type)      = type[5]; //! Internal width
+function bbox_depth(type)      = type[6]; //! Internal depth
+function bbox_height(type)     = type[7]; //! Internal height
+function bbox_name(type)       = type[8] ? type[8] : "bbox"; //! Optional name if there is more than one box in a project
+function bbox_skip_blocks(type)= type[9] ? type[9] : [];  //! List of fixing blocks to skip, used to allow a hinged panel for example
+function star_washers(type)    = type[10] ? type[10] : is_undef(type[10]); //! Set to false to remove star washers.
+
+function bbox_volume(type) = bbox_width(type) * bbox_depth(type) * bbox_height(type) / 1000000; //! Internal volume in litres
+function bbox_area(type) = let(w =  bbox_width(type), d = bbox_depth(type), h = bbox_height(type)) //! Internal surdface area in m^2
+    2 * (w * d + w * h + d * h) / 1000000;
 
 module bbox_shelf_blank(type) { //! 2D template for a shelf
-    dxf("bbox_shelf");
+    dxf(str(bbox_name(type), "_shelf"));
 
     sheet_2D(bbox_sheets(type), bbox_width(type), bbox_depth(type), 1);
 }
@@ -60,18 +71,8 @@ function corner_block_positions(type) = let(
             y = [-1,-1,1,1][corner]
         ) translate([x * (width / 2), y * (depth / 2), z * height / 2]) *
           rotate([z > 0 ? 180 : 0, 0, corner * 90 + (z > 0 ? 90 : 0)])
-
     ];
 
-module corner_block_positions(type) {
-    bt = sheet_thickness(bbox_base_sheet(type));
-    tt = sheet_thickness(bbox_top_sheet(type));
-    for(p = corner_block_positions(type))
-        let($thickness = transform([0, 0, 0], p).z > 0 ? tt : bt)
-            multmatrix(p)
-                children();
-}
-
 function corner_holes(type) = [for(p = corner_block_positions(type), q = corner_block_holes(bbox_screw(type))) p * q];
 
 function fixing_block_positions(type) = let(
@@ -84,36 +85,28 @@ function fixing_block_positions(type) = let(
         dspans = floor(depth / span),
         dspan = depth / (dspans + 1),
         hspans = floor(height / span),
-        hspan = height / (hspans + 1)
+        hspan = height / (hspans + 1),
+        skips = bbox_skip_blocks(type)
     )
     [
         for(i = [0 : 1 : wspans - 1], y = [-1, 1], z = [-1, 1])
-            translate([(i - (wspans - 1) / 2) * wspan, y * depth / 2, z * height / 2]) *
-            rotate([0, z * 90 + 90, y * 90 + 90]),
+            if(!in(skips, [0, y, z]))
+                translate([(i - (wspans - 1) / 2) * wspan, y * depth / 2, z * height / 2]) *
+                rotate([0, z * 90 + 90, y * 90 + 90]),
 
         for(i = [0 : 1 : dspans - 1], x = [-1, 1], z = [-1, 1])
-            translate([x * width / 2, (i - (dspans - 1) / 2) * dspan, z * height / 2]) *
-            rotate([0, z * 90 + 90, x * 90]),
+            if(!in(skips, [x, 0, z]))
+                translate([x * width / 2, (i - (dspans - 1) / 2) * dspan, z * height / 2]) *
+                rotate([0, z * 90 + 90, x * 90]),
 
         for(i = [0 : 1 : hspans - 1], x = [-1, 1], y = [-1, 1])
-            translate([x * width / 2, y * depth / 2, (i - (hspans - 1) / 2) * hspan]) *
-            rotate([y > 0 ? 180 : 0, x * y * 90, 0]),
-
+            if(!in(skips, [x, y, 0]))
+                translate([x * width / 2, y * depth / 2, (i - (hspans - 1) / 2) * hspan]) *
+                rotate([y > 0 ? 180 : 0, x * y * 90, 0]),
     ];
 
 function side_holes(type) = [for(p = fixing_block_positions(type), q = fixing_block_holes(bbox_screw(type))) p * q];
 
-module fixing_block_positions(type) {
-    t = sheet_thickness(bbox_sheets(type));
-    bt = sheet_thickness(bbox_base_sheet(type));
-    tt = sheet_thickness(bbox_top_sheet(type));
-    h = bbox_height(type) / 2 - 1;
-    for(p = fixing_block_positions(type))
-        let(z = transform([0, 0, 0], p).z, $thickness = z > h ? tt : z < -h ? bt : t)
-            multmatrix(p)
-                children();
-}
-
 module drill_holes(type, t)
     for(list = [corner_holes(type), side_holes(type)], p = list)
         let(q = t * p)
@@ -122,7 +115,7 @@ module drill_holes(type, t)
                     drill(screw_clearance_radius(bbox_screw(type)), 0);
 
 module bbox_base_blank(type) { //! 2D template for the base
-    dxf("bbox_base");
+    dxf(str(bbox_name(type), "_base"));
 
     difference() {
         sheet_2D(bbox_base_sheet(type), bbox_width(type), bbox_depth(type), 1);
@@ -132,7 +125,7 @@ module bbox_base_blank(type) { //! 2D template for the base
 }
 
 module bbox_top_blank(type) { //! 2D template for the top
-    dxf("bbox_top");
+    dxf(str(bbox_name(type), "_top"));
 
     t = sheet_thickness(bbox_sheets(type));
 
@@ -144,36 +137,40 @@ module bbox_top_blank(type) { //! 2D template for the top
     }
 }
 
-module bbox_left_blank(type) { //! 2D template for the left side
-    dxf("bbox_left");
+function subst_sheet(type, sheet) =
+    let(s = bbox_sheets(type))
+        sheet ? assert(sheet_thickness(sheet) == sheet_thickness(s)) sheet : s;
+
+module bbox_left_blank(type, sheet = false) { //! 2D template for the left side
+    dxf(str(bbox_name(type), "_left"));
 
     t = sheet_thickness(bbox_sheets(type));
     bb = sheet_thickness(bbox_base_sheet(type));
 
     difference() {
         translate([-t / 2, -bb / 2])
-            sheet_2D(bbox_sheets(type), bbox_depth(type) + t, bbox_height(type) + bb);
+            sheet_2D(subst_sheet(type, sheet), bbox_depth(type) + t, bbox_height(type) + bb);
 
         drill_holes(type, rotate([0, 90, 90]) * translate([bbox_width(type) / 2, 0]));
     }
 }
 
-module bbox_right_blank(type) { //! 2D template for the right side
-    dxf("bbox_right");
+module bbox_right_blank(type, sheet = false) { //! 2D template for the right side
+    dxf(str(bbox_name(type), "_right"));
 
     t = sheet_thickness(bbox_sheets(type));
     bb = sheet_thickness(bbox_base_sheet(type));
 
     difference() {
         translate([t / 2, -bb / 2])
-            sheet_2D(bbox_sheets(type), bbox_depth(type) + t, bbox_height(type) + bb);
+            sheet_2D(subst_sheet(type, sheet), bbox_depth(type) + t, bbox_height(type) + bb);
 
-        drill_holes(type, rotate([0, -90, 90]) * translate([-bbox_width(type) / 2, 0]));
+        drill_holes(type, rotate([0, 90, 90]) * translate([-bbox_width(type) / 2, 0]));
     }
 }
 
-module bbox_front_blank(type) { //! 2D template for the front
-    dxf("bbox_front");
+module bbox_front_blank(type, sheet = false, width = 0) { //! 2D template for the front
+    dxf(str(bbox_name(type), "_front"));
 
     t = sheet_thickness(bbox_sheets(type));
     bb = sheet_thickness(bbox_base_sheet(type));
@@ -181,23 +178,23 @@ module bbox_front_blank(type) { //! 2D template for the front
 
     difference() {
         translate([0, (bt - bb) / 2])
-            sheet_2D(bbox_sheets(type), bbox_width(type) + 2 * t, bbox_height(type) + bb + bt);
+            sheet_2D(subst_sheet(type, sheet), max(bbox_width(type) + 2 * t, width), bbox_height(type) + bb + bt);
 
         drill_holes(type, rotate([-90, 0, 0]) * translate([0, bbox_depth(type) / 2]));
     }
 }
 
-module bbox_back_blank(type) { //! 2D template for the back
-    dxf("bbox_back");
+module bbox_back_blank(type, sheet = false) { //! 2D template for the back
+    dxf(str(bbox_name(type), "_back"));
 
     bb = sheet_thickness(bbox_base_sheet(type));
     t = sheet_thickness(bbox_sheets(type));
 
     difference() {
         translate([0, -bb / 2])
-            sheet_2D(bbox_sheets(type), bbox_width(type), bbox_height(type) + bb);
+            sheet_2D(subst_sheet(type, sheet), bbox_width(type), bbox_height(type) + bb);
 
-        drill_holes(type, rotate([90, 0, 0]) * translate([0, -bbox_depth(type) / 2]));
+        drill_holes(type, rotate([-90, 0, 0]) * translate([0, -bbox_depth(type) / 2]));
     }
 }
 
@@ -208,54 +205,64 @@ module bbox_front(type) render_2D_sheet(bbox_sheets(type)) bbox_front_blank(type
 module bbox_left(type)  render_2D_sheet(bbox_sheets(type)) bbox_left_blank(type);       //! Default left side, can be overridden to customise
 module bbox_right(type) render_2D_sheet(bbox_sheets(type)) bbox_right_blank(type);      //! Default right side, can be overridden to customise
 
-module _bbox_assembly(type, top = true, base = true, left = true, right = true, back = true, front = true) //! The box assembly, wrap with a local copy without parameters
-assembly("bbox") {
+module _bbox_assembly(type, top = true, base = true, left = true, right = true, back = true, front = true) { //! The box assembly, wrap with a local copy without parameters
     width = bbox_width(type);
     depth = bbox_depth(type);
     height = bbox_height(type);
-    echo("Box:", width, depth, height);
+    echo("Box:", width, depth, height, volume = bbox_volume(type), area = bbox_area(type));
 
     t = sheet_thickness(bbox_sheets(type));
     bt = sheet_thickness(bbox_base_sheet(type));
     tt = sheet_thickness(bbox_top_sheet(type));
 
-    corner_block_positions(type)
-        fastened_corner_block_assembly(t, bbox_screw(type), $thickness);
+    function is_missing_screw(p) = p.y > depth / 2 - 1 ? !back : false;
 
-    fixing_block_positions(type)
-        fastened_fixing_block_assembly(t, bbox_screw(type), thickness2 = $thickness);
+    assembly(bbox_name(type)) {
 
-    for(x = [-1, 1])
-        translate([x * (width / 2 + t / 2 + eps + 25 * exploded()), 0])
-            rotate([90, 0, x * 90])
-                if(x > 0) {
-                    if(right)
-                        bbox_right(type);
+        for(p = corner_block_positions(type))
+            let(q = transform([0, 0, 0], p), thickness = q.z > 0 ? tt : bt)
+                multmatrix(p)
+                    fastened_corner_block_assembly(is_missing_screw(q) && ((q.z > 0) != (q.x > 0)) ? 0 : t, bbox_screw(type), thickness,
+                                                   is_missing_screw(q) && ((q.z > 0) == (q.x > 0)) ? 0 : t, star_washers = star_washers(type));
+
+        h = height / 2 - 1;
+        for(p = fixing_block_positions(type))
+            let(q = transform([0, 0, 0], p), thickness = q.z > h ? tt : q.z < -h ? bt : t)
+                multmatrix(p)
+                    fastened_fixing_block_assembly(is_missing_screw(q) ? 0 : t, bbox_screw(type), thickness2 = thickness, star_washers = star_washers(type));
+
+        for(x = [-1, 1])
+            translate([x * (width / 2 + t / 2 + eps + 25 * exploded()), 0])
+                rotate([90, 0, x * 90])
+                    if(x > 0) {
+                        if(right)
+                            bbox_right(type);
+                    }
+                    else
+                        if(left)
+                            bbox_left(type);
+
+        for(y = [1, -1])
+            translate([0, y * (depth / 2 + t / 2 + eps + 25 * exploded())])
+                rotate([90, 0, y * 90 + 90])
+                    if(y < 0) {
+                        if(front)
+                            bbox_front(type);
+                    }
+                    else
+                        if(back)
+                            bbox_back(type);
+
+        for(z = [-1, 1]) {
+            sheet_thickness = z > 0 ? tt : bt;
+            translate_z(z * (height / 2 + sheet_thickness / 2 + eps + 100 * exploded()))
+                if(z > 0) {
+                    if(top)
+                        bbox_top(type);
                 }
                 else
-                    if(left)
-                        bbox_left(type);
-
-    for(y = [-1, 1])
-        translate([0, y * (depth / 2 + t / 2 + eps + 25 * exploded())])
-            rotate([90, 0, y * 90 + 90])
-                if(y < 0) {
-                    if(front)
-                        bbox_front(type);
-                }
-                else
-                    if(back)
-                        bbox_back(type);
-
-    for(z = [-1, 1]) {
-        sheet_thickness = z > 0 ? tt : bt;
-        translate_z(z * (height / 2 + sheet_thickness / 2 + eps + 100 * exploded()))
-            if(z > 0) {
-                if(top)
-                    bbox_top(type);
-            }
-            else
-                if(base)
-                    bbox_base(type);
+                    if(base)
+                        bbox_base(type);
+        }
     }
 }

printed/cable_grommets.scad

@@ -195,12 +195,15 @@ module mouse_grommet_assembly(r, thickness)
 module ribbon_grommet_20_3_stl() ribbon_grommet(20, 3);
 module mouse_grommet_15_3_stl() mouse_grommet(1.5, 3);
 module mouse_grommet_20_3_stl() mouse_grommet(2, 3);
+module mouse_grommet_25_3_stl() mouse_grommet(2.5, 3);
 module mouse_grommet_30_3_stl() mouse_grommet(3, 3);
 
 module round_grommet_bottom_30_stl() round_grommet_bottom(3);
 module round_grommet_bottom_40_stl() round_grommet_bottom(4);
+module round_grommet_bottom_50_stl() round_grommet_bottom(5);
 module round_grommet_bottom_60_stl() round_grommet_bottom(6);
 
 module round_grommet_top_30_3_stl() round_grommet_top(3, 3);
 module round_grommet_top_40_3_stl() round_grommet_top(4, 3);
+module round_grommet_top_50_3_stl() round_grommet_top(5, 3);
 module round_grommet_top_60_3_stl() round_grommet_top(6, 3);

printed/corner_block.scad

@@ -24,6 +24,11 @@
 //! See [butt_box](#Butt_box) for an example of usage.
 //!
 //! Note that the block with its inserts is defined as a sub assembly, but its fasteners get added to the parent assembly.
+//!
+//! Specific fasteners can be omitted by setting a side's thickness to 0 and the block omitted by setting ```show_block``` to false.
+//! This allows the block and one set of fasteners to be on one assembly and the other fasteners on the mating assemblies.
+//!
+//! Star washers can be omitted by setting ```star_washers``` to false.
 //
 include <../core.scad>
 include <../vitamins/screws.scad>
@@ -57,8 +62,8 @@ module corner_block_v_hole(screw = def_screw) //! Place children at the bottom s
     multmatrix(corner_block_v_hole(screw))
         children();
 
-module corner_block_h_holes(screw = def_screw) //! Place children at the side screw holes
-    for(p = corner_block_h_holes(screw))
+module corner_block_h_holes(screw = def_screw, index = undef) //! Place children at the side screw holes
+    for(p = !is_undef(index) ? [corner_block_h_holes(screw)[index]] : corner_block_h_holes(screw))
         multmatrix(p)
             children();
 
@@ -126,22 +131,33 @@ assembly(str("corner_block_M", 20 * screw_radius(screw))) {
         insert(insert);
 }
 
-module fastened_corner_block_assembly(thickness, screw = def_screw, thickness_below = undef, name = false) { //! Printed block with all fasteners
+module fastened_corner_block_assembly(thickness, screw = def_screw, thickness_below = undef, thickness_side2 = undef, name = false, show_block = true, star_washers = true) { //! Printed block with all fasteners
+    thickness2 = !is_undef(thickness_below) ? thickness_below : thickness;
+    thickness3 = !is_undef(thickness_side2) ? thickness_side2 : thickness;
     washer = screw_washer(screw);
     insert = screw_insert(screw);
-    screw_length = screw_shorter_than(2 * washer_thickness(washer) + thickness + insert_length(insert) + overshoot);
+    function screw_length(t) = screw_shorter_than((star_washers ? 2 : 1) * washer_thickness(washer) + t + insert_length(insert) + overshoot);
+    screw_length = screw_length(thickness);
+    screw_length2 = screw_length(thickness2);
+    screw_length3 = screw_length(thickness3);
 
-    corner_block_assembly(screw, name) children();
+    if(show_block)
+        corner_block_assembly(screw, name) children();
 
-    corner_block_h_holes(screw)
-        translate_z(thickness)
-            screw_and_washer(screw, screw_length, true);
+    if(thickness)
+        corner_block_h_holes(screw, 0)
+            translate_z(thickness)
+                screw_and_washer(screw, screw_length, star_washers);
 
-    thickness2 = thickness_below ? thickness_below : thickness;
-    screw_length2 = screw_shorter_than(2 * washer_thickness(washer) + thickness2 + insert_length(insert) + overshoot);
-    corner_block_v_hole(screw)
-        translate_z(thickness2)
-            screw_and_washer(screw, screw_length2, true);
+    if(thickness3)
+        corner_block_h_holes(screw, 1)
+            translate_z(thickness3)
+                screw_and_washer(screw, screw_length3, star_washers);
+
+    if(thickness2)
+        corner_block_v_hole(screw)
+            translate_z(thickness2)
+                screw_and_washer(screw, screw_length2, star_washers);
 }
 
 module corner_block_M20_stl() corner_block(M2_cap_screw);

printed/fixing_block.scad

@@ -24,6 +24,11 @@
 //! See [butt_box](#Butt_box) for an example of usage.
 //!
 //! Note that the block with its inserts is defined as a sub assembly, but its fasteners get added to the parent assembly.
+//!
+//! Specific fasteners can be omitted by setting a side's thickness to 0 and the block omitted by setting ```show_block``` to false.
+//! This allows the block and one set of fasteners to be on one assembly and the other fasteners on the mating assemblies.
+//!
+//! Star washers can be omitted by setting ```star_washers``` to false.
 //
 include <../core.scad>
 include <../vitamins/screws.scad>
@@ -116,20 +121,24 @@ assembly(str("fixing_block_M", 20 * screw_radius(screw))) {
         insert(insert);
 }
 
-module fastened_fixing_block_assembly(thickness, screw = def_screw, screw2 = undef, thickness2 = undef) { //! Assembly with fasteners in place
+module fastened_fixing_block_assembly(thickness, screw = def_screw, screw2 = undef, thickness2 = undef, show_block = true, star_washers = true) { //! Assembly with fasteners in place
     module fb_screw(screw, thickness) {
         washer = screw_washer(screw);
         insert = screw_insert(screw);
-        screw_length = screw_longer_than(2 * washer_thickness(washer) + thickness + insert_length(insert));
+        screw_length = screw_longer_than((star_washers ? 2 : 1) * washer_thickness(washer) + thickness + insert_length(insert));
 
-        translate_z(thickness)
-            screw_and_washer(screw, screw_length, true);
+        if(thickness)
+            translate_z(thickness)
+                screw_and_washer(screw, screw_length, star_washers);
     }
 
-    no_pose() fixing_block_assembly(screw);
+    if(show_block)
+        no_pose()
+            fixing_block_assembly(screw);
 
+    t2 = !is_undef(thickness2) ? thickness2 : thickness;
     fixing_block_v_holes(screw)
-        fb_screw(screw, thickness2 ? thickness2 : thickness);
+        fb_screw(screw, t2);
 
     fixing_block_h_hole(screw)
         fb_screw(screw2 ? screw2 : screw, thickness);

printed/foot.scad

@@ -66,7 +66,7 @@ module foot(type = foot) { //! Generate STL
     }
 }
 
-module foot_assembly(t = 0, type = foot) { //! Assembly with fasteners in place for specified sheet thickness
+module foot_assembly(t = 0, type = foot, flip = false) { //! Assembly with fasteners in place for specified sheet thickness
     screw = foot_screw(type);
     washer = screw_washer(screw);
     nut = screw_nut(screw);
@@ -79,11 +79,17 @@ module foot_assembly(t = 0, type = foot) { //! Assembly with fasteners in place
         if(t)
             explode(15, true)
                 translate_z(foot_thickness(type))
-                    screw_and_washer(screw, screw_length);
+                    if(flip)
+                        nut_and_washer(nut, true);
+                    else
+                        screw_and_washer(screw, screw_length);
     }
     if(t)
         translate_z(t)
-            nut_and_washer(nut, true);
+            if(flip)
+                screw_and_washer(screw, screw_length);
+            else
+                nut_and_washer(nut, true);
 }
 
 module insert_foot(type = insert_foot) { //! Generate STL for foot with insert

printed/pcb_mount.scad

@@ -0,0 +1,124 @@
+//
+// NopSCADlib Copyright Chris Palmer 2019
+// nop.head@gmail.com
+// hydraraptor.blogspot.com
+//
+// This file is part of NopSCADlib.
+//
+// NopSCADlib is free software: you can redistribute it and/or modify it under the terms of the
+// GNU General Public License as published by the Free Software Foundation, either version 3 of
+// the License, or (at your option) any later version.
+//
+// NopSCADlib is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+// without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+// See the GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License along with NopSCADlib.
+// If not, see <https://www.gnu.org/licenses/>.
+//
+
+//
+//! A frame to mount a PCB by its corners when it has no mounting holes.
+//! The stl must be given a parameterless wrapper in the project that uses it.
+//
+include <../core.scad>
+include <../vitamins/screws.scad>
+use <../vitamins/pcb.scad>
+
+clearance = 0.2;
+min_wall = extrusion_width * 2;
+wall = 2;
+
+overlap = 2;
+
+screw = M3_cap_screw;
+screw_clearance_r = 3.1 / 2;
+pillar_r = corrected_radius(screw_clearance_r) + wall;
+
+function pillar_x_pitch(pcb) = pcb_length(pcb) + 2 * clearance + 2 * (pillar_r - overlap) / sqrt(2); //! x pitch of screw pillars
+function pillar_y_pitch(pcb) = pcb_width(pcb)  + 2 * clearance + 2 * (pillar_r - overlap) / sqrt(2); //! y pitch of screw pillars
+
+function pcb_mount_length(pcb) = pillar_x_pitch(pcb) + 2 * pillar_r; //! Outside length of the mount
+function pcb_mount_width(pcb)  = pillar_y_pitch(pcb) + 2 * pillar_r; //! Outside width of the mount
+
+frame_w = 3;
+frame_t = 2;
+
+washer_thickness = 1.25;
+
+module pcb_mount_screw_positions(pcb) //! Positions of the screws and pillars
+    for(x = [-1, 1], y = [-1, 1])
+        translate([x * pillar_x_pitch(pcb) / 2, y * pillar_y_pitch(pcb) / 2])
+            children();
+
+module pcb_mount_holes(pcb, h = 0)          //! Drill holes for PCB mount
+    pcb_mount_screw_positions(pcb)
+        drill(screw_clearance_radius(screw), h);
+
+module pcb_mount_ring()
+    difference() {
+        circle(pillar_r);
+
+        poly_circle(screw_clearance_r);
+    }
+
+module pcb_mount_washer_stl() //! A plastic washer to clamp a PCB
+    linear_extrude(height = washer_thickness)
+        pcb_mount_ring();
+
+module pcb_mount(pcb, height = 5, washers = true) { //! Make the STL of a pcb mount for the specified PCB.
+    stl(str("pcb_mount_", pcb[0], "_", height));
+
+    y_pitch = pcb_width(pcb) > 4 * pillar_r + 4 ? pillar_r + 1
+                                                : pcb_width(pcb) / 2 + frame_w + 1 + pillar_r;
+
+    if(washers)
+        for(x = [-1, 1], y = [-1, 1])
+            translate([x * (pillar_r + 1), y * y_pitch, 0])
+                pcb_mount_washer_stl();
+
+    for(x = [-1, 1])
+        translate([x * pillar_x_pitch(pcb) / 2, 0, frame_t / 2])
+            cube([frame_w, pillar_y_pitch(pcb) - 2 * wall, frame_t], center = true);
+
+    for(y = [-1, 1])
+        translate([0, y * pillar_y_pitch(pcb) / 2, frame_t / 2])
+            cube([pillar_x_pitch(pcb) - 2 * wall, frame_w, frame_t], center = true);
+
+    pcb_mount_screw_positions(pcb)
+        linear_extrude(height = height)
+            pcb_mount_ring();
+
+    linear_extrude(height = height + pcb_thickness(pcb) - layer_height)
+        difference() {
+            pcb_mount_screw_positions(pcb)
+                pcb_mount_ring();
+
+            square([pcb_length(pcb) + 2 * clearance, pcb_width(pcb) + 2 * clearance], center = true);
+        }
+}
+
+module pcb_mount_assembly(pcb, thickness, height = 5) { //! A PCB mount assembly with fasteners
+    translate_z(height)
+        pcb(pcb);
+
+    color(pp1_colour) pcb_mount(pcb, washers = false);
+
+    washer = screw_washer(screw);
+    nut = screw_nut(screw);
+    t = pcb_thickness(pcb);
+    screw_length = screw_longer_than(height + t + washer_thickness + thickness + washer_thickness(washer) + nut_thickness(nut, true));
+
+    pcb_mount_screw_positions(pcb) {
+        translate_z(height + t) {
+            color(pp2_colour) pcb_mount_washer_stl();
+
+            translate_z(washer_thickness)
+                screw(screw, screw_length);
+        }
+
+        translate_z(-thickness)
+            vflip()
+                nut_and_washer(nut, true);
+    }
+}

printed/psu_shroud.scad

@@ -139,8 +139,8 @@ module psu_shroud(type, cable_d, name, cables = 1) { //! Generate the STL file f
     mirror([0, 1, 0])
         psu_shroud_hole_positions(type)
             translate_z(height)
-                rotate(90)
-                    insert_lug(insert, wall, $side, counter_bore);
+                rotate($side * 90)
+                    insert_lug(insert, wall, counter_bore);
  }
 
 module psu_shroud_assembly(type, cable_d, name, cables = 1) //! The printed parts with inserts fitted

printed/ssr_shroud.scad

@@ -103,8 +103,8 @@ module ssr_shroud(type, cable_d, name) {    //! Generate the STL file for a spec
     ssr_shroud_hole_positions(type)
         vflip()
             translate_z(height)
-                rotate(90)
-                    insert_lug(insert, wall, $side, counter_bore);
+                rotate($side * 90)
+                    insert_lug(insert, wall, counter_bore);
 }
 
 module ssr_shroud_assembly(type, cable_d, name) //! The printed parts with inserts fitted

readme.md

@@ -17,35 +17,36 @@ See [usage](docs/usage.md) for requirements, installation instructions and a usa
 
 ## Table of Contents<a name="top"/>
 <table><tr>
-<th align="left"> Vitamins A-N </th><th align="left"> Vitamins O-Z </th><th align="left"> Printed </th><th align="left"> Utilities </th><th align="left"> Core Utilities </th></tr>
-<tr><td> <a href = "#Ball_bearings">Ball_bearings</a> </td><td> <a href = "#Opengrab">Opengrab</a> </td><td> <a href = "#Box">Box</a> </td><td> <a href = "#Annotation">Annotation</a> </td><td> <a href = "#Bom">Bom</a> </td></tr>
+<th align="left"> Vitamins A-M </th><th align="left"> Vitamins N-Z </th><th align="left"> Printed </th><th align="left"> Utilities </th><th align="left"> Core Utilities </th></tr>
+<tr><td> <a href = "#Ball_bearings">Ball_bearings</a> </td><td> <a href = "#Nuts">Nuts</a> </td><td> <a href = "#Box">Box</a> </td><td> <a href = "#Annotation">Annotation</a> </td><td> <a href = "#Bom">Bom</a> </td></tr>
 <tr><td> <a href = "#Batteries">Batteries</a> </td><td> <a href = "#O_ring">O_ring</a> </td><td> <a href = "#Butt_box">Butt_box</a> </td><td> <a href = "#Bezier">Bezier</a> </td><td> <a href = "#Clip">Clip</a> </td></tr>
-<tr><td> <a href = "#Belts">Belts</a> </td><td> <a href = "#Pcbs">Pcbs</a> </td><td> <a href = "#Cable_grommets">Cable_grommets</a> </td><td> <a href = "#Dogbones">Dogbones</a> </td><td> <a href = "#Global">Global</a> </td></tr>
-<tr><td> <a href = "#Blowers">Blowers</a> </td><td> <a href = "#Pillars">Pillars</a> </td><td> <a href = "#Carriers">Carriers</a> </td><td> <a href = "#Fillet">Fillet</a> </td><td> <a href = "#Polyholes">Polyholes</a> </td></tr>
-<tr><td> <a href = "#Bulldogs">Bulldogs</a> </td><td> <a href = "#Pin_headers">Pin_headers</a> </td><td> <a href = "#Corner_block">Corner_block</a> </td><td> <a href = "#Hanging_hole">Hanging_hole</a> </td><td> <a href = "#Rounded_rectangle">Rounded_rectangle</a> </td></tr>
-<tr><td> <a href = "#Buttons">Buttons</a> </td><td> <a href = "#Psus">Psus</a> </td><td> <a href = "#Door_hinge">Door_hinge</a> </td><td> <a href = "#Layout">Layout</a> </td><td> <a href = "#Sphere">Sphere</a> </td></tr>
-<tr><td> <a href = "#Cable_strips">Cable_strips</a> </td><td> <a href = "#Pulleys">Pulleys</a> </td><td> <a href = "#Door_latch">Door_latch</a> </td><td> <a href = "#Maths">Maths</a> </td><td> <a href = "#Teardrops">Teardrops</a> </td></tr>
-<tr><td> <a href = "#Components">Components</a> </td><td> <a href = "#Rails">Rails</a> </td><td> <a href = "#Fan_guard">Fan_guard</a> </td><td> <a href = "#Offset">Offset</a> </td><td></td></tr>
-<tr><td> <a href = "#Displays">Displays</a> </td><td> <a href = "#Ring_terminals">Ring_terminals</a> </td><td> <a href = "#Fixing_block">Fixing_block</a> </td><td> <a href = "#Quadrant">Quadrant</a> </td><td></td></tr>
-<tr><td> <a href = "#D_connectors">D_connectors</a> </td><td> <a href = "#Rockers">Rockers</a> </td><td> <a href = "#Flat_hinge">Flat_hinge</a> </td><td> <a href = "#Round">Round</a> </td><td></td></tr>
-<tr><td> <a href = "#Fans">Fans</a> </td><td> <a href = "#Rod">Rod</a> </td><td> <a href = "#Foot">Foot</a> </td><td> <a href = "#Rounded_cylinder">Rounded_cylinder</a> </td><td></td></tr>
-<tr><td> <a href = "#Fuseholder">Fuseholder</a> </td><td> <a href = "#Screws">Screws</a> </td><td> <a href = "#Handle">Handle</a> </td><td> <a href = "#Rounded_polygon">Rounded_polygon</a> </td><td></td></tr>
-<tr><td> <a href = "#Green_terminals">Green_terminals</a> </td><td> <a href = "#Sealing_strip">Sealing_strip</a> </td><td> <a href = "#Psu_shroud">Psu_shroud</a> </td><td> <a href = "#Sector">Sector</a> </td><td></td></tr>
-<tr><td> <a href = "#Hot_ends">Hot_ends</a> </td><td> <a href = "#Sheets">Sheets</a> </td><td> <a href = "#Ribbon_clamp">Ribbon_clamp</a> </td><td> <a href = "#Sweep">Sweep</a> </td><td></td></tr>
-<tr><td> <a href = "#Iecs">Iecs</a> </td><td> <a href = "#Spades">Spades</a> </td><td> <a href = "#Screw_knob">Screw_knob</a> </td><td> <a href = "#Tube">Tube</a> </td><td></td></tr>
-<tr><td> <a href = "#Inserts">Inserts</a> </td><td> <a href = "#Spools">Spools</a> </td><td> <a href = "#Socket_box">Socket_box</a> </td><td></td><td></td></tr>
-<tr><td> <a href = "#Jack">Jack</a> </td><td> <a href = "#Springs">Springs</a> </td><td> <a href = "#Ssr_shroud">Ssr_shroud</a> </td><td></td><td></td></tr>
-<tr><td> <a href = "#Ldrs">Ldrs</a> </td><td> <a href = "#Ssrs">Ssrs</a> </td><td> <a href = "#Strap_handle">Strap_handle</a> </td><td></td><td></td></tr>
-<tr><td> <a href = "#Leadnuts">Leadnuts</a> </td><td> <a href = "#Stepper_motors">Stepper_motors</a> </td><td></td><td></td><td></td></tr>
-<tr><td> <a href = "#Leds">Leds</a> </td><td> <a href = "#Toggles">Toggles</a> </td><td></td><td></td><td></td></tr>
-<tr><td> <a href = "#Light_strips">Light_strips</a> </td><td> <a href = "#Transformers">Transformers</a> </td><td></td><td></td><td></td></tr>
-<tr><td> <a href = "#Linear_bearings">Linear_bearings</a> </td><td> <a href = "#Tubings">Tubings</a> </td><td></td><td></td><td></td></tr>
-<tr><td> <a href = "#Mains_sockets">Mains_sockets</a> </td><td> <a href = "#Variacs">Variacs</a> </td><td></td><td></td><td></td></tr>
-<tr><td> <a href = "#Meter">Meter</a> </td><td> <a href = "#Veroboard">Veroboard</a> </td><td></td><td></td><td></td></tr>
-<tr><td> <a href = "#Microswitches">Microswitches</a> </td><td> <a href = "#Washers">Washers</a> </td><td></td><td></td><td></td></tr>
-<tr><td> <a href = "#Microview">Microview</a> </td><td> <a href = "#Wire">Wire</a> </td><td></td><td></td><td></td></tr>
-<tr><td> <a href = "#Modules">Modules</a> </td><td> <a href = "#Zipties">Zipties</a> </td><td></td><td></td><td></td></tr>
-<tr><td> <a href = "#Nuts">Nuts</a> </td><td></td><td></td><td></td><td></td></tr>
+<tr><td> <a href = "#Belts">Belts</a> </td><td> <a href = "#Opengrab">Opengrab</a> </td><td> <a href = "#Cable_grommets">Cable_grommets</a> </td><td> <a href = "#Dogbones">Dogbones</a> </td><td> <a href = "#Global">Global</a> </td></tr>
+<tr><td> <a href = "#Blowers">Blowers</a> </td><td> <a href = "#Pcbs">Pcbs</a> </td><td> <a href = "#Carriers">Carriers</a> </td><td> <a href = "#Fillet">Fillet</a> </td><td> <a href = "#Polyholes">Polyholes</a> </td></tr>
+<tr><td> <a href = "#Bulldogs">Bulldogs</a> </td><td> <a href = "#Pillars">Pillars</a> </td><td> <a href = "#Corner_block">Corner_block</a> </td><td> <a href = "#Hanging_hole">Hanging_hole</a> </td><td> <a href = "#Rounded_rectangle">Rounded_rectangle</a> </td></tr>
+<tr><td> <a href = "#Buttons">Buttons</a> </td><td> <a href = "#Pin_headers">Pin_headers</a> </td><td> <a href = "#Door_hinge">Door_hinge</a> </td><td> <a href = "#Layout">Layout</a> </td><td> <a href = "#Sphere">Sphere</a> </td></tr>
+<tr><td> <a href = "#Cable_strips">Cable_strips</a> </td><td> <a href = "#Psus">Psus</a> </td><td> <a href = "#Door_latch">Door_latch</a> </td><td> <a href = "#Maths">Maths</a> </td><td> <a href = "#Teardrops">Teardrops</a> </td></tr>
+<tr><td> <a href = "#Components">Components</a> </td><td> <a href = "#Pulleys">Pulleys</a> </td><td> <a href = "#Fan_guard">Fan_guard</a> </td><td> <a href = "#Offset">Offset</a> </td><td></td></tr>
+<tr><td> <a href = "#D_connectors">D_connectors</a> </td><td> <a href = "#Rails">Rails</a> </td><td> <a href = "#Fixing_block">Fixing_block</a> </td><td> <a href = "#Quadrant">Quadrant</a> </td><td></td></tr>
+<tr><td> <a href = "#Displays">Displays</a> </td><td> <a href = "#Ring_terminals">Ring_terminals</a> </td><td> <a href = "#Flat_hinge">Flat_hinge</a> </td><td> <a href = "#Round">Round</a> </td><td></td></tr>
+<tr><td> <a href = "#Fans">Fans</a> </td><td> <a href = "#Rockers">Rockers</a> </td><td> <a href = "#Foot">Foot</a> </td><td> <a href = "#Rounded_cylinder">Rounded_cylinder</a> </td><td></td></tr>
+<tr><td> <a href = "#Fuseholder">Fuseholder</a> </td><td> <a href = "#Rod">Rod</a> </td><td> <a href = "#Handle">Handle</a> </td><td> <a href = "#Rounded_polygon">Rounded_polygon</a> </td><td></td></tr>
+<tr><td> <a href = "#Geared_steppers">Geared_steppers</a> </td><td> <a href = "#Screws">Screws</a> </td><td> <a href = "#Pcb_mount">Pcb_mount</a> </td><td> <a href = "#Sector">Sector</a> </td><td></td></tr>
+<tr><td> <a href = "#Green_terminals">Green_terminals</a> </td><td> <a href = "#Sealing_strip">Sealing_strip</a> </td><td> <a href = "#Psu_shroud">Psu_shroud</a> </td><td> <a href = "#Sweep">Sweep</a> </td><td></td></tr>
+<tr><td> <a href = "#Hot_ends">Hot_ends</a> </td><td> <a href = "#Sheets">Sheets</a> </td><td> <a href = "#Ribbon_clamp">Ribbon_clamp</a> </td><td> <a href = "#Tube">Tube</a> </td><td></td></tr>
+<tr><td> <a href = "#Hygrometer">Hygrometer</a> </td><td> <a href = "#Spades">Spades</a> </td><td> <a href = "#Screw_knob">Screw_knob</a> </td><td></td><td></td></tr>
+<tr><td> <a href = "#Iecs">Iecs</a> </td><td> <a href = "#Spools">Spools</a> </td><td> <a href = "#Socket_box">Socket_box</a> </td><td></td><td></td></tr>
+<tr><td> <a href = "#Inserts">Inserts</a> </td><td> <a href = "#Springs">Springs</a> </td><td> <a href = "#Ssr_shroud">Ssr_shroud</a> </td><td></td><td></td></tr>
+<tr><td> <a href = "#Jack">Jack</a> </td><td> <a href = "#Ssrs">Ssrs</a> </td><td> <a href = "#Strap_handle">Strap_handle</a> </td><td></td><td></td></tr>
+<tr><td> <a href = "#Ldrs">Ldrs</a> </td><td> <a href = "#Stepper_motors">Stepper_motors</a> </td><td></td><td></td><td></td></tr>
+<tr><td> <a href = "#Leadnuts">Leadnuts</a> </td><td> <a href = "#Toggles">Toggles</a> </td><td></td><td></td><td></td></tr>
+<tr><td> <a href = "#Leds">Leds</a> </td><td> <a href = "#Transformers">Transformers</a> </td><td></td><td></td><td></td></tr>
+<tr><td> <a href = "#Light_strips">Light_strips</a> </td><td> <a href = "#Tubings">Tubings</a> </td><td></td><td></td><td></td></tr>
+<tr><td> <a href = "#Linear_bearings">Linear_bearings</a> </td><td> <a href = "#Variacs">Variacs</a> </td><td></td><td></td><td></td></tr>
+<tr><td> <a href = "#Mains_sockets">Mains_sockets</a> </td><td> <a href = "#Veroboard">Veroboard</a> </td><td></td><td></td><td></td></tr>
+<tr><td> <a href = "#Meter">Meter</a> </td><td> <a href = "#Washers">Washers</a> </td><td></td><td></td><td></td></tr>
+<tr><td> <a href = "#Microswitches">Microswitches</a> </td><td> <a href = "#Wire">Wire</a> </td><td></td><td></td><td></td></tr>
+<tr><td> <a href = "#Microview">Microview</a> </td><td> <a href = "#Zipties">Zipties</a> </td><td></td><td></td><td></td></tr>
+<tr><td> <a href = "#Modules">Modules</a> </td><td></td><td></td><td></td><td></td></tr>
 </table>
 
 ---
@@ -164,6 +165,8 @@ exposing enough information to make a battery box.
 Models timing belt running over toothed or smooth pulleys and calculates an accurate length.
 Only models 2D paths, so not core XY!
 
+To make the back of the belt run against a smooth pulley on the outside of the loop specify a negative pitch radius.
+
 By default the path is a closed loop but a gap length and position can be specified to make open loops.
 
 Individual teeth are not drawn, instead they are represented by a lighter colour.
@@ -257,7 +260,7 @@ Models of radial blowers.
 | Qty | Module call | BOM entry |
 | ---:|:--- |:---|
 |   1 | ```blower(PE4020)``` |  Blower Pengda Technology 4020 |
-|   1 | ```blower(RM5015)``` |  Blower Runda RB5015 |
+|   1 | ```blower(RB5015)``` |  Blower Runda RB5015 |
 |   3 | ```screw(M3_cap_screw, 20)``` |  Screw M3 cap x 20mm |
 |   2 | ```screw(M4_cap_screw, 25)``` |  Screw M4 cap x 25mm |
 |   3 | ```washer(M3_washer)``` |  Washer  M3 x 7mm x 0.5mm |
@@ -476,55 +479,6 @@ Various electronic components used in hot ends and heated beds.
 |   1 | ```resistor(Honewell)``` |  Thermistor Honeywell 135-104LAC-J01 100K 1% |
 
 
-<a href="#top">Top</a>
-
----
-<a name="Displays"></a>
-## Displays
-LCD dispays.
-
-
-[vitamins/displays.scad](vitamins/displays.scad) Object definitions.
-
-[vitamins/display.scad](vitamins/display.scad) Implementation.
-
-[tests/displays.scad](tests/displays.scad) Code for this example.
-
-### Properties
-| Function | Description |
-|:--- |:--- |
-| ```display_aperture(type)``` | Size of the aperture including its depth |
-| ```display_height(type)``` | Depth of the metal part |
-| ```display_pcb(type)``` | PCB mounted on the back |
-| ```display_pcb_offset(type)``` | 3D offset of the PCB centre |
-| ```display_ribbon(type)``` | Keep out region for ribbon cable |
-| ```display_thickness(type)``` | Height of the metal part |
-| ```display_threads(type)``` | Length that studs protrude from the PCB holes |
-| ```display_touch_screen(type)``` | Touch screen position and size |
-| ```display_width(type)``` | Width of the metal part |
-
-### Functions
-| Function | Description |
-|:--- |:--- |
-| ```display_depth(type)``` | Total thickness including touch screen and PCB |
-| ```display_ts_thickness(type)``` | Touch screen thickness or 0 |
-
-### Modules
-| Module | Description |
-|:--- |:--- |
-| ```display(type)``` | Draw specified display |
-| ```display_aperture(type, clearance, clear_pcb = false)``` | Make aperture cutout |
-
-![displays](tests/png/displays.png)
-
-### Vitamins
-| Qty | Module call | BOM entry |
-| ---:|:--- |:---|
-|   1 | ```display(HDMI5)``` |  HDMI display 5" |
-|   1 | ```display(LCD1602A)``` |  LCD display 1602A |
-|   1 | ```display(SSD1963_4p3)``` |  LCD display SSD1963 4.3" |
-
-
 <a href="#top">Top</a>
 
 ---
@@ -581,6 +535,56 @@ D-connectors. Can be any number of ways, male or female, solder buckets, PCB mou
 |   6 | ```d_pillar()``` |  D-type connector pillar |
 
 
+<a href="#top">Top</a>
+
+---
+<a name="Displays"></a>
+## Displays
+LCD dispays.
+
+
+[vitamins/displays.scad](vitamins/displays.scad) Object definitions.
+
+[vitamins/display.scad](vitamins/display.scad) Implementation.
+
+[tests/displays.scad](tests/displays.scad) Code for this example.
+
+### Properties
+| Function | Description |
+|:--- |:--- |
+| ```display_aperture(type)``` | Size of the aperture including its depth |
+| ```display_height(type)``` | Depth of the metal part |
+| ```display_pcb(type)``` | PCB mounted on the back |
+| ```display_pcb_offset(type)``` | 3D offset of the PCB centre |
+| ```display_ribbon(type)``` | Keep out region for ribbon cable |
+| ```display_thickness(type)``` | Height of the metal part |
+| ```display_threads(type)``` | Length that studs protrude from the PCB holes |
+| ```display_touch_screen(type)``` | Touch screen position and size |
+| ```display_width(type)``` | Width of the metal part |
+
+### Functions
+| Function | Description |
+|:--- |:--- |
+| ```display_depth(type)``` | Total thickness including touch screen and PCB |
+| ```display_ts_thickness(type)``` | Touch screen thickness or 0 |
+
+### Modules
+| Module | Description |
+|:--- |:--- |
+| ```display(type)``` | Draw specified display |
+| ```display_aperture(type, clearance, clear_pcb = false)``` | Make aperture cutout |
+
+![displays](tests/png/displays.png)
+
+### Vitamins
+| Qty | Module call | BOM entry |
+| ---:|:--- |:---|
+|   1 | ```display(HDMI5)``` |  HDMI display 5" |
+|   1 | ```display(LCD1602A)``` |  LCD display 1602A |
+|   1 | ```display(LCDS7282B)``` |  LCD display S-7282B |
+|   1 | ```display(SSD1963_4p3)``` |  LCD display SSD1963 4.3" |
+
+
 <a href="#top">Top</a>
 
 ---
@@ -612,16 +616,11 @@ Can draw three styles: solid, open frame and open frame with screw bosses.
 | ```fan_thickness(type)``` | Thickness of the frame |
 | ```fan_width(type)``` | Width of square |
 
-### Functions
-| Function | Description |
-|:--- |:--- |
-| ```fan_screw_length(type, thickness)``` | Screw length required |
-
 ### Modules
 | Module | Description |
 |:--- |:--- |
 | ```fan(type)``` | Draw specified fan, origin in the centre |
-| ```fan_assembly(type, thickness, include_fan = true, screw = false)``` | Fan with its fasteners |
+| ```fan_assembly(type, thickness, include_fan = true, screw = false, full_depth = false)``` | Fan with its fasteners |
 | ```fan_hole_positions(type, z = undef)``` | Position children at the screw hole positions |
 | ```fan_holes(type, poly = false, screws = true, h = 100)``` | Make all the holes for the fan, or just the aperture if ```screws``` is false. Set ```poly``` true for poly_holes. |
 
@@ -631,6 +630,7 @@ Can draw three styles: solid, open frame and open frame with screw bosses.
 | Qty | Module call | BOM entry |
 | ---:|:--- |:---|
 |   1 | ```fan(fan120x25)``` |  Fan 120mm x 25mm |
+|   1 | ```fan(fan17x8)``` |  Fan 17mm x 8mm |
 |   1 | ```fan(fan25x10)``` |  Fan 25mm x 10mm |
 |   1 | ```fan(fan30x10)``` |  Fan 30mm x 10mm |
 |   1 | ```fan(fan40x11)``` |  Fan 40mm x 11mm |
@@ -640,17 +640,20 @@ Can draw three styles: solid, open frame and open frame with screw bosses.
 |   1 | ```fan(fan70x15)``` |  Fan 70mm x 15mm |
 |   1 | ```fan(fan80x25)``` |  Fan 80mm x 25mm |
 |   1 | ```fan(fan80x38)``` |  Fan 80mm x 38mm |
+|   4 | ```nut(M2_nut, nyloc = true)``` |  Nut M2 x 1.6mm nyloc |
 |   4 | ```nut(M2p5_nut, nyloc = true)``` |  Nut M2.5 x 2.2mm nyloc |
 |   8 | ```nut(M3_nut, nyloc = true)``` |  Nut M3 x 2.4mm nyloc |
 |  28 | ```nut(M4_nut, nyloc = true)``` |  Nut M4 x 3.2mm nyloc |
+|   4 | ```screw(M2_cap_screw, 16)``` |  Screw M2 cap x 16mm |
 |   4 | ```screw(M2p5_pan_screw, 20)``` |  Screw M2.5 pan x 20mm |
 |   8 | ```screw(M3_dome_screw, 20)``` |  Screw M3 dome x 20mm |
 |  20 | ```screw(M4_dome_screw, 16)``` |  Screw M4 dome x 16mm |
 |   4 | ```screw(M4_dome_screw, 25)``` |  Screw M4 dome x 25mm |
 |   4 | ```screw(M4_dome_screw, 30)``` |  Screw M4 dome x 30mm |
-|   4 | ```washer(M2p5_washer)``` |  Washer  M2.5 x 5.9mm x 0.5mm |
-|   8 | ```washer(M3_washer)``` |  Washer  M3 x 7mm x 0.5mm |
-|  28 | ```washer(M4_washer)``` |  Washer  M4 x 9mm x 0.8mm |
+|   8 | ```washer(M2_washer)``` |  Washer  M2 x 5mm x 0.3mm |
+|   8 | ```washer(M2p5_washer)``` |  Washer  M2.5 x 5.9mm x 0.5mm |
+|  12 | ```washer(M3_washer)``` |  Washer  M3 x 7mm x 0.5mm |
+|  32 | ```washer(M4_washer)``` |  Washer  M4 x 9mm x 0.8mm |
 
 
 <a href="#top">Top</a>
@@ -684,6 +687,57 @@ Can draw three styles: solid, open frame and open frame with screw bosses.
 |   1 | ```fuseholder(6)``` |  Fuse holder 20mm |
 
 
+<a href="#top">Top</a>
+
+---
+<a name="Geared_steppers"></a>
+## Geared_steppers
+Geared tin can steppers
+
+
+[vitamins/geared_steppers.scad](vitamins/geared_steppers.scad) Object definitions.
+
+[vitamins/geared_stepper.scad](vitamins/geared_stepper.scad) Implementation.
+
+[tests/geared_steppers.scad](tests/geared_steppers.scad) Code for this example.
+
+### Properties
+| Function | Description |
+|:--- |:--- |
+| ```gs_boss_d(type)``` | Boss around the shaft diameter |
+| ```gs_boss_h(type)``` | Boss around the shaft height |
+| ```gs_bulge2_d(type)``` | Plastic rear bulge depth from centre |
+| ```gs_bulge2_h(type)``` | Plastic rear bulge height |
+| ```gs_bulge2_w(type)``` | Plastic rear bulge width |
+| ```gs_bulge_d(type)``` | Plastic bulge depth from centre |
+| ```gs_bulge_h(type)``` | Plastic bulge height |
+| ```gs_bulge_w(type)``` | Plastic bulge width |
+| ```gs_diameter(type)``` | Can diameter |
+| ```gs_flat_length(type)``` | Shaft flat length |
+| ```gs_height(type)``` | Can height |
+| ```gs_hole_d(type)``` | Screw hole diameter |
+| ```gs_lug_t(type)``` | Screw lug thickness |
+| ```gs_lug_w(type)``` | Screw lug width |
+| ```gs_offset(type)``` | Offset of the shaft from the centre of the can |
+| ```gs_pitch(type)``` | Screw pitch |
+| ```gs_shaft_d(type)``` | Shaft diameter |
+| ```gs_shaft_flat(type)``` | Shaft width across the flats |
+| ```gs_shaft_length(type)``` | Shaft length |
+
+### Modules
+| Module | Description |
+|:--- |:--- |
+| ```geared_stepper(type)``` | Draw the specified geared stepper |
+| ```geared_stepper_screw_positions(type)``` | Place children at the screw positions |
+
+![geared_steppers](tests/png/geared_steppers.png)
+
+### Vitamins
+| Qty | Module call | BOM entry |
+| ---:|:--- |:---|
+|   1 | ```geared_stepper(28BYJ_48)``` |  Geared stepper - 28BYJ-48 5V |
+
+
 <a href="#top">Top</a>
 
 ---
@@ -775,7 +829,7 @@ Needs updating as mostly obsolete versions.
 ### Modules
 | Module | Description |
 |:--- |:--- |
-| ```hot_end(type, filament, naked = false)``` | Draw specified hot end |
+| ```hot_end(type, filament, naked = false, resistor_wire_rotate = [0,0,0])``` | Draw specified hot end |
 
 ![hot_ends](tests/png/hot_ends.png)
 
@@ -794,7 +848,38 @@ Needs updating as mostly obsolete versions.
 |   1 |  |  Tape self amalgamating silicone 110mm x 25mm |
 |   1 | ```resistor(Epcos)``` |  Thermistor Epcos B57560G104F 100K 1% |
 |   2 |  |  Wire Red PTFE 16/0.2mm strands, length 170mm |
-|   4 | ```ziptie(small_ziptie, 8)``` |  Ziptie 100mm min length |
+|   4 | ```ziptie(small_ziptie, 8)``` |  Ziptie 2.5mm x 100mm min length |
+
+
+<a href="#top">Top</a>
+
+---
+<a name="Hygrometer"></a>
+## Hygrometer
+Mini LCD Celsius Digital Thermometer Hygrometer Temperature Humidity Meter Gauge on eBay
+
+
+[vitamins/hygrometer.scad](vitamins/hygrometer.scad) Implementation.
+
+[tests/hygrometer.scad](tests/hygrometer.scad) Code for this example.
+
+### Functions
+| Function | Description |
+|:--- |:--- |
+| ```hygrometer_or()``` | The outside radius of a hygrometer |
+
+### Modules
+| Module | Description |
+|:--- |:--- |
+| ```hygrometer()``` | Draw a hygrometer |
+| ```hygrometer_hole(h = 0)``` | Drill the hole for a hygrometer |
+
+![hygrometer](tests/png/hygrometer.png)
+
+### Vitamins
+| Qty | Module call | BOM entry |
+| ---:|:--- |:---|
+|   1 | ```hygrometer()``` |  Mini LCD Digital Thermometer / Hygrometer |
 
 
 <a href="#top">Top</a>
@@ -901,7 +986,7 @@ Heatfit threaded inserts. Can be pushed into thermoplastics using a soldering ir
 | ```insert(type)``` | Draw specified insert |
 | ```insert_boss(type, z, wall = 2 * extrusion_width)``` | Make a boss to take an insert |
 | ```insert_hole(type, counterbore = 0, horizontal = false)``` | Make a hole to take an insert, ```counterbore``` is the extra length for the screw |
-| ```insert_lug(insert, wall, side, counter_bore = 0)``` | Make a flying insert lug, see [ssr_shroud](#Ssr_shroud) |
+| ```insert_lug(insert, wall, counter_bore = 0, extension = 0, corner_r = 0, flying = true)``` | Make a flying insert lug, see [ssr_shroud](#Ssr_shroud) |
 
 ![inserts](tests/png/inserts.png)
 
@@ -1490,6 +1575,34 @@ If a nut is given a child then it gets placed on its top surface.
 |   1 | ```wingnut(M4_wingnut)``` |  Wingnut M4 |
 
 
+<a href="#top">Top</a>
+
+---
+<a name="O_ring"></a>
+## O_ring
+Nitrile rubber O-rings.
+
+Just a black torus specified by internal diameter, ```id``` and ```minor_d``` plus a BOM entry.
+Can be shown stretched by specifying the ```actual_id```.
+
+
+[vitamins/o_ring.scad](vitamins/o_ring.scad) Implementation.
+
+[tests/o_ring.scad](tests/o_ring.scad) Code for this example.
+
+### Modules
+| Module | Description |
+|:--- |:--- |
+| ```O_ring(id, minor_d, actual_id = 0)``` | Draw O-ring with specified internal diameter and minor diameter. ```actual_id``` can be used to stretch it around something. |
+
+![o_ring](tests/png/o_ring.png)
+
+### Vitamins
+| Qty | Module call | BOM entry |
+| ---:|:--- |:---|
+|   1 | ```O_ring(2.5, 1.6)``` |  O-ring nitrile 2.5mm x 1.6mm |
+
+
 <a href="#top">Top</a>
 
 ---
@@ -1527,34 +1640,6 @@ A permanent magnet that can be magnatized and de-magnatized electronically.
 |   1 | ```opengrab()``` |  OpenGrab V3 electro permanent magnet |
 
 
-<a href="#top">Top</a>
-
----
-<a name="O_ring"></a>
-## O_ring
-Nitrile rubber O-rings.
-
-Just a black torus specified by internal diameter, ```id``` and ```minor_d``` plus a BOM entry.
-Can be shown stretched by specifying the ```actual_id```.
-
-
-[vitamins/o_ring.scad](vitamins/o_ring.scad) Implementation.
-
-[tests/o_ring.scad](tests/o_ring.scad) Code for this example.
-
-### Modules
-| Module | Description |
-|:--- |:--- |
-| ```O_ring(id, minor_d, actual_id = 0)``` | Draw O-ring with specified internal diameter and minor diameter. ```actual_id``` can be used to stretch it around something. |
-
-![o_ring](tests/png/o_ring.png)
-
-### Vitamins
-| Qty | Module call | BOM entry |
-| ---:|:--- |:---|
-|   1 | ```O_ring(2.5, 1.6)``` |  O-ring nitrile 2.5mm x 1.6mm |
-
-
 <a href="#top">Top</a>
 
 ---
@@ -1572,6 +1657,13 @@ PCBs and perfboard with optional components. The shape can be a rectangle with o
 ### Properties
 | Function | Description |
 |:--- |:--- |
+| ```hdmi_depth(type)``` | Front to back depth |
+| ```hdmi_height(type)``` | Outside height above the PCB |
+| ```hdmi_height1(type)``` | Inside height at the sides |
+| ```hdmi_height2(type)``` | Inside height in the middle |
+| ```hdmi_thickness(type)``` | Wall thickness of the metal |
+| ```hdmi_width1(type)``` | Inside width at the top |
+| ```hdmi_width2(type)``` | Inside width at the bottom |
 | ```pcb_accessories(type)``` | List of accessories to go on the BOM, SD cards, USB cables, etc. |
 | ```pcb_colour(type)``` | Colour of the subtrate |
 | ```pcb_components(type)``` | List of components |
@@ -1590,7 +1682,9 @@ PCBs and perfboard with optional components. The shape can be a rectangle with o
 ### Functions
 | Function | Description |
 |:--- |:--- |
+| ```pcb_component_position(type, name, index = 0)``` | Return x y position of specified component |
 | ```pcb_coord(type, p)``` | Convert offsets from the edge to coordinates relative to the centre |
+| ```pcb_grid_pos(type, x, y, z = 0)``` | Returns a pcb grid position |
 | ```pcb_screw(type, cap = hs_cap)``` | Mounting screw type |
 
 ### Modules
@@ -1598,19 +1692,21 @@ PCBs and perfboard with optional components. The shape can be a rectangle with o
 |:--- |:--- |
 | ```barrel_jack(cutout = false)``` | Draw barrel power jack |
 | ```chip(length, width, thickness, colour, cutout = false)``` | Draw a coloured cube to represent a chip, or other rectangular component |
+| ```flat_flex(cutout = false)``` | Draw flat flexistrip connector as used on RPI0 |
 | ```flex(cutout = false)``` | Draw flexistrip connector |
-| ```hdmi(cutout = false)``` | Draw HDMI socket |
+| ```hdmi(type, cutout = false)``` | Draw HDMI socket |
 | ```jack(cutout = false)``` | Draw 3.5mm jack |
 | ```molex_254(ways)``` | Draw molex header |
 | ```pcb(type)``` | Draw specified PCB |
 | ```pcb_assembly(type, height, thickness)``` | Draw PCB assembly with spaces and fasteners in place |
 | ```pcb_base(type, height, thickness, wall = 2)``` | Generate STL for a base with PCB spacers |
 | ```pcb_component(comp, cutouts = false, angle = undef)``` | Draw pcb component from description |
+| ```pcb_component_position(type, name)``` | Position child at the specified component position |
 | ```pcb_components(type, cutouts = false, angle = undef)``` | Draw list of PCB components on the PCB |
 | ```pcb_cutouts(type, angle = undef)``` | Make cut outs to clear components on a PCB |
-| ```pcb_grid(type, x, y, z = 0)``` | Positions children at specified grid positions |
+| ```pcb_grid(type, x, y, z = 0)``` | Positions children at specified grid position |
 | ```pcb_screw_positions(type)``` | Positions children at the mounting hole positions |
-| ```pcb_spacer(screw, height, wall = 1.8)``` | Generate STL for PCB spacer |
+| ```pcb_spacer(screw, height, wall = 1.8, taper = 0)``` | Generate STL for PCB spacer |
 | ```rj45(cutout = false)``` | Draw RJ45 Ethernet connector |
 | ```terminal_35(ways)``` | Draw 3.5mm terminal block |
 | ```uSD(size, cutout = false)``` | Draw uSD socket |
@@ -1623,20 +1719,22 @@ PCBs and perfboard with optional components. The shape can be a rectangle with o
 ### Vitamins
 | Qty | Module call | BOM entry |
 | ---:|:--- |:---|
+|   1 | ```pcb(ArduinoLeonardo)``` |  Arduino Leonardo |
 |   1 | ```pcb(ArduinoUno3)``` |  Arduino Uno R3 |
 |   1 |  |  Cat 5 patch cable 300mm |
 |   1 | ```d_plug(DCONN15, pcb = true)``` |  D-type 15 way PCB mount plug |
 |   1 | ```pcb(DuetE)``` |  Duet 2 Ethernet electronics |
 |   1 | ```pcb(Duex2)``` |  Duex2 expansion board |
 |   1 | ```pcb(Duex5)``` |  Duex5 expasnion board |
+|   1 | ```pcb(EnviroPlus)``` |  Enviro+ |
 |   1 | ```pcb(ExtruderPCB)``` |  Extruder connection PCB |
 |   1 | ```pcb(Keyes5p1)``` |  Keyes5.1 Arduino Uno expansion board |
 |   1 | ```pcb(Melzi)``` |  Melzi electronics |
-|   3 |  |  Micro SD card |
+|   4 |  |  Micro SD card |
 |   1 | ```molex_254(2)``` |  Molex KK header 2 way |
 |   1 | ```molex_254(3)``` |  Molex KK header 3 way |
 |  16 | ```nut(M2_nut, nyloc = true)``` |  Nut M2 x 1.6mm nyloc |
-|  12 | ```nut(M2p5_nut, nyloc = true)``` |  Nut M2.5 x 2.2mm nyloc |
+|  28 | ```nut(M2p5_nut, nyloc = true)``` |  Nut M2.5 x 2.2mm nyloc |
 |  12 | ```nut(M3_nut, nyloc = true)``` |  Nut M3 x 2.4mm nyloc |
 |  12 | ```nut(M4_nut, nyloc = true)``` |  Nut M4 x 3.2mm nyloc |
 |   1 | ```pcb(PI_IO)``` |  PI_IO V2 |
@@ -1648,38 +1746,46 @@ PCBs and perfboard with optional components. The shape can be a rectangle with o
 |   1 | ```pcb(PERF80x20)``` |  Perfboard 80 x 20mm |
 |   1 | ```pin_socket(2p54header, 13, 2, right_angle = true)``` |  Pin socket 13 x 2 right_angle |
 |   1 | ```pcb(RPI3)``` |  Raspberry Pi 3 |
-|  12 | ```screw(M2_cap_screw, 20)``` |  Screw M2 cap x 20mm |
-|   4 | ```screw(M2_cap_screw, 25)``` |  Screw M2 cap x 25mm |
+|   1 | ```pcb(RPI0)``` |  Raspberry Pi Zero |
+|  16 | ```screw(M2_cap_screw, 25)``` |  Screw M2 cap x 25mm |
 |   4 | ```screw(M2p5_cap_screw, 16)``` |  Screw M2.5 cap x 16mm |
+|   8 | ```screw(M2p5_cap_screw, 20)``` |  Screw M2.5 cap x 20mm |
 |   8 | ```screw(M2p5_pan_screw, 20)``` |  Screw M2.5 pan x 20mm |
-|   8 | ```screw(M3_cap_screw, 25)``` |  Screw M3 cap x 25mm |
-|   4 | ```screw(M3_cap_screw, 30)``` |  Screw M3 cap x 30mm |
-|  12 | ```screw(M4_cap_screw, 30)``` |  Screw M4 cap x 30mm |
+|   4 | ```screw(M2p5_pan_screw, 25)``` |  Screw M2.5 pan x 25mm |
+|   4 | ```screw(M2p5_pan_screw, 35)``` |  Screw M2.5 pan x 35mm |
+|   8 | ```screw(M3_cap_screw, 30)``` |  Screw M3 cap x 30mm |
+|   4 | ```screw(M3_cap_screw, 35)``` |  Screw M3 cap x 35mm |
+|   4 | ```screw(M4_cap_screw, 30)``` |  Screw M4 cap x 30mm |
+|   8 | ```screw(M4_cap_screw, 35)``` |  Screw M4 cap x 35mm |
 |   3 | ```terminal_35(2)``` |  Terminal block 2 way 3.5mm |
 |   2 | ```green_terminal(gt_2p54, 4)``` |  Terminal block 4 way 0.1" |
 |   1 |  |  USB A to Mini B lead |
 |  16 | ```washer(M2_washer)``` |  Washer  M2 x 5mm x 0.3mm |
-|  12 | ```washer(M2p5_washer)``` |  Washer  M2.5 x 5.9mm x 0.5mm |
+|  28 | ```washer(M2p5_washer)``` |  Washer  M2.5 x 5.9mm x 0.5mm |
 |  12 | ```washer(M3_washer)``` |  Washer  M3 x 7mm x 0.5mm |
 |  12 | ```washer(M4_washer)``` |  Washer  M4 x 9mm x 0.8mm |
+|   1 | ```pcb(ZC_A0591)``` |  ZC-A0591 ULN2003 driver PCB |
 
 ### Printed
 | Qty | Filename |
 | ---:|:--- |
-|   4 | pcb_spacer20100.stl |
-|   4 | pcb_spacer20110.stl |
-|   4 | pcb_spacer20120.stl |
 |   4 | pcb_spacer20130.stl |
-|   4 | pcb_spacer2560.stl |
-|   8 | pcb_spacer2570.stl |
+|   4 | pcb_spacer20140.stl |
+|   4 | pcb_spacer20150.stl |
+|   4 | pcb_spacer20160.stl |
+|   4 | pcb_spacer25100_2.stl |
+|   4 | pcb_spacer25110_2.stl |
+|   4 | pcb_spacer25120_2.stl |
+|   4 | pcb_spacer25230.stl |
+|   4 | pcb_spacer2570.stl |
 |   4 | pcb_spacer2580.stl |
 |   4 | pcb_spacer2590.stl |
-|   4 | pcb_spacer30140.stl |
-|   4 | pcb_spacer30150.stl |
-|   4 | pcb_spacer30190.stl |
-|   4 | pcb_spacer40160.stl |
-|   4 | pcb_spacer40170.stl |
-|   4 | pcb_spacer40180.stl |
+|   4 | pcb_spacer30170.stl |
+|   4 | pcb_spacer30180.stl |
+|   4 | pcb_spacer30220.stl |
+|   4 | pcb_spacer40190.stl |
+|   4 | pcb_spacer40200.stl |
+|   4 | pcb_spacer40210.stl |
 
 
 <a href="#top">Top</a>
@@ -1761,17 +1867,18 @@ Pin headers and sockets, etc.
 | ```box_header(type, cols = 1, rows = 1, smt = false, cutout = false)``` | Draw box header |
 | ```idc_transition(type, cols = 5, skip = [], cutout = false)``` | Draw IDC transition header |
 | ```pin(type, length = undef)``` | Draw a header pin |
-| ```pin_header(type, cols = 1, rows = 1, smt = false, cutout = false)``` | Draw pin header |
-| ```pin_socket(type, cols = 1, rows = 1, right_angle = false, height = 0, cutout = false)``` | Draw pin socket |
+| ```pin_header(type, cols = 1, rows = 1, smt = false, right_angle = false, cutout = false)``` | Draw pin header |
+| ```pin_socket(type, cols = 1, rows = 1, right_angle = false, height = 0, smt = false, cutout = false)``` | Draw pin socket |
 
 ![pin_headers](tests/png/pin_headers.png)
 
 ### Vitamins
 | Qty | Module call | BOM entry |
 | ---:|:--- |:---|
+|   1 | ```box_header(2p54header, 10, 2)``` |  Box header 10 x 2 |
 |   1 | ```idc_transition(2p54header, 10)``` |  IDC transition header 10 x 2 |
-|   1 | ```pin_header(2p54header102)``` |  Pin header 10 x 2 |
-|   1 | ```box_header(2p54header102)``` |  Pin header 10 x 2 |
+|   1 | ```pin_header(2p54header, 10, 2)``` |  Pin header 10 x 2 |
+|   1 | ```pin_header(2p54header, 10, 2, right_angle = true)``` |  Pin header 10 x 2 right_angle |
 |   1 | ```pin_socket(2p54header, 10, 2)``` |  Pin socket 10 x 2 |
 |   1 | ```pin_socket(2p54header, 10, 2, right_angle = true)``` |  Pin socket 10 x 2 right_angle |
 
@@ -2017,6 +2124,7 @@ Ring terminals and earth assemblies for DiBond panels.
 ### Properties
 | Function | Description |
 |:--- |:--- |
+| ```ringterm_crimp_length(type)``` | If non-zero the length of the crimp tube |
 | ```ringterm_hole(type)``` | Wire hole diameter |
 | ```ringterm_id(type)``` | Inside diameter |
 | ```ringterm_length(type)``` | Length of the tail including the ring |
@@ -2042,12 +2150,13 @@ Ring terminals and earth assemblies for DiBond panels.
 ### Vitamins
 | Qty | Module call | BOM entry |
 | ---:|:--- |:---|
-|   2 | ```nut(M3_nut, nyloc = true)``` |  Nut M3 x 2.4mm nyloc |
+|   3 | ```nut(M3_nut, nyloc = true)``` |  Nut M3 x 2.4mm nyloc |
 |   1 | ```ring_terminal(M3_ringterm)``` |  Ring terminal 3mm |
 |   1 | ```ring_terminal(M3_ringterm_cs)``` |  Ring terminal 3mm |
+|   1 | ```ring_terminal(M3_ringterm_crimp)``` |  Ring terminal crimp 3mm |
 |   1 | ```screw(M3_cap_screw, 10)``` |  Screw M3 cap x 10mm |
-|   1 | ```screw(M3_dome_screw, 10)``` |  Screw M3 dome x 10mm |
-|   4 | ```star_washer(M3_washer)``` |  Washer star M3 x 0.5mm |
+|   2 | ```screw(M3_dome_screw, 10)``` |  Screw M3 dome x 10mm |
+|   6 | ```star_washer(M3_washer)``` |  Washer star M3 x 0.5mm |
 
 
 <a href="#top">Top</a>
@@ -2101,13 +2210,19 @@ Rocket switch. Also used for neon indicator in the same form factor.
 ---
 <a name="Rod"></a>
 ## Rod
-Steel rods, with optional chamfer.
+Steel rods and studding with chamfered ends.
 
 
 [vitamins/rod.scad](vitamins/rod.scad) Implementation.
 
 [tests/rod.scad](tests/rod.scad) Code for this example.
 
+### Modules
+| Module | Description |
+|:--- |:--- |
+| ```rod(d , l)``` | Draw a smooth rod with specified length and diameter |
+| ```studding(d , l)``` | Draw a threaded rod with specified length and diameter |
+
 ![rod](tests/png/rod.png)
 
 ### Vitamins
@@ -2120,6 +2235,13 @@ Steel rods, with optional chamfer.
 |   1 | ```rod(5, 80)``` |  Smooth rod 5mm x 80mm |
 |   1 | ```rod(6, 80)``` |  Smooth rod 6mm x 80mm |
 |   1 | ```rod(8, 80)``` |  Smooth rod 8mm x 80mm |
+|   1 | ```studding(10, 80)``` |  Threaded rod M10 x 80mm |
+|   1 | ```studding(12, 80)``` |  Threaded rod M12 x 80mm |
+|   1 | ```studding(3, 80)``` |  Threaded rod M3 x 80mm |
+|   1 | ```studding(4, 80)``` |  Threaded rod M4 x 80mm |
+|   1 | ```studding(5, 80)``` |  Threaded rod M5 x 80mm |
+|   1 | ```studding(6, 80)``` |  Threaded rod M6 x 80mm |
+|   1 | ```studding(8, 80)``` |  Threaded rod M8 x 80mm |
 
 
 <a href="#top">Top</a>
@@ -2285,6 +2407,7 @@ Note that modules that drill holes will return a 2D object if ```h``` is set to
 |   1 | ```sheet(MDF19, 30, 30, 2)``` |  Sheet MDF 30mm x 30mm x 19mm |
 |   1 | ```sheet(MDF6, 30, 30, 2)``` |  Sheet MDF 30mm x 30mm x 6mm |
 |   1 | ```sheet(PMMA10, 30, 30, 2)``` |  Sheet acrylic 30mm x 30mm x 10mm |
+|   1 | ```sheet(PMMA2, 30, 30, 2)``` |  Sheet acrylic 30mm x 30mm x 2mm |
 |   1 | ```sheet(PMMA3, 30, 30, 2)``` |  Sheet acrylic 30mm x 30mm x 3mm |
 |   1 | ```sheet(PMMA6, 30, 30, 2)``` |  Sheet acrylic 30mm x 30mm x 6mm |
 |   1 | ```sheet(PMMA8, 30, 30, 2)``` |  Sheet acrylic 30mm x 30mm x 8mm |
@@ -2366,6 +2489,7 @@ Filament spool models
 | Qty | Module call | BOM entry |
 | ---:|:--- |:---|
 |   1 | ```spool(spool_200x55)``` |  Filament spool 200 x 55 |
+|   1 | ```spool(spool_200x60)``` |  Filament spool 200 x 60 |
 |   1 | ```spool(spool_300x85)``` |  Filament spool 300 x 85 |
 |   1 | ```spool(spool_300x88)``` |  Filament spool 300 x 88 |
 
@@ -2579,7 +2703,7 @@ Toggle switches
 | ---:|:--- |:---|
 |   1 | ```toggle(AP5236, 3)``` |  Toggle switch AP5236 |
 |   1 | ```toggle(CK7101, 3)``` |  Toggle switch CK7101 |
-|   1 | ```toggle(CK7105, 3)``` |  Toggle switch CK7101 |
+|   1 | ```toggle(CK7105, 3)``` |  Toggle switch CK7105 |
 |   1 | ```toggle(MS332F, 3)``` |  Toggle switch MS332F |
 
 
@@ -2921,7 +3045,7 @@ Just a BOM entry at the moment and cable bundle size functions for holes, plus c
 |:--- |:--- |
 | ```cable_tie(cable_r, thickness)``` | A ziptie threaded around cable radius ```cable_r``` and through a panel with specified ```thickness```. |
 | ```cable_tie_holes(cable_r, h = 100)``` | Holes to thread a ziptie through a panel to make a cable tie. |
-| ```mouse_hole(cable, h = 100)``` | A mouse hole to allow a panel to go over a wire bundle. |
+| ```mouse_hole(cable, h = 100, teardrop = false)``` | A mouse hole to allow a panel to go over a wire bundle. |
 | ```ribbon_cable(ways, length)``` | Add ribbon cable to the BOM |
 | ```wire(color, strands, length, strand = 0.2)``` | Add stranded wire to the BOM |
 
@@ -2937,7 +3061,7 @@ Just a BOM entry at the moment and cable bundle size functions for holes, plus c
 |   1 |  |  Wire orange 7/0.2mm strands, length 90mm |
 |   1 |  |  Wire red 7/0.2mm strands, length 90mm |
 |   1 |  |  Wire yellow 7/0.2mm strands, length 90mm |
-|   1 | ```ziptie(small_ziptie, 2.1)``` |  Ziptie 100mm min length |
+|   1 | ```ziptie(small_ziptie, 2.1)``` |  Ziptie 2.5mm x 100mm min length |
 
 
 <a href="#top">Top</a>
@@ -2973,9 +3097,9 @@ Cable zipties.
 ### Vitamins
 | Qty | Module call | BOM entry |
 | ---:|:--- |:---|
-|   1 | ```ziptie(small_ziptie, 5)``` |  Ziptie 100mm min length |
-|   1 | ```ziptie(ziptie_3mm, 5)``` |  Ziptie 100mm min length |
-|   1 | ```ziptie(ziptie_3p6mm, 5)``` |  Ziptie 100mm min length |
+|   1 | ```ziptie(small_ziptie, 5)``` |  Ziptie 2.5mm x 100mm min length |
+|   1 | ```ziptie(ziptie_3p6mm, 5)``` |  Ziptie 3.6mm x 100mm min length |
+|   1 | ```ziptie(ziptie_3mm, 5)``` |  Ziptie 3mm x 100mm min length |
 
 
 <a href="#top">Top</a>
@@ -3099,6 +3223,10 @@ and mounted components.
 A list specifies the internal dimensions, screw type, top, bottom and side sheet types and the block
 maximum spacing.
 
+ * An optional name can be specified to allow more then one box in a project.
+ * An optional list of fixing blocks to be omitted can be given.
+ * Star washers can be omitted by setting the 11th parameter to false.
+
 Uses [fixing blocks](#fixing_block) and [corner blocks](#corner_block).
 
 
@@ -3112,26 +3240,35 @@ Uses [fixing blocks](#fixing_block) and [corner blocks](#corner_block).
 | ```bbox_base_sheet(type)``` | Sheet type for the base |
 | ```bbox_depth(type)``` | Internal depth |
 | ```bbox_height(type)``` | Internal height |
+| ```bbox_name(type)``` | Optional name if there is more than one box in a project |
 | ```bbox_screw(type)``` | Screw type for corner blocks |
 | ```bbox_sheets(type)``` | Sheet type for the sides |
+| ```bbox_skip_blocks(type)``` | List of fixing blocks to skip, used to allow a hinged panel for example |
 | ```bbox_span(type)``` | Maximum span between fixing blocks |
 | ```bbox_top_sheet(type)``` | Sheet type for the top |
 | ```bbox_width(type)``` | Internal width |
+| ```star_washers(type)``` | Set to false to remove star washers. |
+
+### Functions
+| Function | Description |
+|:--- |:--- |
+| ```bbox_area(type)``` | Internal surdface area in m^2 |
+| ```bbox_volume(type)``` | Internal volume in litres |
 
 ### Modules
 | Module | Description |
 |:--- |:--- |
 | ```_bbox_assembly(type, top = true, base = true, left = true, right = true, back = true, front = true)``` | The box assembly, wrap with a local copy without parameters |
 | ```bbox_back(type)``` | Default back, can be overridden to customise |
-| ```bbox_back_blank(type)``` | 2D template for the back |
+| ```bbox_back_blank(type, sheet = false)``` | 2D template for the back |
 | ```bbox_base(type)``` | Default base, can be overridden to customise |
 | ```bbox_base_blank(type)``` | 2D template for the base |
 | ```bbox_front(type)``` | Default front, can be overridden to customise |
-| ```bbox_front_blank(type)``` | 2D template for the front |
+| ```bbox_front_blank(type, sheet = false, width = 0)``` | 2D template for the front |
 | ```bbox_left(type)``` | Default left side, can be overridden to customise |
-| ```bbox_left_blank(type)``` | 2D template for the left side |
+| ```bbox_left_blank(type, sheet = false)``` | 2D template for the left side |
 | ```bbox_right(type)``` | Default right side, can be overridden to customise |
-| ```bbox_right_blank(type)``` | 2D template for the right side |
+| ```bbox_right_blank(type, sheet = false)``` | 2D template for the right side |
 | ```bbox_shelf_blank(type)``` | 2D template for a shelf |
 | ```bbox_top(type)``` | Default top, can be overridden to customise |
 | ```bbox_top_blank(type)``` | 2D template for the top |
@@ -3249,6 +3386,11 @@ See [butt_box](#Butt_box) for an example of usage.
 
 Note that the block with its inserts is defined as a sub assembly, but its fasteners get added to the parent assembly.
 
+Specific fasteners can be omitted by setting a side's thickness to 0 and the block omitted by setting ```show_block``` to false.
+This allows the block and one set of fasteners to be on one assembly and the other fasteners on the mating assemblies.
+
+Star washers can be omitted by setting ```star_washers``` to false.
+
 
 [printed/corner_block.scad](printed/corner_block.scad) Implementation.
 
@@ -3269,10 +3411,10 @@ Note that the block with its inserts is defined as a sub assembly, but its faste
 |:--- |:--- |
 | ```corner_block(screw = def_screw, name = false)``` | Generate the STL for a printed corner block |
 | ```corner_block_assembly(screw = def_screw, name = false)``` | The printed block with inserts |
-| ```corner_block_h_holes(screw = def_screw)``` | Place children at the side screw holes |
+| ```corner_block_h_holes(screw = def_screw, index = undef)``` | Place children at the side screw holes |
 | ```corner_block_holes(screw = def_screw)``` | Place children at all the holes |
 | ```corner_block_v_hole(screw = def_screw)``` | Place children at the bottom screw hole |
-| ```fastened_corner_block_assembly(thickness, screw = def_screw, thickness_below = undef, name = false)``` | Printed block with all fasteners |
+| ```fastened_corner_block_assembly(thickness, screw = def_screw, thickness_below = undef, thickness_side2 = undef, name = false, show_block = true, star_washers = true)``` | Printed block with all fasteners |
 
 ![corner_block](tests/png/corner_block.png)
 
@@ -3440,6 +3582,7 @@ The ring spacing as well as the number of spokes can be specified, if zero a gas
 | Qty | Filename |
 | ---:|:--- |
 |   1 | fan_guard_120.stl |
+|   1 | fan_guard_17.stl |
 |   1 | fan_guard_25.stl |
 |   1 | fan_guard_30.stl |
 |   1 | fan_guard_40.stl |
@@ -3461,6 +3604,11 @@ See [butt_box](#Butt_box) for an example of usage.
 
 Note that the block with its inserts is defined as a sub assembly, but its fasteners get added to the parent assembly.
 
+Specific fasteners can be omitted by setting a side's thickness to 0 and the block omitted by setting ```show_block``` to false.
+This allows the block and one set of fasteners to be on one assembly and the other fasteners on the mating assemblies.
+
+Star washers can be omitted by setting ```star_washers``` to false.
+
 
 [printed/fixing_block.scad](printed/fixing_block.scad) Implementation.
 
@@ -3480,7 +3628,7 @@ Note that the block with its inserts is defined as a sub assembly, but its faste
 ### Modules
 | Module | Description |
 |:--- |:--- |
-| ```fastened_fixing_block_assembly(thickness, screw = def_screw, screw2 = undef, thickness2 = undef)``` | Assembly with fasteners in place |
+| ```fastened_fixing_block_assembly(thickness, screw = def_screw, screw2 = undef, thickness2 = undef, show_block = true, star_washers = true)``` | Assembly with fasteners in place |
 | ```fixing_block(screw = def_screw)``` | Generate the STL |
 | ```fixing_block_assembly(screw = def_screw)``` | Printed part with the inserts inserted |
 | ```fixing_block_h_hole(screw = def_screw)``` | Position children on the horizontal hole |
@@ -3630,7 +3778,7 @@ inserts don't grip well in rubber.
 |:--- |:--- |
 | ```fastened_insert_foot_assembly(t = 3, type = insert_foot)``` | Assembly with fasteners in place for specified sheet thickness |
 | ```foot(type = foot)``` | Generate STL |
-| ```foot_assembly(t = 0, type = foot)``` | Assembly with fasteners in place for specified sheet thickness |
+| ```foot_assembly(t = 0, type = foot, flip = false)``` | Assembly with fasteners in place for specified sheet thickness |
 | ```insert_foot(type = insert_foot)``` | Generate STL for foot with insert |
 | ```insert_foot_assembly(type = insert_foot)``` | Printed part with insert in place |
 
@@ -3709,6 +3857,54 @@ Printed handle that can be printed without needing support material due to its t
 |   1 | handle_assembly |
 
 
+<a href="#top">Top</a>
+
+---
+<a name="Pcb_mount"></a>
+## Pcb_mount
+A frame to mount a PCB by its corners when it has no mounting holes.
+The stl must be given a parameterless wrapper in the project that uses it.
+
+
+[printed/pcb_mount.scad](printed/pcb_mount.scad) Implementation.
+
+[tests/pcb_mount.scad](tests/pcb_mount.scad) Code for this example.
+
+### Functions
+| Function | Description |
+|:--- |:--- |
+| ```pcb_mount_length(pcb)``` | Outside length of the mount |
+| ```pcb_mount_width(pcb)``` | Outside width of the mount |
+| ```pillar_x_pitch(pcb)``` | x pitch of screw pillars |
+| ```pillar_y_pitch(pcb)``` | y pitch of screw pillars |
+
+### Modules
+| Module | Description |
+|:--- |:--- |
+| ```pcb_mount(pcb, height = 5, washers = true)``` | Make the STL of a pcb mount for the specified PCB. |
+| ```pcb_mount_assembly(pcb, thickness, height = 5)``` | A PCB mount assembly with fasteners |
+| ```pcb_mount_holes(pcb, h = 0)``` | Drill holes for PCB mount |
+| ```pcb_mount_screw_positions(pcb)``` | Positions of the screws and pillars |
+| ```pcb_mount_washer_stl()``` | A plastic washer to clamp a PCB |
+
+![pcb_mount](tests/png/pcb_mount.png)
+
+### Vitamins
+| Qty | Module call | BOM entry |
+| ---:|:--- |:---|
+|   4 | ```nut(M3_nut, nyloc = true)``` |  Nut M3 x 2.4mm nyloc |
+|   1 | ```pcb(PI_IO)``` |  PI_IO V2 |
+|   1 | ```pin_socket(2p54header, 13, 2)``` |  Pin socket 13 x 2 |
+|   4 | ```screw(M3_cap_screw, 16)``` |  Screw M3 cap x 16mm |
+|   3 | ```terminal_35(2)``` |  Terminal block 2 way 3.5mm |
+|   4 | ```washer(M3_washer)``` |  Washer  M3 x 7mm x 0.5mm |
+
+### Printed
+| Qty | Filename |
+| ---:|:--- |
+|   1 | pcb_mount_PI_IO_5.stl |
+
+
 <a href="#top">Top</a>
 
 ---
@@ -3752,7 +3948,7 @@ The stl and assembly must be given a name and parameterless wrappers for the stl
 |   4 | ```screw(M3_cap_screw, 10)``` |  Screw M3 cap x 10mm |
 |   4 | ```washer(M3_washer)``` |  Washer  M3 x 7mm x 0.5mm |
 |   4 | ```star_washer(M3_washer)``` |  Washer star M3 x 0.5mm |
-|   2 | ```ziptie(small_ziptie, 3)``` |  Ziptie 100mm min length |
+|   2 | ```ziptie(small_ziptie, 3)``` |  Ziptie 2.5mm x 100mm min length |
 
 ### Printed
 | Qty | Filename |
@@ -3949,7 +4145,7 @@ The stl and assembly must be given a name and parameterless wrappers for the stl
 |   4 | ```screw(M3_cap_screw, 10)``` |  Screw M3 cap x 10mm |
 |   4 | ```washer(M3_washer)``` |  Washer  M3 x 7mm x 0.5mm |
 |   4 | ```star_washer(M3_washer)``` |  Washer star M3 x 0.5mm |
-|   4 | ```ziptie(small_ziptie, 3)``` |  Ziptie 100mm min length |
+|   4 | ```ziptie(small_ziptie, 3)``` |  Ziptie 2.5mm x 100mm min length |
 
 ### Printed
 | Qty | Filename |
@@ -4162,7 +4358,7 @@ Layout objects in a line with equal gaps given a vector of their widths.
 ---
 <a name="Maths"></a>
 ## Maths
-Maths utilities for minapulating vectors and matrices.
+Maths utilities for manipulating vectors and matrices.
 
 
 [utils/maths.scad](utils/maths.scad) Implementation.

scripts/deps.py

@@ -37,9 +37,10 @@ def read_deps(dname):
                 deps.append(dep)
     return deps
 
-def check_deps(target_mtime, dname):
+def check_deps(target, dname):
+    target_mtime = mtime(target)
     if not target_mtime:
-        return "target missing"
+        return target + " missing"
     if not os.path.isfile(dname):
         return "no deps"
     deps = read_deps(dname)

scripts/exports.py

@@ -84,7 +84,6 @@ def make_parts(target, part_type, parts = None):
     # Find all the scad files
     #
     lib_dir = os.environ['OPENSCADPATH'] + '/NopSCADlib/printed'
-    used = []
     module_suffix = '_dxf' if part_type == 'svg' else '_' + part_type
     for dir in [source_dir, lib_dir]:
         for filename in os.listdir(dir):
@@ -113,7 +112,7 @@ def make_parts(target, part_type, parts = None):
                                     #
                                     part_file = target_dir + "/" + part
                                     dname = deps_name(deps_dir, filename)
-                                    changed = check_deps(mtime(part_file), dname)
+                                    changed = check_deps(part_file, dname)
                                     changed = times.check_have_time(changed, part)
                                     if part_type == 'stl' and not changed and not part in bounds_map:
                                         changed = "No bounds"
@@ -125,14 +124,9 @@ def make_parts(target, part_type, parts = None):
                                         if part_type == 'stl':
                                             bounds = c14n_stl.canonicalise(part_file)
                                             bounds_map[part] = bounds
+
                                     targets.remove(part)
                                     os.remove(part_maker_name)
-                                    #
-                                    # Add the files on the BOM to the used list for plates.py
-                                    #
-                                    for line in open("openscad.log"):
-                                        if line[:7] == 'ECHO: "' and line[-6:] == '.' + part_type + '"\n':
-                                            used.append(line[7:-2])
     #
     # Write new bounds file
     #
@@ -150,4 +144,3 @@ def make_parts(target, part_type, parts = None):
                 print("Could not find a module called", part[:-4] + module_suffix, "to make", part)
         sys.exit(1)
     times.print_times()
-    return used

scripts/make_all.py

@@ -26,6 +26,7 @@ from exports import make_parts
 from bom import boms
 from render import render
 from views import views
+from plateup import plateup
 
 if __name__ == '__main__':
     target = None if len(sys.argv) == 1 else sys.argv[1]
@@ -33,4 +34,6 @@ if __name__ == '__main__':
     for part in ['stl', 'dxf']:
         make_parts(target, part)
         render(target, part)
+        plateup(target, part)
+
     views(target)

scripts/openscad.py

@@ -24,11 +24,12 @@ from __future__ import print_function
 
 import subprocess, sys
 
-def run(*args):
-    cmd = ["openscad"] + list(args)
-    for arg in cmd:
-        print(arg, end=" ")
-    print()
+def _run(args, silent):
+    cmd = ["openscad"] + args
+    if not silent:
+        for arg in cmd:
+            print(arg, end=" ")
+        print()
     with open("openscad.log", "w") as log:
         rc = subprocess.call(cmd, stdout = log, stderr = log)
     for line in open("openscad.log", "rt"):
@@ -36,3 +37,9 @@ def run(*args):
             print(line[:-1])
     if rc:
         sys.exit(rc)
+
+def run(*args):
+    _run(list(args), False)
+
+def run_silent(*args):
+    _run(list(args), True);

scripts/panels.py

@@ -0,0 +1,33 @@
+#!/usr/bin/env python
+
+#
+# NopSCADlib Copyright Chris Palmer 2018
+# nop.head@gmail.com
+# hydraraptor.blogspot.com
+#
+# This file is part of NopSCADlib.
+#
+# NopSCADlib is free software: you can redistribute it and/or modify it under the terms of the
+# GNU General Public License as published by the Free Software Foundation, either version 3 of
+# the License, or (at your option) any later version.
+#
+# NopSCADlib is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+# without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+# See the GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along with NopSCADlib.
+# If not, see <https://www.gnu.org/licenses/>.
+#
+#! Panelises DXF files so they can be routed together by running scad files found in the ```panels``` directory.
+
+from __future__ import print_function
+import sys
+
+from plateup import plateup
+
+if __name__ == '__main__':
+    if len(sys.argv) > 1:
+        target = sys.argv[1]
+    else:
+        target = None
+    plateup(target, 'dxf')

scripts/plateup.py

@@ -0,0 +1,98 @@
+#!/usr/bin/env python
+
+#
+# NopSCADlib Copyright Chris Palmer 2018
+# nop.head@gmail.com
+# hydraraptor.blogspot.com
+#
+# This file is part of NopSCADlib.
+#
+# NopSCADlib is free software: you can redistribute it and/or modify it under the terms of the
+# GNU General Public License as published by the Free Software Foundation, either version 3 of
+# the License, or (at your option) any later version.
+#
+# NopSCADlib is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+# without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+# See the GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along with NopSCADlib.
+# If not, see <https://www.gnu.org/licenses/>.
+#
+
+from __future__ import print_function
+import os
+import openscad
+import sys
+import c14n_stl
+from set_config import *
+from deps import *
+from shutil import copyfile
+
+source_dirs = { "stl" : "platters", "dxf" : "panels" }
+target_dirs = { "stl" : "printed",  "dxf" : "routed" }
+
+def plateup(target, part_type):
+    #
+    # Make the target directory
+    #
+    top_dir = set_config(target)
+    parts_dir = top_dir + part_type + 's'
+    target_dir = parts_dir + '/' + target_dirs[part_type]
+    source_dir = top_dir + source_dirs[part_type]
+    deps_dir = source_dir + "/deps"
+    if not os.path.isdir(source_dir):
+        return
+    if not os.path.isdir(target_dir):
+        os.makedirs(target_dir)
+    if not os.path.isdir(deps_dir):
+        os.makedirs(deps_dir)
+    #
+    # Decide which files to make
+    #
+    sources = [file for file in os.listdir(source_dir) if file.endswith('.scad')]
+    #
+    # Run OpenSCAD on the source files to make the targets
+    #
+    used = []
+    for src in sources:
+        src_file = source_dir + '/' + src
+        part_file = target_dir + '/' + src[:-4] + part_type
+        dname = deps_name(deps_dir, src)
+        changed = check_deps(part_file, dname)
+        if changed:
+            print(changed)
+            openscad.run("-D$bom=1", "-d", dname, "-o", part_file, src_file)
+            if part_type == 'stl':
+                c14n_stl.canonicalise(part_file)
+            log_name = 'openscad.log'
+        else:
+            log_name = 'openscad.echo'
+            openscad.run_silent("-D$bom=1", "-o", log_name, src_file)
+        #
+        # Add the files on the BOM to the used list
+        #
+        with open(log_name) as file:
+            for line in file.readlines():
+                if line.startswith('ECHO: "~') and line.endswith('.' + part_type + '"\n'):
+                    used.append(line[8:-2])
+    #
+    # Copy file that are not included
+    #
+    copied = []
+    for file in os.listdir(parts_dir):
+        if file.endswith('.' + part_type) and not file in used:
+            src = parts_dir + '/' + file
+            dst = target_dir + '/' + file
+            if mtime(src) > mtime(dst):
+                print("Copying %s to %s" % (src, dst))
+                copyfile(src, dst)
+            copied.append(file)
+    #
+    # Remove any cruft
+    #
+    targets = [file[:-4] + part_type for file in sources]
+    for file in os.listdir(target_dir):
+        if file.endswith('.' + part_type):
+            if not file in targets and not file in copied:
+                print("Removing %s" % file)
+                os.remove(target_dir + '/' + file)

scripts/platters.py

@@ -0,0 +1,33 @@
+#!/usr/bin/env python
+
+#
+# NopSCADlib Copyright Chris Palmer 2018
+# nop.head@gmail.com
+# hydraraptor.blogspot.com
+#
+# This file is part of NopSCADlib.
+#
+# NopSCADlib is free software: you can redistribute it and/or modify it under the terms of the
+# GNU General Public License as published by the Free Software Foundation, either version 3 of
+# the License, or (at your option) any later version.
+#
+# NopSCADlib is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+# without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+# See the GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along with NopSCADlib.
+# If not, see <https://www.gnu.org/licenses/>.
+#
+#! Generates build plates of STL files for efficient printing by running scad files found in the ```platters``` directory.
+
+from __future__ import print_function
+import sys
+
+from plateup import plateup
+
+if __name__ == '__main__':
+    if len(sys.argv) > 1:
+        target = sys.argv[1]
+    else:
+        target = None
+    plateup(target, 'stl')

scripts/readme.md

@@ -12,6 +12,8 @@ They should work with both Python 2 and Python 3.
 | ```dxfs.py``` | Generates DXF files for all the routed parts listed on the BOM or a specified list. |
 | ```gallery.py``` | Finds projects and adds them to the gallery. |
 | ```make_all.py``` | Generates all the files for a project by running ```bom.py```, ```stls.py```, ```dxfs.py```, ```render.py``` and ```views.py```. |
+| ```panels.py``` | Panelises DXF files so they can be routed together by running scad files found in the ```panels``` directory. |
+| ```platters.py``` | Generates build plates of STL files for efficient printing by running scad files found in the ```platters``` directory. |
 | ```render.py``` | Renders STL and DXF files to PNG for inclusion in the build instructions. |
 | ```set_config.py``` | Sets the target configuration for multi-target projects that have variable configurations. |
 | ```stls.py``` | Generates STL files for all the printed parts listed on the BOM or a specified list. |

scripts/tests.py

@@ -107,7 +107,7 @@ def tests(tests):
     #
     # List of individual part files
     #
-    scads = [i for i in os.listdir(scad_dir) if i[-5:] == ".scad"]
+    scads = [i for i in sorted(os.listdir(scad_dir)) if i[-5:] == ".scad"]
 
     for scad in scads:
         base_name = scad[:-5]
@@ -138,7 +138,7 @@ def tests(tests):
                 print("Can't find implementation!")
                 continue
 
-            vsplit = "N"
+            vsplit = "M"
             vtype = locations[0][1]
             types = [vtype + ' A-' + vsplit[0], vtype + ' ' + chr(ord(vsplit) + 1) + '-Z'] + [loc[1] for loc in locations[1 :]]
             if type == vtype:
@@ -187,7 +187,7 @@ def tests(tests):
             body += ["![%s](%s)\n" %(base_name, png_name)]
 
             dname = deps_name(deps_dir, scad)
-            oldest = min(mtime(png_name), mtime(bom_name))
+            oldest = png_name if mtime(png_name) < mtime(bom_name) else bom_name
             changed = check_deps(oldest, dname)
             changed = times.check_have_time(changed, scad_name)
             if changed:
@@ -257,7 +257,7 @@ See [usage](docs/usage.md) for requirements, installation instructions and a usa
             print('<tr>',  file = doc_file, end = '')
             for type in types:
                 if i < len(index[type]):
-                    name = index[type][i]
+                    name = sorted(index[type])[i]
                     print('<td> <a href = "#' + name + '">' + name + '</a> </td>', file = doc_file, end = '')
                 else:
                     print('<td></td>', file = doc_file, end = '')

scripts/views.py

@@ -154,14 +154,14 @@ def views(target, do_assemblies = None):
                                         f.write("use <%s/%s>\n" % (dir, filename))
                                         f.write("%s();\n" % module);
                                     #
-                                    # Run openscad on the created file
+                                    # Run openscad on th created file
                                     #
                                     dname = deps_name(deps_dir, filename)
                                     for explode in [0, 1]:
                                         png_name = target_dir + '/' + module + '.png'
                                         if not explode:
                                             png_name = png_name.replace('_assembly', '_assembled')
-                                        changed = check_deps(mtime(png_name), dname)
+                                        changed = check_deps(png_name, dname)
                                         changed = times.check_have_time(changed, png_name)
                                         tmp_name = 'tmp.png'
                                         if changed:

tests/geared_steppers.scad

@@ -0,0 +1,27 @@
+//
+// NopSCADlib Copyright Chris Palmer 2019
+// nop.head@gmail.com
+// hydraraptor.blogspot.com
+//
+// This file is part of NopSCADlib.
+//
+// NopSCADlib is free software: you can redistribute it and/or modify it under the terms of the
+// GNU General Public License as published by the Free Software Foundation, either version 3 of
+// the License, or (at your option) any later version.
+//
+// NopSCADlib is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+// without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+// See the GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License along with NopSCADlib.
+// If not, see <https://www.gnu.org/licenses/>.
+//
+include <../vitamins/geared_steppers.scad>
+
+use <../utils/layout.scad>
+
+module geared_steppers()
+    layout([for(g = geared_steppers) gs_diameter(g)], 5)
+        geared_stepper(geared_steppers[$i]);
+
+geared_steppers();

tests/hygrometer.scad

@@ -0,0 +1,22 @@
+//
+// NopSCADlib Copyright Chris Palmer 2018
+// nop.head@gmail.com
+// hydraraptor.blogspot.com
+//
+// This file is part of NopSCADlib.
+//
+// NopSCADlib is free software: you can redistribute it and/or modify it under the terms of the
+// GNU General Public License as published by the Free Software Foundation, either version 3 of
+// the License, or (at your option) any later version.
+//
+// NopSCADlib is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+// without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+// See the GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License along with NopSCADlib.
+// If not, see <https://www.gnu.org/licenses/>.
+//
+use <../vitamins/hygrometer.scad>
+
+if($preview)
+    hygrometer();

tests/inserts.scad

@@ -21,10 +21,20 @@ use <../utils/layout.scad>
 
 include <../vitamins/inserts.scad>
 
-module inserts()
+module inserts() {
+
     for(i = [0: len(inserts) -1])
         translate([10 * i, 0])
             insert(inserts[i]);
 
+    color(pp1_colour)
+        translate([len(inserts) * 10, 0]) {
+            insert_lug(inserts[0], 2, 1);
+
+            translate([10, 0])
+                insert_boss(inserts[0], z = 10, wall = 2);
+        }
+}
+
 if($preview)
     inserts();

tests/pcb_mount.scad

@@ -0,0 +1,35 @@
+//
+// NopSCADlib Copyright Chris Palmer 2019
+// nop.head@gmail.com
+// hydraraptor.blogspot.com
+//
+// This file is part of NopSCADlib.
+//
+// NopSCADlib is free software: you can redistribute it and/or modify it under the terms of the
+// GNU General Public License as published by the Free Software Foundation, either version 3 of
+// the License, or (at your option) any later version.
+//
+// NopSCADlib is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+// without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+// See the GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License along with NopSCADlib.
+// If not, see <https://www.gnu.org/licenses/>.
+//
+include <../lib.scad>
+use <../printed/pcb_mount.scad>
+
+PI_IO = ["PI_IO", "PI_IO V2",       35.56, 25.4, 1.6, 0,    0,   0, "green", true, [],
+    [[(3.015 - 2.7) * 25.4 - 3.5 /2, (4.5 - 3.685) * 25.4, 90, "term35", 2],
+     [(3.46  - 2.7) * 25.4 - 3.5 /2, (4.5 - 3.69)  * 25.4, 90, "term35", 2],
+     [(3.91  - 2.7) * 25.4 - 3.5 /2, (4.5 - 3.69)  * 25.4, 90, "term35", 2],
+     [(3.4   - 2.7) * 25.4,          (4.5 - 4.15)  * 25.4,  0, "2p54socket", 13, 2],
+    ], []];
+
+module pcb_mounts()
+    if($preview)
+        pcb_mount_assembly(PI_IO, 3);
+    else
+        pcb_mount(PI_IO);
+
+pcb_mounts();

tests/pcbs.scad

@@ -23,7 +23,7 @@ include <../vitamins/d_connectors.scad>
 include <../vitamins/pcbs.scad>
 
 module pcbs()
-    layout([for(p = pcbs) pcb_width(p)], 15)
+    layout([for(p = pcbs) pcb_width(p)], 10)
         translate([0, pcb_length(pcbs[$i]) / 2])
             rotate(90)
                 pcb_assembly(pcbs[$i], 5 + $i, 3);

tests/pin_headers.scad

@@ -28,15 +28,18 @@ module pin_headers()
         idc_transition(pin_headers[$i], 10);
 
         translate([0, 20])
-            pin_header(pin_headers[$i], 10, 2);
+            pin_header(pin_headers[$i], 10, 2, right_angle = true);
 
         translate([0, 40])
+            pin_header(pin_headers[$i], 10, 2);
+
+        translate([0, 60])
             box_header(pin_headers[$i], 10, 2);
 
-        translate([0, 65])
+        translate([0, 80])
             pin_socket(pin_headers[$i], 10, 2);
 
-        translate([0, 95])
+        translate([0, 110])
             pin_socket(pin_headers[$i], 10, 2, right_angle = true);
 
     }

tests/ring_terminals.scad

@@ -24,7 +24,7 @@ include <../vitamins/ring_terminals.scad>
 
 module ring_terminals()
     layout([for(t = ring_terminals) ringterm_od(t)], 5)
-        rotate(90)
+        rotate(180)
             ring_terminal_assembly(ring_terminals[$i], 3);
 
 if($preview)

tests/rod.scad

@@ -24,8 +24,13 @@ include <../vitamins/linear_bearings.scad>
 use <../vitamins/rod.scad>
 
 module rods()
-    layout([for(b = linear_bearings) 2 * bearing_radius(b)])
+    layout([for(b = linear_bearings) 2 * bearing_radius(b)]) {
+
         rod(bearing_rod_dia(linear_bearings[$i]), 80);
 
+        translate([0, 20])
+            studding(bearing_rod_dia(linear_bearings[$i]), 80);
+    }
+
 if($preview)
     rods();

tests/wire.scad

@@ -61,7 +61,7 @@ module wires() {
                     translate([-w / 2, 0])
                         square([w, h]);
 
-                    mouse_hole(bundle, 0);
+                    mouse_hole(bundle, 0, true);
                 }
 
         translate_z(-thickness)

utils/maths.scad

@@ -18,7 +18,7 @@
 //
 
 //
-//! Maths utilities for minapulating vectors and matrices.
+//! Maths utilities for manipulating vectors and matrices.
 //
 function sqr(x) = x * x;
 

vitamins/belt.scad

@@ -21,6 +21,8 @@
 //! Models timing belt running over toothed or smooth pulleys and calculates an accurate length.
 //! Only models 2D paths, so not core XY!
 //!
+//! To make the back of the belt run against a smooth pulley on the outside of the loop specify a negative pitch radius.
+//!
 //! By default the path is a closed loop but a gap length and position can be specified to make open loops.
 //!
 //! Individual teeth are not drawn, instead they are represented by a lighter colour.

vitamins/blowers.scad

@@ -17,7 +17,7 @@
 // If not, see <https://www.gnu.org/licenses/>.
 //
 
-RB5015 = ["RM5015", "Blower Runda RB5015",           51.3, 51, 15, 31.5, M4_cap_screw, 26, [27.3, 25.4], 4.5, [[4.3, 45.4], [47.3,7.4]], 20, 14, 1.5, 1.3, 1.2, 15];
+RB5015 = ["RB5015", "Blower Runda RB5015",           51.3, 51, 15, 31.5, M4_cap_screw, 26, [27.3, 25.4], 4.5, [[4.3, 45.4], [47.3,7.4]], 20, 14, 1.5, 1.3, 1.2, 15];
 PE4020 = ["PE4020", "Blower Pengda Technology 4020", 40,   40, 20, 27.5, M3_cap_screw, 22, [21.5, 20  ], 3.2, [[37,3],[3,37],[37,37]], 29.3, 17, 1.7, 1.2, 1.3, 13];
 
 blowers = [PE4020, RB5015];

vitamins/displays.scad

@@ -47,6 +47,19 @@ LCD1602A = ["LCD1602A", "LCD display 1602A", 71.3, 24.3, 7.0, LCD1602APCB,
           [],                                       // clearance need for the ts ribbon
         ];
 
+LCDS7282BPCB = ["", "", 85, 36, 1.65, 0, 2.56, 0, "green", false, [[-2.5, -2.5], [-2.5, 2.5], [2.5, 2.5], [2.5, -2.5]],
+      [ [3.5, 18, 0, "2p54header", 2, 7]
+      ],
+      []];
+
+LCDS7282B = ["LCDS7282B", "LCD display S-7282B", 73.6, 28.7, 9.6, LCDS7282BPCB,
+          [-2.5, 0, 0],                             // pcb offst
+          [[-64.5 / 2, -14.5 / 2], [64.5 / 2, 14.5 / 2, 0.6]],              // aperture
+          [],                                       // touch screen
+          0,                                        // thread length
+          [],                                       // clearance need for the ts ribbon
+        ];
+
 SSD1963_4p3PCB = ["", "", 120, 74, 1.65, 3, 3, 0, "mediumblue", false, [[3, 3], [-3, 3], [-3, -3], [3, -3]],
     [ [2.75 + 1.27, 37, 90, "2p54header", 20, 2]
     ],
@@ -60,6 +73,6 @@ SSD1963_4p3 = ["SSD1963_4p3", "LCD display SSD1963 4.3\"", 105.5, 67.2, 3.4, SSD
         [[0, -34.5], [12, -31.5]],
         ];
 
-displays = [HDMI5, SSD1963_4p3, LCD1602A];
+displays = [HDMI5, SSD1963_4p3, LCD1602A, LCDS7282B];
 
 use <display.scad>

vitamins/e3d.scad

@@ -61,30 +61,34 @@ heater_y = heater_width / 2;
 
 fan_x_offset = rad_dia / 2 + 4;
 
-module e3d_resistor(type) {
+module e3d_resistor(type, resistor_wire_rotate = [0,0,0]) {
     translate([11 - heater_x, -3 - heater_y, heater_height / 2 + nozzle_h]) {
         color("grey")
             rotate([-90, 0, 0])
                 cylinder(r = resistor_dia / 2, h = resistor_len);
 
         color("red")
-            translate([-3.5/2, resistor_len  + 3.5/2 + 1, 0]) {
-                cylinder(d = 3.5, h = 36);
+            translate([0, resistor_len + 3.5/2 + 1, 0]) {
+              rotate(resistor_wire_rotate) {
+                   translate([-3.5/2, 0, 0]) {
+                       cylinder(d = 3.5, h = 36);
 
-                translate([3.5, 0, 0])
-                    cylinder(r = 3.5 / 2, h = 36);
-            }
+                       translate([3.5, 0, 0])
+                           cylinder(r = 3.5 / 2, h = 36);
+                   }
+               }
+           }
     }
 }
 
-module heater_block(type) {
+module heater_block(type, resistor_wire_rotate = [0,0,0]) {
     translate_z(-hot_end_length(type))  {
         translate_z(nozzle_h)
             color("lightgrey")
                 translate([-heater_x, -heater_y, 0])
                     cube([heater_length, heater_width, heater_height]);
 
-        e3d_resistor(type);
+        e3d_resistor(type, resistor_wire_rotate);
         e3d_nozzle(type);
     }
 }
@@ -118,7 +122,7 @@ module e3d_fan(type) {
                 fan(fan30x10);
 }
 
-module e3d_hot_end(type, filament, naked = false) {
+module e3d_hot_end(type, filament, naked = false, resistor_wire_rotate = [0,0,0]) {
     insulator_length = hot_end_insulator_length(type);
     inset = hot_end_inset(type);
     h_ailettes = rad_len / (2 * rad_nb_ailettes - 1);
@@ -146,17 +150,17 @@ module e3d_hot_end(type, filament, naked = false) {
             }
 
     rotate(90)
-        heater_block(type);
+        heater_block(type, resistor_wire_rotate);
 
     if(!naked)
         translate_z(inset - insulator_length)
             e3d_fan();
 }
 
-module e3d_hot_end_assembly(type, filament, naked = false) {
+module e3d_hot_end_assembly(type, filament, naked = false, resistor_wire_rotate = [0,0,0]) {
     bundle = 3.2;
 
-    e3d_hot_end(type, filament, naked);
+    e3d_hot_end(type, filament, naked, resistor_wire_rotate);
 
     // Wire and ziptie
     if(!naked)

vitamins/fan.scad

@@ -147,11 +147,16 @@ module fan_holes(type, poly = false, screws = true, h = 100) { //! Make all the
     }
 }
 
-function nut_and_washer_thickness(screw, nyloc) = washer_thickness(screw_washer(screw)) + nut_thickness(screw_nut(screw), nyloc);
-function fan_screw_depth(type) = fan_boss_d(type) ? fan_depth(type) : fan_thickness(type);
-function fan_screw_length(type, thickness) = screw_longer_than(thickness + fan_screw_depth(type) + nut_and_washer_thickness(fan_screw(type), true)); //! Screw length required
+function fan_screw_depth(type, full_depth = false) = fan_boss_d(type) || full_depth ? fan_depth(type) : fan_thickness(type);
 
-module fan_assembly(type, thickness, include_fan = true, screw = false) { //! Fan with its fasteners
+function fan_screw_length(type, thickness, full_depth = false) =
+    let(depth = fan_screw_depth(type, full_depth),
+        washers = depth == fan_depth(type) ? 2 : 1,
+        washer = screw_washer(fan_screw(type)),
+        nut = screw_nut(fan_screw(type)))
+            screw_longer_than(thickness + depth + washer_thickness(washer) * washers + nut_thickness(nut, true)); //! Screw length required
+
+module fan_assembly(type, thickness, include_fan = true, screw = false, full_depth = false) { //! Fan with its fasteners
     translate_z(-fan_depth(type) / 2) {
         if(include_fan)
             fan(type);
@@ -160,11 +165,14 @@ module fan_assembly(type, thickness, include_fan = true, screw = false) { //! Fa
         nut = screw_nut(Screw);
         fan_hole_positions(type) {
             translate_z(thickness)
-                screw_and_washer(Screw, fan_screw_length(type, thickness));
+                screw_and_washer(Screw, fan_screw_length(type, thickness, full_depth));
 
-            translate_z(include_fan ? -fan_screw_depth(type) : 0)
+            translate_z(include_fan ? -fan_screw_depth(type, full_depth) : 0)
                 vflip()
-                    nut(nut, true);
+                    if(fan_screw_depth(type, full_depth) == fan_depth(type))
+                        nut_and_washer(nut, true);
+                    else
+                        nut(nut, true);
         }
      }
 }

vitamins/fans.scad

@@ -40,7 +40,8 @@ fan50x15 = [50, 15, 48, 20,    M4_dome_screw, 25,   12.5,100,7, 0,   undef];
 fan40x11 = [40, 11, 37, 16,    M3_dome_screw, 25,   7.5,100, 9, 0,   undef];
 fan30x10 = [30, 10, 27, 12,    M3_dome_screw, 17,   10, 100, 5, 0,   undef];
 fan25x10 = [25, 10, 24, 10,   M2p5_pan_screw, 16,   10, 100, 5, 0,   undef];
+fan17x8  = [17,  8, 16, 6.75,  M2_cap_screw,  12.6,  8, 100, 7, 0,   undef];
 
-fans = [fan25x10, fan30x10, fan40x11, fan50x15, fan60x15, fan60x25, fan70x15, fan80x25, fan80x38, fan120x25];
+fans = [fan17x8, fan25x10, fan30x10, fan40x11, fan50x15, fan60x15, fan60x25, fan70x15, fan80x25, fan80x38, fan120x25];
 
 use <fan.scad>

vitamins/geared_stepper.scad

@@ -0,0 +1,114 @@
+//
+// NopSCADlib Copyright Chris Palmer 2019
+// nop.head@gmail.com
+// hydraraptor.blogspot.com
+//
+// This file is part of NopSCADlib.
+//
+// NopSCADlib is free software: you can redistribute it and/or modify it under the terms of the
+// GNU General Public License as published by the Free Software Foundation, either version 3 of
+// the License, or (at your option) any later version.
+//
+// NopSCADlib is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+// without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+// See the GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License along with NopSCADlib.
+// If not, see <https://www.gnu.org/licenses/>.
+//
+
+//
+//! Geared tin can steppers
+//
+include <../core.scad>
+use <../utils/rounded_cylinder.scad>
+use <../utils/round.scad>
+
+function gs_diameter(type)     = type[2]; //! Can diameter
+function gs_height(type)       = type[3]; //! Can height
+function gs_pitch(type)        = type[4]; //! Screw pitch
+function gs_lug_w(type)        = type[5]; //! Screw lug width
+function gs_lug_t(type)        = type[6]; //! Screw lug thickness
+function gs_hole_d(type)       = type[7]; //! Screw hole diameter
+function gs_offset(type)       = type[8]; //! Offset of the shaft from the centre of the can
+function gs_boss_d(type)       = type[9]; //! Boss around the shaft diameter
+function gs_boss_h(type)       = type[10]; //! Boss around the shaft height
+function gs_shaft_d(type)      = type[11]; //! Shaft diameter
+function gs_shaft_flat(type)   = type[12]; //! Shaft width across the flats
+function gs_shaft_length(type) = type[13]; //! Shaft length
+function gs_flat_length(type)  = type[14]; //! Shaft flat length
+function gs_bulge_w(type)      = type[15]; //! Plastic bulge width
+function gs_bulge_d(type)      = type[16]; //! Plastic bulge depth from centre
+function gs_bulge_h(type)      = type[17]; //! Plastic bulge height
+function gs_bulge2_w(type)     = type[18]; //! Plastic rear bulge width
+function gs_bulge2_d(type)     = type[19]; //! Plastic rear bulge depth from centre
+function gs_bulge2_h(type)     = type[20]; //! Plastic rear bulge height
+
+module geared_stepper_screw_positions(type) //! Place children at the screw positions
+    for(side = [-1, 1])
+        translate([side * gs_pitch(type) / 2, -gs_offset(type)])
+            children();
+
+module geared_stepper(type) { //! Draw the specified geared stepper
+    vitamin(str("geared_stepper(", type[0], "): Geared stepper - ", type[1]));
+
+    radius = gs_diameter(type) / 2;
+    height = gs_height(type);
+    offset = gs_offset(type);
+    color("silver") {
+        translate([0, -offset])
+            rounded_cylinder(r = radius, h = height, r2 = 1);
+
+        cylinder(d = gs_boss_d(type), h = 2 * gs_boss_h(type), center = true);
+
+        linear_extrude(height = gs_lug_t(type))
+            difference() {
+                hull()
+                    geared_stepper_screw_positions(type)
+                        circle(d = gs_lug_w(type));
+
+                geared_stepper_screw_positions(type)
+                    circle(d = gs_hole_d(type));
+            }
+
+        translate([0, -offset - radius, eps])
+            cube([gs_bulge_w(type) - 2, 2 * (gs_bulge_d(type) - radius) - 2, 2 * eps], center = true);
+    }
+    vflip()
+        color(brass) {
+            d = gs_shaft_d(type);
+            h = gs_shaft_length(type);
+            linear_extrude(height = h)
+                intersection() {
+                    circle(d = d);
+
+                    square([d + 1, gs_shaft_flat(type)], center = true);
+                }
+
+            cylinder(d = d, h = h - gs_flat_length(type));
+        }
+
+    color("skyblue") {
+        h1 = gs_bulge_h(type);
+        translate([0, - offset - radius, eps])
+            rounded_rectangle([gs_bulge_w(type), 2 * (gs_bulge_d(type) - radius), h1], 0.5, center = false);
+
+        h2 = gs_bulge2_h(type);
+        translate([0, - offset, h1 + 1 - h2])
+            linear_extrude(height = h2)
+                round(0.5)
+                    intersection() {
+                        circle(gs_bulge2_d(type));
+
+                        translate([0, -50])
+                            square([gs_bulge2_w(type), 100], center = true);
+                    }
+    }
+
+    translate_z(2.5)
+        for(i = [0 : 4])
+            translate([i - 2.5, 0])
+                rotate([90, 0, 0])
+                    color(["yellow", "orange", "red", "pink", "blue"][i])
+                        cylinder(d = 1, h = radius + offset + 10);
+}

vitamins/geared_steppers.scad

@@ -0,0 +1,27 @@
+//
+// NopSCADlib Copyright Chris Palmer 2019
+// nop.head@gmail.com
+// hydraraptor.blogspot.com
+//
+// This file is part of NopSCADlib.
+//
+// NopSCADlib is free software: you can redistribute it and/or modify it under the terms of the
+// GNU General Public License as published by the Free Software Foundation, either version 3 of
+// the License, or (at your option) any later version.
+//
+// NopSCADlib is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+// without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+// See the GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License along with NopSCADlib.
+// If not, see <https://www.gnu.org/licenses/>.
+//
+
+//
+//! Geared tin can steppers
+//
+28BYJ_48 = ["28BYJ_48", "28BYJ-48 5V", 28, 19, 35, 7, 0.85, 4.2, 8, 9, 1.5, 5, 3, 10, 6, 14.7, 17, 16.5, 17.7, 15.5, 13.8 ];
+
+geared_steppers = [28BYJ_48];
+
+use <geared_stepper.scad>

vitamins/hot_end.scad

@@ -44,10 +44,10 @@ function hot_end_length(type) = hot_end_total_length(type) - hot_end_inset(type)
 use <jhead.scad>
 use <e3d.scad>
 
-module hot_end(type, filament, naked = false) { //! Draw specified hot end
+module hot_end(type, filament, naked = false, resistor_wire_rotate = [0,0,0]) { //! Draw specified hot end
     if(hot_end_style(type) == jhead)
         jhead_hot_end_assembly(type, filament, naked);
 
     if(hot_end_style(type) == e3d)
-        e3d_hot_end_assembly(type, filament, naked);
+        e3d_hot_end_assembly(type, filament, naked, resistor_wire_rotate);
 }

vitamins/hygrometer.scad

@@ -0,0 +1,87 @@
+//
+// NopSCADlib Copyright Chris Palmer 2018
+// nop.head@gmail.com
+// hydraraptor.blogspot.com
+//
+// This file is part of NopSCADlib.
+//
+// NopSCADlib is free software: you can redistribute it and/or modify it under the terms of the
+// GNU General Public License as published by the Free Software Foundation, either version 3 of
+// the License, or (at your option) any later version.
+//
+// NopSCADlib is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+// without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+// See the GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License along with NopSCADlib.
+// If not, see <https://www.gnu.org/licenses/>.
+//
+
+//
+//! Mini LCD Celsius Digital Thermometer Hygrometer Temperature Humidity Meter Gauge on eBay
+//
+include <../core.scad>
+use <../utils/round.scad>
+
+od = 40.9;
+h = 14;
+flange_d = 45.5;
+flange_t = 1.5;
+flange_d2 = 32;
+flange_t2 = 2;
+apperture_d = 24.7;
+hygrometer_hole_r = 21.3;
+slot_w = 5.5;
+
+module hygrometer_hole(h = 0) { //! Drill the hole for a hygrometer
+    round(cnc_bit_r) {
+        intersection() {
+            drill(hygrometer_hole_r, h);
+
+            rotate(30)
+                square([slot_w + 2 * cnc_bit_r, 100], center = true);
+        }
+        drill((od + 0.2) / 2, h);
+    }
+}
+
+function hygrometer_or() = flange_d / 2; //! The outside radius of a hygrometer
+
+module hygrometer() { //! Draw a hygrometer
+    vitamin("hygrometer(): Mini LCD Digital Thermometer / Hygrometer");
+
+    explode(40) {
+        color(grey30)
+            rotate_extrude()
+                polygon([
+                    [0, 0],
+                    [apperture_d / 2, 0],
+                    [apperture_d / 2, flange_t],
+                    [flange_d2 / 2,   flange_t2],
+                    [flange_d / 2,    flange_t],
+                    [flange_d / 2,    0],
+                    [od / 2,          0],
+                    [od / 2,          -h],
+                    [0,               -h]
+                ]);
+
+        color("#94A7AB")
+            cylinder(d = apperture_d, h = eps);
+
+        color("black")
+            linear_extrude(height = 0.2, center = true) {
+                translate([0, 3])
+                    text("20_4", font = "7 segment", valign = "bottom", halign = "center", size = apperture_d / 6);
+
+                translate([7, 3])
+                    text("C", font = "7 segment", valign = "bottom", halign = "center", size = apperture_d / 8);
+
+                translate([-1.9, 0.5])
+                    text("50", font = "7 segment", valign = "top", halign = "center", size = apperture_d / 2.7);
+
+                translate([0, -apperture_d / 6])
+                    text("          %", font = "Arial", valign = "center", halign = "center", size = apperture_d / 6);
+            }
+
+    }
+}

vitamins/insert.scad

@@ -21,6 +21,7 @@
 //! Heatfit threaded inserts. Can be pushed into thermoplastics using a soldering iron with a conical bit set to 200°C.
 //
 include <../core.scad>
+use <../utils/quadrant.scad>
 
 function insert_length(type)         = type[1]; //! Length
 function insert_outer_d(type)        = type[2]; //! Outer diameter at the top
@@ -96,31 +97,52 @@ module insert_hole(type, counterbore = 0, horizontal = false) { //! Make a hole
 function insert_boss_radius(type, wall) = corrected_radius(insert_hole_radius(type)) + wall; //! Compute the outer radius of an insert boss
 
 module insert_boss(type, z, wall = 2 * extrusion_width) { //! Make a boss to take an insert
-    render(convexity = 3)
-        difference() {
-            ir = insert_hole_radius(type);
-            linear_extrude(height = z)
-                hull()
-                    poly_ring(corrected_radius(ir) + wall, ir);
+    ir = insert_hole_radius(type);
+    or = corrected_radius(ir) + wall;
 
-            translate_z(z)
-                insert_hole(type, max(0, z - insert_hole_length(type) - 2 * layer_height));
+    module shape()
+        hull()
+            poly_ring(or, ir);
+
+    linear_extrude(height = z)
+        poly_ring(or, ir);
+
+    linear_extrude(height = z - insert_hole_length(type))
+        difference() {
+            shape();
+
+            poly_circle(insert_screw_diameter(type) / 2 + 0.1);
         }
+
+    if(z > insert_hole_length(type) + 2 * layer_height)
+        linear_extrude(height = 2 * layer_height)       // cap the end if room
+            shape();
 }
 
-module insert_lug(insert, wall, side, counter_bore = 0) { //! Make a flying insert lug, see [ssr_shroud](#Ssr_shroud)
+module insert_lug(insert, wall, counter_bore = 0, extension = 0, corner_r = 0, flying = true) { //! Make a flying insert lug, see [ssr_shroud](#Ssr_shroud)
     boss_r = insert_boss_radius(insert, wall);
     boss_h = insert_hole_length(insert);
     boss_h2 = boss_h + counter_bore;
+
+    module shape()
+        intersection() {
+            hull() {
+                circle(boss_r);
+
+                translate([boss_r + extension - eps, 0])
+                    square([eps, 2 * boss_r], center = true);
+            }
+            if(corner_r)
+                translate([boss_r + extension - corner_r, 0])
+                    rotate(-45)
+                        quadrant(w = 100, r = corner_r - eps, center = true);
+        }
+
     translate_z(-boss_h)
         linear_extrude(height = boss_h)
              difference() {
-                hull() {
-                    circle(boss_r);
+                shape();
 
-                    translate([side * (boss_r - 1), 0])
-                        square([eps, 2 * boss_r], center = true);
-                }
                 poly_circle(insert_hole_radius(insert));
             }
 
@@ -128,24 +150,19 @@ module insert_lug(insert, wall, side, counter_bore = 0) { //! Make a flying inse
     translate_z(-boss_h2) {
         linear_extrude(height = counter_bore + eps)
              difference() {
-                hull() {
-                    circle(boss_r);
+                shape();
 
-                    translate([side * (boss_r - 1), 0])
-                        square([eps, 2 * boss_r], center = true);
-                }
                 poly_circle(insert_screw_diameter(insert) / 2 + 0.1);
             }
 
-        // support cones
-        hull() {
-            cylinder(h = eps, r = boss_r - eps);
+        // support cone
+        if(flying)
+            hull() {
+                linear_extrude(height = eps)
+                    shape();
 
-            translate([side * (boss_r - 1), 0])
-                cube([eps, 2 * boss_r, eps], center = true);
-
-            translate([side * (boss_r - wall + eps), 0, - (2 * boss_r - wall)])
-                cube(eps, center = true);
-        }
+                translate([boss_r + extension - wall - eps, 0, - (2 * boss_r + extension - wall)])
+                    cube(eps, center = true);
+            }
     }
 }

vitamins/microview.scad

@@ -43,14 +43,14 @@ module microview(cutout = false) {  //! Draw microview or generate a panel cutou
             translate_z(8.35) {
 
                 color("black")
-                    import("microview/GKM-002_R05_CHIP_UPPER_HOUSING-1.stl", convexity = 2);
+                    import("microview/GKM-002_R05_CHIP_UPPER_HOUSING-1.STL", convexity = 2);
 
                 translate([-2, 0, 0])
                     color("dimgray")
                         cube([12.5, 15.5, 4.41], center = true);
             }
             color("dimgray")
-                import("microview/GKM-003_R05_CHIP_LOWER_HOUSING.stl", convexity = 2);
+                import("microview/GKM-003_R05_CHIP_LOWER_HOUSING.STL", convexity = 2);
 
             for(side = [-1, 1], i = [0 : 7])
                 translate([side * inch(0.35), (i - 3.5) * inch(0.1)])

vitamins/pcb.scad

@@ -49,9 +49,12 @@ function pcb_grid(type)         = type[13]; //! Grid if a perfboard
 function pcb_polygon(type)      = type[14]; //! Optional outline polygon for odd shaped boards
 function pcb_screw(type, cap = hs_cap) = Len(type[15]) ? type[15] : find_screw(cap, screw_smaller_than(pcb_hole_d(type))); //! Mounting screw type
 
-module pcb_grid(type, x, y, z = 0)  //! Positions children at specified grid positions
-    translate([-pcb_length(type) / 2 + pcb_grid(type).x + 2.54 * x,
-               -pcb_width(type)  / 2 + pcb_grid(type).y + 2.54 * y, pcb_thickness(type) + z])
+function pcb_grid_pos(type, x, y, z = 0) = //! Returns a pcb grid position
+    [-pcb_length(type) / 2 + pcb_grid(type).x + 2.54 * x,
+     -pcb_width(type)  / 2 + pcb_grid(type).y + 2.54 * y, pcb_thickness(type) + z];
+
+module pcb_grid(type, x, y, z = 0)  //! Positions children at specified grid position
+    translate(pcb_grid_pos(type, x, y, z))
         children();
 
 // allows negative ordinates to represent offsets from the far edge
@@ -197,14 +200,27 @@ module jack(cutout = false) { //! Draw 3.5mm jack
                 }
 }
 
-module hdmi(cutout = false) { //! Draw HDMI socket
-    l = 12;
-    iw1 = 14;
-    iw2 = 10;
-    ih1 = 3;
-    ih2 = 4.5;
-    h = 6.5;
-    t = 0.5;
+function hdmi_depth(type)     = type[2]; //! Front to back depth
+function hdmi_width1(type)    = type[3]; //! Inside width at the top
+function hdmi_width2(type)    = type[4]; //! Inside width at the bottom
+function hdmi_height1(type)   = type[5]; //! Inside height at the sides
+function hdmi_height2(type)   = type[6]; //! Inside height in the middle
+function hdmi_height(type)    = type[7]; //! Outside height above the PCB
+function hdmi_thickness(type) = type[8]; //! Wall thickness of the metal
+
+hdmi_full = [ "hdmi_full", "HDMI socket",      12,  14,   10,  3,    4.5, 6.5, 0.5 ];
+hdmi_mini = [ "hdmi_mini", "Mini HDMI socket", 7.5, 10.5, 8.3, 1.28, 2.5, 3.2, 0.35 ];
+
+module hdmi(type, cutout = false) { //! Draw HDMI socket
+    vitamin(str("hdmi(", type[0], "): ", type[1]));
+
+    l = hdmi_depth(type);
+    iw1 = hdmi_width1(type);
+    iw2 = hdmi_width2(type);
+    ih1 = hdmi_height1(type);
+    ih2 = hdmi_height2(type);
+    h = hdmi_height(type);
+    t = hdmi_thickness(type);
 
     module D() {
         hull() {
@@ -503,6 +519,53 @@ module flex(cutout = false) { //! Draw flexistrip connector
     }
 }
 
+module flat_flex(cutout = false) { //! Draw flat flexistrip connector as used on RPI0
+    l1 = 17;
+    w1 = 1.4;
+    h1 = 1.2;
+
+    l2 = 15.4;
+    w2 = 1.6;
+    h2 = 1.0;
+
+    l3 = 16;
+    w3 = 1.1;
+    h3 = 1.2;
+
+    l4 = 12;
+
+    slot_l = 11.8;
+    slot_h = 0.9;
+
+    w = w1 + w2 + w3;
+    if(cutout)
+        ;
+    else {
+        color(grey30) {
+            translate([w / 2 - w1, 0, h1 / 2])
+                rotate([90, 0, 90])
+                    linear_extrude(height = w1)
+                        difference() {
+                            square([l1, h1], center = true);
+
+                            translate([0, -h1 / 2])
+                                square([slot_l, slot_h * 2], center = true);
+                        }
+
+        }
+        color(grey90) {
+            translate([-w / 2 + w3 / 2, 0, h3 / 2])
+                cube([w3, l3, h3], center = true);
+
+            translate([-w / 2 + w3 + w2 / 2, 0, h2 / 2])
+                cube([w2, l2, h2], center = true);
+
+             translate([-w / 2 + w3 + w2 / 2, 0, h3 / 2])
+                cube([w2, l4, h3], center = true);
+       }
+    }
+}
+
 module terminal_35(ways) { //! Draw 3.5mm terminal block
     vitamin(str("terminal_35(", ways, "): Terminal block ", ways, " way 3.5mm"));
     pitch = 3.5;
@@ -637,19 +700,22 @@ module standoff(h, d, h2, d2) {
 
 module pcb_component(comp, cutouts = false, angle = undef) { //! Draw pcb component from description
     function show(comp, part) = (comp[3] == part || comp[3] == str("-",part)) && (!cutouts || angle == undef || angle == comp.z);
+    function param(n, default = 0) = len(comp) > n ? comp[n] : default;
     rotate(comp.z) {
-        if(show(comp, "2p54header")) pin_header(2p54header, comp[4], comp[5], len(comp) > 5 ? comp[6] : false, cutouts);
-        if(show(comp, "2p54boxhdr")) box_header(2p54header, comp[4], comp[5], len(comp) > 5 ? comp[6] : false, cutouts);
-        if(show(comp, "2p54socket")) pin_socket(2p54header, comp[4], comp[5], comp[6], len(comp) > 7 ? comp[7] : 0, cutouts);
-        if(show(comp, "chip")) chip(comp[4], comp[5], comp[6], len(comp) > 7 ? comp[7] : grey30, cutouts);
+        if(show(comp, "2p54header")) pin_header(2p54header, comp[4], comp[5], param(6), cutouts);
+        if(show(comp, "2p54boxhdr")) box_header(2p54header, comp[4], comp[5], param(6), cutouts);
+        if(show(comp, "2p54socket")) pin_socket(2p54header, comp[4], comp[5], param(6, false), param(7), param(8, false), cutouts);
+        if(show(comp, "chip")) chip(comp[4], comp[5], comp[6], param(7, grey30), cutouts);
         if(show(comp, "rj45")) rj45(cutouts);
         if(show(comp, "usb_Ax2")) usb_Ax2(cutouts);
         if(show(comp, "usb_uA")) usb_uA(cutouts);
         if(show(comp, "usb_B")) usb_B(cutouts);
         if(show(comp, "jack")) jack(cutouts);
         if(show(comp, "barrel_jack")) barrel_jack(cutouts);
-        if(show(comp, "hdmi")) hdmi(cutouts);
+        if(show(comp, "hdmi")) hdmi(hdmi_full, cutouts);
+        if(show(comp, "mini_hdmi")) hdmi(hdmi_mini, cutouts);
         if(show(comp, "flex")) flex(cutouts);
+        if(show(comp, "flat_flex")) flat_flex(cutouts);
         if(show(comp, "D_plug")) if(!cutouts) translate_z(d_pcb_offset(comp[4])) d_plug(comp[4], pcb = true);
         if(show(comp, "molex_hdr")) if(!cutouts) molex_254(comp[4]);
         if(show(comp, "term254")) if(!cutouts) green_terminal(gt_2p54,comp[4], comp[5]);
@@ -667,6 +733,25 @@ module pcb_component(comp, cutouts = false, angle = undef) { //! Draw pcb compon
     }
 }
 
+function pcb_component_position(type, name, index = 0) = //! Return x y position of specified component
+    [for(comp = pcb_components(type), p = [pcb_coord(type, [comp.x, comp.y])]) if(comp[3] == name) [p.x, p.y]][index];
+
+module pcb_component_position(type, name) { //! Position child at the specified component position
+    for(comp = pcb_components(type)) {
+        p = pcb_coord(type, [comp.x, comp.y]);
+        if(comp[3][0] == "-") {
+            if(comp[3] == str("-", name))
+                translate([p.x, p.y])
+                    vflip()
+                        children();
+        }
+        else
+            if(comp[3] == name)
+                translate([p.x, p.y, pcb_thickness(type)])
+                    children();
+    }
+}
+
 module pcb_components(type, cutouts = false, angle = undef) { //! Draw list of PCB components on the PCB
     not_on_bom(pcb_parts_on_bom(type))
         for(comp = pcb_components(type)) {
@@ -684,11 +769,12 @@ module pcb_components(type, cutouts = false, angle = undef) { //! Draw list of P
 module pcb_cutouts(type, angle = undef) pcb_components(type, true, angle); //! Make cut outs to clear components on a PCB
 
 module pcb_grid_positions(type) {
-    x0 = pcb_grid(type).x;
-    y0 = pcb_grid(type).y;
+    grid =  pcb_grid(type);
+    x0 = grid.x;
+    y0 = grid.y;
 
-    cols = round((pcb_length(type) - 2 * x0) / inch(0.1));
-    rows = round((pcb_width(type) - 2 * y0) / inch(0.1));
+    cols = is_undef(grid[2]) ? round((pcb_length(type) - 2 * x0) / inch(0.1)) : grid[2] - 1;
+    rows = is_undef(grid[3]) ? round((pcb_width(type) - 2 * y0) / inch(0.1))  : grid[3] - 1;
     for(x = [0 : cols], y = [0 : rows])
         pcb_grid(type, x, y)
             children();
@@ -724,9 +810,9 @@ module pcb(type) { //! Draw specified PCB
             pcb_screw_positions(type)
                 tube(or =  max(pcb_land_d(type), 1) / 2, ir = pcb_hole_d(type) / 2, h = t + 2 * eps);
 
-    fr4 = pcb_colour(type) == "green";
+    fr4 = pcb_colour(type) != "sienna";
     plating = 0.15;
-    color(fr4 ? "silver" : "gold")
+    color(pcb_colour(type) == "green" ? "silver" : "gold")
         translate_z(-plating)
             linear_extrude(height = fr4 ? t + 2 * plating : plating)
                 if(Len(grid)) {
@@ -736,7 +822,7 @@ module pcb(type) { //! Draw specified PCB
 
                             circle(d = 1);
                         }
-                    if(fr4) { // oval lands at the ends
+                    if(fr4 && len(grid) < 3) { // oval lands at the ends
                         screw_x = pcb_coord(type, pcb_holes(type)[0]).x;
                         y0 = pcb_grid(type).y;
                         rows = round((pcb_width(type) - 2 * y0) / inch(0.1));

vitamins/pcbs.scad

@@ -209,7 +209,29 @@ RPI3 =  ["RPI3", "Raspberry Pi 3",     85,    56,    1.4, 3,    2.75, 6, "green"
      [45,    11.5,-90, "flex"],
      [7.75,  28,  180, "-uSD", [12, 11.5, 1.28]],
     ],
-    [": Micro SD card"]];
+    [": Micro SD card"],
+    [32.5 - 9.5 * 2.54, 52.5 - 1.27, 20, 2]];
+
+RPI0 =  ["RPI0", "Raspberry Pi Zero",     65,    30,    1.4, 3,    2.75, 6, "green", false, [[3.5, 3.5], [-3.5, 3.5], [-3.5, -3.5], [3.5, -3.5]],
+    [//[32.5, -3.5,   0, "2p54header", 20, 2],
+     [25.5,  13,      0, "chip",       12, 12, 1.2],
+     [12.4,  3.4,   -90, "mini_hdmi"],
+     [54,    2,     -90, "usb_uA"],
+     [41.4,  2,     -90, "usb_uA"],
+     [7.25,  16.7,  180, "uSD", [12, 11.5, 1.4]],
+     [-1.3,    15,    0, "flat_flex"],
+    ],
+    [": Micro SD card"],
+    [32.5 - 9.5 * 2.54, 26.5 - 1.27, 20, 2]];
+
+EnviroPlus =  ["EnviroPlus", "Enviro+",     65,    30.6,    1.6, 3,    2.75, 6, "white", false, [[3.5, 3.8], [-3.5, 3.8], [-3.5, -3.8], [3.5, -3.8]],
+    [[32.5, -3.8,   0, "-2p54socket", 20, 2, false, 5, true],
+     [-15.5, 2.5,   0, "-chip", 15, 5, 3, "white"],
+     [-14.25,16.25, 0, "chip", 27.5, 13.5, 1.5]
+    ],
+    [],
+    [8, 1.5, 9, 1]];
+
 
 ArduinoUno3 = ["ArduinoUno3", "Arduino Uno R3", 68.58, 53.34, 1.6, 0, 3.3, 0, "#2140BE", false, [[15.24, 50.8],[66.04, 35.56],[66.04, 7.62],[13.97, 2.54]],
     [[30.226, -2.54, 0, "2p54socket", 10, 1],
@@ -237,6 +259,32 @@ ArduinoUno3 = ["ArduinoUno3", "Arduino Uno R3", 68.58, 53.34, 1.6, 0, 3.3, 0, "#
     M2p5_pan_screw
    ];
 
+ArduinoLeonardo = ["ArduinoLeonardo", "Arduino Leonardo", 68.58, 53.34, 1.6, 0, 3.3, 0, "#2140BE", false, [[15.24, 50.8],[66.04, 35.56],[66.04, 7.62],[13.97, 2.54]],
+    [[30.226, -2.54, 0, "2p54socket", 10, 1],
+     [54.61,  -2.54, 0, "2p54socket", 8, 1],
+     [36.83,   2.54, 0, "2p54socket", 8, 1],
+     [57.15,   2.54, 0, "2p54socket", 6, 1],
+     [64.91,  27.89, 0, "2p54header", 2, 3],
+     [ 6.5,   -3.5,  0, "button_6mm"],
+     [4.7625,  7.62, 180, "barrel_jack"],
+     [1.5875, 38.1,  180,"usb_uA"],
+    ],
+    [],[],
+    inch([
+     [-1.35, -1.05],
+     [-1.35,  1.05],
+     [ 1.19,  1.05],
+     [ 1.25,  0.99],
+     [ 1.25,  0.54],
+     [ 1.35,  0.44],
+     [ 1.35, -0.85],
+     [ 1.25, -0.95],
+     [ 1.25, -1.05],
+    ]),
+    M2p5_pan_screw
+   ];
+
+
 Keyes5p1 = ["Keyes5p1", "Keyes5.1 Arduino Uno expansion board", 68.58, 53.34, 1.6, 0, 3.3, 0, "#2140BE", false, [[15.24, 50.8],[66.04, 35.56],[66.04, 7.62],[13.97, 2.54]],
     [[30.226, -2.54, 0, "-2p54header", 10, 1],
      [54.61,  -2.54, 0, "-2p54header", 8, 1],
@@ -275,6 +323,10 @@ PI_IO = ["PI_IO", "PI_IO V2",       35.56, 25.4, 1.6, 0,    0,   0, "green", tru
      [(3.4   - 2.7) * 25.4,          (4.5 - 4.15)  * 25.4,  0, "2p54socket", 13, 2, true],
     ], []];
 
+ZC_A0591 = ["ZC_A0591", "ZC-A0591 ULN2003 driver PCB", 35, 32, 1.6, 0, 2.5, 0, "green", false, [[2.25, 3.25], [-2.25, 3.25], [2.25, -3.25], [-2.25, -3.25] ],
+    [], [], [], [], M2p5_pan_screw];
+
+
 PERF80x20 = ["PERF80x20", "Perfboard 80 x 20mm", 80, 20, 1.6, 0, 2.3, 0, "green", true, [[2,2],[-2,2],[2,-2],[-2,-2]], [], [], [5.87, 3.49]];
 
 PERF70x50 = ["PERF70x50", "Perfboard 70 x 50mm", 70, 50, 1.6, 0, 2.3, 0, "green", true, [[2,2],[-2,2],[2,-2],[-2,-2]], [], [], [5.87, 3.49]];
@@ -287,6 +339,6 @@ PERF74x51 = ["PERF74x51", "Perfboard 74 x 51mm", 74, 51, 1.0, 0, 3.0, 0, "sienna
 
 PSU12V1A = ["PSU12V1A", "PSU 12V 1A", 67, 31, 1.7, 0, 3.9, 0, "green", true, [[3.5, 3.5], [-3.5, 3.5], [-3.5, -3.5], [3.5, -3.5]], [], []];
 
-pcbs = [ExtruderPCB, PI_IO, RPI3, ArduinoUno3, Keyes5p1, PERF80x20, PERF70x50, PERF70x30, PERF60x40, PERF74x51, PSU12V1A, DuetE, Duex2, Duex5, Melzi];
+pcbs = [ExtruderPCB, PI_IO, RPI0, EnviroPlus, RPI3, ArduinoUno3, ArduinoLeonardo, Keyes5p1, PERF80x20, PERF70x50, PERF70x30, PERF60x40, PERF74x51, PSU12V1A, DuetE, Duex2, Duex5, Melzi, ZC_A0591];
 
 use <pcb.scad>

vitamins/pillars.scad

@@ -31,7 +31,7 @@
 //
 M2x16_brass_pillar     = ["M2x16_brass_pillar",     "nurled",    2, 16, 3.17,      3.17,       0, 0, brass,     brass,    3,-3];
 M3x13_hex_pillar       = ["M3x13_hex_pillar",       "hex",       3, 13, 5/cos(30), 5/cos(30),  6, 6, "silver", "silver", -6, 6];
-M3x20_hex_pillar       = ["M3x20_hex_pillar",       "hex",       3, 20, 5/cos(30), 5/cos(30),  6, 6, "silver", "silver", -6, 6];
+M3x20_hex_pillar       = ["M3x20_hex_pillar",       "hex",       3, 20, 5/cos(30), 5/cos(30),  6, 6, "silver", "silver", -8, 8];
 M3x20_nylon_pillar     = ["M3x20_nylon_pillar",     "nylon",     3, 20, 8,         5/cos(30),  0, 6, "white",   brass,   -6, 6];
 M4x17_nylon_pillar     = ["M4x17_nylon_pillar",     "nylon",     4, 20, 8,         5/cos(30),  0, 6, "white",   brass,   -6, 6];
 M3x20_nylon_hex_pillar = ["M3x20_nylon_hex_pillar", "hex nylon", 3, 20, 8/cos(30), 8/cos(30),  6, 6,  grey20,   grey20,  -6, 6];

vitamins/pin_header.scad

@@ -43,30 +43,52 @@ module pin(type, length = undef) { //! Draw a header pin
             }
 }
 
-module pin_header(type, cols = 1, rows = 1, smt = false, cutout = false) { //! Draw pin header
+module pin_header(type, cols = 1, rows = 1, smt = false, right_angle = false, cutout = false) { //! Draw pin header
     pitch =  hdr_pitch(type);
     h = pitch;
+    ra_offset = 2.4;
+    width = pitch * rows;
 
     if(cutout)
         dogbone_rectangle([cols * pitch + 2 * panel_clearance, rows * pitch + 2 * panel_clearance, 100], center = false);
     else
-        vitamin(str("pin_header(", type[0], cols, rows, arg(smt, false, "smt"), "): Pin header ", cols, " x ", rows));
+        vitamin(str("pin_header(", type[0], ", ", cols, ", ", rows,
+                    arg(smt, false, "smt"), arg(right_angle, false, "right_angle"), "): Pin header ", cols, " x ", rows, right_angle ? " right_angle" : ""));
 
         translate_z(smt ? 3.5 - h : 0) {
-            for(x = [0 : cols - 1], y = [0 : rows - 1])
+            for(x = [0 : cols - 1], y = [0 : rows - 1]) {
                 translate([pitch * (x - (cols - 1) / 2), pitch * (y - (rows - 1) / 2), 0])
-                    pin(type);
+                    if(right_angle)
+                        pin(type, hdr_pin_below(type) + width / 2 + (y - 0.5) * pitch);
+                    else
+                        pin(type);
 
-            color(hdr_base_colour(type))
-                linear_extrude(height = h)
-                    for(x = [0 : cols - 1], y = [0 : rows - 1])
-                        translate([pitch * (x - (cols - 1) / 2), pitch * (y - (rows - 1) / 2), pitch / 2])
-                            hull() {
-                                chamfer = pitch / 4;
-                                square([pitch + eps, pitch - chamfer], center = true);
+                if(right_angle) {
+                    w = hdr_pin_width(type);
+                    rotate([-90, 0, 180])
+                        translate([pitch * (x - (cols - 1) / 2), -pitch * (y - (rows - 1) / 2) -width / 2, hdr_pin_below(type) - (y - 0.5) * pitch])
+                            pin(type, hdr_pin_length(type) - hdr_pin_below(type) + ra_offset + pitch / 2 + (y - 0.5) * pitch);
 
-                                square([pitch - chamfer, pitch + eps], center = true);
-                            }
+                    translate([pitch * (x - (cols - 1) / 2), pitch * (y - (rows - 1) / 2) - w / 2, pitch * (y - (rows - 1) / 2) + width / 2 - w / 2])
+                        rotate([0, -90, 0])
+                            color(hdr_pin_colour(type))
+                                rotate_extrude(angle = 90, $fn = 32)
+                                    translate([0, -w / 2])
+                                        square(w);
+                }
+            }
+            translate([0, right_angle ? -ra_offset - pitch / 2 : 0, right_angle ? width / 2 : 0])
+                rotate([right_angle ? 90 : 0, 0, 0])
+                    color(hdr_base_colour(type))
+                        linear_extrude(height = h)
+                            for(x = [0 : cols - 1], y = [0 : rows - 1])
+                                translate([pitch * (x - (cols - 1) / 2), pitch * (y - (rows - 1) / 2), pitch / 2])
+                                    hull() {
+                                        chamfer = pitch / 4;
+                                        square([pitch + eps, pitch - chamfer], center = true);
+
+                                        square([pitch - chamfer, pitch + eps], center = true);
+                                    }
         }
 }
 
@@ -80,12 +102,12 @@ module box_header(type, cols = 1, rows = 1, smt = false, cutout = false) { //! D
     if(cutout)
         dogbone_rectangle([cols * pitch + 2 * panel_clearance, rows * pitch + 2 * panel_clearance, 100], center = false);
     else
-        vitamin(str("box_header(", type[0], cols, rows, arg(smt, false, "smt"), "): Pin header ", cols, " x ", rows));
+        vitamin(str("box_header(", type[0], ", ", cols, ", ", rows, arg(smt, false, "smt"), "): Box header ", cols, " x ", rows));
 
         translate_z(smt ? 3.5 - h : 0) {
             for(x = [0 : cols - 1], y = [0 : rows - 1])
                 translate([pitch * (x - (cols - 1) / 2), pitch * (y - (rows - 1) / 2), 0])
-                    pin(type);
+                    pin(type, hdr_pin_length(type) - pitch + base);
 
             color(hdr_base_colour(type)) {
                 linear_extrude(height = base)
@@ -138,16 +160,16 @@ module idc_transition(type, cols = 5, skip = [], cutout = false) { //! Draw IDC
     }
 }
 
-module pin_socket(type, cols = 1, rows = 1, right_angle = false, height = 0, cutout = false) { //! Draw pin socket
+module pin_socket(type, cols = 1, rows = 1, right_angle = false, height = 0, smt = false, cutout = false) { //! Draw pin socket
     pitch = hdr_pitch(type);
     length = pitch * cols + 0.5;
     width = pitch * rows - 0.08;
-    depth = max(hdr_socket_depth(type), height);
+    depth = height ? height : hdr_socket_depth(type);
     ra_offset = 1.5;
     if(cutout)
         ;
     else {
-        vitamin(str("pin_socket(", type[0], ", ", cols, ", ", rows, arg(right_angle, false, "right_angle"), arg(height, 0, "height"),
+        vitamin(str("pin_socket(", type[0], ", ", cols, ", ", rows, arg(right_angle, false, "right_angle"), arg(height, 0, "height"), arg(smt, false, "smt"),
                                "): Pin socket ", cols, " x ", rows, right_angle ? " right_angle" : ""));
         color(hdr_base_colour(type))
             translate([0, right_angle ? -ra_offset - pitch / 2 : 0, right_angle ? width / 2 : 0])
@@ -164,8 +186,9 @@ module pin_socket(type, cols = 1, rows = 1, right_angle = false, height = 0, cut
 
         color(hdr_pin_colour(type))
             for(x = [0 : cols - 1], y = [0 : rows -1]) {
-                translate([pitch * (x - (cols - 1) / 2), pitch * (y - (rows - 1) / 2), 0])
-                    pin(type, hdr_pin_below(type) + width / 2 + (y - 0.5) * pitch);
+                if(!smt)
+                    translate([pitch * (x - (cols - 1) / 2), pitch * (y - (rows - 1) / 2), 0])
+                        pin(type, hdr_pin_below(type) + width / 2 + (y - 0.5) * pitch);
 
                 if(right_angle) {
                     rotate([-90, 0, 0])

vitamins/pin_headers.scad

@@ -17,14 +17,14 @@
 // If not, see <https://www.gnu.org/licenses/>.
 //
 
-//                          p     p   b    p     p       b
-//                          i     i   e    i     i       a
-//                          t     n   l    n     n       s
-//                          c         o                  e
-//                          h     l   w    w     c
-//                                                       c
+//                          p     p     b    p     p       b      Socket depth
+//                          i     i     e    i     i       a
+//                          t     n     l    n     n       s
+//                          c           o                  e
+//                          h     l     w    w     c
+//                                                         c
 //
-2p54header = ["2p54header", 2.54, 12, 3.2, 0.66, "gold", grey20, 8.5];
+2p54header = ["2p54header", 2.54, 11.6, 3.2, 0.66, "gold", grey20, 8.5];
 
 pin_headers = [ 2p54header ];
 

vitamins/ring_terminal.scad

@@ -26,48 +26,96 @@ use <nut.scad>
 use <washer.scad>
 use <../utils/tube.scad>
 
-function ringterm_od(type)        = type[1];    //! Outside diameter
-function ringterm_id(type)        = type[2];    //! Inside diameter
-function ringterm_length(type)    = type[3];    //! Length of the tail including the ring
-function ringterm_width(type)     = type[4];    //! Width of the tail
-function ringterm_hole(type)      = type[5];    //! Wire hole diameter
-function ringterm_thickness(type) = type[6];    //! Metal thickness
-function ringterm_screw(type)     = type[7];    //! Screw type
+function ringterm_od(type)           = type[1];    //! Outside diameter
+function ringterm_id(type)           = type[2];    //! Inside diameter
+function ringterm_length(type)       = type[3];    //! Length of the tail including the ring
+function ringterm_width(type)        = type[4];    //! Width of the tail
+function ringterm_hole(type)         = type[5];    //! Wire hole diameter
+function ringterm_thickness(type)    = type[6];    //! Metal thickness
+function ringterm_screw(type)        = type[7];    //! Screw type
+function ringterm_crimp_length(type) = type[8];    //! If non-zero the length of the crimp tube
 function ringterm_extent(type)    = ringterm_length(type) / sqrt(2); //! Space to leave
 
 module ring_terminal(type) { //! Draw specifeid ring terminal
     screw = ringterm_screw(type);
     d = 2 * screw_radius(screw);
-    vitamin(str("ring_terminal(", type[0], "): Ring terminal ",d,"mm"));
+    crimp = ringterm_crimp_length(type);
+    vitamin(str("ring_terminal(", type[0], "): Ring terminal ", crimp ? "crimp " : "", d, "mm"));
 
     t = ringterm_thickness(type);
     w = ringterm_width(type);
     od = ringterm_od(type);
     id = ringterm_id(type);
     l = ringterm_length(type);
-    angle = 45;
-    bend = washer_radius(screw_washer(screw)) + t * tan(angle / 2);
+    angle = crimp ? 0 : 45;
+    transition = 1;
+    bend = crimp ? l - od / 2 - crimp - transition : washer_radius(screw_washer(screw)) + t * tan(angle / 2);
+    hole_d = ringterm_hole(type);
+
+    module hull_if_crimp()
+        if(crimp)
+            hull()
+                children();
+        else
+            children();
+
     color("silver") union() {
-        tube(or = od / 2, ir = id / 2, h = t, center = false);
+        linear_extrude(height = t)
+            difference() {
+                hull_if_crimp() {
+                    circle(d = od);
 
-        translate([-w / 2, -bend, 0])
-            cube([w, bend - id / 2, t]);
+                    translate([-w / 2, -bend, 0])
+                        square([w, bend - id / 2]);
+                }
+                circle(d = id);
+            }
 
-        translate([0, -bend])
-            rotate([-angle, 0, 0])
-                linear_extrude(height = t)
-                    difference() {
-                        length = l - od / 2 - bend;
-                        hull() {
-                            translate([-w / 2, -eps])
-                                square([w, eps]);
+        if(crimp) {
+            translate([0, -bend, w / 2])
+                rotate([90, 0, 0]) {
+                    render() difference() {
+                        union() {
+                            translate_z(transition)
+                                cylinder(d = w, h = crimp);
 
-                            translate([0, -length + w / 2])
-                                circle(d = w);
+                            hull() {
+                                translate_z(transition)
+                                    cylinder(d = w, h = eps);
+
+                                translate([-w / 2, -w / 2])
+                                    cube([w, t, eps]);
+                            }
                         }
-                        translate([0, -length + w / 2])
-                            circle(d = ringterm_hole(type));
+                        hull() {
+                            translate_z(-eps)
+                                cylinder(d = w - 2 * t, h = crimp + transition + 2 * eps);
+
+                            translate([-w / 2 + t,  -w / 2 + t])
+                                cube([w - 2 * t, w / 2 - t, eps]);
+                         }
+                         translate([0, w / 2])
+                            cube([0.1, w, 100], center = true);
                     }
+                }
+            }
+        else
+            translate([0, -bend])
+                rotate([-angle, 0, 0])
+                    linear_extrude(height = t)
+                        difference() {
+                            length = l - od / 2 - bend;
+                            hull() {
+                                translate([-w / 2, -eps])
+                                    square([w, eps]);
+
+                                translate([0, -length + w / 2])
+                                    circle(d = w);
+                            }
+                            if(hole_d)
+                                translate([0, -length + w / 2])
+                                    circle(d = hole_d);
+                        }
     }
     translate_z(ringterm_thickness(type))
         children();

vitamins/ring_terminals.scad

@@ -20,16 +20,17 @@
 //
 // Ring terminals
 //
-//                                  o  i   l  w    h    t  s
-//                                  d  d   e  i    o    h  c
-//                                         n  d    l    i  r
-//                                         g  t    e    c  e
-//                                         t  h         k  w
-//                                         h
+//                                        o    i     l  w      h    t  s              c
+//                                        d    d     e  i      o    h  c              r
+//                                                   n  d      l    i  r              i
+//                                                   g  t      e    c  e              m
+//                                                   t  h           k  w              p
+//                                                   h
 //
-M3_ringterm    = ["M3_ringterm",    6, 3, 12, 3, 1.5, 0.2, M3_dome_screw];
-M3_ringterm_cs = ["M3_ringterm_cs", 6, 3, 12, 3, 1.5, 0.2, M3_cap_screw];
+M3_ringterm       = ["M3_ringterm",       6,   3,   12, 3,   1.5, 0.2, M3_dome_screw, 0];
+M3_ringterm_cs    = ["M3_ringterm_cs",    6,   3,   12, 3,   1.5, 0.2, M3_cap_screw,  0];
+M3_ringterm_crimp = ["M3_ringterm_crimp", 5.5, 3,   13, 4.1, 0,   0.7, M3_dome_screw, 4.5];
 
-ring_terminals = [M3_ringterm, M3_ringterm_cs];
+ring_terminals = [M3_ringterm, M3_ringterm_cs, M3_ringterm_crimp];
 
 use <ring_terminal.scad>

vitamins/rod.scad

@@ -18,13 +18,14 @@
 //
 
 //
-//! Steel rods, with optional chamfer.
+//! Steel rods and studding with chamfered ends.
 //
 include <../core.scad>
 
 rod_colour = grey80;
+studding_colour = grey70;
 
-module rod(d , l) {
+module rod(d , l) { //! Draw a smooth rod with specified length and diameter
     vitamin(str("rod(", d, ", ", l, "): Smooth rod ", d, "mm x ", l, "mm"));
 
     chamfer = d / 10;
@@ -35,3 +36,15 @@ module rod(d , l) {
             cylinder(d = d - 2 * chamfer, h = l, center = true);
         }
 }
+
+module studding(d , l) { //! Draw a threaded rod with specified length and diameter
+    vitamin(str("studding(", d, ", ", l,"): Threaded rod M", d, " x ", l, "mm"));
+
+    chamfer = d / 20;
+    color(studding_colour)
+        hull() {
+            cylinder(d = d, h = l - 2 * chamfer, center = true);
+
+            cylinder(d = d - 2 * chamfer, h = l, center = true);
+        }
+}

vitamins/screws.scad

@@ -110,7 +110,7 @@ screw_lists = [
 [ M2_cap_screw, M2p5_cap_screw, M3_cap_screw, M4_cap_screw, M5_cap_screw, M6_cap_screw, M8_cap_screw],
 [ 0,            0,              M3_low_cap_screw],
 [ 0,            0,              M3_hex_screw, M4_hex_screw, M5_hex_screw, M6_hex_screw, M8_hex_screw],
-[ 0,            M2p5_pan_screw, M3_pan_screw, M4_pan_screw, No632_pan_screw, M5_pan_screw, M6_pan_screw],
+[ 0,            M2p5_pan_screw, M3_pan_screw, M4_pan_screw, M5_pan_screw, M6_pan_screw, No632_pan_screw],
 [ 0,            No2_screw,      No4_screw,    No6_screw,    No6_cs_screw],
 [ 0,            M2_cs_cap_screw,M3_cs_cap_screw, M4_cs_cap_screw],
 [ 0,            0,              M3_dome_screw, M4_dome_screw],

vitamins/sheets.scad

@@ -31,6 +31,7 @@ MDF10     = [ "MDF10",     "Sheet MDF",              10, mdf_colour,
 MDF12     = [ "MDF12",     "Sheet MDF",              12, mdf_colour,             true];    // ~1/2"
 MDF18     = [ "MDF18",     "Sheet MDF",              18, mdf_colour,             true];
 MDF19     = [ "MDF19",     "Sheet MDF",              19, mdf_colour,             true];    // ~3/4"
+PMMA2     = [ "PMMA2",     "Sheet acrylic",           2, [1,   1,   1,   0.5  ], false];
 PMMA3     = [ "PMMA3",     "Sheet acrylic",           3, [1,   1,   1,   0.5  ], false];   // ~1/8"
 PMMA6     = [ "PMMA6",     "Sheet acrylic",           6, [1,   1,   1,   0.5  ], false];   // ~1/4"
 PMMA8     = [ "PMMA8",     "Sheet acrylic",           8, [1,   1,   1,   0.5  ], false];   // ~5/16"
@@ -45,6 +46,6 @@ AL6       = [ "AL6",       "Aluminium tooling plate", 6, [0.9, 0.9, 0.9, 1    ],
 AL8       = [ "AL8",       "Aluminium tooling plate", 8, [0.9, 0.9, 0.9, 1    ], false];
 Steel06   = [ "Steel06",   "Sheet mild steel",       0.6,"silver"              , false];
 
-sheets = [MDF6, MDF10, MDF12, MDF19, PMMA3, PMMA6, PMMA8, PMMA10, glass2, DiBond, DiBond6, Cardboard, FoilTape, Foam20, AL6, AL8, Steel06];
+sheets = [MDF6, MDF10, MDF12, MDF19, PMMA2, PMMA3, PMMA6, PMMA8, PMMA10, glass2, DiBond, DiBond6, Cardboard, FoilTape, Foam20, AL6, AL8, Steel06];
 
 use <sheet.scad>

vitamins/spools.scad

@@ -27,7 +27,8 @@
 spool_300x88 = ["spool_300x88", 300, 88, 43, 6, 8, 52, 214, 300];
 spool_300x85 = ["spool_300x85", 300, 85, 60, 4, 8, 52, 250, 280];
 spool_200x55 = ["spool_200x55", 200, 55, 40, 5, 5, 52, 200, 200];
+spool_200x60 = ["spool_200x60", 200, 60, 60, 5, 2, 52, 78,  191]; // 3D Filaprint
 
-spools = [spool_200x55, spool_300x85, spool_300x88];
+spools = [spool_200x55, spool_200x60, spool_300x85, spool_300x88];
 
 use <spool.scad>

vitamins/toggles.scad

@@ -33,7 +33,7 @@ MS332F_pin = [4.0 , 1.0,  1.0,  4.7, 4.83];
 
 //                               w     l     d    t    i      c   od  id thread      pv     a    tl     pd    pw
 CK7101 = ["CK7101", "CK7101", 6.86, 12.7, 8.89, 0.4, 1.7, "red", 6.1, 4, 8.89, 0, 0, 4.45, 25/2, 10.67, 2.92, 0,   toggle_nut, toggle_washer, 3, CK7000_tag];
-CK7105 = ["CK7105", "CK7101", 6.86, 12.7, 8.89, 0.4, 1.7, "red", 6.1, 4, 8.89, 0, 0, 4.45,-25/2, 21.33, 5.08, 2.54,toggle_nut, toggle_washer, 3, CK7000_pin];
+CK7105 = ["CK7105", "CK7105", 6.86, 12.7, 8.89, 0.4, 1.7, "red", 6.1, 4, 8.89, 0, 0, 4.45,-25/2, 21.33, 5.08, 2.54,toggle_nut, toggle_washer, 3, CK7000_pin];
 
 AP5236 = ["AP5236", "AP5236", 7.0,  13.6, 11,   0.4, 1.7, "blue",6.1, 4, 8.0 , 8, 1, 3.0 , 25/2, 22.2,  4.90, 2.50,toggle_nut, toggle_washer, 3, AP5236_pin];
 MS332F = ["MS332F", "MS332F", 12.6, 13.1, 9.5,  0.4, 1.7, "blue",6.1, 4, 8.0 , 8, 1, 4.0 , 25/2, 14.4,  5.0,  2.2 ,toggle_nut, toggle_washer, 6, MS332F_pin];

vitamins/wire.scad

@@ -46,10 +46,14 @@ function cable_bundle(cable) = //! Arrangement of a bundle in a flat cable clip
 function cable_width(cable)  = cable_bundle(cable)[0] * cable_wire_size(cable); //! Width in flat clip
 function cable_height(cable) = cable_bundle(cable)[1] * cable_wire_size(cable); //! Height in flat clip
 
-module mouse_hole(cable, h = 100) { //! A mouse hole to allow a panel to go over a wire bundle.
+module mouse_hole(cable, h = 100, teardrop = false) { //! A mouse hole to allow a panel to go over a wire bundle.
     r = wire_hole_radius(cable);
 
-    rotate(90) slot(r, 2 * r, h = h);
+        if(teardrop)
+            vertical_tearslot(r = r, l = 2 * r, h = h);
+        else
+            rotate(90)
+                slot(r, 2 * r, h = h);
 }
 
 module cable_tie_holes(cable_r, h = 100) { //! Holes to thread a ziptie through a panel to make a cable tie.

vitamins/ziptie.scad

@@ -48,11 +48,12 @@ module ziptie(type, r, t = 0) //! Draw specified ziptie wrapped around radius ``
     tangents = rounded_polygon_tangents(outside_path);
     length = ceil(rounded_polygon_length(outside_path, tangents) + ziptie_tail(type) + latch.z + 1);
     len = length <= 100 ? 100 : length;
+    width =  ziptie_width(type);
 
-    vitamin(str("ziptie(", type[0], ", ", r, "): Ziptie ", len, "mm min length"));
+    vitamin(str("ziptie(", type[0], ", ", r, "): Ziptie ", width, "mm x ", len, "mm min length"));
 
     color(ziptie_colour(type)){
-        linear_extrude(height = ziptie_width(type), center = true)
+        linear_extrude(height = width, center = true)
             difference() {
                 rounded_polygon(outside_path, tangents);
                 rounded_polygon(inside_path);