Added comment to belts about using negative pitch radius for outside pulleys.

Fixed index order being different on Linux due to os.listdir order being
inconsistent with Windows.

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/bom/bom.json

@@ -1,64 +1,69 @@
-{
-    "name": "main_assembly",
-    "count": 1,
-    "assemblies": [
-        {
-            "name": "mains_in_assembly",
-            "count": 1,
-            "assemblies": [
-                {
-                    "name": "feet_assembly",
-                    "count": 1,
-                    "assemblies": [
-                        {
-                            "name": "base_assembly",
-                            "count": 1,
-                            "assemblies": [],
-                            "vitamins": {
-                                "insert(F1BM3): Heatfit insert M3": 2
-                            },
-                            "printed": {
-                                "socket_box.stl": 1
-                            },
-                            "routed": {}
-                        }
-                    ],
-                    "vitamins": {
-                        "washer(M3_washer): Washer  M3 x 7mm x 0.5mm": 8,
-                        "screw(M3_dome_screw, 10): Screw M3 dome x 10mm": 4,
-                        "nut(M3_nut, nyloc = true): Nut M3 nyloc": 4
-                    },
-                    "printed": {
-                        "foot.stl": 4
-                    },
-                    "routed": {}
-                }
-            ],
-            "vitamins": {
-                ": Wire green & yellow 30/0.25mm strands, length 150mm - not shown": 1,
-                ": Wire blue 30/0.25mm strands, length 150mm - not shown": 1,
-                ": Wire brown 30/0.25mm strands, length 150mm - not shown": 2,
-                "tubing(HSHRNK32): Heatshrink sleeving ID 3.2mm x 15mm - not shown": 3,
-                "iec(IEC_inlet_atx): IEC inlet for ATX": 1,
-                "screw(M3_cs_cap_screw, 12): Screw M3 cs cap x 12mm": 2,
-                "washer(M3_washer): Washer  M3 x 7mm x 0.5mm": 2,
-                "nut(M3_nut, nyloc = true): Nut M3 nyloc": 2
-            },
-            "printed": {},
-            "routed": {}
-        }
-    ],
-    "vitamins": {
-        ": Wire green & yellow 30/0.25mm strands, length 150mm - not shown": 1,
-        ": Wire blue 30/0.25mm strands, length 150mm - not shown": 1,
-        "tubing(HSHRNK32): Heatshrink sleeving ID 3.2mm x 15mm - not shown": 5,
-        ": Ferrule for 1.5mm^2 wire - not shown": 3,
-        "mains_socket(Contactum): Mains socket 13A": 1,
-        "screw(M3_cs_cap_screw, 20): Screw M3 cs cap x 20mm": 2,
-        "jack_4mm_shielded(\"blue\", 3, \"royalblue\"): 4mm shielded jack socket blue": 2,
-        "jack_4mm_shielded(\"brown\", 3, \"sienna\"): 4mm shielded jack socket brown": 1,
-        "jack_4mm_shielded(\"green\", 3): 4mm shielded jack socket green": 2
+[
+    {
+        "name": "base_assembly",
+        "count": 1,
+        "assemblies": {},
+        "vitamins": {
+            "insert(F1BM3): Heatfit insert M3": 2
+        },
+        "printed": {
+            "socket_box.stl": 1
+        },
+        "routed": {}
     },
-    "printed": {},
-    "routed": {}
-}
+    {
+        "name": "feet_assembly",
+        "count": 1,
+        "assemblies": {
+            "base_assembly": 1
+        },
+        "vitamins": {
+            "washer(M3_washer): Washer  M3 x 7mm x 0.5mm": 8,
+            "screw(M3_dome_screw, 10): Screw M3 dome x 10mm": 4,
+            "nut(M3_nut, nyloc = true): Nut M3 x 2.4mm nyloc": 4
+        },
+        "printed": {
+            "foot.stl": 4
+        },
+        "routed": {}
+    },
+    {
+        "name": "mains_in_assembly",
+        "count": 1,
+        "assemblies": {
+            "feet_assembly": 1
+        },
+        "vitamins": {
+            ": Wire green & yellow 30/0.25mm strands, length 150mm - not shown": 1,
+            ": Wire blue 30/0.25mm strands, length 150mm - not shown": 1,
+            ": Wire brown 30/0.25mm strands, length 150mm - not shown": 2,
+            "tubing(HSHRNK32): Heatshrink sleeving ID 3.2mm x 15mm - not shown": 3,
+            "iec(IEC_inlet_atx): IEC inlet for ATX": 1,
+            "screw(M3_cs_cap_screw, 12): Screw M3 cs cap x 12mm": 2,
+            "washer(M3_washer): Washer  M3 x 7mm x 0.5mm": 2,
+            "nut(M3_nut, nyloc = true): Nut M3 x 2.4mm nyloc": 2
+        },
+        "printed": {},
+        "routed": {}
+    },
+    {
+        "name": "main_assembly",
+        "count": 1,
+        "assemblies": {
+            "mains_in_assembly": 1
+        },
+        "vitamins": {
+            ": Wire green & yellow 30/0.25mm strands, length 150mm - not shown": 1,
+            ": Wire blue 30/0.25mm strands, length 150mm - not shown": 1,
+            "tubing(HSHRNK32): Heatshrink sleeving ID 3.2mm x 15mm - not shown": 5,
+            ": Ferrule for 1.5mm^2 wire - not shown": 3,
+            "mains_socket(Contactum): Mains socket 13A": 1,
+            "screw(M3_cs_cap_screw, 20): Screw M3 cs cap x 20mm": 2,
+            "jack_4mm_shielded(\"blue\", 3, \"royalblue\"): 4mm shielded jack socket blue": 2,
+            "jack_4mm_shielded(\"brown\", 3, \"sienna\"): 4mm shielded jack socket brown": 1,
+            "jack_4mm_shielded(\"green\", 3): 4mm shielded jack socket green": 2
+        },
+        "printed": {},
+        "routed": {}
+    }
+]

examples/MainsBreakOutBox/bom/bom.txt

@@ -17,7 +17,7 @@ Vitamins:
   |  | 1|  |  1 4mm shielded jack socket brown
   |  | 2|  |  2 4mm shielded jack socket green
   |  | 1|  |  1 Mains socket 13A
-  | 4|  | 2|  6 Nut M3 nyloc
+  | 4|  | 2|  6 Nut M3 x 2.4mm nyloc
   |  |  | 2|  2 Screw M3 cs cap x 12mm
   |  | 2|  |  2 Screw M3 cs cap x 20mm
   | 4|  |  |  4 Screw M3 dome x 10mm

examples/MainsBreakOutBox/bom/feet_assembly.txt

@@ -1,6 +1,6 @@
 feet_assembly:
 Vitamins:
-  4 Nut M3 nyloc
+  4 Nut M3 x 2.4mm nyloc
   4 Screw M3 dome x 10mm
   8 Washer  M3 x 7mm x 0.5mm
 

examples/MainsBreakOutBox/bom/mains_in_assembly.txt

@@ -4,7 +4,7 @@ Vitamins:
   2 Wire brown 30/0.25mm strands, length 150mm - not shown
   1 Wire green & yellow 30/0.25mm strands, length 150mm - not shown
   1 IEC inlet for ATX
-  2 Nut M3 nyloc
+  2 Nut M3 x 2.4mm nyloc
   2 Screw M3 cs cap x 12mm
   3 Heatshrink sleeving ID 3.2mm x 15mm - not shown
   2 Washer  M3 x 7mm x 0.5mm

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 |
@@ -39,7 +40,7 @@ Earth leakage can be measured Canadian CSA style by disconnected the neutral lin
 | &nbsp;&nbsp;.&nbsp; | &nbsp;&nbsp;.&nbsp; | &nbsp;&nbsp;3&nbsp; | &nbsp;&nbsp;5&nbsp; |  &nbsp;&nbsp;8&nbsp; | &nbsp;&nbsp; Heatshrink sleeving ID 3.2mm x 15mm - not shown |
 | &nbsp;&nbsp;.&nbsp; | &nbsp;&nbsp;.&nbsp; | &nbsp;&nbsp;1&nbsp; | &nbsp;&nbsp;.&nbsp; |  &nbsp;&nbsp;1&nbsp; | &nbsp;&nbsp; IEC inlet for ATX |
 | &nbsp;&nbsp;.&nbsp; | &nbsp;&nbsp;.&nbsp; | &nbsp;&nbsp;.&nbsp; | &nbsp;&nbsp;1&nbsp; |  &nbsp;&nbsp;1&nbsp; | &nbsp;&nbsp; Mains socket 13A |
-| &nbsp;&nbsp;.&nbsp; | &nbsp;&nbsp;4&nbsp; | &nbsp;&nbsp;2&nbsp; | &nbsp;&nbsp;.&nbsp; |  &nbsp;&nbsp;6&nbsp; | &nbsp;&nbsp; Nut M3 nyloc |
+| &nbsp;&nbsp;.&nbsp; | &nbsp;&nbsp;4&nbsp; | &nbsp;&nbsp;2&nbsp; | &nbsp;&nbsp;.&nbsp; |  &nbsp;&nbsp;6&nbsp; | &nbsp;&nbsp; Nut M3 x 2.4mm nyloc |
 | &nbsp;&nbsp;.&nbsp; | &nbsp;&nbsp;.&nbsp; | &nbsp;&nbsp;2&nbsp; | &nbsp;&nbsp;.&nbsp; |  &nbsp;&nbsp;2&nbsp; | &nbsp;&nbsp; Screw M3 cs cap x 12mm |
 | &nbsp;&nbsp;.&nbsp; | &nbsp;&nbsp;.&nbsp; | &nbsp;&nbsp;.&nbsp; | &nbsp;&nbsp;2&nbsp; |  &nbsp;&nbsp;2&nbsp; | &nbsp;&nbsp; Screw M3 cs cap x 20mm |
 | &nbsp;&nbsp;.&nbsp; | &nbsp;&nbsp;4&nbsp; | &nbsp;&nbsp;.&nbsp; | &nbsp;&nbsp;.&nbsp; |  &nbsp;&nbsp;4&nbsp; | &nbsp;&nbsp; Screw M3 dome x 10mm |
@@ -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| Nut M3 x 2.4mm nyloc|
 |4| Screw M3 dome x 10mm|
-|4| Nut M3 nyloc|
+|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 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

examples/MainsBreakOutBox/scad/bob_main.scad

@@ -60,7 +60,7 @@ insert_length = insert_length(insert);
 insert_boss = mains_socket_insert_boss(socket);
 screw_length = screw_longer_than(mains_socket_height(socket) + insert_length(insert));
 
-iec_h = iec_slot_h(iec) + 1;
+iec_h = iec_body_h(iec) + 1;
 
 box_height = socket_depth + iec_h;
 base_thickness = wall;

lib.scad

@@ -60,6 +60,8 @@ 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>
 
 use <vitamins/jack.scad>
 use <vitamins/meter.scad>

libtest.scad

@@ -34,12 +34,14 @@ use <tests/d_connectors.scad>
 use <tests/displays.scad>
 use <tests/fans.scad>
 use <tests/fuseholder.scad>
+use <tests/geared_steppers.scad>
 use <tests/hot_ends.scad>
 use <tests/iecs.scad>
 use <tests/inserts.scad>
 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>
@@ -86,6 +88,9 @@ use <tests/ribbon_clamp.scad>
 use <tests/screw_knob.scad>
 use <tests/socket_box.scad>
 use <tests/strap_handle.scad>
+use <tests/ssr_shroud.scad>
+use <tests/psu_shroud.scad>
+use <tests/flat_hinge.scad>
 
 x5 = 800;
 
@@ -112,6 +117,9 @@ translate([x5 + 70, cable_grommets_y + 150])
 translate([x5, cable_grommets_y + 470]) {
     door_hinges()
         door_latches();
+
+    translate([120, 0])
+        flat_hinges();
 }
 
 translate([x5, cable_grommets_y + 370])
@@ -150,7 +158,7 @@ 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])
@@ -216,9 +224,11 @@ translate([x0, fans_y]) {
 translate([x0, transformers_y])
     variacs();
 
-translate([x0, psus_y])
+translate([x0, psus_y]) {
     psus();
 
+    psu_shrouds();
+}
 
 x1 = x0 + 100;
 zipties_y = 0;
@@ -244,6 +254,9 @@ components_y = toggles_y + 40;
 translate([x2, leds_y])
     leds();
 
+translate([x2 + 40, leds_y])
+    ldrs();
+
 translate([x2 + 8, carriers_y])
     carriers();
 
@@ -288,6 +301,9 @@ steppers_y = batteries_y + 70;
 translate([x3, veroboard_y])
     veroboard_test();
 
+translate([x3 + 70, veroboard_y + 30])
+    geared_steppers();
+
 translate([x3, d_connectors_y])
     d_connectors();
 
@@ -300,9 +316,12 @@ translate([x3 + 15, modules_y])
 translate([x3 + 40, modules_y])
     modules();
 
-translate([x3, ssrs_y])
+translate([x3, ssrs_y]) {
     ssrs();
 
+    ssr_shrouds();
+}
+
 translate([x3, blowers_y])
     blowers();
 

printed/box.scad

@@ -397,16 +397,6 @@ module box_bezel_section(type, bottom, rows, cols, x, y) { //! Generates interlo
     }
 }
 
