Can now change the box shelf material.

Change LED.scad to led.scad

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

@@ -39,7 +39,7 @@ Earth leakage can be measured Canadian CSA style by disconnected the neutral lin
 |   .  |   .  |   3  |   5  |    8  |    Heatshrink sleeving ID 3.2mm x 15mm - not shown |
 |   .  |   .  |   1  |   .  |    1  |    IEC inlet for ATX |
 |   .  |   .  |   .  |   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 |
@@ -88,7 +88,7 @@ Earth leakage can be measured Canadian CSA style by disconnected the neutral lin
 |--:|:----------|
 |8| Washer  M3 x 7mm x 0.5mm|
 |4| Screw M3 dome x 10mm|
-|4| Nut M3 nyloc|
+|4| Nut M3 x 2.4mm nyloc|
 
 
 ### 3D Printed parts
@@ -129,7 +129,7 @@ Earth leakage can be measured Canadian CSA style by disconnected the neutral lin
 |1| IEC inlet for ATX|
 |2| Screw M3 cs cap x 12mm|
 |2| Washer  M3 x 7mm x 0.5mm|
-|2| Nut M3 nyloc|
+|2| Nut M3 x 2.4mm nyloc|
 
 
 ### 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;

libtest.scad

@@ -86,6 +86,8 @@ 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>
 
 x5 = 800;
 
@@ -216,9 +218,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;
@@ -300,9 +304,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/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

printed/psu_shroud.scad

@@ -0,0 +1,210 @@
+//
+// 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 = wall + corrected_radius(insert_hole_radius(insert));
+boss_h = insert_hole_length(insert);
+counter_bore = 2;
+boss_h2 = boss_h + counter_bore;
+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);
+                }
+
+    mirror([0, 1, 0]) {
+        // insert boss
+        translate_z(height - boss_h)
+            linear_extrude(height = boss_h)
+                psu_shroud_hole_positions(type)
+                    difference() {
+                        hull() {
+                            circle(boss_r);
+
+                            translate([0, $side * (boss_r - 1)])
+                                square([2 * boss_r, eps], center = true);
+                        }
+                        poly_circle(insert_hole_radius(insert));
+                    }
+
+        // insert boss counter_bore
+        translate_z(height - boss_h2)
+            linear_extrude(height = counter_bore + eps)
+                psu_shroud_hole_positions(type)
+                    difference() {
+                        hull() {
+                            circle(boss_r);
+
+                            translate([0, $side * (boss_r - 1)])
+                                square([2 * boss_r, eps], center = true);
+                        }
+                        poly_circle(insert_screw_diameter(insert) / 2 + 0.1);
+                    }
+        // support cones
+        translate_z(height - boss_h2)
+            psu_shroud_hole_positions(type)
+                hull() {
+                    cylinder(h = eps, r = boss_r - eps);
+
+                    translate([0, $side * (boss_r - 1)])
+                        cube([2 * boss_r, eps, eps], center = true);
+
+                    translate([0, $side * (boss_r - wall), - (2 * boss_r - wall)])
+                        cube(eps);
+                }
+    }
+}
+
+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/ssr_shroud.scad

@@ -0,0 +1,182 @@
+//
+// 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 = wall + corrected_radius(insert_hole_radius(insert));
+boss_h = insert_hole_length(insert);
+counter_bore = 2;
+boss_h2 = boss_h + counter_bore;
+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
+    translate_z(height - boss_h)
+        linear_extrude(height = boss_h)
+            ssr_shroud_hole_positions(type)
+                difference() {
+                    hull() {
+                        circle(boss_r);
+
+                        translate([0, -$side * (boss_r - 1)])
+                            square([2 * boss_r, eps], center = true);
+                    }
+                    poly_circle(insert_hole_radius(insert));
+                }
+
+    // insert boss counter_bore
+    translate_z(height - boss_h2)
+        linear_extrude(height = counter_bore + eps)
+            ssr_shroud_hole_positions(type)
+                difference() {
+                    hull() {
+                        circle(boss_r);
+
+                        translate([0, -$side * (boss_r - 1)])
+                            square([2 * boss_r, eps], center = true);
+                    }
+                    poly_circle(insert_screw_diameter(insert) / 2 + 0.1);
+                }
+    // support cones
+    ssr_shroud_hole_positions(type)
+        hull() {
+            translate_z(-height + boss_h2) {
+                cylinder(h = eps, r = boss_r - eps);
+
+                translate([0, -$side * (boss_r - 1)])
+                    cube([2 * boss_r, eps, eps], center = true);
+            }
+            translate([0, -$side * (boss_r - wall), -height + boss_h2 + (2 * boss_r - wall)])
+                cube(eps);
+        }
+
+}
+
+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);
+        }
+
+
+}

readme.md

@@ -29,12 +29,12 @@ See [usage](docs/usage.md) for requirements, installation instructions and a usa
 <tr><td> <a href = "#Displays">Displays</a> </td><td> <a href = "#Rockers">Rockers</a> </td><td> <a href = "#Fixing_block">Fixing_block</a> </td><td> <a href = "#Quadrant">Quadrant</a> </td><td></td></tr>
 <tr><td> <a href = "#D_connectors">D_connectors</a> </td><td> <a href = "#Rod">Rod</a> </td><td> <a href = "#Foot">Foot</a> </td><td> <a href = "#Round">Round</a> </td><td></td></tr>
 <tr><td> <a href = "#Fans">Fans</a> </td><td> <a href = "#Screws">Screws</a> </td><td> <a href = "#Handle">Handle</a> </td><td> <a href = "#Rounded_cylinder">Rounded_cylinder</a> </td><td></td></tr>
