Added pictures and documentation for extrusions.

Initial submission of E2020 aluminium extrusion.

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"));
+}

examples/MainsBreakOutBox/readme.md

@@ -31,6 +31,7 @@ Earth leakage can be measured Canadian CSA style by disconnected the neutral lin
 ## Parts list
 | <span style="writing-mode: vertical-rl; text-orientation: mixed;">Base</span> | <span style="writing-mode: vertical-rl; text-orientation: mixed;">Feet</span> | <span style="writing-mode: vertical-rl; text-orientation: mixed;">Mains&nbsp;In</span> | <span style="writing-mode: vertical-rl; text-orientation: mixed;">Main</span> | <span style="writing-mode: vertical-rl; text-orientation: mixed;">TOTALS</span> |  |
 |--:|--:|--:|--:|--:|:--|
+|  |  |  |  | | **Vitamins** |
 | &nbsp;&nbsp;.&nbsp; | &nbsp;&nbsp;.&nbsp; | &nbsp;&nbsp;.&nbsp; | &nbsp;&nbsp;2&nbsp; |  &nbsp;&nbsp;2&nbsp; | &nbsp;&nbsp; 4mm shielded jack socket blue |
 | &nbsp;&nbsp;.&nbsp; | &nbsp;&nbsp;.&nbsp; | &nbsp;&nbsp;.&nbsp; | &nbsp;&nbsp;1&nbsp; |  &nbsp;&nbsp;1&nbsp; | &nbsp;&nbsp; 4mm shielded jack socket brown |
 | &nbsp;&nbsp;.&nbsp; | &nbsp;&nbsp;.&nbsp; | &nbsp;&nbsp;.&nbsp; | &nbsp;&nbsp;2&nbsp; |  &nbsp;&nbsp;2&nbsp; | &nbsp;&nbsp; 4mm shielded jack socket green |
@@ -47,9 +48,11 @@ Earth leakage can be measured Canadian CSA style by disconnected the neutral lin
 | &nbsp;&nbsp;.&nbsp; | &nbsp;&nbsp;.&nbsp; | &nbsp;&nbsp;1&nbsp; | &nbsp;&nbsp;1&nbsp; |  &nbsp;&nbsp;2&nbsp; | &nbsp;&nbsp; Wire blue 30/0.25mm strands, length 150mm - not shown |
 | &nbsp;&nbsp;.&nbsp; | &nbsp;&nbsp;.&nbsp; | &nbsp;&nbsp;2&nbsp; | &nbsp;&nbsp;.&nbsp; |  &nbsp;&nbsp;2&nbsp; | &nbsp;&nbsp; Wire brown 30/0.25mm strands, length 150mm - not shown |
 | &nbsp;&nbsp;.&nbsp; | &nbsp;&nbsp;.&nbsp; | &nbsp;&nbsp;1&nbsp; | &nbsp;&nbsp;1&nbsp; |  &nbsp;&nbsp;2&nbsp; | &nbsp;&nbsp; Wire green & yellow 30/0.25mm strands, length 150mm - not shown |