-module box_shelf_blank(type) { //! Generates a 2D template for a shelf sheet
-    dxf("box_shelf");
-
-    difference() {
-        sheet_2D(box_sheets(type), box_width(type) - bezel_clearance, box_depth(type) - bezel_clearance, 1);
-
-        offset(bezel_clearance / 2)
-            box_corner_quadrants(type, box_width(type), box_depth(type));
-    }
-}
 
 module box_screw_hole_positions(type)
     for(x = [-1, 1], y = [-1, 1])
@@ -439,6 +429,17 @@ function subst_sheet(type, sheet) =
     let(s = box_sheets(type))
         sheet ? assert(sheet_thickness(sheet) == sheet_thickness(s)) sheet : s;
 
+module box_shelf_blank(type, sheet = false) { //! Generates a 2D template for a shelf sheet
+    dxf("box_shelf");
+
+    difference() {
+        sheet_2D(subst_sheet(type, sheet), box_width(type) - bezel_clearance, box_depth(type) - bezel_clearance, 1);
+
+        offset(bezel_clearance / 2)
+            box_corner_quadrants(type, box_width(type), box_depth(type));
+    }
+}
+
 module box_left_blank(type, sheet = false) { //! Generates a 2D template for the left sheet, ```sheet``` can be set to override the type
     dxf("box_left");
 

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,20 @@ 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.
 
 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 +67,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 +81,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]),