-<tr><td> <a href = "#Fuseholder">Fuseholder</a> </td><td> <a href = "#Sealing_strip">Sealing_strip</a> </td><td> <a href = "#Ribbon_clamp">Ribbon_clamp</a> </td><td> <a href = "#Rounded_polygon">Rounded_polygon</a> </td><td></td></tr>
-<tr><td> <a href = "#Hot_ends">Hot_ends</a> </td><td> <a href = "#Sheets">Sheets</a> </td><td> <a href = "#Screw_knob">Screw_knob</a> </td><td> <a href = "#Sector">Sector</a> </td><td></td></tr>
-<tr><td> <a href = "#Iecs">Iecs</a> </td><td> <a href = "#Spades">Spades</a> </td><td> <a href = "#Socket_box">Socket_box</a> </td><td> <a href = "#Sweep">Sweep</a> </td><td></td></tr>
-<tr><td> <a href = "#Inserts">Inserts</a> </td><td> <a href = "#Spools">Spools</a> </td><td> <a href = "#Strap_handle">Strap_handle</a> </td><td> <a href = "#Tube">Tube</a> </td><td></td></tr>
-<tr><td> <a href = "#Jack">Jack</a> </td><td> <a href = "#Springs">Springs</a> </td><td></td><td></td><td></td></tr>
-<tr><td> <a href = "#Leadnuts">Leadnuts</a> </td><td> <a href = "#Ssrs">Ssrs</a> </td><td></td><td></td><td></td></tr>
+<tr><td> <a href = "#Fuseholder">Fuseholder</a> </td><td> <a href = "#Sealing_strip">Sealing_strip</a> </td><td> <a href = "#Psu_shroud">Psu_shroud</a> </td><td> <a href = "#Rounded_polygon">Rounded_polygon</a> </td><td></td></tr>
+<tr><td> <a href = "#Hot_ends">Hot_ends</a> </td><td> <a href = "#Sheets">Sheets</a> </td><td> <a href = "#Ribbon_clamp">Ribbon_clamp</a> </td><td> <a href = "#Sector">Sector</a> </td><td></td></tr>
+<tr><td> <a href = "#Iecs">Iecs</a> </td><td> <a href = "#Spades">Spades</a> </td><td> <a href = "#Screw_knob">Screw_knob</a> </td><td> <a href = "#Sweep">Sweep</a> </td><td></td></tr>
+<tr><td> <a href = "#Inserts">Inserts</a> </td><td> <a href = "#Spools">Spools</a> </td><td> <a href = "#Socket_box">Socket_box</a> </td><td> <a href = "#Tube">Tube</a> </td><td></td></tr>
+<tr><td> <a href = "#Jack">Jack</a> </td><td> <a href = "#Springs">Springs</a> </td><td> <a href = "#Ssr_shroud">Ssr_shroud</a> </td><td></td><td></td></tr>
+<tr><td> <a href = "#Leadnuts">Leadnuts</a> </td><td> <a href = "#Ssrs">Ssrs</a> </td><td> <a href = "#Strap_handle">Strap_handle</a> </td><td></td><td></td></tr>
 <tr><td> <a href = "#Leds">Leds</a> </td><td> <a href = "#Stepper_motors">Stepper_motors</a> </td><td></td><td></td><td></td></tr>
 <tr><td> <a href = "#Light_strips">Light_strips</a> </td><td> <a href = "#Toggles">Toggles</a> </td><td></td><td></td><td></td></tr>
 <tr><td> <a href = "#Linear_bearings">Linear_bearings</a> </td><td> <a href = "#Transformers">Transformers</a> </td><td></td><td></td><td></td></tr>
@@ -42,8 +42,8 @@ See [usage](docs/usage.md) for requirements, installation instructions and a usa
 <tr><td> <a href = "#Meter">Meter</a> </td><td> <a href = "#Variacs">Variacs</a> </td><td></td><td></td><td></td></tr>
 <tr><td> <a href = "#Microswitches">Microswitches</a> </td><td> <a href = "#Veroboard">Veroboard</a> </td><td></td><td></td><td></td></tr>
 <tr><td> <a href = "#Microview">Microview</a> </td><td> <a href = "#Washers">Washers</a> </td><td></td><td></td><td></td></tr>
-<tr><td> <a href = "#Modules">Modules</a> </td><td> <a href = "#Zipties">Zipties</a> </td><td></td><td></td><td></td></tr>
-<tr><td> <a href = "#Nuts">Nuts</a> </td><td></td><td></td><td></td><td></td></tr>
+<tr><td> <a href = "#Modules">Modules</a> </td><td> <a href = "#Wire">Wire</a> </td><td></td><td></td><td></td></tr>
+<tr><td> <a href = "#Nuts">Nuts</a> </td><td> <a href = "#Zipties">Zipties</a> </td><td></td><td></td><td></td></tr>
 </table>
 
 ---