-|  |  |  |  | | **3D Printed parts** |
-| &nbsp;&nbsp;.&nbsp; | &nbsp;&nbsp;4&nbsp; | &nbsp;&nbsp;.&nbsp; | &nbsp;&nbsp;.&nbsp; | &nbsp;&nbsp;4&nbsp; | &nbsp;&nbsp;&nbsp;foot.stl |
-| &nbsp;&nbsp;1&nbsp; | &nbsp;&nbsp;.&nbsp; | &nbsp;&nbsp;.&nbsp; | &nbsp;&nbsp;.&nbsp; | &nbsp;&nbsp;1&nbsp; | &nbsp;&nbsp;&nbsp;socket_box.stl |
+| &nbsp;&nbsp;2&nbsp; | &nbsp;&nbsp;16&nbsp; | &nbsp;&nbsp;14&nbsp; | &nbsp;&nbsp;18&nbsp; | &nbsp;&nbsp;50&nbsp; | &nbsp;&nbsp;Total vitamins count |
+|  |  |  |  | | **3D printed parts** |
+| &nbsp;&nbsp;.&nbsp; | &nbsp;&nbsp;4&nbsp; | &nbsp;&nbsp;.&nbsp; | &nbsp;&nbsp;.&nbsp; |  &nbsp;&nbsp;4&nbsp; | &nbsp;&nbsp;foot.stl |
+| &nbsp;&nbsp;1&nbsp; | &nbsp;&nbsp;.&nbsp; | &nbsp;&nbsp;.&nbsp; | &nbsp;&nbsp;.&nbsp; |  &nbsp;&nbsp;1&nbsp; | &nbsp;&nbsp;socket_box.stl |
+| &nbsp;&nbsp;1&nbsp; | &nbsp;&nbsp;4&nbsp; | &nbsp;&nbsp;.&nbsp; | &nbsp;&nbsp;.&nbsp; | &nbsp;&nbsp;5&nbsp; | &nbsp;&nbsp;Total 3D printed parts count |
 
 [Top](#TOP)
 
@@ -86,9 +89,9 @@ Earth leakage can be measured Canadian CSA style by disconnected the neutral lin
 ### Vitamins
 |Qty|Description|
 |--:|:----------|
-|8| Washer  M3 x 7mm x 0.5mm|
-|4| Screw M3 dome x 10mm|
 |4| Nut M3 x 2.4mm nyloc|
+|4| Screw M3 dome x 10mm|
+|8| Washer  M3 x 7mm x 0.5mm|
 
 
 ### 3D Printed parts
@@ -122,14 +125,14 @@ Earth leakage can be measured Canadian CSA style by disconnected the neutral lin
 ### Vitamins
 |Qty|Description|
 |--:|:----------|
-|1| Wire green & yellow 30/0.25mm strands, length 150mm - not shown|
-|1| Wire blue 30/0.25mm strands, length 150mm - not shown|
-|2| Wire brown 30/0.25mm strands, length 150mm - not shown|
 |3| Heatshrink sleeving ID 3.2mm x 15mm - not shown|
 |1| IEC inlet for ATX|
+|2| Nut M3 x 2.4mm nyloc|
 |2| Screw M3 cs cap x 12mm|
 |2| Washer  M3 x 7mm x 0.5mm|
-|2| Nut M3 x 2.4mm nyloc|
+|1| Wire blue 30/0.25mm strands, length 150mm - not shown|
+|2| Wire brown 30/0.25mm strands, length 150mm - not shown|
+|1| Wire green & yellow 30/0.25mm strands, length 150mm - not shown|
 
 
 ### Sub-assemblies
@@ -161,15 +164,15 @@ Earth leakage can be measured Canadian CSA style by disconnected the neutral lin
 ### Vitamins
 |Qty|Description|
 |--:|:----------|
-|1| Wire green & yellow 30/0.25mm strands, length 150mm - not shown|
-|1| Wire blue 30/0.25mm strands, length 150mm - not shown|
-|5| Heatshrink sleeving ID 3.2mm x 15mm - not shown|
-|3| Ferrule for 1.5mm^2 wire - not shown|
-|1| Mains socket 13A|
-|2| Screw M3 cs cap x 20mm|
 |2| 4mm shielded jack socket blue|
 |1| 4mm shielded jack socket brown|
 |2| 4mm shielded jack socket green|
+|3| Ferrule for 1.5mm^2 wire - not shown|
+|5| Heatshrink sleeving ID 3.2mm x 15mm - not shown|
+|1| Mains socket 13A|
+|2| Screw M3 cs cap x 20mm|
+|1| Wire blue 30/0.25mm strands, length 150mm - not shown|
+|1| Wire green & yellow 30/0.25mm strands, length 150mm - not shown|
 
 
 ### Sub-assemblies

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

@@ -60,10 +60,14 @@ include <vitamins/ball_bearings.scad>
 include <vitamins/light_strips.scad>
 include <vitamins/spools.scad>
 include <vitamins/mains_sockets.scad>
+include <vitamins/ldrs.scad>
+include <vitamins/geared_steppers.scad>
+include <vitamins/extrusions.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

@@ -32,14 +32,17 @@ use <tests/cable_strips.scad>
 use <tests/components.scad>
 use <tests/d_connectors.scad>
 use <tests/displays.scad>
+use <tests/extrusions.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>
 use <tests/jack.scad>
 use <tests/leadnuts.scad>
 use <tests/leds.scad>
+use <tests/ldrs.scad>
 use <tests/light_strips.scad>
 use <tests/linear_bearings.scad>
 use <tests/meter.scad>
@@ -89,6 +92,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;
 
@@ -149,14 +153,14 @@ leadnuts_y = pillars_y + 40;
 pulleys_y = leadnuts_y +40;
 hot_ends_y = pulleys_y + 60;
 linear_bearings_y = hot_ends_y + 50;
-sheets_y = linear_bearings_y + 50;
+sheets_y = linear_bearings_y + 100;
 pcbs_y = sheets_y + 40;
 displays_y = pcbs_y + 150;
 fans_y = displays_y + 100;
 transformers_y = fans_y + 120;
 psus_y = transformers_y + 190;
 
-translate([x0 + 20, inserts_y])
+translate([x0 + 30, inserts_y])
     inserts();
 
 translate([x0, inserts_y])
@@ -200,6 +204,10 @@ translate([x0, linear_bearings_y]) {
     rods();
 }
 
+translate([x0+120, linear_bearings_y+30]) {
+    extrusions();
+}
+
 translate([x0 + 10, hot_ends_y])
     hot_ends();
 
@@ -252,6 +260,9 @@ components_y = toggles_y + 40;
 translate([x2, leds_y])
     leds();
 
+translate([x2 + 40, leds_y])
+    ldrs();
+
 translate([x2 + 8, carriers_y])
     carriers();
 
@@ -296,6 +307,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();
 
@@ -305,7 +322,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

@@ -130,7 +130,7 @@ module round_grommet_bottom(diameter, od = undef) { //! Generate the STL for a r
 }
 
 module round_grommet_hole(diameter, h = 100) //! Make a hole for a round grommet
-    drill(diameter / 2 + wall + clearance, h);
+    drill(corrected_radius(diameter / 2) + wall + clearance, h);
 
 module round_grommet_assembly(diameter, thickness, od = undef) {
     color(pp1_colour)
@@ -149,12 +149,17 @@ module mouse_grommet_hole(r, h = 50, z = undef, expand = wall + clearance) //! M
         hull(){
             R = r + expand;
             translate([0, z == undef ? R : z])
-                semi_circle(R);
+                if(expand)
+                    semi_circle(R);
+                else
+                    semi_teardrop(r = R, h = 0);
 
             translate([-R, 0])
                 square([2 * R, eps]);
         }
 
+function mouse_grommet_offset(r) = r + wall;
+
 module mouse_grommet(r, thickness) { //! Make the STL for a mouse grommet
     stl(str("mouse_grommet_", r * 10, "_", thickness));
 
@@ -167,7 +172,7 @@ module mouse_grommet(r, thickness) { //! Make the STL for a mouse grommet
                 translate_z(side * (width - wall) / 2)
                     linear_extrude(height = wall, center = true)
                         difference() {
-                            mouse_grommet_hole(r + wall + overlap, z = r + wall, h = 0, expand = 0);
+                            mouse_grommet_hole(r, z = r + wall, h = 0, expand = wall + overlap);
 
                         translate([0, wall])
                             mouse_grommet_hole(r, h = 0, expand = 0);
@@ -182,6 +187,23 @@ module mouse_grommet(r, thickness) { //! Make the STL for a mouse grommet
         }
 }
 
+module mouse_grommet_assembly(r, thickness)
+    color(pp1_colour)
+        rotate([-90, 0, 0])
+            mouse_grommet(r, thickness);
+
 module ribbon_grommet_20_3_stl() ribbon_grommet(20, 3);
-module mouse_grommet_20_3_stl() mouse_grommet(2,3);
-module mouse_grommet_30_3_stl() mouse_grommet(3,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

@@ -33,10 +33,8 @@ wall = 1.8;
 top = 1.5;
 screw = M3_cap_screw;
 insert = screw_insert(screw);
-boss_r = wall + corrected_radius(insert_hole_radius(insert));
-boss_h = insert_hole_length(insert);
+boss_r = insert_boss_radius(insert, wall);
 counter_bore = 2;
-boss_h2 = boss_h + counter_bore;
 rad = 2;
 clearance = layer_height;
 overlap = 6;
@@ -137,49 +135,13 @@ module psu_shroud(type, cable_d, name, cables = 1) { //! Generate the STL file f
                         translate([0, height / 2])
                                 vertical_tearslot(h = 0, r = cable_d / 2, l = cable_d);
                 }
-
-    mirror([0, 1, 0]) {
-        // insert boss
-        translate_z(height - boss_h)
-            linear_extrude(height = boss_h)
-                psu_shroud_hole_positions(type)
-                    difference() {
-                        hull() {
-                            circle(boss_r);
-
-                            translate([0, $side * (boss_r - 1)])
-                                square([2 * boss_r, eps], center = true);
-                        }
-                        poly_circle(insert_hole_radius(insert));
-                    }
-
-        // insert boss counter_bore
-        translate_z(height - boss_h2)
-            linear_extrude(height = counter_bore + eps)
-                psu_shroud_hole_positions(type)
-                    difference() {
-                        hull() {
-                            circle(boss_r);
-
-                            translate([0, $side * (boss_r - 1)])
-                                square([2 * boss_r, eps], center = true);
-                        }
-                        poly_circle(insert_screw_diameter(insert) / 2 + 0.1);
-                    }
-        // support cones
-        translate_z(height - boss_h2)
-            psu_shroud_hole_positions(type)
-                hull() {
-                    cylinder(h = eps, r = boss_r - eps);
-
-                    translate([0, $side * (boss_r - 1)])
-                        cube([2 * boss_r, eps, eps], center = true);
-
-                    translate([0, $side * (boss_r - wall), - (2 * boss_r - wall)])
-                        cube(eps);
-                }
-    }
-}
+    // insert lugs
+    mirror([0, 1, 0])
+        psu_shroud_hole_positions(type)
+            translate_z(height)
+                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
 assembly(str("psu_shroud_", name)) {

printed/screw_knob.scad

@@ -30,7 +30,7 @@ knob_stem_h = 6;
 knob_thickness = 4;
 knob_r = 8;
 knob_wave = 1;
-knob_waves = 9;
+knob_waves = 5;
 knob_height = knob_stem_h + knob_thickness;
 function knob_height() = knob_height;
 
@@ -73,5 +73,8 @@ assembly(str("screw_knob_M", 20 * screw_radius(screw), "_", length)) {
 module screw_knob_M30_stl() screw_knob(M3_hex_screw);
 module screw_knob_M40_stl() screw_knob(M4_hex_screw);
 
+//! * Press the M3 x 16 hex screw into the knob
 module screw_knob_M30_16_assembly() screw_knob_assembly(M3_hex_screw, 16);
+
+//! * Press the M4 x 16 hex screw into the knob
 module screw_knob_M40_16_assembly() screw_knob_assembly(M4_hex_screw, 16);

printed/ssr_shroud.scad

@@ -33,10 +33,8 @@ wall = 1.8;
 top = 1.5;
 screw = M3_cap_screw;
 insert = screw_insert(screw);
-boss_r = wall + corrected_radius(insert_hole_radius(insert));
-boss_h = insert_hole_length(insert);
+boss_r = insert_boss_radius(insert, wall);
 counter_bore = 2;
-boss_h2 = boss_h + counter_bore;
 rad = 3;
 clearance = layer_height;
 
@@ -61,7 +59,6 @@ module ssr_shroud_holes(type, cable_d) { //! Drill the screw and ziptie holes
         translate([ssr_shroud_cable_x(type, cable_d), side * (ssr_width(type) / 2 - 2 * boss_r)])
             rotate(-90)
                 cable_tie_holes(cable_d / 2, h = 0);
-
 }
 
 module ssr_shroud(type, cable_d, name) {    //! Generate the STL file for a specified ssr and cable
@@ -103,45 +100,11 @@ module ssr_shroud(type, cable_d, name) {    //! Generate the STL file for a spec
                             vertical_tearslot(h = 0, r = cable_d / 2, l = cable_d);
                     }
     // insert boss
-    translate_z(height - boss_h)
-        linear_extrude(height = boss_h)
-            ssr_shroud_hole_positions(type)
-                difference() {
-                    hull() {
-                        circle(boss_r);
-
-                        translate([0, -$side * (boss_r - 1)])
-                            square([2 * boss_r, eps], center = true);
-                    }
-                    poly_circle(insert_hole_radius(insert));
-                }
-
-    // insert boss counter_bore
-    translate_z(height - boss_h2)
-        linear_extrude(height = counter_bore + eps)
-            ssr_shroud_hole_positions(type)
-                difference() {
-                    hull() {
-                        circle(boss_r);
-
-                        translate([0, -$side * (boss_r - 1)])
-                            square([2 * boss_r, eps], center = true);
-                    }
-                    poly_circle(insert_screw_diameter(insert) / 2 + 0.1);
-                }
-    // support cones
     ssr_shroud_hole_positions(type)
-        hull() {
-            translate_z(-height + boss_h2) {
-                cylinder(h = eps, r = boss_r - eps);
-
-                translate([0, -$side * (boss_r - 1)])
-                    cube([2 * boss_r, eps, eps], center = true);
-            }
-            translate([0, -$side * (boss_r - wall), -height + boss_h2 + (2 * boss_r - wall)])
-                cube(eps);
-        }
-
+        vflip()
+            translate_z(height)
+                rotate($side * 90)
+                    insert_lug(insert, wall, counter_bore);
 }
 
 module ssr_shroud_assembly(type, cable_d, name) //! The printed parts with inserts fitted
@@ -153,7 +116,6 @@ assembly(str("ssr_shroud_", name)) {
 
     ssr_shroud_hole_positions(type)
         insert(insert);
-
 }
 
 module ssr_shroud_fastened_assembly(type, cable_d, thickness, name) //! Assembly with screws in place
@@ -177,6 +139,4 @@ module ssr_shroud_fastened_assembly(type, cable_d, thickness, name) //! Assembly
                     color(grey20)
                         cylinder(d = cable_d, h = 20, center = true);
         }
-
-
 }

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:
@@ -219,36 +219,49 @@ def views(target, do_assemblies = None):
             # Global BOM
             #
             print('<a name="Parts_list"></a>\n## Parts list', file = doc_file)
-            vitamins = {}
-            printed = {}
-            routed = {}
+            types = ["vitamins", "printed", "routed"]
+            headings = {"vitamins" : "vitamins", "printed" : "3D printed parts", "routed" : "CNC routed parts"}
+            things = {}
+            for t in types:
+                things[t] = {}
             for ass in flat_bom:
-                for v in ass["vitamins"]:
-                    if v in vitamins:
-                        vitamins[v] += ass["vitamins"][v]
-                    else:
-                        vitamins[v] = ass["vitamins"][v]
-                for p in ass["printed"]:
-                    if p in printed:
-                        printed[p] += ass["printed"][p]
-                    else:
-                        printed[p] = ass["printed"][p]
+                for t in types:
+                    for thing in ass[t]:
+                        if thing in things[t]:
+                            things[t][thing] += ass[t][thing]
+                        else:
+                            things[t][thing] = ass[t][thing]
             for ass in flat_bom:
                 name = ass["name"][:-9].replace('_', ' ').title().replace(' ','&nbsp;')
                 print('| <span style="writing-mode: vertical-rl; text-orientation: mixed;">%s</span> ' % name, file = doc_file, end = '')
             print('| <span style="writing-mode: vertical-rl; text-orientation: mixed;">TOTALS</span> |  |', file = doc_file)
+
             print(('|--:' * len(flat_bom) + '|--:|:--|'), file = doc_file)
-            for v in sorted(vitamins, key = lambda s: s.split(":")[-1]):
-                for ass in flat_bom:
-                    count = ass["vitamins"][v] if v in ass["vitamins"] else '.'
-                    print('| %s ' % pad(count, 2, 1), file = doc_file, end = '')
-                print('|  %s | %s |' % (pad(vitamins[v], 2, 1), pad(v.split(":")[1], 2)), file = doc_file)
-            print(('|  ' * len(flat_bom) + '| | **3D Printed parts** |'), file = doc_file)
-            for p in sorted(printed):
-                for ass in flat_bom:
-                    count = ass["printed"][p] if p in ass["printed"] else '.'
-                    print('| %s ' % pad(count, 2, 1), file = doc_file, end = '')
-                print('| %s | %s |' % (pad(printed[p], 2, 1), pad(p, 3)), file = doc_file)
+
+            for t in types:
+                if things[t]:
+                    totals = {}
+                    heading = headings[t][0:1].upper() + headings[t][1:]
+                    print(('|  ' * len(flat_bom) + '| | **%s** |') % heading, file = doc_file)
+                    for thing in sorted(things[t], key = lambda s: s.split(":")[-1]):
+                        for ass in flat_bom:
+                            count = ass[t][thing] if thing in ass[t] else 0
+                            print('| %s ' % pad(count if count else '.', 2, 1), file = doc_file, end = '')
+                            name = ass["name"]
+                            if name in totals:
+                                totals[name] += count
+                            else:
+                                totals[name] = count
+                        print('|  %s | %s |' % (pad(things[t][thing], 2, 1), pad(thing.split(":")[-1], 2)), file = doc_file)
+
+                    grand_total = 0
+                    for ass in flat_bom:
+                        name = ass["name"]
+                        total = totals[name] if name in totals else 0
+                        print('| %s ' % pad(total if total else '.', 2, 1), file = doc_file, end = '')
+                        grand_total += total
+                    print("| %s | %s |" % (pad(grand_total, 2, 1), pad('Total %s count' % headings[t], 2)), file = doc_file)
+
             print(file = doc_file)
             eop(print_mode, doc_file)
             #
@@ -267,7 +280,7 @@ def views(target, do_assemblies = None):
                     print("### Vitamins",         file = doc_file)
                     print("|Qty|Description|",    file = doc_file)
                     print("|--:|:----------|",    file = doc_file)
-                    for v in vitamins:
+                    for v in sorted(vitamins, key = lambda s: s.split(":")[-1]):
                         print("|%d|%s|" % (vitamins[v], v.split(":")[1]),     file = doc_file)
                     print("\n", file = doc_file)
 

tests/extrusions.scad

@@ -0,0 +1,30 @@
+//
+// NopSCADlib Copyright Chris Palmer 2020
+// 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 <../core.scad>
+use <../utils/layout.scad>
+
+include <../vitamins/extrusions.scad>
+
+module extrusions()
+    layout([for(e = extrusions) extrusion_width(e)], 10)
+        extrusion(extrusions[$i], 80);
+
+if ($preview)
+    extrusions();
+

tests/fillet.scad

@@ -20,7 +20,8 @@ include <../global_defs.scad>
 use <../utils/fillet.scad>
 
 module fillets() {
-    fillet(3, 25);
+    rotate(180)
+        fillet(3, 10);
 }
 
 fillets();

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/global.scad

@@ -25,6 +25,9 @@ module globals() {
 
         translate([30, 0])
             ellipse(15, 7);
+
+        translate([50, 0])
+            right_triangle(10, 20, 0);
     }
 }
 

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/ldrs.scad

@@ -0,0 +1,27 @@
+//
+// 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/>.
+//
+include <../vitamins/ldrs.scad>
+
+use <../utils/layout.scad>
+
+module ldrs()
+    layout([for(l = ldrs) ldr_diameter(l)], 5)
+        LDR(ldrs[$i]);
+
+ldrs();

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/polyholes.scad

@@ -52,8 +52,8 @@ module polyholes() {
     sizes = [1.5, 2, 3, 4];
     for(i = [0 : len(sizes) - 1])
         translate([i * 10, -10]) {
-            color(pp1_colour) linear_extrude(height = 1)
-                poly_ring(ir = ir, or = cir + sizes[i] * extrusion_width);
+            color(pp1_colour)
+                poly_tube(ir = ir, or = cir + sizes[i] * extrusion_width, h = 1);
 
             rod(2 * ir, 3);
        }

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/teardrops.scad

@@ -36,7 +36,10 @@ module teardrops() {
                         tearslot(h = 0, r = 3, w = 10);
 
                     translate([30, 15])
-                         vertical_tearslot(h = 0, r =3, l = 10);
+                        vertical_tearslot(h = 0, r =3, l = 10);
+
+                    translate([20, 10])
+                        semi_teardrop(h = 0, r = 3);
                 }
 }
 

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/core/bom.scad

@@ -63,6 +63,22 @@ module pose(a = [55, 0, 25], t = [0, 0, 0], exploded = undef)       //! Pose an
                             translate(-t)
                                 children();
 
+module pose_hflip(exploded = undef)       //! Pose an STL or assembly for rendering to png by flipping around the Y axis, ```exploded = true for``` just the exploded view or ```false``` for unexploded only.
+    if(is_undef($pose) || !is_undef($posed) || (!is_undef(exploded) && exploded != !!exploded()))
+        children();
+    else
+        let($posed = true) // only pose the top level
+            hflip()
+                children();
+
+module pose_vflip(exploded = undef)       //! Pose an STL or assembly for rendering to png by flipping around the X axis, ```exploded = true for``` just the exploded view or ```false``` for unexploded only.
+    if(is_undef($pose) || !is_undef($posed) || (!is_undef(exploded) && exploded != !!exploded()))
+        children();
+    else
+        let($posed = true) // only pose the top level
+            vflip()
+                children();
+
 
 module assembly(name) {                 //! Name an assembly that will appear on the BOM, there needs to a module named ```<name>_assembly``` to make it
     if(bom_mode())

utils/core/global.scad

@@ -63,6 +63,10 @@ module semi_circle(r, d = undef)                    //! A semi circle in the pos
             square([2 * sq, sq]);
     }
 
+module right_triangle(width, height, h, center = true) //! A right angled triangle with the 90° corner at the origin. 3D when ```h``` is nonzero, otherwise 2D
+    extrude_if(h, center = center)
+        polygon(points = [[0,0], [width, 0], [0, height]]);
+
 include <sphere.scad>
 include <bom.scad>
 include <polyholes.scad>

utils/core/polyholes.scad

@@ -62,6 +62,10 @@ module poly_ring(or, ir) { //! Make a 2D ring adjusted to have the correct inter
                 }
 }
 
+module poly_tube(or, ir, h, center = false) //! Make a tube adjusted to have the correct internal radius
+    extrude_if(h, center)
+        poly_ring(or, ir);
+
 module drill(r, h = 100) //! Make a cylinder for drilling holes suitable for CNC routing, set h = 0 for circle
     extrude_if(h)
         circle(r = corrected_radius(r, r2sides(r)));

utils/core/teardrops.scad

@@ -34,6 +34,18 @@ module teardrop(h, r, center = true, truncate = true) //! For making horizontal
                     polygon([[0, 0], [eps, 0], [0, r * sqrt(2)]]);
             }
 
+module semi_teardrop(h, r, d = undef, center = true) //! A semi teardrop in the positive Y domain
+    render(convexity = 5)
+        extrude_if(h, center)
+            intersection() {
+                R = is_undef(d) ? r : d / 2;
+                teardrop(r = R, h = 0);
+
+                sq = R + 1;
+                translate([-sq, 0])
+                    square([2 * sq, sq]);
+            }
+
 module teardrop_plus(h, r, center = true, truncate = true) //! Slightly bigger teardrop to allow for the 3D printing staircase effect
     teardrop(h, r + layer_height / 4, center, truncate);
 

utils/fillet.scad

@@ -28,5 +28,6 @@ module fillet(r, h, center = false) //! Fillet with specified radius and height
             translate([-eps, -eps, 0])
                 square(r + eps);
 
-            circle(r + eps);
+            translate([r, r])
+                circle(r + eps);
         }

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,35 @@ heater_y = heater_width / 2;
 
 fan_x_offset = rad_dia / 2 + 4;
 