-
+            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 +111,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 +121,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 +133,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) { //! 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 +174,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), bbox_width(type) + 2 * t, 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,8 +201,7 @@ 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);
@@ -219,43 +211,54 @@ assembly("bbox") {
     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,20 @@ 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_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_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_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/flat_hinge.scad

@@ -0,0 +1,180 @@
+//
+// 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/>.
+//
+
+//
+//! A parametric flat hinge. A piece of filament can be used for the hinge pin.
+//!
+//! The width, depth, thickness, number and type of screws, number of knuckles, knuckle diameter, pin diameter and clearance can all be varied.
+//! A margin between the screws and the knuckle edge can be enforced to allow the hinge to bend all the way back to 270&deg; from closed.
+//!
+//! Opening the test in OpenSCAD with its customiser enabled allows these parameters to be played with.
+//!
+//! Note setting ```thickness1``` or ```thickness2``` to zero in the ```hinge_fastened_assembly()``` removes the screws from one side or the other and
+//! setting ```show_hinge``` to false removes the hinge.
+//! This allows the hinges and one set of screws to belong to one assembly and the other set of screws to another assembly.
+//
+include <../core.scad>
+include <../vitamins/screws.scad>
+
+function hinge_width(type)       = type[1]; //! Width
+function hinge_depth(type)       = type[2]; //! Depth of each leaf
+function hinge_thickness(type)   = type[3]; //! Thickness of the leaves
+function hinge_pin_dia(type)     = type[4]; //! The pin diameter
+function hinge_knuckle_dia(type) = type[5]; //! The knuckle diameter
+function hinge_knuckles(type)    = type[6]; //! How many knuckles
+function hinge_screw(type)       = type[7]; //! Screw type to mount it
+function hinge_screws(type)      = type[8]; //! How many screws
+function hinge_clearance(type)   = type[9]; //! Clearance between knuckles
+function hinge_margin(type)      = type[10]; //! How far to keep the screws from the knuckes
+
+function hinge_radius(type)      = washer_radius(screw_washer(hinge_screw(type))) + 1;
+
+module hinge_screw_positions(type) { //! Place children at the screw positions
+    screws = hinge_screws(type);
+    w = hinge_width(type);
+    d = hinge_depth(type);
+    r = hinge_radius(type);
+    m = hinge_margin(type);
+    assert(screws > 1, "must be at least two screws");
+    w_pitch = (w - 2 * r) / (screws - 1);
+    d_pitch = d - 2 * r - m;
+    wr = washer_radius(screw_washer(hinge_screw(type)));
+    assert(w_pitch >= wr && norm([w_pitch, d_pitch]) >= 2 * wr && d_pitch >= 0, "not enough room for screws");
+
+    for(i = [0 : screws - 1])
+        translate([-w / 2 + r + i * w_pitch, r + m + (i % 2) * d_pitch])
+            children();
+}
+
+module hinge_male(type, female = false) {       //! The half with the stationary pin
+    stl(str("hinge_", female ? "fe": "", "male_", type[0]));
+
+    r = hinge_radius(type);
+    w = hinge_width(type);
+    t = hinge_thickness(type);
+    kr = hinge_knuckle_dia(type) / 2;
+    pr = hinge_pin_dia(type) / 2;
+    assert(kr > pr, "knuckle diameter must be bigger than the pin diameter");
+
+    n = hinge_knuckles(type);
+    assert(n >= 3, "must be at least three knuckes");
+    mn = ceil(n / 2);                           // Male knuckles
+    fn = floor(n / 2);                          // Female knuckles
+    gap = hinge_clearance(type);
+    mw = (w - (n - 1) * gap) / 2 / mn;          // Male knuckle width
+    fw = (w - (n - 1) * gap) / 2 / fn;          // Female knuckle width
+
+    teardrop_r = kr / cos(22.5);                // The corner on the teardrop
+    inset = sqrt(sqr(teardrop_r + gap) - sqr(kr - t)) - kr;
+
+    linear_extrude(height =t)
+        difference() {
+            hull() {
+                for(side = [-1, 1])
+                    translate([side * (w / 2 - r), hinge_depth(type) - r])
+                        circle4n(r);
+
+                translate([-w / 2, inset])
+                    square([w, eps]);
+            }
+            hinge_screw_positions(type)
+                poly_circle(screw_clearance_radius(hinge_screw(type)));
+        }
+
+    pitch = mw + gap + fw + gap;
+    dir = female ? -1 : 1;
+    translate([0, -kr, kr])
+        rotate([90, 0, -90])
+            for(z = [0 : (female ? fn : mn) - 1])
+                translate_z(-dir * w / 2 + z * dir * pitch + (female ? -fw - mw - gap : 0))
+                    linear_extrude(height = female ? fw : mw)
+                        difference() {
+                            hull() {
+                                rotate(180)
+                                    teardrop(r = kr, h = 0);
+
+                                translate([-kr - 1, -kr])
+                                    square(1);
+                            }
+                            teardrop_plus(r = pr + (female ? gap : 0), h = 0);
+                        }
+}
+
+module hinge_female(type) hinge_male(type, true);
+
+module hinge_both(type) { //! Both parts together for printing
+    hinge_male(type);
+
+    translate([0, -hinge_knuckle_dia(type)])
+        rotate(180)
+             hinge_female(type);
+}
+
+module hinge_assembly(type, angle = 0)
+assembly(str("hinge_", type[0])) { //! Assembled hinge
+    kr = hinge_knuckle_dia(type) / 2;
+    hr = hinge_pin_dia(type) / 2;
+    w = hinge_width(type);
+
+    vitamin(str(": Hinge pin ", w, " x ", 2 * hr, "mm"));
+
+    color(pp1_colour) hinge_male(type);
+
+    translate([0, -kr, kr]) {
+        rotate([0, 90, 0])
+            explode(w + 10)
+                color("silver") cylinder(r = hr , h = w, center = true);
+
+        rotate([-angle, 0, 0])
+            translate([0, -kr, -kr])
+                rotate(180)
+                     color(pp2_colour) hinge_female(type);
+    }
+}
+
+module hinge_fastened_assembly(type, thickness1, thickness2, angle, show_hinge = true) { //! Assembled hinge with its fasteners
+    if(show_hinge)
+        hinge_assembly(type, angle);
+
+    screw = hinge_screw(type);
+    washer_t = 2 * washer_thickness(screw_washer(screw));
+    nut = screw_nut(screw);
+    nut_t = nut_thickness(nut, true);
+    t = hinge_thickness(type);
+    kr = hinge_knuckle_dia(type) / 2;
+
+    module fasteners(thickness)
+        if(thickness)
+            hinge_screw_positions(type) {
+                translate_z(t)
+                    screw_and_washer(screw, screw_longer_than(t + thickness + washer_t + nut_t));
+
+                translate_z(-thickness)
+                    vflip()
+                        nut_and_washer(nut, true);
+            }
+
+    fasteners(thickness1);
+
+    translate([0, -kr, kr])
+        rotate([-angle, 0, 0])
+            translate([0, -kr, - kr])
+                rotate(180)
+                     fasteners(thickness2);
+}

printed/foot.scad

@@ -28,7 +28,6 @@ include <../vitamins/inserts.scad>
 foot        = [25, 12, 3, 2, M4_cap_screw, 10];
 insert_foot = [20, 10, 0, 2, M3_cap_screw, 10];
 
-function foot() = foot; //! Default foot used unless a list of parameters is passed
 function insert_foot() = insert_foot; //! Default foot with insert
 
 function foot_diameter(type = foot) = type[0]; //! Outside maximum diameter
@@ -67,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);
@@ -80,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/psu_shroud.scad

@@ -0,0 +1,172 @@
+//
+// 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/>.
+//
+
+//
+//! A cover to go over the mains end of a PSU terminal strip to make it safe.
+//! The stl and assembly must be given a name and parameterless wrappers for the stl and assembly added to the project.
+//
+include <../core.scad>
+include <../vitamins/screws.scad>
+include <../vitamins/inserts.scad>
+
+use <../vitamins/wire.scad>
+use <../vitamins/psu.scad>
+use <../utils/round.scad>
+
+wall = 1.8;
+top = 1.5;
+screw = M3_cap_screw;
+insert = screw_insert(screw);
+boss_r = insert_boss_radius(insert, wall);
+counter_bore = 2;
+rad = 2;
+clearance = layer_height;
+overlap = 6;
+
+cable_tie_inset = wall + 4;
+
+function psu_shroud_extent(type) = 15 + wall;                                   //! How far it extends beyond the PSU to clear the connections
+function psu_shroud_depth(type) =                                               //! Outside depth of the shroud
+    psu_left_bay(type) + overlap + psu_shroud_extent(type);
+
+function psu_shroud_width(type)  =                                              //! Outside width of the shroud
+    let(terminals = psu_terminals(type))
+        terminals ?
+            let(y = terminals.y, tb = terminals.z)
+                 wall + clearance / 2 + y + 3 * terminal_block_pitch(tb) + terminal_block_divider(tb) / 2 + wall / 2
+        : psu_width(type) + 2 * wall + clearance;
+
+function psu_shroud_height(type) = psu_height(type) + top + clearance;          //! Outside height
+function psu_shroud_centre_y(type) =                                            //! Shroud centre relative to PSU centre
+    psu_width(type) / 2 + clearance / 2 + wall - psu_shroud_width(type) / 2;
+
+function psu_shroud_pitch(type)  = psu_shroud_width(type) - 2 * boss_r - eps;
+function psu_shroud_screw(type)  = screw;                                       //! Screw used to fasten
+function psu_shroud_cable_pitch(cable_d) = cable_d + 5;                        //! Pitch between cable entries
+
+module psu_shroud_hole_positions(type)                                          //! Place children at the screw hole positions
+    for($side = [-1, 1])
+        translate([-psu_length(type) / 2 - boss_r - 1, psu_shroud_centre_y(type) + $side * psu_shroud_pitch(type) / 2])
+            children();
+
+module psu_shroud_cable_positions(type, cable_d, cables = 1)                    //! Place children at the cable tie positions
+    for(i = [0 : 1 : cables - 1])
+        translate([-psu_length(type) / 2 - psu_shroud_extent(type) + cable_tie_inset,
+                   psu_shroud_centre_y(type) + (i - cables / 2 + 0.5) *  psu_shroud_cable_pitch(cable_d)])
+            children();
+
+module psu_shroud_holes(type, cable_d, cables = 1) {                            //! Drill the screw and ziptie holes
+    psu_shroud_hole_positions(type)
+        drill(screw_clearance_radius(screw), 0);
+
+    psu_shroud_cable_positions(type, cable_d, cables)
+        cable_tie_holes(cable_d / 2, h = 0);
+}
+
+module psu_shroud(type, cable_d, name, cables = 1) { //! Generate the STL file for a specified ssr and cable
+    stl(str("psu_shroud_", name));
+
+    extent = psu_shroud_extent(type);
+    depth = psu_shroud_depth(type);
+    width = psu_shroud_width(type);
+    height = psu_shroud_height(type);
+    centre_x = -psu_length(type) / 2 -  psu_shroud_extent(type) + psu_shroud_depth(type) / 2;
+    centre_y = psu_shroud_centre_y(type);
+    terminal_clearance = 0.5;
+    tb = psu_terminals(type).z;
+
+    module shape() {
+        difference() {
+            round(or = wall / 2 - eps, ir = 0) difference() {
+                rounded_square([depth, width], rad);
+
+                rounded_square([depth - 2 * wall, width - 2 * wall], rad - wall);
+
+                translate([depth / 2, 0])
+                    square([2 * rad, width], center = true);
+
+                translate([depth / 2, width / 2 - 5])
+                    square([2 * (overlap + terminal_clearance), 10], center = true);
+            }
+            for(i = [0 : 1 : cables - 1])
+                translate([0, (i - cables / 2 + 0.5) *  psu_shroud_cable_pitch(cable_d)])
+                    square([depth + 1, cable_d], center = true);
+        }
+    }
+
+    // base and sides
+    translate([centre_x, -centre_y]) {
+        rounded_rectangle([depth - eps, width - eps, top], rad, center = false);
+
+        linear_extrude(height = height)
+            difference() {
+                shape();
+
+                translate([depth / 2, width / 2 - 5])
+                    square([2 * (depth - extent + terminal_clearance), 10], center = true);
+        }
+        linear_extrude(height = height - terminal_block_height(tb) - psu_terminal_block_z(type) - terminal_clearance)
+            shape();
+    }
+    // cable slots
+    for(i = [0 : 1 : cables - 1])
+        translate([centre_x - depth / 2 + wall / 2, -centre_y + (i - cables / 2 + 0.5) *  psu_shroud_cable_pitch(cable_d), height / 2])
+            rotate([90, 0, 90])
+                linear_extrude(height = wall, center = true)
+                    difference() {
+                        square([cable_d + eps, height], center = true);
+
+                        translate([0, height / 2])
+                                vertical_tearslot(h = 0, r = cable_d / 2, l = cable_d);
+                }
+    // insert lugs
+    mirror([0, 1, 0])
+        psu_shroud_hole_positions(type)
+            translate_z(height)
+                rotate(90)
+                    insert_lug(insert, wall, $side, counter_bore);
+ }
+
+module psu_shroud_assembly(type, cable_d, name, cables = 1) //! The printed parts with inserts fitted
+assembly(str("psu_shroud_", name)) {
+
+    translate_z(psu_shroud_height(type))
+        vflip()
+            color(pp1_colour) psu_shroud(type, cable_d, name, cables);
+
+    psu_shroud_hole_positions(type)
+        vflip()
+            insert(insert);
+}
+
+module psu_shroud_fastened_assembly(type, cable_d, thickness, name, cables = 1) //! Assembly with screws in place
+{
+    washer = screw_washer(screw);
+    screw_length = screw_shorter_than(2 * washer_thickness(washer) + thickness + insert_length(insert) + counter_bore);
+
+    psu_shroud_assembly(type, cable_d, name, cables);
+
+    translate_z(-thickness)
+        psu_shroud_hole_positions(type)
+            vflip()
+                screw_and_washer(screw, screw_length, true);
+
+    psu_shroud_cable_positions(type, cable_d, cables)
+        cable_tie(cable_d / 2, thickness);
+}

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

@@ -0,0 +1,142 @@
+//
+// 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/>.
+//
+
+//
+//! A cover to go over the mains end of an SSR to make it safe to be touched.
+//! The stl and assembly must be given a name and parameterless wrappers for the stl and assembly added to the project.
+//
+include <../core.scad>
+include <../vitamins/screws.scad>
+include <../vitamins/inserts.scad>
+
+use <../vitamins/wire.scad>
+use <../vitamins/ssr.scad>
+use <../utils/round.scad>
+
+wall = 1.8;
+top = 1.5;
+screw = M3_cap_screw;
+insert = screw_insert(screw);
+boss_r = insert_boss_radius(insert, wall);
+counter_bore = 2;
+rad = 3;
+clearance = layer_height;
+
+function ssr_shroud_pitch(type) = ssr_width(type) + 2 * wall - 2 * boss_r - eps;
+function ssr_shroud_screw(type) = screw;                                    //! Screw used to fasten
+function ssr_shroud_extent(type, cable_d) = 2 * boss_r + 1 + cable_d + rad; //! How far it extends beyond the SSR
+function ssr_shroud_width(type) = ssr_width(type) + 2 * wall + clearance;   //! Outside width of shroud
+function ssr_shroud_height(type) = ssr_height(type) + top + clearance;      //! Outside height
+function ssr_shroud_cable_x(type, cable_d) =  -ssr_length(type) / 2 - 2 * boss_r - 1 - cable_d / 2; //! Position of cable entry holes
+
+module ssr_shroud_hole_positions(type)                                      //! Place children at the screw hole positions
+    for($side = [-1, 1])
+        translate([-ssr_length(type) / 2 -boss_r, $side * ssr_shroud_pitch(type) / 2])
+            vflip()
+                children();
+
+module ssr_shroud_holes(type, cable_d) { //! Drill the screw and ziptie holes
+    ssr_shroud_hole_positions(type)
+        drill(screw_clearance_radius(screw), 0);
+
+    for(side = [-1, 1])
+        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
+    stl(str("ssr_shroud_", name));
+
+    width = ssr_shroud_width(type);
+    depth = ssr_length(type) / 3 + ssr_shroud_extent(type, cable_d);
+    height = ssr_shroud_height(type);
+    cable_x = ssr_shroud_cable_x(type, cable_d);
+    center_x = -ssr_length(type) / 6 - depth / 2;
+
+    // base and sides
+    translate([center_x, 0]) {
+        rounded_rectangle([depth - eps, width - eps, top], rad, center = false);
+
+        linear_extrude(height = height) difference() {
+            round(or = wall / 2 - eps, ir = 0) difference() {
+                rounded_square([depth, width], rad);
+
+                rounded_square([depth - 2 * wall, width - 2 * wall], rad - wall);
+
+                translate([depth / 2, 0])
+                    square([2 * rad, width], center = true);
+
+            }
+            translate([cable_x - center_x, 0])
+                square([cable_d, width + 1], center = true);
+        }
+    }
+    // cable slots
+    for(side = [-1, 1])
+        translate([cable_x, side * (width / 2 - wall / 2), height / 2])
+            rotate([90, 0, 0])
+                linear_extrude(height = wall, center = true)
+                    difference() {
+                        square([cable_d + eps, height], center = true);
+
+                        translate([0, height / 2])
+                            vertical_tearslot(h = 0, r = cable_d / 2, l = cable_d);
+                    }
+    // insert boss
+    ssr_shroud_hole_positions(type)
+        vflip()
+            translate_z(height)
+                rotate(90)
+                    insert_lug(insert, wall, $side, counter_bore);
+}
+
+module ssr_shroud_assembly(type, cable_d, name) //! The printed parts with inserts fitted
+assembly(str("ssr_shroud_", name)) {
+
+    translate_z(ssr_shroud_height(type))
+        vflip()
+            color(pp1_colour) ssr_shroud(type, cable_d, name);
+
+    ssr_shroud_hole_positions(type)
+        insert(insert);
+}
+
+module ssr_shroud_fastened_assembly(type, cable_d, thickness, name) //! Assembly with screws in place
+{
+    washer = screw_washer(screw);
+    screw_length = screw_shorter_than(2 * washer_thickness(washer) + thickness + insert_length(insert) + counter_bore);
+
+    ssr_shroud_assembly(type, cable_d, name);
+
+    translate_z(-thickness)
+        ssr_shroud_hole_positions(type)
+            screw_and_washer(screw, screw_length, true);
+
+    for(side = [-1, 1])
+        translate([ssr_shroud_cable_x(type, cable_d), side * (ssr_width(type) / 2 - 2 * boss_r)]) {
+            rotate(-90)
+                cable_tie(cable_d / 2, thickness);
+
+            *translate_z(cable_d / 2)
+                rotate([90, 0, 0])
+                    color(grey20)
+                        cylinder(d = cable_d, h = 20, center = true);
+        }
+}

scripts/bom.py

@@ -54,21 +54,13 @@ class BOM:
         self.routed = {}
         self.assemblies = {}
 
-    def data(self, main):
-        return {
-             "name"       : self.name,
-             "count"      : self.count,
-             "assemblies" : [main.assemblies[ass].data(main) for ass in self.assemblies],
-             "vitamins"   : self.vitamins,
-             "printed"    : self.printed,
-             "routed"     : self.routed
-        }
-
     def flat_data(self):
         assemblies = {}
         for ass in self.assemblies:
             assemblies[ass] = self.assemblies[ass].count
         return {
+             "name"       : self.name,
+             "count"      : self.count,
              "assemblies" : assemblies,
              "vitamins"   : self.vitamins,
              "printed"    : self.printed,
@@ -167,6 +159,7 @@ class BOM:
 
 def parse_bom(file = "openscad.log", name = None):
     main = BOM(name)
+    main.ordered_assemblies = []
     stack = []
 
     for line in open(file):
@@ -179,6 +172,9 @@ def parse_bom(file = "openscad.log", name = None):
                     main.assemblies[stack[-1]].add_assembly(ass)    #add to nested BOM
                 stack.append(ass)
                 main.add_assembly(ass)                              #add to flat BOM
+                if ass in main.ordered_assemblies:
+                    main.ordered_assemblies.remove(ass)
+                main.ordered_assemblies.insert(0, ass)
             else:
                 if s[0] == '}':
                     if s[1:] != stack[-1]:
@@ -227,14 +223,15 @@ def boms(target = None, assembly = None):
     if assembly == "main_assembly":
         main.print_bom(True, open(bom_dir + "/bom.txt","wt"))
 
-    for ass in sorted(main.assemblies):
+    for ass in main.assemblies:
         with open(bom_dir + "/" + ass + ".txt", "wt") as f:
             bom = main.assemblies[ass]
             print(bom.make_name(ass) + ":", file=f)
             bom.print_bom(False, f)
 
+    data = [main.assemblies[ass].flat_data() for ass in main.ordered_assemblies]
     with open(bom_dir + "/bom.json", 'w') as outfile:
-        json.dump(main.assemblies[assembly].data(main), outfile, indent = 4)
+        json.dump(data, outfile, indent = 4)
 
     print("done")
 

scripts/deps.py

@@ -33,13 +33,14 @@ def read_deps(dname):
     for line in lines:
         if line.startswith('\t'):
             dep = line[1 : -1].rstrip(' \\')
-            if not dep in ['stl.scad', 'dxf.scad', 'svf.scad', 'png.scad']:
+            if not os.path.basename(dep) in ['stl.scad', 'dxf.scad', 'svf.scad', 'png.scad', 'target.scad']:
                 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/render.py

@@ -28,6 +28,7 @@ import os
 import openscad
 from tests import do_cmd, update_image, colour_scheme, background
 from deps import mtime
+from colorama import init
 
 def render(target, type):
     #
@@ -69,6 +70,7 @@ def render(target, type):
             os.remove(png_maker_name)
 
 if __name__ == '__main__':
+    init()
     target =  sys.argv[1] if len(sys.argv) > 1 else None
     render(target, 'stl')
     render(target, 'dxf')

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

@@ -39,13 +39,25 @@ from colorama import Fore
 def is_assembly(s):
     return s[-9:] == '_assembly' or s[-11:] == '_assemblies'
 
-def add_assembly(flat_bom, bom, bounds_map):
-    if not bom in flat_bom:
+def bom_to_assemblies(bom_dir, bounds_map):
+    global flat_bom
+    #
+    # Make a list of all the parts in the BOM
+    #
+    bom_file = bom_dir + "/bom.json"
+    with open(bom_file) as json_file:
+        flat_bom = json.load(json_file)
+    #
+    # Decide if we need big or small assembly pictures
+    #
+    for bom in flat_bom:
         big = False
         for ass in bom["assemblies"]:
-            add_assembly(flat_bom, ass, bounds_map)
-            if ass["big"]:
-                big = True
+            for b in flat_bom:
+                if b["name"] == ass:
+                    if b["big"]:
+                        big = True
+                    break
         if not big:
             for stl in bom["printed"]:
                 bounds = bounds_map[stl]
@@ -54,21 +66,10 @@ def add_assembly(flat_bom, bom, bounds_map):
                 if max(width, depth) > 80:
                     big = True
                     break
-
         bom["big"] = big or bom["routed"]
-        flat_bom.append(bom)
-
-def bom_to_assemblies(bom_dir, bounds_map):
-    global flat_bom
     #
-    # Make a list of all the parts in the BOM
+    # Remove the main assembly if it is a shell
     #
-    bom  = {}
-    bom_file = bom_dir + "/bom.json"
-    with open(bom_file) as json_file:
-        bom = json.load(json_file)
-    flat_bom = []
-    add_assembly(flat_bom, bom, bounds_map)
     ass =  flat_bom[-1]
     if len(ass["assemblies"]) < 2 and not ass["vitamins"] and not ass["printed"] and not ass["routed"]:
         flat_bom = flat_bom[:-1]
@@ -153,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:
@@ -218,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)
             #
@@ -266,56 +280,56 @@ 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)
 
                 printed = ass["printed"]
                 if printed:
                     print('### 3D Printed parts', file = doc_file)