@@ -766,6 +766,10 @@ IEC mains inlets and outlet.
 | ```iec_bezel_r(type)``` | Bezel corner radius |
 | ```iec_bezel_t(type)``` | Bezel thickness |
 | ```iec_bezel_w(type)``` | Bezel width |
+| ```iec_body_h(type)``` | Body height |
+| ```iec_body_r(type)``` | Body corner radius |
+| ```iec_body_w(type)``` | Body width |
+| ```iec_body_w2(type)``` | Body width at the narrow part |
 | ```iec_depth(type)``` | Depth of the body below the flange |
 | ```iec_flange_h(type)``` | Flange height |
 | ```iec_flange_r(type)``` | Flange corner radius |
@@ -775,18 +779,21 @@ IEC mains inlets and outlet.
 | ```iec_part(type)``` | Description |
 | ```iec_pitch(type)``` | Screw hole pitch |
 | ```iec_screw(type)``` | Screw type |
-| ```iec_slot_h(type)``` | Body height |
-| ```iec_slot_r(type)``` | Body corner radius |
-| ```iec_slot_w(type)``` | Body width |
 | ```iec_spades(type)``` | Spade type |
 | ```iec_width(type)``` | Widest part including the lugs |
 
+### Functions
+| Function | Description |
+|:--- |:--- |
+| ```iec_insert_screw_length()``` | Screw length used for inserts |
+
 ### Modules
 | Module | Description |
 |:--- |:--- |
 | ```iec(type)``` | Draw specified IEC connector |
 | ```iec_assembly(type, thickness)``` | Assembly with fasteners given panel thickness |
 | ```iec_holes(type, h = 100, poly = false, horizontal = false, insert = false)``` | Drill the required panel holes |
+| ```iec_inserts(type)``` | Place the inserts |
 | ```iec_screw_positions(type)``` | Position children at the screw holes |
 
 ![iecs](tests/png/iecs.png)
@@ -794,14 +801,15 @@ IEC mains inlets and outlet.
 ### Vitamins
 | Qty | Module call | BOM entry |
 | ---:|:--- |:---|
-|   1 | ```iec(IEC_fused_inlet)``` |  IEC fused inlet |
+|   1 | ```iec(IEC_fused_inlet)``` |  IEC fused inlet JR-101-1F |
+|   1 | ```iec(IEC_fused_inlet2)``` |  IEC fused inlet old |
 |   1 | ```iec(IEC_inlet)``` |  IEC inlet |
 |   1 | ```iec(IEC_inlet_atx)``` |  IEC inlet for ATX |
-|   1 | ```iec(IEC_outlet)``` |  IEC outlet |
-|   8 | ```nut(M3_nut, nyloc = true)``` |  Nut M3 x 2.4mm nyloc |
+|   1 | ```iec(IEC_outlet)``` |  IEC outlet RS 811-7193 |
+|  10 | ```nut(M3_nut, nyloc = true)``` |  Nut M3 x 2.4mm nyloc |
 |   4 | ```screw(M3_cs_cap_screw, 10)``` |  Screw M3 cs cap x 10mm |
-|   4 | ```screw(M3_cs_cap_screw, 12)``` |  Screw M3 cs cap x 12mm |
-|   8 | ```washer(M3_washer)``` |  Washer  M3 x 7mm x 0.5mm |
+|   6 | ```screw(M3_cs_cap_screw, 12)``` |  Screw M3 cs cap x 12mm |
+|  10 | ```washer(M3_washer)``` |  Washer  M3 x 7mm x 0.5mm |
 
 
 <a href="#top">Top</a>
@@ -2742,6 +2750,53 @@ If a washer is given a child, usually a screw or a nut, then it is placed on its
 |   1 | M80_washer.stl |
 
 
+<a href="#top">Top</a>
+
+---
+<a name="Wire"></a>
+## Wire
+Just a BOM entry at the moment and cable bundle size functions for holes, plus cable ties.
+
+
+[vitamins/wire.scad](vitamins/wire.scad) Implementation.
+
+[tests/wire.scad](tests/wire.scad) Code for this example.
+
+### Functions
+| Function | Description |
+|:--- |:--- |
+| ```cable_bundle(cable)``` | Arrangement of a bundle in a flat cable clip |
+| ```cable_height(cable)``` | Height in flat clip |
+| ```cable_radius(cable)``` | Radius of a bundle of wires, see <http://mathworld.wolfram.com/CirclePacking.html>. |
+| ```cable_width(cable)``` | Width in flat clip |
+| ```cable_wire_size(cable)``` | Size of each wire in a bundle |
+| ```cable_wires(cable)``` | Number of wires in a bindle |
+| ```wire_hole_radius(cable)``` | Radius of a hole to accept a bundle of wires |
+
+### Modules
+| Module | Description |
+|:--- |:--- |
+| ```cable_tie(cable_r, thickness)``` | A ziptie threaded around cable radius ```cable_r``` and through a panel with specified ```thickness```. |
+| ```cable_tie_holes(cable_r, h = 100)``` | Holes to thread a ziptie through a panel to make a cable tie. |
+| ```mouse_hole(cable, h = 100)``` | A mouse hole to allow a panel to go over a wire bundle. |
+| ```ribbon_cable(ways, length)``` | Add ribbon cable to the BOM |
+| ```wire(color, strands, length, strand = 0.2)``` | Add stranded wire to the BOM |
+
+![wire](tests/png/wire.png)
+
+### Vitamins
+| Qty | Module call | BOM entry |
+| ---:|:--- |:---|
+|   1 |  |  Wire black 7/0.2mm strands, length 90mm |
+|   1 |  |  Wire blue 7/0.2mm strands, length 90mm |
+|   1 |  |  Wire brown 7/0.2mm strands, length 90mm |
+|   1 |  |  Wire green 7/0.2mm strands, length 90mm |
+|   1 |  |  Wire orange 7/0.2mm strands, length 90mm |
+|   1 |  |  Wire red 7/0.2mm strands, length 90mm |
+|   1 |  |  Wire yellow 7/0.2mm strands, length 90mm |
+|   1 | ```ziptie(small_ziptie, 2.1)``` |  Ziptie 100mm min length |
+
+
 <a href="#top">Top</a>
 
 ---