-module e3d_resistor(type) {
+module e3d_resistor(type, naked = false, 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);
+        if(!naked)
+            color("red")
+                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, naked = false, 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, naked, resistor_wire_rotate);
         e3d_nozzle(type);
     }
 }
@@ -118,7 +123,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 +151,17 @@ module e3d_hot_end(type, filament, naked = false) {
             }
 
     rotate(90)
-        heater_block(type);
+        heater_block(type, naked, 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/extrusion.scad

@@ -0,0 +1,128 @@
+//
+// NopSCADlib Copyright Chris Palmer 2020
+// 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/>.
+
+//
+//! Aluminium  extrusion.
+//
+include <../core.scad>
+
+function extrusion_width(type)          = type[1];   //! Width of extrusion
+function extrusion_height(type)         = type[2];   //! Height of extrusion
+function extrusion_center_hole(type)    = type[3];   //! Diameter of center hole
+function extrusion_corner_hole(type)    = type[4];   //! Diameter of corner hole
+function extrusion_center_square(type)  = type[5];   //! Size of center square
+function extrusion_channel_width(type)  = type[6];   //! Channel width
+function extrusion_channel_width_internal(type)  = type[7];   //! Internal channel width
+function extrusion_tab_thickness(type)  = type[8];   //! Tab thickness
+function extrusion_spar_thickness(type) = type[9];   //! Spar thickness
+function extrusion_fillet(type)         = type[10];  //! Radius of corner fillet
+
+module extrusion_cross_section(type, cornerHole) {
+
+    module extrusion_corner(type, cornerHole) {
+        width = extrusion_width(type);
+        tabThickness = extrusion_tab_thickness(type);
+        sparThickness = extrusion_spar_thickness(type);
+        centerSquare = extrusion_center_square(type);
+        channelWidth = extrusion_channel_width(type);
+        fillet = extrusion_fillet(type);
+        cornerSize = (width-channelWidth)/2;
+        cornerSquare = (width-extrusion_channel_width_internal(type))/2;
+        cornerHoleDiameter =extrusion_corner_hole(type);
+
+        translate([-width/2,-width/2]) {
+            difference() {
+                union() {
+                    translate([fillet,0])
+                        square([cornerSize-fillet,tabThickness]);
+                    translate([0,fillet])
+                        square([tabThickness,cornerSize-fillet]);
+                    translate([fillet,fillet])
+                        circle(fillet);
+                    translate([fillet,fillet])
+                        square([cornerSquare-fillet,cornerSquare-fillet]);
+                }
+                if(cornerHole)
+                    translate([cornerSquare/2,cornerSquare/2])
+                        circle(d=cornerHoleDiameter);
+            }
+        }
+        rotate(-135) translate([centerSquare/2,-sparThickness/2]) square([sqrt(2)*(width-centerSquare-cornerSquare)/2,sparThickness]);
+    }
+
+    module extrusion_center_section(type) {
+        width = extrusion_width(type);
+        tabThickness = extrusion_tab_thickness(type);
+        sparThickness = extrusion_spar_thickness(type);
+        centerSquare = extrusion_center_square(type);
+        channelWidth = extrusion_channel_width(type);
+
+        translate([0,width/2])
+            for(angle=[225,315])
+                rotate(angle)
+                    translate([centerSquare/2,-sparThickness/2])
+                        square([sqrt(2)*(width-centerSquare)/2,sparThickness]);
+        translate([0,-width/2])
+            for(angle=[45,135])
+                rotate(angle)
+                    translate([centerSquare/2,-sparThickness/2])
+                        square([sqrt(2)*(width-centerSquare)/2,sparThickness]);
+
+        centerHeight = width-channelWidth;
+        translate([-width/2,-centerHeight/2])
+            square([tabThickness,centerHeight]);
+        translate([width/2-tabThickness,-centerHeight/2])
+            square([tabThickness,centerHeight]);
+    }
+
+
+    centerSquare = extrusion_center_square(type);
+
+    width = extrusion_width(type);
+    height = extrusion_height(type);
+    count = (height-width)/width;
+
+    for(i=[0:count])
+        translate([0,i*width+(width-height)/2])
+            difference() {
+                square([centerSquare,centerSquare],center=true);
+                circle(d=extrusion_center_hole(type));
+            }
+    translate([0,(width-height)/2])
+        for(angle=[0,90])
+            rotate(angle)
+                extrusion_corner(type, cornerHole);
+    translate([0,-(width-height)/2])
+        for(angle=[180,270])
+            rotate(angle)
+                extrusion_corner(type, cornerHole);
+    if(count>=1)
+        for(i=[1:count])
+            translate([0,i*width-height/2])
+                extrusion_center_section(type);
+}
+
+module extrusion(type, length, cornerHole = false) { //! Draw the specified extrusion
+
+    vitamin(str("extrusion(", type[0], ", ", length, "): Extrusion ", type[0], " x ", length, "mm"));
+
+    color(grey90)
+        linear_extrude(height = length)
+            extrusion_cross_section(type, cornerHole);
+}
+

vitamins/extrusions.scad

@@ -0,0 +1,35 @@
+//
+// NopSCADlib Copyright Chris Palmer 2020
+// 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/>.
+//
+//
+// Extrusion
+//
+//                   W   H    d1   d2   s  cw   cwi    t  st  f
+E2020  = [ "E2020", 20, 20,  4.2,   0,  8,  6, 12.0,   2,  2, 1 ];
+E2040  = [ "E2040", 20, 40,  4.2,   0,  8,  6, 12.0,   2,  2, 1 ];
+E2060  = [ "E2060", 20, 60,  4.2,   0,  8,  6, 12.0,   2,  2, 1 ];
+E2080  = [ "E2080", 20, 80,  4.2,   0,  8,  6, 12.0,   2,  2, 1 ];
+E3030  = [ "E3030", 30, 30,  6.8, 4.2, 12,  8, 16.5,   2,  2, 1 ];
+E3060  = [ "E3060", 30, 60,  6.8, 4.2, 12,  8, 16.5,   2,  2, 1 ];
+E4040  = [ "E4040", 40, 40, 10.5, 6.0, 15, 10, 20.0, 5.5,  3, 1 ];
+E4080  = [ "E4080", 40, 80, 10.5, 6.0, 15, 10, 20.0, 5.5,  3, 1 ];
+
+extrusions = [E2020,E2040,E2060,E2080,E3030,E3060,E4040,E4080];
+
+use <extrusion.scad>
+

vitamins/fan.scad

@@ -147,24 +147,32 @@ 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) { //! 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);
 
-        screw = fan_screw(type);
-        nut = screw_nut(screw);
+        Screw = screw ? screw : fan_screw(type);
+        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
@@ -93,15 +94,75 @@ module insert_hole(type, counterbore = 0, horizontal = false) { //! Make a hole
         }
 }
 