-                    i = 0
-                    for p in printed:
+                    keys = sorted(list(printed.keys()))
+                    for i in range(len(keys)):
+                        p = keys[i]
                         print('%s %d x %s |' % ('\n|' if not (i % 3) else '', printed[p], p), file = doc_file, end = '')
                         if (i % 3) == 2 or i == len(printed) - 1:
                             n = (i % 3) + 1
                             print('\n|%s' % ('--|' * n), file =  doc_file)
                             for j in range(n):
-                                part = list(printed.keys())[i - n + j + 1]
+                                part = keys[i - n + j + 1]
                                 print('| ![%s](stls/%s) %s' % (part, part.replace('.stl','.png'), '|\n' if j == j - 1 else ''), end = '', file = doc_file)
                             print('\n', file = doc_file)
-                        i += 1
                     print('\n', file  = doc_file)
 
                 routed = ass["routed"]
                 if routed:
                     print("### CNC Routed parts", file = doc_file)
-                    i = 0
-                    for r in routed:
+                    keys = sorted(list(routed.keys()))
+                    for i in range(len(keys)):
+                        r = keys[i]
                         print('%s %d x %s |' % ('\n|' if not (i % 3) else '', routed[r], r), file = doc_file, end = '')
                         if (i % 3) == 2 or i == len(routed) - 1:
                             n = (i % 3) + 1
                             print('\n|%s' % ('--|' * n), file =  doc_file)
                             for j in range(n):