@@ -2765,6 +2820,11 @@ Cable zipties.
 | ```ziptie_thickness(type)``` | Thickness |
 | ```ziptie_width(type)``` | Width |
 
+### Modules
+| Module | Description |
+|:--- |:--- |
+| ```ziptie(type, r, t = 0)``` | Draw specified ziptie wrapped around radius ```r``` and optionally through panel thickness ```t``` |
+
 ![zipties](tests/png/zipties.png)
 
 ### Vitamins
@@ -3350,7 +3410,6 @@ inserts don't grip well in rubber.
 ### Functions
 | Function | Description |
 |:--- |:--- |
-| ```foot()``` | Default foot used unless a list of parameters is passed |
 | ```insert_foot()``` | Default foot with insert |
 
 ### Modules
@@ -3437,6 +3496,64 @@ Printed handle that can be printed without needing support material due to its t
 |   1 | handle_assembly |
 
 
+<a href="#top">Top</a>
+
+---
+<a name="Psu_shroud"></a>
+## Psu_shroud
+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.
+
+
+[printed/psu_shroud.scad](printed/psu_shroud.scad) Implementation.
+
+[tests/psu_shroud.scad](tests/psu_shroud.scad) Code for this example.
+
+### Functions
+| Function | Description |
+|:--- |:--- |
+| ```psu_shroud_cable_pitch(cable_d)``` | Pitch between cable entries |
+| ```psu_shroud_centre_y(type)``` | Shroud centre relative to PSU centre |
+| ```psu_shroud_depth(type)``` | Outside depth of the shroud |
+| ```psu_shroud_extent(type)``` | How far it extends beyond the PSU to clear the connections |
+| ```psu_shroud_height(type)``` | Outside height |
+| ```psu_shroud_screw(type)``` | Screw used to fasten |
+| ```psu_shroud_width(type)``` | Outside width of the shroud |
+
+### Modules
+| Module | Description |
+|:--- |:--- |
+| ```psu_shroud(type, cable_d, name, cables = 1)``` | Generate the STL file for a specified ssr and cable |
+| ```psu_shroud_assembly(type, cable_d, name, cables = 1)``` | The printed parts with inserts fitted |
+| ```psu_shroud_cable_positions(type, cable_d, cables = 1)``` | Place children at the cable tie positions |
+| ```psu_shroud_fastened_assembly(type, cable_d, thickness, name, cables = 1)``` | Assembly with screws in place |
+| ```psu_shroud_hole_positions(type)``` | Place children at the screw hole positions |
+| ```psu_shroud_holes(type, cable_d, cables = 1)``` | Drill the screw and ziptie holes |
+
+![psu_shroud](tests/png/psu_shroud.png)
+
+### Vitamins
+| Qty | Module call | BOM entry |
+| ---:|:--- |:---|
+|   4 | ```insert(F1BM3)``` |  Heatfit insert M3 |
+|   4 | ```screw(M3_cap_screw, 10)``` |  Screw M3 cap x 10mm |
+|   4 | ```washer(M3_washer)``` |  Washer  M3 x 7mm x 0.5mm |
+|   4 | ```star_washer(M3_washer)``` |  Washer star M3 x 0.5mm |
+|   2 | ```ziptie(small_ziptie, 3)``` |  Ziptie 100mm min length |
+
+### Printed
+| Qty | Filename |
+| ---:|:--- |
+|   1 | psu_shroud_PD_150_12.stl |
+|   1 | psu_shroud_S_250_48.stl |
+
+### Assemblies
+| Qty | Name |
+| ---:|:--- |
+|   1 | psu_shroud_PD_150_12_assembly |
+|   1 | psu_shroud_S_250_48_assembly |
+
+
 <a href="#top">Top</a>
 
 ---
@@ -3579,6 +3696,61 @@ UK 13A socket and printed backbox with earth terminal for the panel it is mounte
 |   1 | socket_box_MKLOGIC_assembly |
 
 