-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);
+function insert_boss_radius(type, wall) = corrected_radius(insert_hole_radius(type)) + wall; //! Compute the outer radius of an insert boss
 
-            translate_z(z)
-                insert_hole(type, max(0, z - insert_hole_length(type) - 2 * layer_height));
+module insert_boss(type, z, wall = 2 * extrusion_width) { //! Make a boss to take an insert
+    ir = insert_hole_radius(type);
+    or = corrected_radius(ir) + wall;
+
+    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, 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() {
+                shape();
+
+                poly_circle(insert_hole_radius(insert));
+            }
+
+    // insert boss counter_bore
+    translate_z(-boss_h2) {
+        linear_extrude(height = counter_bore + eps)
+             difference() {
+                shape();
+
+                poly_circle(insert_screw_diameter(insert) / 2 + 0.1);
+            }
+
+        // support cone
+        if(flying)
+            hull() {
+                linear_extrude(height = eps)
+                    shape();
+
+                translate([boss_r + extension - wall - eps, 0, - (2 * boss_r + extension - wall)])
+                    cube(eps, center = true);
+            }
+    }
 }

vitamins/ldr.scad

@@ -0,0 +1,105 @@
+//
+// 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/>.
+//
+
+//
+//! Light dependent resistors.
+//!
+//! Larger ones seem to have both a higher dark resistance and a lower bright light resistance.
+//
+include <../core.scad>
+
+function ldr_description(type) = type[1]; //! Description
+function ldr_diameter(type)    = type[2]; //! The diameter of the round bit
+function ldr_width(type)       = type[3]; //! Across the flats
+function ldr_thickness(type)   = type[4]; //! Thickness
+function ldr_pitch(type)       = type[5]; //! Pitch between the leads
+function ldr_active(type)      = type[6]; //! The active width
+function ldr_lead_d(type)      = type[7]; //! The lead diameter
+
+module LDR(type, lead_length = 3) { //! Draw an LDR, can specify the lead length
+    vitamin(str("ldr(", type[0], "): Light dependent resistor - ", ldr_description(type)));
+
+    module shape()
+        intersection() {
+            circle(d = ldr_diameter(type));
+
+            square([100, ldr_width(type)], center = true);
+        }
+
+    function serpentine_t() = let(w = ldr_width(type), n = floor(w / 0.5) + 0.5) w / (n * 2);
+
+    module serpentine() {
+        w = ldr_width(type);
+
+        t = serpentine_t();
+        pitch = 2 * t;
+        l = ldr_active(type);
+        lines = ceil(w / pitch);
+
+        for(i = [0 : lines - 1])
+            translate([0, i * pitch - w / 2 + t / 2]) {
+                square([l - 3 * t, t], center = true);
+
+                end = i % 2 ? 1 : -1;
+                $fn = 16;
+                translate([end * (l / 2 - 1.5 * t), t])
+                    rotate(-end * 90)
+                    difference() {
+                        semi_circle(1.5 * t);
+
+                        semi_circle(t / 2);
+                    }
+            }
+    }
+
+    t = ldr_thickness(type);
+
+    color("white")
+        linear_extrude(height = t - 0.4)
+            shape();
+
+    color("orange")
+        translate_z(t - 0.4)
+            linear_extrude(height = 0.1)
+                shape();
+
+    color([0.9, 0.9, 0.9])
+        translate_z(t - 0.3)
+            linear_extrude(height = 0.1)
+                difference() {
+                    offset(-serpentine_t())
+                        shape();
+
+                serpentine();
+            }
+
+    color("silver")
+        for(side = [-1, 1])
+            translate([side * ldr_pitch(type) / 2, 0]) {
+                translate_z(-lead_length)
+                    cylinder(d = ldr_lead_d(type), h = lead_length, $fn = 16);
+
+                translate_z(t - 0.3)
+                    cylinder(d = 1.5 * ldr_lead_d(type), h = 0.2, $fn = 16);
+            }
+    color([1, 1, 1, 0.25])
+        translate_z(t - 0.3 + eps)
+            linear_extrude(height = 0.3)
+                shape();
+}