-                                part = list(routed.keys())[i - n + j + 1]
+                                part = keys[i - n + j + 1]
                                 print('| ![%s](dxfs/%s) %s' % (part, part.replace('.dxf','.png'), '|\n' if j == j - 1 else ''), end = '', file = doc_file)
                             print('\n', file = doc_file)
-                        i += 1
                     print('\n', file  = doc_file)
 
                 sub_assemblies = ass["assemblies"]
                 if sub_assemblies:
                     print("### Sub-assemblies", file = doc_file)
-                    i = 0
-                    for a in sub_assemblies:
-                        print('%s %d x %s |' % ('\n|' if not (i % 3) else '', a["count"], a["name"]), file = doc_file, end = '')
-                        if (i % 3) == 2 or i == len(sub_assemblies) - 1:
+                    keys = sorted(list(sub_assemblies.keys()))
+                    for i in range(len(keys)):
+                        a = keys[i]
+                        print('%s %d x %s |' % ('\n|' if not (i % 3) else '', sub_assemblies[a], a), file = doc_file, end = '')
+                        if (i % 3) == 2 or i == len(keys) - 1:
                             n = (i % 3) + 1
                             print('\n|%s' % ('--|' * n), file =  doc_file)
                             for j in range(n):
-                                a = sub_assemblies[i - n + j + 1]["name"].replace('_assembly', '_assembled')
+                                a = keys[i - n + j + 1].replace('_assembly', '_assembled')
                                 print('| ![%s](assemblies/%s) %s' % (a, a + '_tn.png', '|\n' if j == j - 1 else ''), end = '', file = doc_file)
                             print('\n', file = doc_file)
-                        i += 1
                     print('\n', file  = doc_file)
 
                 small = not ass["big"]

tests/cable_strips.scad