+<a href="#top">Top</a>
+
+---
+<a name="Ssr_shroud"></a>
+## Ssr_shroud
+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.
+
+
+[printed/ssr_shroud.scad](printed/ssr_shroud.scad) Implementation.
+
+[tests/ssr_shroud.scad](tests/ssr_shroud.scad) Code for this example.
+
+### Functions
+| Function | Description |
+|:--- |:--- |
+| ```ssr_shroud_cable_x(type, cable_d)``` | Position of cable entry holes |
+| ```ssr_shroud_extent(type, cable_d)``` | How far it extends beyond the SSR |
+| ```ssr_shroud_height(type)``` | Outside height |
+| ```ssr_shroud_screw(type)``` | Screw used to fasten |
+| ```ssr_shroud_width(type)``` | Outside width of shroud |
+
+### Modules
+| Module | Description |
+|:--- |:--- |
+| ```ssr_shroud(type, cable_d, name)``` | Generate the STL file for a specified ssr and cable |
+| ```ssr_shroud_assembly(type, cable_d, name)``` | The printed parts with inserts fitted |
+| ```ssr_shroud_fastened_assembly(type, cable_d, thickness, name)``` | Assembly with screws in place |
+| ```ssr_shroud_hole_positions(type)``` | Place children at the screw hole positions |
+| ```ssr_shroud_holes(type, cable_d)``` | Drill the screw and ziptie holes |
+
+![ssr_shroud](tests/png/ssr_shroud.png)
+
+### Vitamins
+| Qty | Module call | BOM entry |
+| ---:|:--- |:---|
+|   4 | ```insert(F1BM3)``` |  Heatfit insert M3 |
+|   4 | ```screw(M3_cap_screw, 10)``` |  Screw M3 cap x 10mm |
+|   4 | ```washer(M3_washer)``` |  Washer  M3 x 7mm x 0.5mm |
+|   4 | ```star_washer(M3_washer)``` |  Washer star M3 x 0.5mm |
+|   4 | ```ziptie(small_ziptie, 3)``` |  Ziptie 100mm min length |
+
+### Printed
+| Qty | Filename |
+| ---:|:--- |
+|   1 | ssr_shroud_SSR10DA.stl |
+|   1 | ssr_shroud_SSR25DA.stl |
+
+### Assemblies
+| Qty | Name |
+| ---:|:--- |
+|   1 | ssr_shroud_SSR10DA_assembly |
+|   1 | ssr_shroud_SSR25DA_assembly |
+
+
 <a href="#top">Top</a>
 
 ---
@@ -4105,12 +4277,17 @@ Global constants, functions and modules. This file is used directly or indirectl
 | Function | Description |
 |:--- |:--- |
 | ```Len(x)``` | Returns the length of a list or 0 if ```x``` is not a list |
+| ```cm(x)``` | cm to mm conversion |
 | ```echoit(x)``` | Echo expression and return it, useful for debugging |
+| ```foot(x)``` | Foot to mm conversion |
 | ```in(list, x)``` | Returns true if ```x``` is an element in the ```list``` |
-| ```inch(x)``` | Inch to mm conversion |
+| ```inch(x)``` | Inch to mm conversion (For fractional inches, 'inch(1 + 7/8)' will work as expected.) |
+| ```m(x)``` | m to mm conversion |
+| ```mm(x)``` | Explicit mm specified |
 | ```r2sides(r)``` | Replicates the OpenSCAD logic to calculate the number of sides from the radius |
 | ```r2sides4n(r)``` | Round up the number of sides to a multiple of 4 to ensure points land on all axes |
 | ```sqr(x)``` | Returns the square of ```x``` |
+| ```yard(x)``` | Yard to mm conversion |
 
 ### Modules
 | Module | Description |
@@ -4118,10 +4295,10 @@ Global constants, functions and modules. This file is used directly or indirectl
 | ```circle4n(r, d = undef)``` | Circle with multiple of 4 vertices |
 | ```ellipse(xr, yr)``` | Draw an ellipse |
 | ```extrude_if(h, center = true)``` | Extrudes 2D object to 3D when ```h``` is nonzero, otherwise leaves it 2D |
-| ```hflip()``` | Invert children by doing a 180 glip around the Y axis |
+| ```hflip()``` | Invert children by doing a 180&deg; flip around the Y axis |
 | ```semi_circle(r, d = undef)``` | A semi circle in the positive Y domain |
 | ```translate_z(z)``` | Shortcut for Z only translations |
-| ```vflip()``` | Invert children by doing a 180 flip around the X axis |
+| ```vflip()``` | Invert children by doing a 180&deg; flip around the X axis |
 
 ![global](tests/png/global.png)
 

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,7 +33,7 @@ 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
 

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/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]
@@ -273,49 +274,49 @@ def views(target, do_assemblies = None):
                 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/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/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/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);
+                }
+
+        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/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,8 +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 hflip() rotate([0, 180, 0]) children();                                      //! Invert children by doing a 180 glip around the Y 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

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

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

vitamins/iecs.scad

@@ -19,29 +19,43 @@
 include <screws.scad>
 include <spades.scad>
 