vitamins/ldrs.scad

@@ -0,0 +1,28 @@
+//
+// 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/>.
+//
+
+//
+// Light dependent resistors.
+//
+small_ldr = ["small_ldr", "small", 5,   4.2, 2.0, 3.2, 2.5, 0.4];
+large_ldr = ["large_ldr", "large", 9.2, 7.9, 2.0, 6.8, 4.5, 0.5];
+
+ldrs = [small_ldr, large_ldr];
+
+use <ldr.scad>

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/nut.scad

@@ -58,7 +58,7 @@ module nut(type, nyloc = false, brass = false, nylon = false) { //! Draw specifi
                     rounded_cylinder(r = outer_rad * cos(30) , h = nyloc_thickness, r2 = (nyloc_thickness - thickness) / 2, ir = hole_rad);
         }
     if($children)
-        translate_z(thickness)
+        translate_z(nut_thickness(type, nyloc))
             children();
 }
 

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));
@@ -750,14 +836,19 @@ module pcb(type) { //! Draw specified PCB
                 }
 }
 
-module pcb_spacer(screw, height, wall = 1.8) { //! Generate STL for PCB spacer
-    stl(str("pcb_spacer", round(screw_radius(screw) * 20), round(height * 10)));
+module pcb_spacer(screw, height, wall = 1.8, taper = 0) { //! Generate STL for PCB spacer
+    stl(str("pcb_spacer", round(screw_radius(screw) * 20), round(height * 10), taper ? str("_", taper) : ""));
 
     ir = screw_clearance_radius(screw);
     or = corrected_radius(ir) + wall;
 
-    linear_extrude(height = height)
-        poly_ring(or, ir);
+    if(height > taper)
+        linear_extrude(height = height - taper)
+            poly_ring(or, ir);
+
+    if(taper)
+        linear_extrude(height = height)
+            poly_ring(ir + 2 * extrusion_width, ir);
 }
 
 module pcb_base(type, height, thickness, wall = 2) { //! Generate STL for a base with PCB spacers
@@ -798,12 +889,8 @@ module pcb_assembly(type, height, thickness) { //! Draw PCB assembly with spaces
                 screw(screw, screw_length);
 
             color(pp1_colour)
-                if(taper) {
-                    h2 = max(0,  height - 2);
-                    if(h2)
-                        pcb_spacer(screw, h2);
-                    pcb_spacer(screw, height, 2 * extrusion_width); // Thin as can be at the top because there is no clearance around the holes.
-                }
+                if(taper)
+                    pcb_spacer(screw, height, taper = 2);
                 else
                     pcb_spacer(screw, height);
 

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];