@@ -24,11 +24,11 @@ module cable_strips() {
     depth = 50;
     rotate(-90)
         for(pos = [-100, 0, 100]) {
-            bezier_cable_strip(ways = 20, depth = depth, length = 150, travel = 100, pos = pos, below = 100, extra = 10);
+            bezier_cable_strip(ways = 20, depth = depth, length = 150, below = 100, extra = 10, pos = pos);
 
             translate([0, depth * 2])
                 rotate([0, -90, 0])
-                    cable_strip(ways =20, depth = depth / 2, travel = 100, x = pos, extra = 30);
+                    cable_strip(ways =20, depth = depth / 2, travel = 100, extra = 30, pos = pos);
 
 
         }

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

@@ -0,0 +1,48 @@
+//
+// 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 <../core.scad>
+include <../vitamins/screws.scad>
+use <../utils/layout.scad>
+use <../printed/flat_hinge.scad>
+
+width = 50; // [20 : 100]
+depth = 20; // [8  : 50]
+thickness = 4; //[1 : 10]
+screws = 5; // [1  : 20]
+knuckles = 5; // [3 : 10]
+pin_diameter = 4; // [1:  10]
+knuckle_diameter = 9; //[4 : 15]
+margin = 0; // [0 : 10]
+clearance = 0.2;
+
+angle = 0; // [-90 : 180]
+
+big_hinge =   ["big",   width, depth, thickness, pin_diameter,  knuckle_diameter, knuckles, M3_dome_screw, screws, clearance, margin];
+small_hinge = ["small", 20,    16,    2,         2.85,          7,                3,        M3_dome_screw, 2,      0.2,       0];
+
+hinges = [small_hinge, big_hinge];
+
+module flat_hinges()
+    layout([for(h = hinges) hinge_width(h)], 10)
+        if($preview)
+            hinge_fastened_assembly(hinges[$i], 3, 3, angle);
+        else
+            hinge_male(hinges[$i]);
+
+flat_hinges();

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

@@ -0,0 +1,29 @@
+//
+// 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 <../utils/layout.scad>
+
+include <../vitamins/green_terminals.scad>
+
+module green_terminals()
+    layout([for(t = green_terminals) gt_depth(t)], 15)
+        rotate(180)
+            green_terminal(green_terminals[$i], len(green_terminals) + 1 - $i);
+
+if($preview)
+    green_terminals();

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

@@ -0,0 +1,45 @@
+//
+// 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 <../core.scad>
+use <../utils/layout.scad>
+
+include <../vitamins/pin_headers.scad>
+
+pins = 10;
+
+module pin_headers()
+    layout([for(p = pin_headers) hdr_pitch(p) * pins], 15) {
+        idc_transition(pin_headers[$i], 10);
+
+        translate([0, 20])
+            pin_header(pin_headers[$i], 10, 2);
+
+        translate([0, 40])
+            box_header(pin_headers[$i], 10, 2);
+
+        translate([0, 65])
+            pin_socket(pin_headers[$i], 10, 2);
+
+        translate([0, 95])
+            pin_socket(pin_headers[$i], 10, 2, right_angle = true);
+
+    }
+
+if($preview)
+    pin_headers();

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

@@ -0,0 +1,38 @@
+//
+// 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 <../core.scad>
+use <../utils/layout.scad>
+
+include <../vitamins/screws.scad>
+include <../vitamins/psus.scad>
+use <../printed/psu_shroud.scad>
+
+thickness = 3;
+
+module psu_shrouds()
+    layout([for(p = psus) psu_width(p)], 10) let(psu = psus[$i])
+        if(psu_terminals(psu))
+            rotate(90) {
+                if($preview)
+                    psu_shroud_fastened_assembly(psu, 6, thickness, psu[0]);
+                else
+                    psu_shroud(psu, 6, psu[0]);
+            }
+
+psu_shrouds();

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

@@ -0,0 +1,37 @@
+//
+// 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 <../core.scad>
+use <../utils/layout.scad>
+
+include <../vitamins/screws.scad>
+include <../vitamins/ssrs.scad>
+use <../printed/ssr_shroud.scad>
+
+thickness = 3;
+
+module ssr_shrouds()
+    layout([for(s = ssrs) ssr_width(s)], 15) let(ssr = ssrs[$i])
+        rotate(90) {
+            if($preview)
+                ssr_shroud_fastened_assembly(ssr, 6, thickness, ssr[0]);
+            else
+                ssr_shroud(ssr, 6, ssr[0]);
+        }
+
+ssr_shrouds();

tests/ssrs.scad

@@ -23,8 +23,9 @@ include <../vitamins/screws.scad>
 include <../vitamins/ssrs.scad>
 
 module ssrs()
-    layout([for(s = ssrs) ssr_length(s)], 15)
-        ssr_assembly(ssrs[$i], M4_cap_screw, 3);
+    layout([for(s = ssrs) ssr_width(s)], 15)
+        rotate(90)
+            ssr_assembly(ssrs[$i], M4_cap_screw, 3);
 
 if($preview)
     ssrs();

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

@@ -0,0 +1,82 @@
+//
+// 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 <../core.scad>
+
+include <../vitamins/wire.scad>
+
+bundle = [7, 1.4];
+
+bundle_r = cable_radius(bundle);
+
+thickness = 2;
+w = 50;
+d = 20;
+h = 40;
+wire_l = 90;
+
+module wires() {
+    translate_z(bundle_r)
+        rotate([0, 90, 0]) {
+            n = cable_wires(bundle);
+            d = cable_wire_size(bundle);
+            if(n > 6)
+                color("green") {
+                    cylinder(d = d, h = wire_l, center = true);
+                    wire("green", 7, wire_l);
+                }
+
+            m = n > 6 ? n - 1 : n;
+            for(i = [0 : m - 1])
+                rotate(i * 360 / m)
+                    translate([bundle_r - d / 2, 0]) {
+                        colour = ["black", "brown", "red", "orange", "yellow", "blue", "purple"][i];
+                        wire(colour, 7, wire_l);
+                        color(colour)
+                            cylinder(d = d, h = wire_l, center = true);
+                   }
+
+            %cylinder(r = bundle_r, h = wire_l - 10, center = true);
+        }
+
+    color(pp1_colour) {
+        rotate([90, 0, 90])
+            linear_extrude(height = thickness)
+                difference() {
+                    translate([-w / 2, 0])
+                        square([w, h]);
+
+                    mouse_hole(bundle, 0, true);
+                }
+
+        translate_z(-thickness)
+            linear_extrude(height = thickness)
+                difference() {
+                    translate([thickness -d, -w / 2])
+                        square([d, w]);
+
+                    translate([-15, 0])
+                        cable_tie_holes(bundle_r, 0);
+                }
+    }
+    translate([-15, 0])
+        cable_tie(bundle_r, thickness);
+}
+
+if($preview)
+    wires();

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

@@ -22,8 +22,14 @@
 //
 include <../../global_defs.scad>
 
+function inch(x) = x * 25.4;                                                        //! Inch to mm conversion (For fractional inches, 'inch(1 + 7/8)' will work as expected.)
+function foot(x) = x * 25.4 * 12;                                                   //! Foot to mm conversion
+function yard(x) = x * 25.4 * 12 * 3;                                               //! Yard to mm conversion
+function mm(x)   = x;                                                               //! Explicit mm specified
+function cm(x)   = x * 10.0;                                                        //! cm to mm conversion
+function m(x)    = x * 1000.0;                                                      //! m to mm conversion
+
 function sqr(x) = x * x;                                                            //! Returns the square of ```x```
-function inch(x) = x * 25.4;                                                        //! Inch to mm conversion
 function echoit(x) = echo(x) x;                                                     //! Echo expression and return it, useful for debugging
 function in(list, x) = !!len([for(v = list) if(v == x) true]);                      //! Returns true if ```x``` is an element in the ```list```
 function Len(x) = is_list(x) ? len(x) : 0;                                          //! Returns the length of a list or 0 if ```x``` is not a list
@@ -31,7 +37,8 @@ function r2sides(r) = $fn ? $fn : ceil(max(min(360/ $fa, r * 2 * PI / $fs), 5));
 function r2sides4n(r) = floor((r2sides(r) + 3) / 4) * 4;                            //! Round up the number of sides to a multiple of 4 to ensure points land on all axes
 
 module translate_z(z) translate([0, 0, z]) children();                              //! Shortcut for Z only translations
-module vflip() rotate([180, 0, 0]) children();                                      //! Invert children by doing a 180 flip around the X axis
+module vflip() rotate([180, 0, 0]) children();                                      //! Invert children by doing a 180&deg; flip around the X axis
+module hflip() rotate([0, 180, 0]) children();                                      //! Invert children by doing a 180&deg; flip around the Y axis
 module ellipse(xr, yr) scale([1, yr / xr]) circle4n(xr);                            //! Draw an ellipse
 
 module extrude_if(h, center = true)                 //! Extrudes 2D object to 3D when ```h``` is nonzero, otherwise leaves it 2D
@@ -56,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&deg; 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

@@ -23,9 +23,9 @@
 //!
 //! The module provides `poly_circle()`, `poly_cylinder()` and `poly_ring()` that is useful for making printed washers and pillars.
 //
-function sides(r) = max(round(4 * r), 3); //! Optimium number of sides for specified radius
-function corrected_radius(r, n = 0)   = r / cos(180 / (n ? n : sides(r))); //! Adjusted radius to make flats lie on the circle
-function corrected_diameter(d, n = 0) = d / cos(180 / (n ? n : sides(d / 2))); //! Adjusted diameter to make flats lie on the circle
+function sides(r) = max(round(4 * r), 3);                                       //! Optimium number of sides for specified radius
+function corrected_radius(r, n = 0)   = r / cos(180 / (n ? n : sides(r)));      //! Adjusted radius to make flats lie on the circle
+function corrected_diameter(d, n = 0) = d / cos(180 / (n ? n : sides(d / 2)));  //! Adjusted diameter to make flats lie on the circle
 
 module poly_circle(r, sides = 0) { //! Make a circle adjusted to print the correct size
     n = sides ? sides : sides(r);
@@ -38,8 +38,8 @@ module poly_cylinder(r, h, center = false, sides = 0) //! Make a cylinder adjust
 
 module poly_ring(or, ir) { //! Make a 2D ring adjusted to have the correct internal radius
     cir = corrected_radius(ir);
-    filaments = floor((or - cir) / extrusion_width);
-    if(filaments > 3)
+    filaments = (or - cir) / extrusion_width;
+    if(filaments > 3 + eps)
         difference() {
             circle(or);
 
@@ -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/round.scad

@@ -17,7 +17,7 @@
 // If not, see <https://www.gnu.org/licenses/>.
 //
 
-//! Round 2D shapes uisng `offset()`, which is fast and 3D shapes with [`offset_3D()`](#offset), which is very slow.
+//! Round 2D shapes using `offset()`, which is fast and 3D shapes with [`offset_3D()`](#offset), which is very slow.
 //!
 //! A single radius can be specified or separate internal and external radii.
 //! If `chamfer_base` is `true` for `round_3D()` then the bottom edge is made suitable for 3D printing by chamfering once the

utils/sweep.scad

@@ -61,7 +61,7 @@ function rotate_from_to(a, b) =
 //
 function calculate_twist(A, B) = let(D = transpose3(B) * A) atan2(D[1][0], D[0][0]);
 //
-// Compute a 4x4 matrix to orientate a frame of the sweep given the position and a 3x3 rotation matrix.
+// Compute a 4x3 matrix to orientate a frame of the sweep given the position and a 3x3 rotation matrix.
 //
 function orientate(p, r) =
     let(x = r[0], y = r[1], z = r[2])
@@ -113,7 +113,7 @@ function skin_points(profile, path, loop, twist = 0) =
 
 function cap(facets, segment = 0) = [for(i = [0 : facets - 1]) segment ? facets * segment + i : facets - 1 - i];
 
-function quad(p, a,b,c,d) = norm(p[a] - p[c]) > norm(p[b] - p[d]) ? [[b, c, d], [b, d, a]] : [[a, b, c], [a, c, d]];
+function quad(p, a, b, c, d) = norm(p[a] - p[c]) > norm(p[b] - p[d]) ? [[b, c, d], [b, d, a]] : [[a, b, c], [a, c, d]];
 
 function skin_faces(points, segs, facets, loop) = [for(i = [0 : facets - 1], s = [0 : segs - (loop ? 1 : 2)])
    each quad(points,

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

@@ -44,14 +44,14 @@ function cable_strip_control_points(depth, min_z, pos) = let(z = min(min_z, min_
 function bezier_cable_length(depth, min_z, pos) = //! Calculate a length that will achieve the desired minimum z
     bezier_length(adjust_bezier_z(cable_strip_control_points(depth, min_z, pos), min_z));
 
-module bezier_cable_strip(ways, depth, length, travel, pos, below, extra) { //! Draw a cable strip using a Bezier curve
+module bezier_cable_strip(ways, depth, length, below, extra, pos = 0) { //! Draw a cable strip using a Bezier curve
     width = ceil(ribbon_clamp_slot(ways) - 1);
 
     thickness = cable_strip_thickness;
 
     total = 2 * extra + length;
 
-    vitamin(str("bezier_cable_strip(", ways, ", ", depth, ", ", length, ", ", travel, ", ", pos, ", ", below, ", ", extra,
+    vitamin(str("bezier_cable_strip(", ways, ", ", depth, ", ", length, ", ", below, ", ", extra,
                                    "): Polypropylene strip ", total, "mm x ", width, "mm x ", thickness, "mm"));
 
     c = cable_strip_control_points(depth, -below + extra, pos);
@@ -71,7 +71,7 @@ module bezier_cable_strip(ways, depth, length, travel, pos, below, extra) { //!
 
 function cable_strip_length(depth, travel, extra = 15) = ceil(travel / 2 + 2 * extra + PI * depth); //! Calculate circular cable strip length
 
-module cable_strip(ways, depth, travel, x, extra = 15) {  //! Draw a cable stripe with a semi circular fold
+module cable_strip(ways, depth, travel, extra = 15, pos = 0) {  //! Draw a cable stripe with a semi circular fold
 
     width = ribbon_clamp_slot(ways);
 
@@ -79,15 +79,15 @@ module cable_strip(ways, depth, travel, x, extra = 15) {  //! Draw a cable strip
 
     radius = depth / 2;
 
-    top = travel / 4 + extra + x / 2;
-    bottom = travel / 4 + extra - x /2;
+    top = travel / 4 + extra + pos / 2;
+    bottom = travel / 4 + extra - pos /2;
 
     length = max(top, bottom);
 
     total = ceil(top + bottom + PI * depth);
     w = floor(width - 2);
 
-    vitamin(str("cable_strip(", ways, ", ", depth, ", ", travel, ", ", x, arg(extra, 15), "): Polypropylene strip ", total, "mm x ", w, "mm x ", thickness, "mm"));
+    vitamin(str("cable_strip(", ways, ", ", depth, ", ", travel, arg(extra, 15), "): Polypropylene strip ", total, "mm x ", w, "mm x ", thickness, "mm"));
 
     color(cable_strip_color) linear_extrude(height = w, center = true, convexity = 4)
         difference() {
@@ -108,7 +108,7 @@ module cable_strip(ways, depth, travel, x, extra = 15) {  //! Draw a cable strip
             translate([0, -thickness / 2])
                 square([travel, thickness * 2]);
 
-            translate([x, depth - thickness - thickness / 2])
+            translate([pos, depth - thickness - thickness / 2])
                 square([travel, thickness * 2]);
         }
 }

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
         ];
 
-displays = [LCD1602A, HDMI5];
+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]
+    ],
+    []];
+
+SSD1963_4p3 = ["SSD1963_4p3", "LCD display SSD1963 4.3\"", 105.5, 67.2, 3.4, SSD1963_4p3PCB,
+        [0, 0, 0],
+        [[-50, -26.5], [50, 31.5, 0.5]],
+        [[-105.5 / 2, -65 / 2 + 1], [105.5 / 2, 65 / 2 + 1, 1]],
+        0,
+        [[0, -34.5], [12, -31.5]],
+        ];
+
+displays = [HDMI5, SSD1963_4p3, LCD1602A];
 
 use <display.scad>

vitamins/e3d.scad

@@ -112,7 +112,7 @@ module e3d_fan_duct(type) {
 module e3d_fan(type) {
     e3d_fan_duct(type);
 
-    translate([fan_x_offset + 5, 0, 15])
+    translate([fan_x_offset + 5 + eps, 0, 15])
         rotate([0, 90, 0])
              not_on_bom()
                 fan(fan30x10);

vitamins/fan.scad

@@ -151,16 +151,16 @@ function nut_and_washer_thickness(screw, nyloc) = washer_thickness(screw_washer(
 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
 
-module fan_assembly(type, thickness, include_fan = true) { //! Fan with its fasteners
+module fan_assembly(type, thickness, include_fan = true, screw = 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));
 
             translate_z(include_fan ? -fan_screw_depth(type) : 0)
                 vflip()

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

@@ -0,0 +1,183 @@
+//
+// 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/>.
+//
+
+//
+//! Parametric green terminal blocks
+//
+include <../core.scad>
+use <../utils/tube.scad>
+
+function gt_pitch(type)        = type[1];   //! Pitch between terminals
+function gt_depth(type)        = type[2];   //! Total front to back depth
+function gt_height(type)       = type[3];   //! Height of the flat top
+function gt_top(type)          = type[4];   //! Depth at the top
+function gt_front_height(type) = type[5];   //! Height at the front
+function gt_front_depth(type)  = type[6];   //! Front ledge depth
+function gt_back_height(type)  = type[7];   //! Height at the back
+function gt_back_depth(type)   = type[8];   //! Back ledge depth
+function gt_screw_r(type)      = type[9];   //! Screw head radius
+function gt_front_t(type)      = type[10];  //! Thickness of frame around the front aperture
+function gt_box_w(type)        = type[11];  //! Width inside the cable entry box
+function gt_box_h(type)        = type[12];  //! Height of the cable entry box
+function gt_y_offset(type)     = type[13];  //! Offset of the pins from centre of the depth
+function gt_y_offset2(type)    = type[14];  //! Offset of the pins screws from the screws
+function gt_tube_h(type)       = type[15];  //! Height of optional tubes around the screws
+
+module green_terminal(type, ways, skip = []) { //! Draw green terminal blocks, skip can be used to remove pins.
+    pitch = gt_pitch(type);
+
+    imperial = str(pitch / inch(1));
+    vitamin(str("green_terminal(", type[0], ", ", ways, "): Terminal block ", ways, " way ", len(imperial) < 5 ? str(pitch / inch(1), "\"") : str(pitch, "mm")));
+    width = ways * pitch;
+    depth = gt_depth(type);
+    height = gt_height(type);
+    ledge_height =  gt_front_height(type);
+    ledge_depth = gt_front_depth(type);
+    top = gt_top(type);
+    back = gt_back_height(type);
+    back_ledge = gt_back_depth(type);
+    tube_h = gt_tube_h(type);
+    module single(skip = false) {
+        screw_r = gt_screw_r(type);
+        box_w1 = pitch - 2 * gt_front_t(type);
+        box_h1 = ledge_height - 2 * gt_front_t(type);
+        box_w2 = gt_box_w(type);
+        box_h2 = gt_box_h(type);
+        y = gt_y_offset(type);
+        y2 = gt_y_offset2(type);
+        box_front = y + depth / 2 - 2;
+        box_back = y - depth / 2 + 1;
+
+        module horizontal_section()
+            difference() {
+                translate([y, 0])
+                    square([depth, pitch], center = true);
+
+                translate([y + 1, 0])
+                    square([depth, box_w2], center = true);
+
+                translate([y + depth / 2, 0])
+                    hull() {
+                        square([1, box_w1], center = true);
+                        square([4, box_w2], center = true);
+                    }
+            }
+
+        color("lime") {
+            rotate([90, 0, 0])
+                linear_extrude(height = pitch, center = true, convexity = 5)
+                    polygon(points = [                          // Vertical section
+                        [y + depth / 2,                  0],
+                        [y + depth / 2,                  ledge_height / 2 - box_h1 / 2],
+                        [y + depth / 2 - 0.5,            ledge_height / 2 - box_h1 / 2],
+                        [box_front,                      ledge_height / 2 - box_h2 / 2],
+                        [box_back,                       ledge_height / 2 - box_h2 / 2],
+                        [box_back,                       ledge_height / 2 + box_h2 / 2],
+                        [box_front,                      ledge_height / 2 + box_h2 / 2],
+                        [y + depth / 2 - 0.5,            ledge_height / 2 + box_h1 / 2],
+                        [y + depth / 2,                  ledge_height / 2 + box_h1 / 2],
+                        [y + depth / 2,                  ledge_height],
+                        [y + depth / 2 - ledge_depth,    ledge_height],
+                        [y2 + top / 2,                   height],
+                        [y2 + screw_r + eps,             height],
+                        [y2 + screw_r + eps,             ledge_height / 2 + box_h2 / 2],
+                        [y2 - screw_r - eps,             ledge_height / 2 + box_h2 / 2],
+                        [y2 - screw_r - eps,             height],
+                        [y2 -top / 2,                    height],
+                        [y - depth / 2 + back_ledge,     back],
+                        [y - depth / 2,                  back],
+                        [y - depth / 2,                  0],
+                    ]);
+
+            translate([y2, 0, ledge_height / 2 + box_h2 / 2])   // Screw socket
+                linear_extrude(height = height - ledge_height / 2 - box_h2 / 2)
+                    difference() {
+                        square([screw_r * 2 + 0.1, pitch], center = true);
+
+                        circle(screw_r);
+                    }
+
+
+            linear_extrude(height = ledge_height)
+                intersection() {
+                    horizontal_section();
+
+                    translate([0, -5])
+                        square([10, 10]);
+                }
+
+            linear_extrude(height = back)
+                intersection() {
+                    horizontal_section();
+
+                    translate([-10, -5])
+                        square([10, 10]);
+                }
+
+            if(tube_h)
+                translate([y2, 0, height])
+                    linear_extrude(height = tube_h - height)
+                        intersection() {
+                            ring(or = top / 2, ir = screw_r);
+
+                            square([10, pitch], center = true);
+                        }
+
+        }
+        if(!skip)
+            color("silver") {
+                    slot_depth = 1;
+                    screw_top = height - 0.5;
+                    pin_l = 3.3;
+                    translate([y2, 0]) {
+                        translate_z(screw_top - 2 * slot_depth)        // screw head
+                            cylinder(r = screw_r, h = slot_depth);
+
+                        translate_z(screw_top - slot_depth)         // screw head
+                            linear_extrude(height = slot_depth)
+                                difference() {
+                                    circle(screw_r);
+
+                                    square([10, screw_r / 4], center = true);
+                                }
+                    }
+                    translate([box_back, 0, ledge_height / 2]) {
+                        rotate([0, 90, 0])
+                            linear_extrude(height = box_front - box_back)
+                                difference() {
+                                    square([box_h2, box_w2], center = true);
+
+                                    square([box_h2 - 0.1, box_w2 - 0.1], center = true);
+
+                                }
+
+                        cube([1, box_w2, box_h2], center = true); // terminal back
+                    }
+
+                    translate_z(-pin_l)
+                        cube([0.44, 0.75, pin_l]);     // pin
+                }
+    }
+    for(i = [0: ways - 1])
+        translate([0, i * pitch - width / 2 + pitch / 2])
+            single(in(skip, i));
+}
+
+module terminal_254(ways, skip = []) //! Draw 0.1" terminal block
+    green_terminal(gt_2p54, ways, skip);

vitamins/green_terminals.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/>.
+//
+// Green terminal blocks
+//
+gt_2p54 = ["gt_2p54", 2.54,  6.6,   10, 3,    6, 0.4,  6.4, 1,  1,    0.2, 2,   2,     0,  0,   0];
+gt_3p5  = ["gt_3p5",  3.5,   7.3,  8.5, 4,    5, 0.4,  4,   0,  1.35, 0.4, 1.8, 2,     0,  0,   0];
+gt_6p35 = ["gt_6p35", 6.35, 12.6, 17.4, 6.8, 12, 0.4, 11,   2,  2.7,  0.8, 3.4, 4.2, 1.8,  1.1, 21.4];
+
+green_terminals = [gt_2p54, gt_3p5, gt_6p35];
+
+use <green_terminal.scad>

vitamins/iec.scad

@@ -30,23 +30,25 @@ include <inserts.scad>
 function iec_part(type)     = type[1];  //! Description
 function iec_screw(type)    = type[2];  //! Screw type
 function iec_pitch(type)    = type[3];  //! Screw hole pitch
-function iec_slot_w(type)   = type[4];  //! Body width
-function iec_slot_h(type)   = type[5];  //! Body height
-function iec_slot_r(type)   = type[6];  //! Body corner radius
-function iec_bezel_w(type)  = type[7];  //! Bezel width
-function iec_bezel_h(type)  = type[8];  //! Bezel height
-function iec_bezel_r(type)  = type[9];  //! Bezel corner radius
-function iec_bezel_t(type)  = type[10]; //! Bezel thickness
-function iec_flange_w(type) = type[11]; //! Flange width not including the lugs
-function iec_flange_h(type) = type[12]; //! Flange height
-function iec_flange_r(type) = type[13]; //! Flange corner radius
-function iec_flange_t(type) = type[14]; //! Flange thickness
-function iec_width(type)    = type[15]; //! Widest part including the lugs
-function iec_depth(type)    = type[16]; //! Depth of the body below the flange
-function iec_spades(type)   = type[17]; //! Spade type
-function iec_male(type)     = type[18]; //! True for an outlet
+function iec_body_w(type)   = type[4];  //! Body width
+function iec_body_w2(type)  = type[5];  //! Body width at the narrow part
+function iec_body_h(type)   = type[6];  //! Body height
+function iec_body_r(type)   = type[7];  //! Body corner radius
+function iec_bezel_w(type)  = type[8];  //! Bezel width
+function iec_bezel_h(type)  = type[9];  //! Bezel height
+function iec_bezel_r(type)  = type[10];  //! Bezel corner radius
+function iec_bezel_t(type)  = type[11]; //! Bezel thickness
+function iec_flange_w(type) = type[12]; //! Flange width not including the lugs
+function iec_flange_h(type) = type[13]; //! Flange height
+function iec_flange_r(type) = type[14]; //! Flange corner radius
+function iec_flange_t(type) = type[15]; //! Flange thickness
+function iec_width(type)    = type[16]; //! Widest part including the lugs
+function iec_depth(type)    = type[17]; //! Depth of the body below the flange
+function iec_spades(type)   = type[18]; //! Spade type
+function iec_male(type)     = type[19]; //! True for an outlet
 
-insert_overlap = 1.1; // chosen to make cap screws 10mm long.
+insert_screw_length = 10;
+function iec_insert_screw_length() = insert_screw_length; //! Screw length used for inserts
 
 module iec(type) { //! Draw specified IEC connector
     vitamin(str("iec(", type[0], "): ", iec_part(type)));
@@ -67,10 +69,10 @@ module iec(type) { //! Draw specified IEC connector
                     cube([pin_w, pin_d, h - pin_chamfer], center = true);
             }
 
-    socket_w  = 24;
+    socket_w  = 24.5;
     socket_w2 = 14;
-    socket_h  = 16.5;
-    socket_h2 = 12;
+    socket_h  = 16.34;
+    socket_h2 = socket_h - (socket_w - socket_w2);
     socket_d  = 17;
     socket_r = 3;
     socket_r2 = 0.5;
@@ -82,7 +84,7 @@ module iec(type) { //! Draw specified IEC connector
                 translate([side * (socket_w / 2 - socket_r), -socket_h / 2 + socket_r])
                     circle(socket_r);
 
-                translate([side * (socket_w / 2 - socket_r2), -socket_h / 2 + socket_h2 + socket_r2])
+                translate([side * (socket_w / 2 - socket_r2), socket_h2 / 2 - socket_r2])
                     circle(socket_r2);
 
                 translate([side * (socket_w2 / 2 - socket_r2), socket_h / 2 - socket_r2])
@@ -93,7 +95,7 @@ module iec(type) { //! Draw specified IEC connector
         translate([0, socket_offset])
             if(iec_male(type))
                 difference() {
-                    offset(3)
+                    offset(2)
                         socket_shape();
 
                     difference() {
@@ -110,6 +112,28 @@ module iec(type) { //! Draw specified IEC connector
             else
                 socket_shape();
 
+    module body_shape() {
+        hull() {
+            bw = iec_body_w(type);
+            bh = iec_body_h(type);
+            br = iec_body_r(type);
+            bw2 = iec_body_w2(type);
+            bh2 = bh - (bw - bw2);
+            br2 = 1;
+
+            for(side = [-1, 1]) {
+                translate([side * (bw / 2 - br), -bh / 2 + br])
+                    circle4n(br);
+
+                translate([side * (bw / 2 - br2), bh2 / 2 - br2])
+                    circle4n(br2);
+
+                translate([side * (bw2 / 2 - br2), bh / 2 - br2])
+                    circle4n(br2);
+            }
+        }
+    }
+
     color(grey20) {
         // Flange
         flange_t = iec_flange_t(type);
@@ -152,12 +176,14 @@ module iec(type) { //! Draw specified IEC connector
         translate_z(-h)
             linear_extrude(height = h)
                 difference() {
-                    rounded_square([iec_slot_w(type), iec_slot_h(type)], iec_slot_r(type));
+                    body_shape();
+
                     oriffice_shape();
                 }
         // Back
         translate_z(-iec_depth(type))
-            rounded_rectangle([iec_slot_w(type), iec_slot_h(type), iec_depth(type) - h], iec_slot_r(type), center = false);
+            linear_extrude(height = iec_depth(type) - h)
+                body_shape();
     }
     if(!iec_male(type))
         translate([0, socket_offset, iec_flange_t(type) + iec_bezel_t(type) - socket_d]) {
@@ -174,6 +200,8 @@ module iec(type) { //! Draw specified IEC connector
                 spade(spade[0], spade[1]);
 }
 
+function iec_spade_depth(type) = iec_depth(type) + max([for(spade = iec_spades(type)) spade[1]]);
+
 module iec_screw_positions(type) //! Position children at the screw holes
     for(side = [-1, 1])
         translate([side * iec_pitch(type) / 2, 0])
@@ -181,36 +209,49 @@ module iec_screw_positions(type) //! Position children at the screw holes
 
 module iec_holes(type, h = 100, poly = false, horizontal = false, insert = false) { //! Drill the required panel holes
     clearance = 0.2;
+    screw = iec_screw(type);
+    insert_type = screw_insert(screw);
+    insert_overlap = max(0, insert_screw_length + clearance - iec_flange_t(type) - insert_hole_length(insert_type));
 
     iec_screw_positions(type)
         if(insert)
-            insert_hole(screw_insert(iec_screw(type)), insert_overlap, horizontal = horizontal);
+            if(h)
+                insert_hole(insert_type, insert_overlap, horizontal = horizontal);
+            else
+                poly_circle(insert_hole_radius(insert_type));
         else
             if(horizontal)
-                teardrop_plus(r = screw_clearance_radius(iec_screw(type)), h = h);
+                teardrop_plus(r = screw_clearance_radius(screw), h = h);
             else
                 if(poly)
-                    poly_cylinder(r = screw_clearance_radius(iec_screw(type)), h = h, center = true);
+                    poly_cylinder(r = screw_clearance_radius(screw), h = h, center = true);
                 else
-                    drill(screw_clearance_radius(iec_screw(type)), h);
+                    drill(screw_clearance_radius(screw), h);
 
     extrude_if(h)
         hull()
             for(x = [-1, 1], y = [-1, 1], sag = horizontal && y > 1 ? layer_height : 0)
-                translate([x * (iec_slot_w(type) / 2 - iec_slot_r(type)), y * (iec_slot_h(type) / 2  - iec_slot_r(type) + sag )])
+                translate([x * (iec_body_w(type) / 2 - iec_body_r(type)), y * (iec_body_h(type) / 2  - iec_body_r(type) + sag )])
                     if(horizontal)
-                        teardrop(0, iec_slot_r(type) + clearance / 2 + layer_height / 4);
+                        teardrop(0, iec_body_r(type) + clearance / 2 + layer_height / 4);
                     else
-                        drill(iec_slot_r(type) + clearance / 2, 0);
+                        drill(iec_body_r(type) + clearance / 2, 0);
 }
 
-module iec_assembly(type, thickness) { //! Assembly with fasteners given panel thickness
+module iec_inserts(type) {              //! Place the inserts
+    insert = screw_insert(iec_screw(type));
+
+    iec_screw_positions(type)
+        insert(insert);
+}
+
+module iec_assembly(type, thickness) {  //! Assembly with fasteners given panel thickness
     screw = iec_screw(type);
     washer = screw_washer(screw);
     nut = screw_nut(screw);
     insert = screw_insert(screw);
     screw_length = thickness ? screw_longer_than(iec_flange_t(type) + thickness + washer_thickness(washer) + nut_thickness(nut, true))
-                             : screw_shorter_than(iec_flange_t(type) + insert_hole_length(insert) + insert_overlap);
+                             : insert_screw_length;
 
     iec(type);
 
@@ -222,7 +263,5 @@ module iec_assembly(type, thickness) { //! Assembly with fasteners given panel t
             translate_z(-thickness)
                 vflip()
                     nut_and_washer(nut, true);
-        else
-            insert(insert);
     }
 }