-fused_spades = [[spade6p4, 14,  -7,  0, 0],
-                [spade6p4, 14,   7,  0, 0],
-                [spade6p4, 14,   0, 11, 0],
+fused_spades = [[spade4p8, 8.5,  7,  3, 90],
+                [spade4p8, 8.5,  0,  7, 90],
+                [spade4p8, 8.5,  5, -7, 90]];
+
+fused_spades2 = [[spade6p4, 13,  -7,  0, 0],
+                [spade6p4, 13,   7,  0, 0],
+                [spade6p4, 13,   0, 11, 0],
                 [spade4p8, 8.5, -7, -9, 90],
                 [spade4p8, 8.5,  7, -9, 90]];
 
 inlet_spades = [[spade6p4, 9, -7,  -5.5, 0],
                 [spade6p4, 9,  7,  -5.5, 0],
                 [spade6p4, 9,  0,   5.5, 0]];
-//
-//                                    p                    s                p   s     s     s  b   b     b  b    f   f   f  f    w   d   s            m
-//                                    a                    c                i   l     l     l  e   e     e  e    l   l   l  l    i   e   p            a
-//                                    r                    r                t   o     o     o  z   z     z  z    a   a   a  a    d   p   a            l
-//                                    t                    e                c   t     t     t  e   e     e  e    n   n   n  n    t   t   d            e
-//                                                         w                h                  l   l     l  l    g   g   g  g    h   h   e
-//                                                                              w     h     r                    e   e   e  e            s
-//                                                                                             w   h     r  t
-//                                                                                                               w   h   r  t
-//
-IEC_fused_inlet = ["IEC_fused_inlet", "IEC fused inlet",   M3_cs_cap_screw, 36, 27.3, 31.2, 3, 28, 31,   2, 2.5, 30, 33, 4, 2.5, 44, 21, fused_spades, false ];
-IEC_inlet       = ["IEC_inlet",       "IEC inlet",         M3_cs_cap_screw, 40, 28.2, 20.2, 3, 28, 20.5, 4, 2.5, 37, 23, 1, 2.5, 48, 14, inlet_spades, false ];
-IEC_inlet_atx   = ["IEC_inlet_atx",   "IEC inlet for ATX", M3_cs_cap_screw, 40, 27.0, 19.0, 3, 30, 22,   2, 2.0, 30, 22, 2, 4.0, 50, 13, inlet_spades, false ];
-IEC_outlet      = ["IEC_outlet",      "IEC outlet",        M3_cs_cap_screw, 40, 32,   24,   3, 28, 20.5, 2, 0.0, 29, 29, 2, 2.9, 50, 23, inlet_spades, true ];
 
-iecs = [IEC_inlet, IEC_inlet_atx, IEC_fused_inlet, IEC_outlet];
+atx_spades = [[spade3p5, 8, -7,  -3, 90],
+              [spade3p5, 8,  7,  -3, 90],
+              [spade3p5, 8,  0,   3, 90]];
+
+outlet_spades = [[spade4p8ll, 8, -7,  -2, 90],
+                 [spade4p8ll, 8,  7,  -2, 90],
+                 [spade4p8ll, 8,  0,   2, 90]];
+
+//
+//                                    p                              s                p    b   b   b  b   b     b    b    b   f     f  f    f   w   d   s            m
+//                                    a                              c                i    o   o   o  o   e     e    e    e   l     l  l    l   i   e   p            a
+//                                    r                              r                t    d   d   d  d   z     z    z    z   a     a  a    a   d   p   a            l
+//                                    t                              e                c    y   y   y  y   e     e    e    e   n     n  n    n   t   t   d            e
+//                                                                   w                h                   l     l    l    l   g     g  g    g   h   h   e
+//                                                                                         w   w   h  r                       e     e  e    e           s
+//                                                                                             2          w     h    r    t
+//                                                                                                                            w     h  r    t
+IEC_fused_inlet = ["IEC_fused_inlet", "IEC fused inlet JR-101-1F",   M3_cs_cap_screw, 36, 27, 16, 31, 3, 28,   31,   2, 2.0, 30,   33, 4, 3.0, 44, 15, fused_spades,  false ];
+IEC_fused_inlet2= ["IEC_fused_inlet2","IEC fused inlet old",         M3_cs_cap_screw, 36, 27, 14, 31, 3, 28,   31,   2, 2.5, 30,   33, 4, 2.5, 44, 18, fused_spades2, false ];
+
+IEC_inlet       = ["IEC_inlet",       "IEC inlet",                   M3_cs_cap_screw, 40, 28, 18, 20, 3, 28,   20.5, 4, 2.5, 37,   23, 1, 2.5, 48, 14, inlet_spades,  false ];
+IEC_inlet_atx   = ["IEC_inlet_atx",   "IEC inlet for ATX",           M3_cs_cap_screw, 40, 27, 18, 19, 3, 30.5, 22,   2, 2.0, 30.5, 22, 2, 4.0, 50, 15, atx_spades,    false ];
+IEC_outlet      = ["IEC_outlet",      "IEC outlet RS 811-7193",      M3_cs_cap_screw, 40, 32, 18, 24, 3, 28,   20.5, 2, 0.0, 29,   29, 2, 2.8, 50, 23, outlet_spades, true ];
+
+iecs = [IEC_inlet, IEC_inlet_atx, IEC_fused_inlet, IEC_fused_inlet2, IEC_outlet];
 use <iec.scad>

vitamins/insert.scad

@@ -94,12 +94,14 @@ module insert_hole(type, counterbore = 0, horizontal = false) { //! Make a hole
 }
 
 module insert_boss(type, z, wall = 2 * extrusion_width) { //! Make a boss to take an insert
-    difference() {
-        ir = insert_hole_radius(type);
-        linear_extrude(height = z)
-            poly_ring(corrected_radius(ir) + wall, insert_screw_diameter(type) / 2 + 0.1);
+    render(convexity = 3)
+        difference() {
+            ir = insert_hole_radius(type);
+            linear_extrude(height = z)
+                hull()
+                    poly_ring(corrected_radius(ir) + wall, ir);
 
-        translate_z(z)
-            insert_hole(type, max(0, z - insert_hole_length(type) - 2 * layer_height));
-    }
+            translate_z(z)
+                insert_hole(type, max(0, z - insert_hole_length(type) - 2 * layer_height));
+        }
 }

vitamins/leds.scad

@@ -31,4 +31,4 @@ LED10mm = ["LED10mm", 10, 11.0, 2.0, 13.5, 2.54, 0.4];
 
 LEDs = [LED3mm, LED5mm, LED10mm];
 
-use <LED.scad>
+use <led.scad>

vitamins/psu.scad

@@ -139,6 +139,8 @@ module psu_grill(width, height) {
     }
 }
 
+function psu_terminal_block_z(type) = psu_face_cutouts(psu_faces(type)[f_left])[0][2].y + psu_height(type) / 2;
+
 module psu(type) { //! Draw a power supply
     vitamin(str("psu(", type[0], "): PSU ", psu_name(type)));
 
@@ -242,7 +244,7 @@ module psu(type) { //! Draw a power supply
         rt = psu_face_thickness(faces[f_right]);
         lt =  psu_face_thickness(faces[f_left]);
         cutout = psu_face_cutouts(faces[f_left])[0];
-        z = cutout[2].y + h / 2;
+        z = psu_terminal_block_z(type);
         pw = w -ft - bt;
         pl = l - right - rt;
         pcb_thickness = 1.6;

vitamins/spades.scad

@@ -17,12 +17,13 @@
 // If not, see <https://www.gnu.org/licenses/>.
 //
 
-spade3     = [3.8, 3.0, 0.4, 1.0, 3.9];
-spade6p4   = [8.3, 6.4, 0.8, 1.8, 8];
-spade4p8   = [6.4, 4.8, 0.5, 1.8, 8];
-spade4p8l  = [7.0, 4.8, 0.5, 1.8, 8];
-spade4p8ll = [8.0, 4.8, 0.5, 1.8, 4.8];
+spade3     = [3.8, 3.0, 0.4, 1.0,  3.9];
+spade3p5   = [7.0, 3.5, 0.8, 1.75, 6.8];
+spade6p4   = [8.3, 6.4, 0.8, 1.8,  8];
+spade4p8   = [6.4, 4.8, 0.5, 1.8,  8];
+spade4p8l  = [7.0, 4.8, 0.5, 1.8,  8];
+spade4p8ll = [8.0, 4.8, 0.5, 1.8,  4.8];
 
-spades = [spade3, spade6p4, spade4p8, spade4p8l, spade4p8ll];
+spades = [spade3, spade3p5, spade6p4, spade4p8, spade4p8l, spade4p8ll];
 
 use <spade.scad>

vitamins/wire.scad

@@ -18,59 +18,54 @@
 //
 
 //
-//! Wires. Just a BOM entry at the moment and cable bundle size fuctions for holes. See
-//! <http://mathworld.wolfram.com/CirclePacking.html>.
+//! Just a BOM entry at the moment and cable bundle size functions for holes, plus cable ties.
 //
 include <../core.scad>
 include <zipties.scad>
 
-module wire(color, strands, length, strand = 0.2)
+module wire(color, strands, length, strand = 0.2)   //! Add stranded wire to the BOM
     vitamin(str(": Wire ", color, " ", strands, "/", strand, "mm strands, length ",length, "mm"));
 
-module ribbon_cable(ways, length)
+module ribbon_cable(ways, length)                   //! Add ribbon cable to the BOM
     vitamin(str(": Ribbon cable ", ways, " way ", length, "mm"));
 
 //
 // Cable sizes
 //
-function cable_wires(cable)     = cable[0];
-function cable_wire_size(cable) = cable[1];
+function cable_wires(cable)     = cable[0]; //! Number of wires in a bindle
+function cable_wire_size(cable) = cable[1]; //! Size of each wire in a bundle
 
 // numbers from http://mathworld.wolfram.com/CirclePacking.html
-function cable_radius(cable) = ceil([0, 1, 2, 2.15, 2.41, 2.7, 3, 3, 3.3][cable_wires(cable)] * cable_wire_size(cable)) / 2; // radius of a bundle
+function cable_radius(cable) = [0, 1, 2, 2.15, 2.41, 2.7, 3, 3, 3.3][cable_wires(cable)] * cable_wire_size(cable) / 2; //! Radius of a bundle of wires, see <http://mathworld.wolfram.com/CirclePacking.html>.
 
-function wire_hole_radius(cable) = cable_radius(cable) + 0.5;
+function wire_hole_radius(cable) = ceil(2 * cable_radius(cable) +1) / 2; //! Radius of a hole to accept a bundle of wires
 
-// arrangement of bundle in flat cable clip
-function cable_bundle(cable) = [[0,0], [1,1], [2,1], [2, 0.5 + sin(60)], [2,2], [3, 0.5 + sin(60)], [3,2]][cable_wires(cable)];
+function cable_bundle(cable) = //! Arrangement of a bundle in a flat cable clip
+    [[0,0], [1,1], [2,1], [2, 0.5 + sin(60)], [2,2], [3, 0.5 + sin(60)], [3,2]][cable_wires(cable)];
 
-function cable_width(cable)  = cable_bundle(cable)[0] * cable_wire_size(cable); // width in flat clip
-function cable_height(cable) = cable_bundle(cable)[1] * cable_wire_size(cable); // height in flat clip
+function cable_width(cable)  = cable_bundle(cable)[0] * cable_wire_size(cable); //! Width in flat clip
+function cable_height(cable) = cable_bundle(cable)[1] * cable_wire_size(cable); //! Height in flat clip
 
-module mouse_hole(cable, h = 100) {
+module mouse_hole(cable, h = 100) { //! A mouse hole to allow a panel to go over a wire bundle.
     r = wire_hole_radius(cable);
 
     rotate(90) slot(r, 2 * r, h = h);
 }
 
-module cable_tie_holes(cable_r, h = 100) {
+module cable_tie_holes(cable_r, h = 100) { //! Holes to thread a ziptie through a panel to make a cable tie.
     r = cnc_bit_r;
     l = 3;
     extrude_if(h)
         for(side = [-1, 1])
-            translate([0, side * (cable_r + r)])
+            translate([0, side * (cable_r + ziptie_thickness(small_ziptie) / 2)])
                 hull()
                     for(end = [-1, 1])
                         translate([end * (l / 2 - r), 0])
                             drill(r, 0);
 }
 
-module cable_tie(cable_r, thickness) {
-    w =  2 * (cable_r + cnc_bit_r);
-    translate_z(thickness / 2)
+module cable_tie(cable_r, thickness) { //! A ziptie threaded around cable radius ```cable_r``` and through a panel with specified ```thickness```.
+    translate_z(cable_r)
         rotate([-90, 0, 90])
-            ziptie(small_ziptie, w / 2);
+            ziptie(small_ziptie, cable_r, thickness);
 }
-
-//cable_tie_holes(6 / 2);
-//cable_tie(6 / 2, 3);

vitamins/ziptie.scad

@@ -22,7 +22,7 @@
 //
 
 include <../core.scad>
-use <../utils/tube.scad>
+use <../utils/rounded_polygon.scad>
 
 function ziptie_width(type)     = type[1]; //! Width
 function ziptie_thickness(type) = type[2]; //! Thickness
@@ -30,24 +30,41 @@ function ziptie_latch(type)     = type[3]; //! Latch dimensions
 function ziptie_colour(type)    = type[4]; //! Colour
 function ziptie_tail(type)      = type[5]; //! The length without teeth
 
-module ziptie(type, r)
+module ziptie(type, r, t = 0) //! Draw specified ziptie wrapped around radius ```r``` and optionally through panel thickness ```t```
 {
     latch = ziptie_latch(type);
-    length = ceil(2 * PI * r + ziptie_tail(type) + latch.z + 1);
+    lx = latch.x / 2;
+    zt = ziptie_thickness(type);
+    cr = zt;                        // sharp corner raduus
+    z = r + t - cr;
+    x = r - cr;
+    inside_corners  = t ? [ [0, 0, r],      [-x, z, cr],      [x, z, cr]      ] : [];
+    outside_corners = t ? [ [0, 0, r + zt], [-x, z, cr + zt], [x, z, cr + zt] ] : [];
+    x1 = lx - zt / 2;
+    x2 = x1 + x1 * zt / r;
+    inside_path  = concat([ [0, 0, r],      [x1, -r,      eps] ], inside_corners);
+    outside_path = concat([ [0, 0, r + zt], [x2, -r - zt, eps] ], outside_corners);
+
+    tangents = rounded_polygon_tangents(outside_path);
+    length = ceil(rounded_polygon_length(outside_path, tangents) + ziptie_tail(type) + latch.z + 1);
     len = length <= 100 ? 100 : length;
+
     vitamin(str("ziptie(", type[0], ", ", r, "): Ziptie ", len, "mm min length"));
 
-    angle = (r > latch.x / 2) ? asin((latch.x / 2) / r) - asin(ziptie_thickness(type) / latch.x) : 0;
-    color(ziptie_colour(type)) union() {
-        tube(ir = r, or = r + ziptie_thickness(type), h = ziptie_width(type));
-        translate([0, -r, - latch.y / 2])
-            rotate([90, 0, angle]) {
-                union() {
-                    cube(latch);
+    color(ziptie_colour(type)){
+        linear_extrude(height = ziptie_width(type), center = true)
+            difference() {
+                rounded_polygon(outside_path, tangents);
+                rounded_polygon(inside_path);
+             }
 
-                    translate([latch.x / 2, latch.y / 2, (latch.z + 1) / 2])
+        translate([lx, -r])
+             rotate([90, 0, 0])
+                union() {
+                    rounded_rectangle(latch, 0.5, center = false);
+
+                    translate_z((latch.z + 1) / 2)
                         cube([ziptie_thickness(type), ziptie_width(type), latch.z + 1], center = true);
                 }
-            }
-    }
+     }
 }