plateup.py now saves the used files to speed up processing when a part hasn't changed.

Added times to plateup.py.

docs/usage.md

@@ -172,7 +172,7 @@ This is achieved by having a pair of modules: -
     //! Place inserts in the bottom of the posts and push them home with a soldering iron with a conical bit heated to 200°C.
     //
     module handle_assembly() pose([225, 0, 150], [0, 0, 14]) //! Printed part with inserts in place
-    assembly("handle") {
+    assembly("handle", ngb = true) {
         translate_z(handle_height())
             stl_colour(pp1_colour) vflip() handle_stl();
 
@@ -201,6 +201,9 @@ When the parent assembly is shown exploded the handle's screws will be exploded
 Note also the `pose([225, 0, 150], [0, 0, 14])` call before the `assembly()` call. This allows the sub-assembly to be posed differently in its build step but doesn't
 affect its orientation in the parent assembly. The pose parameters are the rotation and the translation taken from the GUI.
 
+Setting `ngb = true` in the `assembly()` prevents the handle assembly appearing as a columun in the top level BOM in the build instructions.
+Instead its parts are merged into the parent BOM so the correct quantites are listed.
+
 ### Exploded diagrams
 
 A lot of vitamins explode themselves when `$explode=1`. This is done with module `explode()` that can be passed a Z offset, or a 3D vector that gives the displacement

examples/MainsBreakOutBox/bom/bom.json

@@ -2,6 +2,7 @@
     {
         "name": "base_assembly",
         "big": null,
+        "ngb": false,
         "count": 1,
         "assemblies": {},
         "vitamins": {
@@ -20,6 +21,7 @@
     {
         "name": "feet_assembly",
         "big": null,
+        "ngb": false,
         "count": 1,
         "assemblies": {
             "base_assembly": 1
@@ -46,6 +48,7 @@
     {
         "name": "mains_in_assembly",
         "big": null,
+        "ngb": false,
         "count": 1,
         "assemblies": {
             "feet_assembly": 1
@@ -82,6 +85,7 @@
     {
         "name": "main_assembly",
         "big": null,
+        "ngb": false,
         "count": 1,
         "assemblies": {
             "mains_in_assembly": 1

examples/MainsBreakOutBox/readme.md

@@ -15,6 +15,7 @@ Earth leakage can be measured Canadian CSA style by disconnected the neutral lin
 
 ![Main Assembly](assemblies/main_assembled.png)
 
+<span></span>
 
 ---
 ## Table of Contents
@@ -24,6 +25,7 @@ Earth leakage can be measured Canadian CSA style by disconnected the neutral lin
 1. [Mains In Assembly](#mains_in_assembly)
 1. [Main Assembly](#main_assembly)
 
+<span></span>
 [Top](#TOP)
 
 ---
@@ -54,6 +56,7 @@ Earth leakage can be measured Canadian CSA style by disconnected the neutral lin
 | &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 |
 
+<span></span>
 [Top](#TOP)
 
 ---
@@ -81,6 +84,7 @@ Earth leakage can be measured Canadian CSA style by disconnected the neutral lin
 
 ![base_assembled](assemblies/base_assembled.png)
 
+<span></span>
 [Top](#TOP)
 
 ---
@@ -117,6 +121,7 @@ Earth leakage can be measured Canadian CSA style by disconnected the neutral lin
 
 ![feet_assembled](assemblies/feet_assembled.png)
 
+<span></span>
 [Top](#TOP)
 
 ---
@@ -156,6 +161,7 @@ Earth leakage can be measured Canadian CSA style by disconnected the neutral lin
 
 ![mains_in_assembled](assemblies/mains_in_assembled.png)
 
+<span></span>
 [Top](#TOP)
 
 ---
@@ -199,4 +205,5 @@ Earth leakage can be measured Canadian CSA style by disconnected the neutral lin
 
 ![main_assembled](assemblies/main_assembled.png)
 
+<span></span>
 [Top](#TOP)

gallery/readme.md

@@ -1,40 +1,30 @@
 # A gallery of projects made with NopSCADlib
-<a name="TOP"></a>
 ## ArduinoThermostat
 Arduino thermostat to control a beer fridge to use it as an environmental chamber.
 
 ![](ArduinoThermostat.png)
 
-
-<a name="TOP"></a>
 ## EnviroPlus
 Environmental monitor using Enviro+ sensor board and a Raspberry Pi Zero.
 
 ![](EnviroPlus.png)
 
-
-<a name="TOP"></a>
 ## FilamentDryBox
 A small fan oven with a spool holder to keep the filament warm and dry.
 
 ![](FilamentDryBox.png)
 
-
-<a name="TOP"></a>
 ## HydraBot
 Current state of HydraRaptor after being modified for laser engraving.
 
 ![](HydraBot.png)
 
 
-<a name="TOP"></a>
 ## IOT 50V PSU
 WiFi controllable PSU
 
 ![](IOT_50V_PSU.png)
 
-
-<a name="TOP"></a>
 ## Lab ATX PSU
 Bench power supply built around an ATX PSU.
 
@@ -47,15 +37,11 @@ Bench power supply built around an ATX PSU.
 
 
 
-
-<a name="TOP"></a>
 ## Laser Load
 15kV dummy load for testing CO2 laser PSUs
 
 ![](Laser_load.png)
 
-
-<a name="TOP"></a>
 ## MainsBreakOutBox
 13A socket break out box with 4mm jacks to measure voltage and / or load current and earth leakage current.
 
@@ -72,8 +58,6 @@ Earth leakage can be measured Canadian CSA style by disconnected the neutral lin
 
 ![](MainsBreakOutBox.png)
 
-
-<a name="TOP"></a>
 ## Mains Box
 Mains isolated and variable supply with metering.
 
@@ -81,15 +65,11 @@ Mains isolated and variable supply with metering.
 
 
 
-
-<a name="TOP"></a>
 ## SunBot
 A solar tracker to keep a solar panel pointing at the sun.
 
 ![](SunBot.png)
 
-
-<a name="TOP"></a>
 ## Turntable
 WiFi enabled remote control turntable for photography
 
@@ -97,8 +77,6 @@ WiFi enabled remote control turntable for photography
 
 Was actually made from DiBond but shown made with carbon fibre here.
 
-
-<a name="TOP"></a>
 ## Variac
 Motorised variac with WiFi control, see [hydraraptor.blogspot.com/2018/04/esp8266-spi-spy](https://hydraraptor.blogspot.com/2018/04/esp8266-spi-spy.html)
 
@@ -106,4 +84,3 @@ Motorised variac with WiFi control, see [hydraraptor.blogspot.com/2018/04/esp826
 
 
 
-

printed/box.scad

@@ -139,17 +139,17 @@ module box_corner_profile_2D(type) { //! The 2D shape of the corner profile.
 }
 
 module box_corner_profile(type) { //! Generates the corner profile STL for 3D printing.
-    stl("box_corner_profile");
-
     length = box_height(type) - 2 * box_margin(type);
-    difference() {
-        linear_extrude(length, center = true, convexity = 5)
-            box_corner_profile_2D(type);
 
-        for(z = [-1, 1])
-            translate([box_hole_inset(type), box_hole_inset(type), z * length / 2])
-                insert_hole(box_insert(type), 5);
-    }
+    stl("box_corner_profile")
+        difference() {
+            linear_extrude(length, center = true, convexity = 5)
+                box_corner_profile_2D(type);
+
+            for(z = [-1, 1])
+                translate([box_hole_inset(type), box_hole_inset(type), z * length / 2])
+                    insert_hole(box_insert(type), 5);
+        }
 }
 
 module box_corner_profile_section(type, section, sections) { //! Generates interlocking sections of the corner profile to allow it to be taller than the printer
@@ -209,7 +209,6 @@ module box_corner_quadrants(type, width, depth)
     }
 
 module box_bezel(type, bottom) { //! Generates top and bottom bezel STLs
-    stl(bottom ? "bottom_bezel" : "top_bezel");
     feet = bottom && box_feet(type);
     t = box_sheet_slot(type);
     outset =  box_outset(type);
@@ -221,66 +220,67 @@ module box_bezel(type, bottom) { //! Generates top and bottom bezel STLs
     height = box_bezel_height(type, bottom);
     foot_extension = foot_height - height;
 
-    difference() {
-        w = box_width(type);
-        d = box_depth(type);
-        translate_z(-box_profile_overlap(type)) difference() {
-            tw = w + 2 * outset;
-            td = d + 2 * outset;
-            rounded_rectangle([tw, td, feet ? foot_height : height], box_corner_rad(type), false);
-            //
-            // Remove edges between the feet
-            //
-            if(feet)
-                hull() {
-                    translate_z(height + 0.5)
-                        cube([w - 2 * foot_length, td + 1, 1], center = true);
+    stl(bottom ? "bottom_bezel" : "top_bezel")
+        difference() {
+            w = box_width(type);
+            d = box_depth(type);
+            translate_z(-box_profile_overlap(type)) difference() {
+                tw = w + 2 * outset;
+                td = d + 2 * outset;
+                rounded_rectangle([tw, td, feet ? foot_height : height], box_corner_rad(type));
+                //
+                // Remove edges between the feet
+                //
+                if(feet)
+                    hull() {
+                        translate_z(height + 0.5)
+                            cube([w - 2 * foot_length, td + 1, 1], center = true);
 
-                    translate_z(foot_height + 1)
-                        cube([w - 2 * (foot_length - foot_extension), td + 1, 1], center = true);
-                }
-            if(feet)
-                hull() {
-                    translate_z(height + 0.5)
-                        cube([tw + 1, d - 2 * foot_length, 1], center = true);
-
-                    translate_z(foot_height + 1)
-                        cube([tw + 1, d - 2 * (foot_length - foot_extension), 1], center = true);
-                }
-        }
-        //
-        // slots for side panels
-        //
-        translate_z(-box_profile_overlap(type))
-            linear_extrude(2 * box_profile_overlap(type), center = true)
-                for(i = [-1, 1]) {
-                    translate([i * (w + t - sheet_slot_clearance) / 2, 0])
-                         square([t, d - 2 * cgap], center = true);
-
-                    translate([0, i * (d + t - sheet_slot_clearance) / 2])
-                         square([w - 2 * cgap, t], center = true);
-                }
-        //
-        // recess for top / bottom panel
-        //
-        translate_z(cgap)
-            rounded_rectangle([w + bezel_clearance, d + bezel_clearance, height], inner_r + bezel_clearance / 2, false);
-        //
-        // leave plastic over the corner profiles
-        //
-        translate_z(-box_profile_overlap(type) - 1)
-            linear_extrude(box_profile_overlap(type) + cgap + 2)
-                union() {
-                    difference() {
-                        square([w - 2 * inset,
-                                d - 2 * inset], center = true);
-
-                        box_corner_quadrants(type, w, d);
+                        translate_z(foot_height + 1)
+                            cube([w - 2 * (foot_length - foot_extension), td + 1, 1], center = true);
                     }
-                    box_screw_hole_positions(type)
-                        poly_circle(screw_clearance_radius(box_screw(type)));
-                }
-     }
+                if(feet)
+                    hull() {
+                        translate_z(height + 0.5)
+                            cube([tw + 1, d - 2 * foot_length, 1], center = true);
+
+                        translate_z(foot_height + 1)
+                            cube([tw + 1, d - 2 * (foot_length - foot_extension), 1], center = true);
+                    }
+            }
+            //
+            // slots for side panels
+            //
+            translate_z(-box_profile_overlap(type))
+                linear_extrude(2 * box_profile_overlap(type), center = true)
+                    for(i = [-1, 1]) {
+                        translate([i * (w + t - sheet_slot_clearance) / 2, 0])
+                             square([t, d - 2 * cgap], center = true);
+
+                        translate([0, i * (d + t - sheet_slot_clearance) / 2])
+                             square([w - 2 * cgap, t], center = true);
+                    }
+            //
+            // recess for top / bottom panel
+            //
+            translate_z(cgap)
+                rounded_rectangle([w + bezel_clearance, d + bezel_clearance, height], inner_r + bezel_clearance / 2);
+            //
+            // leave plastic over the corner profiles
+            //
+            translate_z(-box_profile_overlap(type) - 1)
+                linear_extrude(box_profile_overlap(type) + cgap + 2)
+                    union() {
+                        difference() {
+                            square([w - 2 * inset,
+                                    d - 2 * inset], center = true);
+
+                            box_corner_quadrants(type, w, d);
+                        }
+                        box_screw_hole_positions(type)
+                            poly_circle(screw_clearance_radius(box_screw(type)));
+                    }
+         }
 }
 
 dowel_length = 20;
@@ -485,7 +485,6 @@ module box_shelf_screw_positions(type, screw_positions, thickness = 0, wall = un
 }
 
 module box_shelf_bracket(type, screw_positions, wall = undef) { //! Generates a shelf bracket, the first optional child is a 2D cutout and the second 3D cutouts
-    stl("shelf_bracket");
     w = is_undef(wall) ? box_wall(type) : wall;
     insert = box_shelf_insert(type);
     lip = 2 * insert_boss_radius(insert, w);
@@ -513,44 +512,45 @@ module box_shelf_bracket(type, screw_positions, wall = undef) { //! Generates a
                         square([lip, eps]);
                 }
 
-    difference() {
-        union() {
-            linear_extrude(w)
-                difference() {
-                    shape()
-                        if($children)
-                            children(0);
-
-                    round(2) offset(-width)
+    stl("shelf_bracket")
+        difference() {
+            union() {
+                linear_extrude(w)
+                    difference() {
                         shape()
                             if($children)
                                 children(0);
-                }
 
-            linear_extrude(lip)
-                difference() {
-                    shape()
-                        if($children)
-                            children(0);
+                        round(2) offset(-width)
+                            shape()
+                                if($children)
+                                    children(0);
+                    }
 
-                    offset(-w)
+                linear_extrude(lip)
+                    difference() {
                         shape()
                             if($children)
                                 children(0);
-                }
+
+                        offset(-w)
+                            shape()
+                                if($children)
+                                    children(0);
+                    }
+
+                hflip()
+                    box_shelf_screw_positions(type, screw_positions, 0, w)
+                        boss();
+            }
+            if($children > 1)
+                hflip()
+                    children(1);
 
             hflip()
                 box_shelf_screw_positions(type, screw_positions, 0, w)
-                    boss();
+                    insert_hole(insert, counterbore = 1, horizontal = true);
         }
-        if($children > 1)
-            hflip()
-                children(1);
-
-        hflip()
-            box_shelf_screw_positions(type, screw_positions, 0, w)
-                insert_hole(insert, counterbore = 1, horizontal = true);
-    }
 }
 
 module box_shelf_bracket_section(type, rows, cols, x, y) { //! Generates sections of the shelf bracket to allow it to be bigger than the printer

printed/cable_grommets.scad

@@ -49,84 +49,84 @@ module ribbon_grommet_hole(ways, h = 50, expand = true) { //! Generate a hole fo
 }
 
 module ribbon_grommet(ways, thickness) { //! Generate the STL for a printed ribbon grommet
-    stl(str("ribbon_grommet_", ways, "_", thickness));
 
     width = 2 * (wall + clearance) + thickness;
     slot_length = ribbon_clamp_slot(ways);
     length = slot_length + 2 * wall + 2 * overlap;
 
-    rotate([90, 0, 0])
-        union() {
-            for(side = [-1, 1])
-                translate_z(side * (width - wall) / 2)
-                    linear_extrude(wall, center = true, convexity = 5)
-                        difference() {
-                            hull() {
-                                translate([-length / 2, 0])
-                                    square([length, base]);
+    stl(str("ribbon_grommet_", ways, "_", thickness))
+        rotate([90, 0, 0])
+            union() {
+                for(side = [-1, 1])
+                    translate_z(side * (width - wall) / 2)
+                        linear_extrude(wall, center = true, convexity = 5)
+                            difference() {
+                                hull() {
+                                    translate([-length / 2, 0])
+                                        square([length, base]);
 
-                                for(end = [-1, 1])
-                                    translate([end * (length / 2 - rad), height - rad])
-                                        semi_circle(rad);
+                                    for(end = [-1, 1])
+                                        translate([end * (length / 2 - rad), height - rad])
+                                            semi_circle(rad);
+                                }
+                                translate([-slot_length / 2, base])
+                                    square([slot_length, slot_height]);
                             }
-                            translate([-slot_length / 2, base])
-                                square([slot_length, slot_height]);
-                        }
 
-            linear_extrude(width -1, center = true)
-                difference() {
-                    ribbon_grommet_hole(ways, expand = false, h = 0);
+                linear_extrude(width -1, center = true)
+                    difference() {
+                        ribbon_grommet_hole(ways, expand = false, h = 0);
 
-                    translate([-slot_length / 2, base])
-                        square([slot_length, slot_height]);
-                }
-        }
+                        translate([-slot_length / 2, base])
+                            square([slot_length, slot_height]);
+                    }
+            }
 }
 
 module round_grommet_top(diameter, thickness, od = undef) { //! Generate the STL for a round grommet top half
-    stl(str("round_grommet_top_", round(diameter * 10), "_", thickness));
     chamfer = layer_height;
     h = wall + thickness + wall;
     r1 = diameter / 2;
     r2 = od == undef ? corrected_radius(r1) + wall : od / 2;
     r3 = r2 + overlap;
     r0 = r1 + 1;
-    union() {
-        rotate_extrude()
-            polygon([
-                [r0, 0],
-                [r3 - chamfer, 0],
-                [r3, chamfer],
-                [r3, wall],
-                [r2, wall],
-                [r2, h - chamfer],
-                [r2 - chamfer, h],
-                [r0, h],
-            ]);
+    stl(str("round_grommet_top_", round(diameter * 10), "_", thickness))
+        union() {
+            rotate_extrude()
+                polygon([
+                    [r0, 0],
+                    [r3 - chamfer, 0],
+                    [r3, chamfer],
+                    [r3, wall],
+                    [r2, wall],
+                    [r2, h - chamfer],
+                    [r2 - chamfer, h],
+                    [r0, h],
+                ]);
 
-        render() difference() {
-            cylinder(r = r0 + eps, h = h);
+            render() difference() {
+                cylinder(r = r0 + eps, h = h);
 
-            poly_cylinder(r = r1, h = 100, center = true);
+                poly_cylinder(r = r1, h = 100, center = true);
+            }
         }
-    }
 }
 
 module round_grommet_bottom(diameter, od = undef) { //! Generate the STL for a round grommet bottom half
-    stl(str("round_grommet_bottom_", round(diameter * 10)));
     chamfer = layer_height;
     r1 = diameter / 2;
     r2 = od == undef ? corrected_radius(r1) + wall : od / 2;
     r3 = r2 + max(overlap, wall + chamfer);
-    rotate_extrude()
-        polygon([
-            [r2, chamfer],
-            [r2 + chamfer, 0],
-            [r3, 0],
-            [r3, wall - chamfer],
-            [r3 - chamfer, wall],
-            [r2, wall],
-        ]);
+    stl(str("round_grommet_bottom_", round(diameter * 10)))
+        rotate_extrude()
+            polygon([
+                [r2, chamfer],
+                [r2 + chamfer, 0],
+                [r3, 0],
+                [r3, wall - chamfer],
+                [r3 - chamfer, wall],
+                [r2, wall],
+            ]);
 }
 
 module round_grommet_hole(diameter, h = 100) //! Make a hole for a round grommet
@@ -161,30 +161,30 @@ module mouse_grommet_hole(r, h = 50, z = undef, expand = wall + clearance) //! M
 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));
 
     width = 2 * (wall + clearance) + thickness;
     length = 2 * r + 2 * wall + 2 * overlap;
 
-    rotate([90, 0, 0])
-        union() {
-            for(side = [-1, 1])
-                translate_z(side * (width - wall) / 2)
-                    linear_extrude(wall, center = true)
-                        difference() {
-                            mouse_grommet_hole(r, z = r + wall, h = 0, expand = wall + overlap);
+    stl(str("mouse_grommet_", r * 10, "_", thickness))
+        rotate([90, 0, 0])
+            union() {
+                for(side = [-1, 1])
+                    translate_z(side * (width - wall) / 2)
+                        linear_extrude(wall, center = true)
+                            difference() {
+                                mouse_grommet_hole(r, z = r + wall, h = 0, expand = wall + overlap);
+
+                            translate([0, wall])
+                                mouse_grommet_hole(r, h = 0, expand = 0);
+                        }
+                linear_extrude(width - 1, center = true)
+                    difference() {
+                        mouse_grommet_hole(r, h = 0, z = r + wall, expand = wall);
 
                         translate([0, wall])
                             mouse_grommet_hole(r, h = 0, expand = 0);
                     }
-            linear_extrude(width - 1, center = true)
-                difference() {
-                    mouse_grommet_hole(r, h = 0, z = r + wall, expand = wall);
-
-                    translate([0, wall])
-                        mouse_grommet_hole(r, h = 0, expand = 0);
-                }
-        }
+            }
 }
 
 module mouse_grommet_assembly(r, thickness)

printed/camera_housing.scad

@@ -82,7 +82,6 @@ module cam_holes(cam) {
 }
 
 module rpi_camera_focus_ring_stl() { //! Focus ring the glue onto RPI lens
-    stl("rpi_camera_focus_ring");
 
     rad = 15 / 2;
     hole_r1 = 2.5 / 2;
@@ -93,58 +92,58 @@ module rpi_camera_focus_ring_stl() { //! Focus ring the glue onto RPI lens
     x = rad / (sin(angle / 2) + cos(angle / 2));
     r = x * sin(angle / 2);
 
-    difference() {
-        linear_extrude(height = thickness, convexity = 5)
-            difference() {
-                union() {
-                    circle(x);
+    stl("rpi_camera_focus_ring")
+        difference() {
+            linear_extrude(height = thickness, convexity = 5)
+                difference() {
+                    union() {
+                        circle(x);
+                        for(i = [0 : flutes - 1])
+                            rotate([0, 0, 2 * angle * i])
+                                translate([x, 0])
+                                    circle(r);
+                    }
                     for(i = [0 : flutes - 1])
-                        rotate([0, 0, 2 * angle * i])
+                        rotate([0, 0, 2 * angle * i + angle])
                             translate([x, 0])
                                 circle(r);
                 }
-                for(i = [0 : flutes - 1])
-                    rotate([0, 0, 2 * angle * i + angle])
-                        translate([x, 0])
-                            circle(r);
-            }
-        hull() {
-            poly_cylinder(r = hole_r1, h = 0.1, center = true);
+            hull() {
+                poly_cylinder(r = hole_r1, h = 0.1, center = true);
 
-            translate([0, 0, thickness])
-                poly_cylinder(r = hole_r2, h = 0.1, center = true);
+                translate([0, 0, thickness])
+                    poly_cylinder(r = hole_r2, h = 0.1, center = true);
+            }
         }
-    }
 }
 
 module camera_back(cam) { //! Make the STL for a camera case back
-    stl(str("camera_back_", cam[0]));
     pcb = camera_pcb(cam);
     back = cam_back_size(cam);
     screw = pcb_screw(pcb);
     nut = screw_nut(screw);
 
-    translate_z(back.z)
-        hflip()
-            difference() {
-                translate_z(back.z / 2)
-                    cube(back, center = true);
+    stl(str("camera_back_", cam[0]))
+        translate_z(back.z)
+            hflip()
+                difference() {
+                    translate_z(back.z / 2)
+                        cube(back, center = true);
 
-                translate([0, -cam_back_overlap])
-                    cube([pcb_length(pcb) - 2 * cam_back_overlap, pcb_width(pcb), 2 * cam_back_clearance], center = true);
+                    translate([0, -cam_back_overlap])
+                        cube([pcb_length(pcb) - 2 * cam_back_overlap, pcb_width(pcb), 2 * cam_back_clearance], center = true);
 
-                translate([0, -pcb_width(pcb) / 2])
-                    cube([connector_size.x + 2 * clearance, 2 * connector_size.y + 1, 2 * round_to_layer(connector_size.z + clearance)], center = true);
+                    translate([0, -pcb_width(pcb) / 2])
+                        cube([connector_size.x + 2 * clearance, 2 * connector_size.y + 1, 2 * round_to_layer(connector_size.z + clearance)], center = true);
 
-                translate_z(back.z)
-                    cam_holes(cam)
-                        hflip()
-                            nut_trap(screw, nut, supported = true);
-            }
+                    translate_z(back.z)
+                        cam_holes(cam)
+                            hflip()
+                                nut_trap(screw, nut, supported = true);
+                }
 }
 
 module camera_front(cam, hinge = 0) { //! Make the STL for a camera case front
-    stl(str("camera_front_", cam[0]));
     front = cam_front_size(cam);
     back = cam_back_size(cam);
     pcb = camera_pcb(cam);
@@ -170,70 +169,71 @@ module camera_front(cam, hinge = 0) { //! Make the STL for a camera case front
                 translate([0, (hinge ? front.x * hinge : front.y) / 2 + hinge_offset, hinge_r])
                     children();
 
-    difference() {
-        union() {
-            hull()
-                for(x = [-1, 1], y = [-1, 1])
-                    translate([x * (front.x / 2 - rad), y * (front.y / 2 - rad)])
-                        hull() {    // 3D truncated teardrop gives radiused edges without exceeding 45 degree overhang
-                            translate_z(front.z - 1)
-                                cylinder(r = rad, h = 1);
+    stl(str("camera_front_", cam[0]))
+        difference() {
+            union() {
+                hull()
+                    for(x = [-1, 1], y = [-1, 1])
+                        translate([x * (front.x / 2 - rad), y * (front.y / 2 - rad)])
+                            hull() {    // 3D truncated teardrop gives radiused edges without exceeding 45 degree overhang
+                                translate_z(front.z - 1)
+                                    cylinder(r = rad, h = 1);
 
-                            translate_z(rad)
-                                sphere(rad);
+                                translate_z(rad)
+                                    sphere(rad);
 
-                            cylinder(r = rad * (sqrt(2) - 1), h = eps);
-                        }
+                                cylinder(r = rad * (sqrt(2) - 1), h = eps);
+                            }
 
-            hinge_pos()
-                hull() {
-                    rotate([-90, 0, -90])
-                        teardrop(r = hinge_r, h = hinge_h, center = false);
+                hinge_pos()
+                    hull() {
+                        rotate([-90, 0, -90])
+                            teardrop(r = hinge_r, h = hinge_h, center = false);
 
-                    translate([0, -10, -hinge_r])
-                        cube([hinge_h, eps, 2 * hinge_r]);
-                }
-        }
-
-        hinge_pos()
-            rotate([90, 0, 90])
-                teardrop_plus(r = screw_clearance_radius(hinge_screw), h = 100, center = true);
-
-        translate_z(front.z / 2 + shelf - layer_height)                                 // recess for the back
-            cube([back.x + 2 * clearance, back.y + 2 * clearance, front.z], center = true);
-
-        translate_z(front.z / 2 + shelf - pcb_size.z)                                   // recess for PCB
-            cube([pcb_size.x + 2 * clearance, pcb_size.y + 2 * clearance, front.z], center = true);
-
-        translate_z(shelf)
-            hflip() {
-                pcb_component_position(pcb, "smd_led")                                  // clearance for LED
-                    cube(led_clearance, center = true);
-
-                pcb_component_position(pcb, "smd_res")                                  // clearance for resistor
-                    cube(res_clearance, center = true);
+                        translate([0, -10, -hinge_r])
+                            cube([hinge_h, eps, 2 * hinge_r]);
+                    }
             }
 
-        translate([conn_pos.x, lens_offset.y + sensor_length / 2, shelf - pcb_size.z])  // clearance for sensor connector
-            cube([conn.x + 2 * clearance, sensor_length, 2 * cam_front_clearance(cam)], center = true);
+            hinge_pos()
+                rotate([90, 0, 90])
+                    teardrop_plus(r = screw_clearance_radius(hinge_screw), h = 100, center = true);
 
-        translate([0, -front.y / 2, shelf + front.z / 2])                               // slot for connector
-            cube([connector_slot.x, connector_slot.y, front.z], center = true);
+            translate_z(front.z / 2 + shelf - layer_height)                                 // recess for the back
+                cube([back.x + 2 * clearance, back.y + 2 * clearance, front.z], center = true);
 
-        translate_z(cam_back_clearance + layer_height)
-            cam_holes(cam)
-                rotate(90)
-                    poly_cylinder(r = screw_clearance_radius(screw), h = 100, center = true);
+            translate_z(front.z / 2 + shelf - pcb_size.z)                                   // recess for PCB
+                cube([pcb_size.x + 2 * clearance, pcb_size.y + 2 * clearance, front.z], center = true);
+
+            translate_z(shelf)
+                hflip() {
+                    pcb_component_position(pcb, "smd_led")                                  // clearance for LED
+                        cube(led_clearance, center = true);
+
+                    pcb_component_position(pcb, "smd_res")                                  // clearance for resistor
+                        cube(res_clearance, center = true);
+                }
+
+            translate([conn_pos.x, lens_offset.y + sensor_length / 2, shelf - pcb_size.z])  // clearance for sensor connector
+                cube([conn.x + 2 * clearance, sensor_length, 2 * cam_front_clearance(cam)], center = true);
+
+            translate([0, -front.y / 2, shelf + front.z / 2])                               // slot for connector
+                cube([connector_slot.x, connector_slot.y, front.z], center = true);
+
+            translate_z(cam_back_clearance + layer_height)
+                cam_holes(cam)
+                    rotate(90)
+                        poly_cylinder(r = screw_clearance_radius(screw), h = 100, center = true);
+
+            translate_z(shelf - pcb_size.z)
+                hflip()
+                    camera_lens(cam, clearance);
 
-        translate_z(shelf - pcb_size.z)
             hflip()
-                camera_lens(cam, clearance);
-
-        hflip()
-            pcb_component_position(pcb, "smd_led")
-                rotate(45)
-                    poly_cylinder(r = led_hole_r, h = 100, center = true);              // hole for led
-    }
+                pcb_component_position(pcb, "smd_led")
+                    rotate(45)
+                        poly_cylinder(r = led_hole_r, h = 100, center = true);              // hole for led
+        }
 }
 
 function bracket_thickness(cam) = max(wall, min(3.5, hinge_z(cam) - hinge_r - 1));
@@ -253,38 +253,39 @@ module camera_bracket_position(cam) //! Position children at the bracket positio
         children();
 
 module camera_bracket(cam) { //! Make the STL for the camera bracket
-    stl(str("camera_bracket_", cam[0]));
-
     t = bracket_thickness(cam);
     z = hinge_z(cam);
-    translate([hinge_h / 2, 0])
-        difference() {
-            hull() {
-                translate_z(eps / 2)
-                    cube([hinge_h, 2 * hinge_r, eps], center = true);
 
-                translate_z(z)
-                    rotate([0, 90, 0])
-                        cylinder(r = hinge_r, h = hinge_h, center = true);
+    stl(str("camera_bracket_", cam[0])) union() {
+        translate([hinge_h / 2, 0])
+            difference() {
+                hull() {
+                    translate_z(eps / 2)
+                        cube([hinge_h, 2 * hinge_r, eps], center = true);
+
+                    translate_z(z)
+                        rotate([0, 90, 0])
+                            cylinder(r = hinge_r, h = hinge_h, center = true);
+                }
+                translate([hinge_h / 2, 0, z])
+                    rotate([90, 0, 90])
+                        nut_trap(hinge_screw, screw_nut(hinge_screw), horizontal = true);
             }
-            translate([hinge_h / 2, 0, z])
-                rotate([90, 0, 90])
-                    nut_trap(hinge_screw, screw_nut(hinge_screw), horizontal = true);
-        }
 
-    linear_extrude(t)
-        difference() {
-            hull()
+        linear_extrude(t)
+            difference() {
+                hull()
+                    camera_bracket_screw_positions(cam)
+                        circle(washer_radius(screw_washer(bracket_screw)) + 0.5);
+
                 camera_bracket_screw_positions(cam)
-                    circle(washer_radius(screw_washer(bracket_screw)) + 0.5);
-
-            camera_bracket_screw_positions(cam)
-                poly_circle(screw_clearance_radius(bracket_screw));
-        }
+                    poly_circle(screw_clearance_radius(bracket_screw));
+            }
+    }
 }
 
 module camera_assembly(cam, angle = 0) //! Camera case assembly
-assembly(str("camera_", cam[0])) {
+assembly(str("camera_", cam[0]), ngb = true) {
     front = cam_front_size(cam);
     screw = pcb_screw(camera_pcb(cam));
     nut = screw_nut(screw);

printed/carriers.scad

@@ -27,7 +27,6 @@ include <../utils/core/core.scad>
 function carrier_height() = 3; //! Height of PCB carrier
 
 module ESP12F_carrier_stl() { //! Generate the STL for an ESP12 carrier
-    stl("ESP12F_carrier");
     pins = 8;
     pitch1 = 2;
     pitch2 = 2.54;
@@ -43,29 +42,29 @@ module ESP12F_carrier_stl() { //! Generate the STL for an ESP12 carrier
     width1 = wpitch1 + hole + squeezed_wall * 2;
     width2 = wpitch2 + hole2 + squeezed_wall * 2;
 
-    difference() {
-        hull() {
-            translate_z(height - eps / 2)
-                cube([width1, length1, eps], center = true);
+    stl("ESP12F_carrier")
+        difference() {
+            hull() {
+                translate_z(height - eps / 2)
+                    cube([width1, length1, eps], center = true);
 
-            translate_z(eps / 2)
-                cube([width2, length2, eps], center = true);
+                translate_z(eps / 2)
+                    cube([width2, length2, eps], center = true);
+            }
+
+            for(side = [-1, 1])
+                for(i = [0 : pins - 1])
+                    hull() {
+                        translate([side * wpitch1 / 2, i * pitch1 - (pins - 1) * pitch1 / 2, height])
+                            cube([hole, hole, eps], center = true);
+
+                        translate([side * wpitch2 / 2, i * pitch2 - (pins - 1) * pitch2 / 2])
+                            cube([hole2, hole2, eps], center = true);
+                    }
         }
-
-        for(side = [-1, 1])
-            for(i = [0 : pins - 1])
-                hull() {
-                    translate([side * wpitch1 / 2, i * pitch1 - (pins - 1) * pitch1 / 2, height])
-                        cube([hole, hole, eps], center = true);
-
-                    translate([side * wpitch2 / 2, i * pitch2 - (pins - 1) * pitch2 / 2])
-                        cube([hole2, hole2, eps], center = true);
-                }
-    }
 }
 
 module TP4056_carrier_stl() { //! Generate the STL for an TP4056 carrier, two required
-    stl("TP4056_carrier");
     pitch = 2.54;
     outer_pitch = 13.9;
     inner_pitch = 7.54;
@@ -78,30 +77,30 @@ module TP4056_carrier_stl() { //! Generate the STL for an TP4056 carrier, two re
     width = hole + squeezed_wall * 2;
     spacing = inch(0.9);
 
-    difference() {
-        hull() {
-            translate_z(height - eps / 2)
-                cube([width, length1, eps], center = true);
+    stl("TP4056_carrier")
+        difference() {
+            hull() {
+                translate_z(height - eps / 2)
+                    cube([width, length1, eps], center = true);
 
-            translate_z(eps / 2)
-                cube([width, length2, eps], center = true);
+                translate_z(eps / 2)
+                    cube([width, length2, eps], center = true);
+            }
+
+            for(i = [0 : pins - 1])
+                let(x = [-outer_pitch / 2, - inner_pitch / 2, 0, 0, inner_pitch / 2, outer_pitch / 2][i])
+                    if(x)
+                        hull() {
+                            translate([0, x, height])
+                                cube([hole, hole, eps], center = true);
+
+                            translate([0, i * pitch - (pins - 1) * pitch / 2])
+                                cube([hole, hole, eps], center = true);
+                        }
         }
-
-        for(i = [0 : pins - 1])
-            let(x = [-outer_pitch / 2, - inner_pitch / 2, 0, 0, inner_pitch / 2, outer_pitch / 2][i])
-                if(x)
-                    hull() {
-                        translate([0, x, height])
-                            cube([hole, hole, eps], center = true);
-
-                        translate([0, i * pitch - (pins - 1) * pitch / 2])
-                            cube([hole, hole, eps], center = true);
-                    }
-    }
 }
 
 module MT3608_carrier_stl() { //! Generate the STL for an MT3608 carrier, two required
-    stl("MT3608_carrier");
     pcb_width = 17;
     w_pitch_top = 6.81;
     w_pitch_bot = inch(0.3);
@@ -113,21 +112,22 @@ module MT3608_carrier_stl() { //! Generate the STL for an MT3608 carrier, two re
     width = hole + 2 * wall;
     offset = (l_pitch_top - l_pitch_bot) / 2;
 
-    difference() {
-        hull() {
-            translate([offset, 0, height - eps / 2])
-                rounded_rectangle([width, pcb_width - 2, eps], 1);
-
-            translate_z(eps / 2)
-                rounded_rectangle([width, pcb_width - 2, eps], 1);
-        }
-        for(side = [-1, 1])
+    stl("MT3608_carrier")
+        difference() {
             hull() {
-                translate([offset, side * w_pitch_top / 2, height])
-                    cube([hole, hole, eps], center = true);
+                translate([offset, 0, height - eps / 2])
+                    rounded_rectangle([width, pcb_width - 2, eps], 1, true);
 
-                translate([0, side * w_pitch_bot / 2])
-                    cube([hole, hole, eps], center = true);
+                translate_z(eps / 2)
+                    rounded_rectangle([width, pcb_width - 2, eps], 1, true);
             }
-    }
+            for(side = [-1, 1])
+                hull() {
+                    translate([offset, side * w_pitch_top / 2, height])
+                        cube([hole, hole, eps], center = true);
+
+                    translate([0, side * w_pitch_bot / 2])
+                        cube([hole, hole, eps], center = true);
+                }
+        }
 }

printed/corner_block.scad

@@ -72,8 +72,6 @@ module corner_block_holes(screw = def_screw) //! Place children at all the holes
             children();
 
 module corner_block(screw = def_screw, name = false) { //! Generate the STL for a printed corner block
-    stl(name ? name : str("corner_block", "_M", screw_radius(screw) * 20));
-
     r = 1;
     cb_width = corner_block_width(screw);
     cb_height = cb_width;
@@ -81,43 +79,45 @@ module corner_block(screw = def_screw, name = false) { //! Generate the STL for
     insert = screw_insert(screw);
     corner_rad = insert_outer_d(insert) / 2 + wall;
     offset = corner_block_hole_offset(screw);
-    difference() {
-        hull()  {
-            translate([r, r])
-                rounded_cylinder(r = r, h = cb_height, r2 = r);
 
-            translate([r, cb_depth - r])
-                cylinder(r = r, h = cb_height - corner_rad);
+    stl(name ? name : str("corner_block", "_M", screw_radius(screw) * 20))
+        difference() {
+            hull()  {
+                translate([r, r])
+                    rounded_cylinder(r = r, h = cb_height, r2 = r);
 
-            translate([cb_width - r, r])
-                cylinder(r = r, h = cb_height - corner_rad);
+                translate([r, cb_depth - r])
+                    cylinder(r = r, h = cb_height - corner_rad);
 
-            translate([offset, offset, offset])
-                sphere(corner_rad);
+                translate([cb_width - r, r])
+                    cylinder(r = r, h = cb_height - corner_rad);
 
-            translate([offset, offset])
-                cylinder(r = corner_rad, h = offset);
+                translate([offset, offset, offset])
+                    sphere(corner_rad);
 
-            translate([offset, r, offset])
-                rotate([-90, 0, 180])
-                    rounded_cylinder(r = corner_rad, h = r, r2 = r);
+                translate([offset, offset])
+                    cylinder(r = corner_rad, h = offset);
 
-            translate([r, offset, offset])
-                rotate([0, 90, 180])
-                    rounded_cylinder(r = corner_rad, h = r, r2 = r);
+                translate([offset, r, offset])
+                    rotate([-90, 0, 180])
+                        rounded_cylinder(r = corner_rad, h = r, r2 = r);
+
+                translate([r, offset, offset])
+                    rotate([0, 90, 180])
+                        rounded_cylinder(r = corner_rad, h = r, r2 = r);
+            }
+            corner_block_v_hole(screw)
+                insert_hole(insert, overshoot);
+
+            corner_block_h_holes(screw)
+                insert_hole(insert, overshoot, true);
+
+            children();
         }
-        corner_block_v_hole(screw)
-            insert_hole(insert, overshoot);
-
-        corner_block_h_holes(screw)
-            insert_hole(insert, overshoot, true);
-
-        children();
-    }
 }
 
 module corner_block_assembly(screw = def_screw, name = false) //! The printed block with inserts
-assembly(str("corner_block_M", 20 * screw_radius(screw))) {
+assembly(str("corner_block_M", 20 * screw_radius(screw)), ngb = true) {
     insert = screw_insert(screw);
 
     stl_colour(name ? pp2_colour : pp1_colour)

printed/door_hinge.scad

@@ -54,44 +54,44 @@ module door_hinge_hole_positions(dir = 0) {                 //! Position chidren
 }
 
 module door_hinge(door_thickness) {                         //! Generates STL for the moving part of the hinge
-    stl(str("door_hinge_", door_thickness));
 
     hole_pitch = width - 10;
 
-    union() {
-        rotate([90, 0, 0])
-            linear_extrude(width, center = true)
+    stl(str("door_hinge_", door_thickness))
+        union() {
+            rotate([90, 0, 0])
+                linear_extrude(width, center = true)
+                    difference() {
+                        hull() {
+                            translate([dia / 2, thickness + door_thickness / 2])
+                                intersection() {
+                                    rotate(180)
+                                        teardrop(r = dia / 2, h = 0, truncate = false);
+
+                                    square([dia + 1, 2 * thickness + door_thickness], center = true);
+                                }
+
+                                square([1, thickness + door_thickness]);
+                        }
+                        translate([dia / 2, thickness + door_thickness / 2])
+                            teardrop_plus(r = screw_clearance_radius(pin_screw), h = 0);
+                    }
+            linear_extrude(thickness)
                 difference() {
                     hull() {
-                        translate([dia / 2, thickness + door_thickness / 2])
-                            intersection() {
-                                rotate(180)
-                                    teardrop(r = dia / 2, h = 0, truncate = false);
+                        translate([0, -width / 2])
+                            square([1, width]);
 
-                                square([dia + 1, 2 * thickness + door_thickness], center = true);
-                            }
-
-                            square([1, thickness + door_thickness]);
+                        for(side = [-1, 1])
+                            translate([-width + rad, side * (width / 2 - rad)])
+                                circle4n(rad);
                     }
-                    translate([dia / 2, thickness + door_thickness / 2])
-                        teardrop_plus(r = screw_clearance_radius(pin_screw), h = 0);
+                    rotate(180)
+                        vflip()
+                            door_hinge_hole_positions()
+                                poly_circle(screw_clearance_radius(screw));
                 }
-        linear_extrude(thickness)
-            difference() {
-                hull() {
-                    translate([0, -width / 2])
-                        square([1, width]);
-
-                    for(side = [-1, 1])
-                        translate([-width + rad, side * (width / 2 - rad)])
-                            circle4n(rad);
-                }
-                rotate(180)
-                    vflip()
-                        door_hinge_hole_positions()
-                            poly_circle(screw_clearance_radius(screw));
-            }
-    }
+        }
 }
 
 module door_hinge_6_stl() door_hinge(6);

printed/door_latch.scad

@@ -38,23 +38,23 @@ function door_latch_offset() = width / 2 + 1; //! Offset of the axle from the do
 nut_trap_depth = round_to_layer(screw_head_height(screw)) + 4 * layer_height;
 
 module door_latch_stl() { //! Generates the STL for the printed part
-    stl("door_latch");
-
     ridge = 4;
-    difference() {
-        union() {
-            hull() {
-                rounded_rectangle([length, width, thickness - tan(30) * (width -  ridge) / 2], rad, center = false);
 
-                translate_z(thickness / 2)
-                    cube([length, ridge, thickness], center = true);
+    stl("door_latch")
+        difference() {
+            union() {
+                hull() {
+                    rounded_rectangle([length, width, thickness - tan(30) * (width -  ridge) / 2], rad);
+
+                    translate_z(thickness / 2)
+                        cube([length, ridge, thickness], center = true);
+                }
+
+                cylinder(d = width, h = height);
             }
-
-            cylinder(d = width, h = height);
+            hanging_hole(nut_trap_depth, screw_clearance_radius(screw))
+                circle(r = nut_trap_radius(screw_nut(screw)), $fn = 6);
         }
-        hanging_hole(nut_trap_depth, screw_clearance_radius(screw))
-            circle(r = nut_trap_radius(screw_nut(screw)), $fn = 6);
-    }
 }
 
 module door_latch_assembly(sheet_thickness = 3) { //! The assembly for a specified sheet thickess

printed/drag_chain.scad

@@ -311,7 +311,7 @@ module _drag_chain_assembly(type, pos = 0, render = false) {
 //! 1. Remove the support material from the links with side cutters.
 //! 1. Clip the links together with the special ones at the ends.
 module drag_chain_assembly(type, pos = 0, render = false)  //! Drag chain assembly
-    assembly(str(drag_chain_name(type), "_drag_chain"), big = true)
+    assembly(str(drag_chain_name(type), "_drag_chain"), big = true, ngb = true)
         if($children == 2)
             _drag_chain_assembly(type, pos, render) {
                 children(0);

printed/fixing_block.scad

@@ -71,42 +71,42 @@ module fixing_block_h_hole_2D(screw = def_screw) //! Position 2D child on the ho
         children();
 
 module fixing_block(screw = def_screw) { //! Generate the STL
-    stl(str("fixing_block_M", screw_radius(screw) * 20));
-    r = 1;
+   r = 1;
     insert = screw_insert(screw);
     corner_rad = insert_outer_d(insert) / 2 + wall;
     fb_width = fixing_block_width(screw);
     fb_height = fixing_block_height(screw);
     fb_depth = fixing_block_depth(screw);
 
-    difference() {
-        union() {
-            linear_extrude(fb_height, convexity = 5)
-                difference() {
-                    hull() {
-                        for(side = [-1, 1]) {
-                            translate([side * (fb_width / 2 - corner_rad), fb_depth - corner_rad])
-                                circle4n(corner_rad);
+    stl(str("fixing_block_M", screw_radius(screw) * 20))
+        difference() {
+            union() {
+                linear_extrude(fb_height, convexity = 5)
+                    difference() {
+                        hull() {
+                            for(side = [-1, 1]) {
+                                translate([side * (fb_width / 2 - corner_rad), fb_depth - corner_rad])
+                                    circle4n(corner_rad);
 
-                            translate([side * (fb_width / 2 - r), r])
-                                circle4n(r);
+                                translate([side * (fb_width / 2 - r), r])
+                                    circle4n(r);
+                            }
                         }
+                        fixing_block_v_holes(screw)
+                            poly_circle(screw_clearance_radius(screw));
                     }
-                    fixing_block_v_holes(screw)
-                        poly_circle(screw_clearance_radius(screw));
-                }
-        }
-        translate_z(fb_height)
-            fixing_block_v_holes(screw)
-                insert_hole(insert);
+            }
+            translate_z(fb_height)
+                fixing_block_v_holes(screw)
+                    insert_hole(insert);
 
-        fixing_block_h_hole(screw)
-            insert_hole(insert, 10, true);
-    }
+            fixing_block_h_hole(screw)
+                insert_hole(insert, 10, true);
+        }
 }
 
 module fixing_block_assembly(screw = def_screw) pose([55, 180, 25], [0, 4.8, 4.8]) //! Printed part with the inserts inserted
-assembly(str("fixing_block_M", 20 * screw_radius(screw))) {
+assembly(str("fixing_block_M", 20 * screw_radius(screw)), ngb = true) {
     translate_z(fixing_block_height(screw))
         rotate([0, 180, 0])
             stl_colour(pp1_colour) render() fixing_block(screw);

printed/flat_hinge.scad

@@ -65,8 +65,6 @@ module hinge_screw_positions(type) { //! Place children at the screw positions
 }
 
 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);
@@ -85,37 +83,40 @@ module hinge_male(type, female = false) {       //! The half with the stationary
     teardrop_r = kr / cos(22.5);                // The corner on the teardrop
     inset = sqrt(sqr(teardrop_r + gap) - sqr(kr - t)) - kr;
 
-    linear_extrude(t)
-        difference() {
-            hull() {
-                for(side = [-1, 1])
-                    translate([side * (w / 2 - r), hinge_depth(type) - r])
-                        circle4n(r);
+    stl(str("hinge_", female ? "fe": "", "male_", type[0]))
+        union() {
+            linear_extrude(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)));
+                        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(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);
+                                }
         }
-
-    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(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);
@@ -129,7 +130,7 @@ module hinge_both(type) { //! Both parts together for printing
 }
 
 module hinge_assembly(type, angle = 0)
-assembly(str("hinge_", type[0])) { //! Assembled hinge
+assembly(str("hinge_", type[0]), ngb = true) { //! Assembled hinge
     kr = hinge_knuckle_dia(type) / 2;
     hr = hinge_pin_dia(type) / 2;
     w = hinge_width(type);

printed/foot.scad

@@ -39,7 +39,6 @@ function foot_screw(type = foot)    = type[4]; //! Screw type
 function foot_slant(type = foot)    = type[5]; //! Taper angle
 
 module foot(type = foot) { //! Generate STL
-    stl("foot");
     h = foot_height(type);
     t = foot_thickness(type);
     r1 = washer_radius(screw_washer(foot_screw(type)));
@@ -47,24 +46,25 @@ module foot(type = foot) { //! Generate STL
     r2 = r3 - h * tan(foot_slant(type));
     r =  foot_rad(type);
 
-    union() {
-        rotate_extrude(convexity = 3) {
-            hull() {
-                translate([r1, 0])
-                    square([r3 - r1, eps]);
+    stl("foot")
+        union() {
+            rotate_extrude(convexity = 3) {
+                hull() {
+                    translate([r1, 0])
+                        square([r3 - r1, eps]);
 
-                for(x = [r1 + r, r2 - r])
-                    translate([x, h - r])
-                        circle4n(r);
+                    for(x = [r1 + r, r2 - r])
+                        translate([x, h - r])
+                            circle4n(r);
+                }
+            }
+            linear_extrude(t)
+                difference() {
+                    circle(r1 + eps);
+
+                    poly_circle( screw_clearance_radius(foot_screw(type)));
             }
         }
-        linear_extrude(t)
-            difference() {
-                circle(r1 + eps);
-
-                poly_circle( screw_clearance_radius(foot_screw(type)));
-        }
-    }
 }
 
 module foot_assembly(t = 0, type = foot, flip = false) { //! Assembly with fasteners in place for specified sheet thickness
@@ -93,7 +93,6 @@ module foot_assembly(t = 0, type = foot, flip = false) { //! Assembly with faste
 }
 
 module insert_foot(type = insert_foot) { //! Generate STL for foot with insert
-    stl("insert_foot");
     h = foot_height(type);
     r3 = foot_diameter(type) / 2;
     r2 = r3 - h * tan(foot_slant(type));
@@ -103,36 +102,37 @@ module insert_foot(type = insert_foot) { //! Generate STL for foot with insert
     h2 = insert_hole_length(insert);
     r4 = insert_hole_radius(insert);
     r5 = r4 + 1;
-    union() {
-        rotate_extrude() {
-            union() {
-                hull() {
-                    translate([r5, 0]) {
-                        square([r3 - r5, eps]);
-                        square([eps, h]);
-                    }
+    stl("insert_foot")
+        union() {
+            rotate_extrude() {
+                union() {
+                    hull() {
+                        translate([r5, 0]) {
+                            square([r3 - r5, eps]);
+                            square([eps, h]);
+                        }
 
-                    translate([r2 - r, h - r])
-                        circle4n(r);
+                        translate([r2 - r, h - r])
+                            circle4n(r);
+                    }
                 }
             }
+            linear_extrude(h2 + eps)
+                difference() {
+                    circle(r5 + eps);
+
+                    poly_circle(r4);
+                }
+
+            translate_z(h2)
+                cylinder(r = r5 + eps, h = h - h2);
         }
-        linear_extrude(h2 + eps)
-            difference() {
-                circle(r5 + eps);
-
-                poly_circle(r4);
-            }
-
-        translate_z(h2)
-            cylinder(r = r5 + eps, h = h - h2);
-    }
 }
 //
 //! Place the insert in the bottom of the foot and push home with a soldering iron with a conical bit heated to 200°C.
 //
 module insert_foot_assembly(type = insert_foot) //! Printed part with insert in place
-assembly("insert_foot") {
+assembly("insert_foot", ngb = true) {
     screw = foot_screw(type);
     insert = screw_insert(screw);
 

printed/handle.scad

@@ -46,8 +46,6 @@ module handle_holes(h = 100) //! Drills holes for the screws
         drill(screw_clearance_radius(screw), h);
 
 module handle_stl() { //! generate the STL
-    stl("handle");
-
     module end(end)
         translate([end * pitch / 2, 0])
             rotate_extrude()
@@ -59,29 +57,30 @@ module handle_stl() { //! generate the STL
                         square([dia / 2 + 1, dia + 1]);
                 }
 
-    translate_z(dia / 2)
-        union() {
-            hull() {
-                end(-1);
+    stl("handle")
+        translate_z(dia / 2)
+            union() {
+                hull() {
+                    end(-1);
 
-                end(1);
-            }
-
-            handle_screw_positions()
-                render() difference() {
-                    h =  height + dia / 2;
-                    cylinder(d = dia, h = h);
-
-                    translate_z(h)
-                        insert_hole(insert, 6);
+                    end(1);
                 }
-        }
+
+                handle_screw_positions()
+                    render() difference() {
+                        h =  height + dia / 2;
+                        cylinder(d = dia, h = h);
+
+                        translate_z(h)
+                            insert_hole(insert, 6);
+                    }
+            }
 }
 //
 //! Place inserts in the bottom of the posts and push them home with a soldering iron with a conical bit heated to 200°C.
 //
 module handle_assembly() pose([225, 0, 150], [0, 0, 14]) //! Printed part with inserts in place
-assembly("handle") {
+assembly("handle", ngb = true) {
     translate_z(handle_height())
         stl_colour(pp1_colour) vflip() handle_stl();
 

printed/pcb_mount.scad

@@ -66,35 +66,35 @@ module pcb_mount_washer_stl() //! A plastic washer to clamp a PCB
         pcb_mount_ring();
 
 module pcb_mount(pcb, height = 5, washers = true) { //! Make the STL of a pcb mount for the specified PCB.
-    stl(str("pcb_mount_", pcb[0], "_", height));
-
     y_pitch = pcb_width(pcb) > 4 * pillar_r + 4 ? pillar_r + 1
                                                 : pcb_width(pcb) / 2 + frame_w + 1 + pillar_r;
 
-    if(washers)
-        for(x = [-1, 1], y = [-1, 1])
-            translate([x * (pillar_r + 1), y * y_pitch, 0])
-                pcb_mount_washer_stl();
+    stl(str("pcb_mount_", pcb[0], "_", height)) union() {
+        if(washers)
+            for(x = [-1, 1], y = [-1, 1])
+                translate([x * (pillar_r + 1), y * y_pitch, 0])
+                    pcb_mount_washer_stl();
 
-    for(x = [-1, 1])
-        translate([x * pillar_x_pitch(pcb) / 2, 0, frame_t / 2])
-            cube([frame_w, pillar_y_pitch(pcb) - 2 * wall, frame_t], center = true);
+        for(x = [-1, 1])
+            translate([x * pillar_x_pitch(pcb) / 2, 0, frame_t / 2])
+                cube([frame_w, pillar_y_pitch(pcb) - 2 * wall, frame_t], center = true);
 
-    for(y = [-1, 1])
-        translate([0, y * pillar_y_pitch(pcb) / 2, frame_t / 2])
-            cube([pillar_x_pitch(pcb) - 2 * wall, frame_w, frame_t], center = true);
+        for(y = [-1, 1])
+            translate([0, y * pillar_y_pitch(pcb) / 2, frame_t / 2])
+                cube([pillar_x_pitch(pcb) - 2 * wall, frame_w, frame_t], center = true);
 
-    pcb_mount_screw_positions(pcb)
-        linear_extrude(height)
-            pcb_mount_ring();
-
-    linear_extrude(height + pcb_thickness(pcb) - layer_height)
-        difference() {
-            pcb_mount_screw_positions(pcb)
+        pcb_mount_screw_positions(pcb)
+            linear_extrude(height)
                 pcb_mount_ring();
 
-            square([pcb_length(pcb) + 2 * clearance, pcb_width(pcb) + 2 * clearance], center = true);
-        }
+        linear_extrude(height + pcb_thickness(pcb) - layer_height)
+            difference() {
+                pcb_mount_screw_positions(pcb)
+                    pcb_mount_ring();
+
+                square([pcb_length(pcb) + 2 * clearance, pcb_width(pcb) + 2 * clearance], center = true);
+            }
+    }
 }
 
 module pcb_mount_assembly(pcb, thickness, height = 5) { //! A PCB mount assembly with fasteners

printed/printed_box.scad

@@ -129,28 +129,27 @@ module pbox_outer_shape(type) //! 2D outer shape of the box
     offset(pbox_wall(type) / 2) pbox_mid_shape(type);
 
 module pbox_base(type) { //! Generate the STL for the base
-    stl(str(pbox_name(type),"_base"));
     t = pbox_base(type);
-    difference() {
-        union() {
-            linear_extrude(t)
-                offset(base_outset - 0.2)
-                    pbox_inner_shape(type);
 
-            if($children > 0)
-                children(0);
+    stl(str(pbox_name(type),"_base"))
+        difference() {
+            union() {
+                linear_extrude(t)
+                    offset(base_outset - 0.2)
+                        pbox_inner_shape(type);
+
+                if($children > 0)
+                    children(0);
+            }
+            pbox_screw_positions(type)
+                poly_cylinder(r = screw_clearance_radius(pbox_screw(type)), h = 2 * t + eps, center = true);
+
+            if($children > 1)
+                children(1);
         }
-        pbox_screw_positions(type)
-            poly_cylinder(r = screw_clearance_radius(pbox_screw(type)), h = 2 * t + eps, center = true);
-
-        if($children > 1)
-            children(1);
-    }
 }
 
 module pbox(type) { //! Generate the STL for the main case
-    stl(pbox_name(type));
-
     height = pbox_height(type);
     total_height = pbox_total_height(type);
     top_thickness = pbox_top(type);
@@ -159,60 +158,61 @@ module pbox(type) { //! Generate the STL for the main case
     ledge_inset = base_outset - base_overlap;
     ledge_h = pbox_base(type) ? (ledge_outset - ledge_inset) * 2 : 0;
 
-    difference() {
-        union() {
-            linear_extrude(total_height)
-                pbox_outer_shape(type);
-
-            if($children > 2)
-                children(2);
-        }
+    stl(pbox_name(type))
         difference() {
-            translate_z(top_thickness)
-                union() {
-                    linear_extrude(height + eps)
-                         offset(-wall / 2) pbox_mid_shape(type);
+            union() {
+                linear_extrude(total_height)
+                    pbox_outer_shape(type);
 
-                     translate_z(height)                                     // Recess for the base
-                        linear_extrude(total_height - height)
-                            offset(base_outset)
-                                pbox_inner_shape(type);
-                }
-            // Ledge to support the lid
-            if(ledge_h)
-                translate_z(top_thickness + height - ledge_h)
-                    difference() {
-                        rounded_rectangle([pbox_width(type) + 2 * outset, pbox_depth(type) + 2 * outset, ledge_h], 1, center = false);
+                if($children > 2)
+                    children(2);
+            }
+            difference() {
+                translate_z(top_thickness)
+                    union() {
+                        linear_extrude(height + eps)
+                             offset(-wall / 2) pbox_mid_shape(type);
 
-                        hull() {
-                            linear_extrude(ledge_h + eps)
-                                offset(ledge_inset)
+                         translate_z(height)                                     // Recess for the base
+                            linear_extrude(total_height - height)
+                                offset(base_outset)
                                     pbox_inner_shape(type);
-
-                            linear_extrude(eps)
-                                offset(ledge_outset)
-                                     pbox_inner_shape(type);
-                        }
-                        pbox_screw_positions(type)
-                            insert_hole(pbox_insert(type));
                     }
+                // Ledge to support the lid
+                if(ledge_h)
+                    translate_z(top_thickness + height - ledge_h)
+                        difference() {
+                            rounded_rectangle([pbox_width(type) + 2 * outset, pbox_depth(type) + 2 * outset, ledge_h], 1);
 
-            // Corner lugs for inserts
-            outset = wall + pbox_ridges(type).y;
-            or = pbox_radius(type) + outset;
-            inset = pbox_screw_inset(type) + outset;
-            br = insert_boss_radius(pbox_insert(type), wall);
-            ext = sqrt(2) * inset - or * (sqrt(2) - 1) - br;
-            translate_z(height + top_thickness)
-                pbox_screw_positions(type)
-                    insert_lug(pbox_insert(type), wall, counter_bore = 0, extension = ext, corner_r = or);
+                            hull() {
+                                linear_extrude(ledge_h + eps)
+                                    offset(ledge_inset)
+                                        pbox_inner_shape(type);
 
-            if($children > 0)
-                children(0);
+                                linear_extrude(eps)
+                                    offset(ledge_outset)
+                                         pbox_inner_shape(type);
+                            }
+                            pbox_screw_positions(type)
+                                insert_hole(pbox_insert(type));
+                        }
+
+                // Corner lugs for inserts
+                outset = wall + pbox_ridges(type).y;
+                or = pbox_radius(type) + outset;
+                inset = pbox_screw_inset(type) + outset;
+                br = insert_boss_radius(pbox_insert(type), wall);
+                ext = sqrt(2) * inset - or * (sqrt(2) - 1) - br;
+                translate_z(height + top_thickness)
+                    pbox_screw_positions(type)
+                        insert_lug(pbox_insert(type), wall, counter_bore = 0, extension = ext, corner_r = or);
+
+                if($children > 0)
+                    children(0);
+            }
+            if($children > 1)
+                children(1);
         }
-        if($children > 1)
-            children(1);
-    }
 }
 
 module pbox_inserts(type) //! Place the inserts for the base screws

printed/printed_pulleys.scad

@@ -93,7 +93,6 @@ module printed_pulley(type) { //! Draw a printable pulley
     or = pulley_od(type) / 2;
     screw_z = pulley_screw_z(type);
 
-    stl(str("printed_pulley_", type[0]));
 
     module core() {
         translate_z(pulley_hub_length(type) + ft)
@@ -129,58 +128,59 @@ module printed_pulley(type) { //! Draw a printable pulley
                 circle(d = pulley_bore(type));
             }
 
-    translate_z(printed_pulley_inverted(type) ? - hl : 0) {
-        // hub
-        if(hl)
-            translate_z(printed_pulley_inverted(type) ? hl + w + 2 * ft : 0)
-                if(screw_z && screw_z < hl)
-                    render()
-                        difference() {
-                            hub();
+    stl(str("printed_pulley_", type[0]))
+        translate_z(printed_pulley_inverted(type) ? - hl : 0) {
+            // hub
+            if(hl)
+                translate_z(printed_pulley_inverted(type) ? hl + w + 2 * ft : 0)
+                    if(screw_z && screw_z < hl)
+                        render()
+                            difference() {
+                                hub();
 
+                                screw_holes();
+                            }
+                    else
+                        hub();
+
+            // bottom flange
+            translate_z(hl)
+                linear_extrude(ft)
+                    difference() {
+                        circle(d = pulley_flange_dia(type));
+                        circle(d = pulley_bore(type));
+                    }
+
+            // top flange
+            translate_z(hl + ft + w) {
+                // inner part, supported by core
+                linear_extrude(ft)
+                    difference() {
+                        circle(r = or);
+                        circle(d = pulley_bore(type));
+                    }
+                // outer part at 45 degrees for printing
+                rotate_extrude()
+                    translate([or - eps, ft])
+                        vflip()
+                            right_triangle(ft, ft);
+            }
+
+            if(screw_z && screw_z > hl)
+                render()
+                    difference() { // T5 pulleys have screws through the teeth
+                        core();
+
+                        translate_z(printed_pulley_inverted(type) ? pulley_height(type) + hl - 2 * screw_z : 0)
                             screw_holes();
-                        }
+                    }
                 else
-                    hub();
-
-        // bottom flange
-        translate_z(hl)
-            linear_extrude(ft)
-                difference() {
-                    circle(d = pulley_flange_dia(type));
-                    circle(d = pulley_bore(type));
-                }
-
-        // top flange
-        translate_z(hl + ft + w) {
-            // inner part, supported by core
-            linear_extrude(ft)
-                difference() {
-                    circle(r = or);
-                    circle(d = pulley_bore(type));
-                }
-            // outer part at 45 degrees for printing
-            rotate_extrude()
-                translate([or - eps, ft])
-                    vflip()
-                        right_triangle(ft, ft);
-        }
-
-        if(screw_z && screw_z > hl)
-            render()
-                difference() { // T5 pulleys have screws through the teeth
                     core();
-
-                    translate_z(printed_pulley_inverted(type) ? pulley_height(type) + hl - 2 * screw_z : 0)
-                        screw_holes();
-                }
-            else
-                core();
-    }
+        }
 }
 
 module printed_pulley_assembly(type, colour = pp1_colour) //! Draw a printed pulley with its grub screws in place
-assembly(str("printed_pulley_", type[0])) {
+assembly(str("printed_pulley_", type[0]), ngb = true) {
     translate_z(pulley_offset(type)) {
         stl_colour(colour)
             if(printed_pulley_inverted(type))

printed/psu_shroud.scad

@@ -79,8 +79,6 @@ module psu_shroud_holes(type, cable_d, cables = 1) {
 }
 
 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);
@@ -109,41 +107,43 @@ module psu_shroud(type, cable_d, name, cables = 1) { //! Generate the STL file f
         }
     }
 
-    // base and sides
-    translate([centre_x, -centre_y]) {
-        rounded_rectangle([depth - eps, width - eps, top], rad, center = false);
+    stl(str("psu_shroud_", name)) {
+        // base and sides
+        translate([centre_x, -centre_y]) {
+            rounded_rectangle([depth - eps, width - eps, top], rad);
 
-        linear_extrude(height)
-            difference() {
+            linear_extrude(height)
+                difference() {
+                    shape();
+
+                    translate([depth / 2, width / 2 - 5])
+                        square([2 * (depth - extent + terminal_clearance), 10], center = true);
+            }
+            linear_extrude(height - terminal_block_height(tb) - psu_terminal_block_z(type) - terminal_clearance)
                 shape();
-
-                translate([depth / 2, width / 2 - 5])
-                    square([2 * (depth - extent + terminal_clearance), 10], center = true);
         }
-        linear_extrude(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(wall, center = true)
-                    difference() {
-                        square([cable_d + eps, height], center = true);
+        // 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(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($side * 90)
-                    insert_lug(insert, wall, counter_bore);
- }
+                            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($side * 90)
+                        insert_lug(insert, wall, counter_bore);
+     }
+}
 
 module psu_shroud_assembly(type, cable_d, name, cables = 1) //! The printed parts with inserts fitted
-assembly(str("PSU_shroud_", name)) {
+assembly(str("PSU_shroud_", name), ngb = true) {
 
     translate_z(psu_shroud_height(type))
         vflip()

printed/ribbon_clamp.scad

@@ -47,7 +47,6 @@ module ribbon_clamp_holes(ways, h = 20, screw = screw) //! Drill screw holes
 
 module ribbon_clamp(ways, screw = screw) { //! Generate STL for given number of ways
     screw_d = screw_radius(screw) * 2;
-    stl(str("ribbon_clamp_", ways, screw_d != 3 ? str("_", screw_d) : ""));
 
     pitch = ribbon_clamp_hole_pitch(ways, screw);
     d = ribbon_clamp_width(screw);
@@ -55,34 +54,35 @@ module ribbon_clamp(ways, screw = screw) { //! Generate STL for given number of
     t = round_to_layer(ribbon_clamp_slot_depth() + wall);
     insert = screw_insert(screw);
 
-    difference() {
-        union() {
-            hull() {
-                translate_z(h - t / 2)
-                    cube([ribbon_clamp_hole_pitch(ways, screw), d, t], center = true);
+    stl(str("ribbon_clamp_", ways, screw_d != 3 ? str("_", screw_d) : ""))
+        difference() {
+            union() {
+                hull() {
+                    translate_z(h - t / 2)
+                        cube([ribbon_clamp_hole_pitch(ways, screw), d, t], center = true);
 
-                translate_z(1)
-                    cube([pitch, max(wall, d - 2 * (h - t)), 2], center = true);
+                    translate_z(1)
+                        cube([pitch, max(wall, d - 2 * (h - t)), 2], center = true);
+                }
+                ribbon_clamp_hole_positions(ways, screw, -1)
+                    cylinder(d = d, h = h);
+
+                ribbon_clamp_hole_positions(ways, screw, 1)
+                    cylinder(d = d, h = h);
             }
-            ribbon_clamp_hole_positions(ways, screw, -1)
-                cylinder(d = d, h = h);
 
-            ribbon_clamp_hole_positions(ways, screw, 1)
-                cylinder(d = d, h = h);
-        }
-
-        translate_z(h)
-            cube([ribbon_clamp_slot(ways), d + 1, ribbon_clamp_slot_depth() * 2], center = true);
-
-        ribbon_clamp_hole_positions(ways, screw)
             translate_z(h)
-                rotate(22.5)
-                    insert_hole(insert, ribbon_clamp_screw_depth(screw) - insert_length(insert));
-    }
+                cube([ribbon_clamp_slot(ways), d + 1, ribbon_clamp_slot_depth() * 2], center = true);
+
+            ribbon_clamp_hole_positions(ways, screw)
+                translate_z(h)
+                    rotate(22.5)
+                        insert_hole(insert, ribbon_clamp_screw_depth(screw) - insert_length(insert));
+        }
 }
 
 module ribbon_clamp_assembly(ways, screw = screw) pose([55, 180, 25])  //! Printed part with inserts in place
-    assembly(let(screw_d = screw_radius(screw) * 2)str("ribbon_clamp_", ways, screw_d != 3 ? str("_", screw_d) : "")) {
+    assembly(let(screw_d = screw_radius(screw) * 2)str("ribbon_clamp_", ways, screw_d != 3 ? str("_", screw_d) : ""), ngb = true) {
     h = ribbon_clamp_height(screw);
     insert = screw_insert(screw);
 

printed/screw_knob.scad

@@ -34,32 +34,31 @@ knob_height = knob_stem_h + knob_thickness;
 function knob_height() = knob_height;
 
 module screw_knob(screw) { //! Generate the STL for a knob to fit the specified hex screw
-    stl(str("screw_knob_M", screw_radius(screw) * 20));
-
     knob_stem_r = nut_trap_radius(screw_nut(screw)) + knob_wall;
 
     function wave(a) = knob_r + sin(a * knob_waves) * knob_wave;
 
-    union() {
-        render() difference() {
-            cylinder(r = knob_stem_r, h = knob_thickness + knob_stem_h);
+    stl(str("screw_knob_M", screw_radius(screw) * 20))
+        union() {
+            render() difference() {
+                cylinder(r = knob_stem_r, h = knob_thickness + knob_stem_h);
 
-            hanging_hole(knob_nut_trap_depth(screw), screw_clearance_radius(screw))
-                rotate(45)
-                    circle(r = nut_trap_radius(screw_nut(screw)), $fn = 6);
-        }
-        linear_extrude(knob_thickness, convexity = 3)
-            difference() {
-                polygon(points = [for(a = [0 : 359]) [wave(a) * sin(a), wave(a) * cos(a)]]);
-
-                circle(knob_stem_r - eps);
+                hanging_hole(knob_nut_trap_depth(screw), screw_clearance_radius(screw))
+                    rotate(45)
+                        circle(r = nut_trap_radius(screw_nut(screw)), $fn = 6);
             }
-    }
+            linear_extrude(knob_thickness, convexity = 3)
+                difference() {
+                    polygon(points = [for(a = [0 : 359]) [wave(a) * sin(a), wave(a) * cos(a)]]);
+
+                    circle(knob_stem_r - eps);
+                }
+        }
 }
 
 //! Place the screw through the printed part
 module screw_knob_assembly(screw, length) //! Assembly with the screw in place
-assembly(str("screw_knob_M", 20 * screw_radius(screw), "_", length)) {
+assembly(str("screw_knob_M", 20 * screw_radius(screw), "_", length), ngb = true) {
     translate_z(knob_height)
         vflip()
             stl_colour(pp1_colour) screw_knob(screw);

printed/socket_box.scad

@@ -41,7 +41,6 @@ height = base_thickness + box_height;
 function socket_box_depth() = height; //! Outside depth of the backbox
 
 module socket_box(type) { //! Generate STL of the backbox for the specified socket
-    stl(str("socket_box_",type[0]));
 
     screw = mains_socket_screw(type);
     screw_clearance_radius = screw_clearance_radius(screw);
@@ -51,37 +50,38 @@ module socket_box(type) { //! Generate STL of the backbox for the specified sock
     insert_boss = mains_socket_insert_boss(type);
     insert_hole_radius = insert_hole_radius(insert);
 
-    difference() {
-        linear_extrude(height, convexity = 5)
-            face_plate(type);
-
+    stl(str("socket_box_",type[0]))
         difference() {
-            translate_z(base_thickness)
-                linear_extrude(height, convexity = 5)
-                     offset(-wall) offset(1) face_plate(type);
+            linear_extrude(height, convexity = 5)
+                face_plate(type);
 
-            for(side = [-1, 1])
-                hull()
-                    for(x = [1, 2])
-                        translate([side * mains_socket_pitch(type) / x, 0])
-                            cylinder(d = insert_boss, h = 100);
-        }
-        //
-        // Socket holes
-        //
-        translate_z(height)
-            mains_socket_hole_positions(type) {
-                poly_cylinder(r = screw_clearance_radius, h = 2 * box_height, center = true);
+            difference() {
+                translate_z(base_thickness)
+                    linear_extrude(height, convexity = 5)
+                         offset(-wall) offset(1) face_plate(type);
 
-                poly_cylinder(r = insert_hole_radius, h = 2 * insert_length, center = true);
+                for(side = [-1, 1])
+                    hull()
+                        for(x = [1, 2])
+                            translate([side * mains_socket_pitch(type) / x, 0])
+                                cylinder(d = insert_boss, h = 100);
             }
-        //
-        // Cable hole
-        //
-        translate([cable_x, cable_y(type), cable_z])
-            rotate([90, 0, 0])
-                teardrop_plus(r = cable_d / 2, h = 30);
-    }
+            //
+            // Socket holes
+            //
+            translate_z(height)
+                mains_socket_hole_positions(type) {
+                    poly_cylinder(r = screw_clearance_radius, h = 2 * box_height, center = true);
+
+                    poly_cylinder(r = insert_hole_radius, h = 2 * insert_length, center = true);
+                }
+            //
+            // Cable hole
+            //
+            translate([cable_x, cable_y(type), cable_z])
+                rotate([90, 0, 0])
+                    teardrop_plus(r = cable_d / 2, h = 30);
+        }
 }
 
 module socket_box_MKLOGIC_stl() socket_box(MKLOGIC);

printed/ssr_shroud.scad

@@ -61,53 +61,54 @@ module ssr_shroud_holes(type, cable_d) { //! Drill the screw and ziptie holes
 }
 
 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) difference() {
-            round(or = wall / 2 - eps, ir = 0) difference() {
-                rounded_square([depth, width], rad);
+    stl(str("ssr_shroud_", name)) {
+        // base and sides
+        translate([center_x, 0]) {
+            rounded_rectangle([depth - eps, width - eps, top], rad);
 
-                rounded_square([depth - 2 * wall, width - 2 * wall], rad - wall);
+            linear_extrude(height) difference() {
+                round(or = wall / 2 - eps, ir = 0) difference() {
+                    rounded_square([depth, width], rad);
 
-                translate([depth / 2, 0])
-                    square([2 * rad, width], center = true);
+                    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);
             }
-            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(wall, center = true)
-                    difference() {
-                        square([cable_d + eps, height], center = true);
+        // cable slots
+        for(side = [-1, 1])
+            translate([cable_x, side * (width / 2 - wall / 2), height / 2])
+                rotate([90, 0, 0])
+                    linear_extrude(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($side * 90)
-                    insert_lug(insert, wall, counter_bore);
+                            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($side * 90)
+                        insert_lug(insert, wall, counter_bore);
+    }
 }
 
 module ssr_shroud_assembly(type, cable_d, name) //! The printed parts with inserts fitted
-assembly(str("SSR_shroud_", name)) {
+assembly(str("SSR_shroud_", name), ngb = true) {
 
     translate_z(ssr_shroud_height(type))
         vflip()

printed/strap_handle.scad

@@ -75,32 +75,29 @@ module strap_holes(length, type = strap, h = 100) //! The panel cut outs
                     strap_boss_shape(type);
 
 module strap(length, type = strap) { //! Generate the STL for the rubber strap
-    stl("strap");
-
     len = length - 2 * (wall + clearance);
     w = strap_width(type);
 
-    linear_extrude(strap_thickness(type), convexity = 3)
-        difference() {
-            rounded_square([len, w], w / 2 - eps);
+    stl("strap")
+        linear_extrude(strap_thickness(type), convexity = 3)
+            difference() {
+                rounded_square([len, w], w / 2 - eps);
 
-            for(end = [-1, 1])
-                translate([end * (len / 2 - strap_min_width(type) - strap_boss_r(type) - clearance), 0])
-                    rotate(end * 90 + 90)
-                        hull() {
-                            offset(clearance)
-                                strap_boss_shape(type);
-
-                            translate([strap_extension(type) / 2, 0])
+                for(end = [-1, 1])
+                    translate([end * (len / 2 - strap_min_width(type) - strap_boss_r(type) - clearance), 0])
+                        rotate(end * 90 + 90)
+                            hull() {
                                 offset(clearance)
                                     strap_boss_shape(type);
-                        }
-        }
+
+                                translate([strap_extension(type) / 2, 0])
+                                    offset(clearance)
+                                        strap_boss_shape(type);
+                            }
+            }
 }
 
 module strap_end(type = strap) { //! Generate the STL for end piece
-    stl("strap_end");
-
     z1 = strap_height(type) - strap_thickness(type) - clearance;
     z2 = strap_height(type) + strap_key(type);
     r1 = strap_boss_r(type) - 1;
@@ -121,48 +118,49 @@ module strap_end(type = strap) { //! Generate the STL for end piece
             circle(r1);
         }
 
-    union() {
-        linear_extrude(z1)
-            with_hole()
-                outer();
-
-        translate_z(z1)
-            linear_extrude(strap_height(type) - z1)
-                difference() {
+    stl("strap_end")
+        union() {
+            linear_extrude(z1)
+                with_hole()
                     outer();
 
-                    hull() {
-                        translate([0, -strap_width(type) / 2 - clearance])
-                            square([strap_boss_r(type) + overlap, strap_width(type) + 2 * clearance]);
+            translate_z(z1)
+                linear_extrude(strap_height(type) - z1)
+                    difference() {
+                        outer();
 
-                        translate([-strap_extension(type) / 2, 0])
-                            circle(d = strap_width(type) + 2 * clearance);
+                        hull() {
+                            translate([0, -strap_width(type) / 2 - clearance])
+                                square([strap_boss_r(type) + overlap, strap_width(type) + 2 * clearance]);
+
+                            translate([-strap_extension(type) / 2, 0])
+                                circle(d = strap_width(type) + 2 * clearance);
+                        }
                     }
-                }
 
-        linear_extrude(strap_height(type) - layer_height)
-            with_hole()
-                strap_boss_shape(type);
+            linear_extrude(strap_height(type) - layer_height)
+                with_hole()
+                    strap_boss_shape(type);
 
-        linear_extrude(z2)
-            with_hole()
-                 offset(cnc_bit_r)
-                    offset(-step - cnc_bit_r)
-                        strap_boss_shape(type);
+            linear_extrude(z2)
+                with_hole()
+                     offset(cnc_bit_r)
+                        offset(-step - cnc_bit_r)
+                            strap_boss_shape(type);
 
-        render() difference() {
-            cylinder(r = r1 + eps, h = z2);
+            render() difference() {
+                cylinder(r = r1 + eps, h = z2);
 
-            translate_z(z2)
-                insert_hole(strap_insert(type), counterbore);
+                translate_z(z2)
+                    insert_hole(strap_insert(type), counterbore);
+            }
         }
-    }
 }
 //
 //! * Place the insert into the hole and push home with a soldering iron with a tapered bit heated to 200°C.
 //
 module strap_end_assembly(type = strap)
-assembly("strap_end") {
+assembly("strap_end", ngb = true) {
     stl_colour(pp1_colour)
         strap_end(type);
 

readme.md

@@ -288,6 +288,8 @@ Models of radial blowers.
 | `blower_screw_holes(type)` | List of XY coordinates of the screw holes |
 | `blower_top(type)` | Thickness of the top |
 | `blower_wall(type)` | Side wall thickness |
+| `blower_wall_left(type)` | Left side wall thickness |
+| `blower_wall_right(type)` | Right wall thickness (for square fans) |
 | `blower_width(type)` | Width of enclosing rectangle |
 
 ### Functions
@@ -311,10 +313,12 @@ Models of radial blowers.
 |   1 | `blower(PE4020)` |  Blower Pengda Technology 4020 |
 |   1 | `blower(RB5015)` |  Blower Runda RB5015 |
 |   4 | `screw(M2_cap_screw, 8)` |  Screw M2 cap x  8mm |
+|   2 | `screw(M2_cap_screw, 10)` |  Screw M2 cap x 10mm |
 |   3 | `screw(M3_cap_screw, 20)` |  Screw M3 cap x 20mm |
 |   2 | `screw(M4_cap_screw, 25)` |  Screw M4 cap x 25mm |
+|   1 | `blower(BL30x10)` |  Square radial fan 3010 |
 |   1 | `blower(BL40x10)` |  Square radial fan 4010 |
-|   4 | `washer(M2_washer)` |  Washer  M2 x 5mm x 0.3mm |
+|   6 | `washer(M2_washer)` |  Washer  M2 x 5mm x 0.3mm |
 |   3 | `washer(M3_washer)` |  Washer  M3 x 7mm x 0.5mm |
 |   2 | `washer(M4_washer)` |  Washer  M4 x 9mm x 0.8mm |
 
@@ -1750,7 +1754,11 @@ UK 13A sockets at the moment.
 ---
 <a name="Microswitches"></a>
 ## Microswitches
-Used for limit switches.
+Used for limit switches. Currently only the button type is supported as the lever and roller types are less accurate.
+
+The switch is drawn with the button at the nominal operation point. This can be plus or minus `microswitch_op_tol(type)`.
+
+When the button is released it comes out by a maximum of `microswitch_fp_max(type)` from the nominal operating point.
 
 [vitamins/microswitches.scad](vitamins/microswitches.scad) Object definitions.
 
@@ -1763,14 +1771,16 @@ Used for limit switches.
 |:--- |:--- |
 | `microswitch_body_clr(type)` | Body colour |
 | `microswitch_button_clr(type)` | Button colour |
-| `microswitch_button_pos(type)` | Button position |
+| `microswitch_button_pos(type)` | Button position at operating point |
 | `microswitch_button_t(type)` | Button thickness |
 | `microswitch_button_w(type)` | Button width |
+| `microswitch_fp_max(type)` | Free position maximum |
 | `microswitch_hole_d(type)` | Screw hole diameter |
 | `microswitch_holes(type)` | Hole positions |
 | `microswitch_leg(type)` | Leg types |
 | `microswitch_legs(type)` | Leg positions |
 | `microswitch_length(type)` | Body length |
+| `microswitch_op_tol(type)` | Operating position +/- tolerance |
 | `microswitch_radius(type)` | Body corner radius |
 | `microswitch_thickness(type)` | Body thickness |
 | `microswitch_width(type)` | Body width |
@@ -2305,6 +2315,7 @@ PCBs and perfboard with optional components. The shape can be a rectangle with o
 | ---:|:--- |:---|
 |   1 | `pcb(ArduinoLeonardo)` |  Arduino Leonardo |
 |   1 | `pcb(ArduinoUno3)` |  Arduino Uno R3 |
+|   1 | `pcb(BTT_SKR_E3_TURBO)` |  BigTreeTech SKR E3 Turbo |
 |   1 | `pcb(BTT_SKR_MINI_E3_V2_0)` |  BigTreeTech SKR Mini E3 v2.0 |
 |   1 | `pcb(BTT_SKR_V1_4_TURBO)` |  BigTreeTech SKR v1.4 Turbo |
 |   1 |  |  Cat 5 patch cable 300mm |
@@ -2315,7 +2326,7 @@ PCBs and perfboard with optional components. The shape can be a rectangle with o
 |   1 | `pcb(ESP-01)` |  ESP-01 |
 |   1 | `pcb(EnviroPlus)` |  Enviro+ |
 |   1 | `pcb(ExtruderPCB)` |  Extruder connection PCB |
-|   1 | `pcb(Keyes5p1)` |  Keyes5.1 Arduino Uno expansion board |
+|   1 | `pcb(Keyes5p1)` |  Keyes5.1 Arduino Uno expansion board - not shown |
 |   1 | `pcb(MP1584EN)` |  MP1584EN 3A buck converter |
 |   1 | `pcb(MT3608)` |  MT3608 boost converter module |
 |   1 | `pcb(Melzi)` |  Melzi electronics - not shown |
@@ -2324,8 +2335,8 @@ PCBs and perfboard with optional components. The shape can be a rectangle with o
 |   1 | `molex_254(2)` |  Molex KK header 2 way |
 |   1 | `molex_254(3)` |  Molex KK header 3 way |
 |  16 | `nut(M2_nut, nyloc = true)` |  Nut M2 x 1.6mm nyloc |
-|  34 | `nut(M2p5_nut, nyloc = true)` |  Nut M2.5 x 2.2mm nyloc |
-|  17 | `nut(M3_nut, nyloc = true)` |  Nut M3 x 2.4mm nyloc |
+|  30 | `nut(M2p5_nut, nyloc = true)` |  Nut M2.5 x 2.2mm nyloc |
+|  22 | `nut(M3_nut, nyloc = true)` |  Nut M3 x 2.4mm nyloc |
 |   8 | `nut(M4_nut, nyloc = true)` |  Nut M4 x 3.2mm nyloc |
 |   1 | `pcb(PI_IO)` |  PI_IO V2 |
 |   1 | `pcb(PSU12V1A)` |  PSU 12V 1A - not shown |
@@ -2345,9 +2356,8 @@ PCBs and perfboard with optional components. The shape can be a rectangle with o
 |   8 | `screw(M2p5_cap_screw, 25)` |  Screw M2.5 cap x 25mm |
 |   8 | `screw(M2p5_cap_screw, 30)` |  Screw M2.5 cap x 30mm |
 |  12 | `screw(M2p5_pan_screw, 25)` |  Screw M2.5 pan x 25mm |
-|   4 | `screw(M2p5_pan_screw, 30)` |  Screw M2.5 pan x 30mm |
 |   4 | `screw(M3_cap_screw, 16)` |  Screw M3 cap x 16mm |
-|   4 | `screw(M3_cap_screw, 30)` |  Screw M3 cap x 30mm |
+|   9 | `screw(M3_cap_screw, 30)` |  Screw M3 cap x 30mm |
 |   9 | `screw(M3_cap_screw, 35)` |  Screw M3 cap x 35mm |
 |   8 | `screw(M4_cap_screw, 35)` |  Screw M4 cap x 35mm |
 |   1 | `pcb(TP4056)` |  TP4056 Li-lon Battery charger module |
@@ -2356,8 +2366,8 @@ PCBs and perfboard with optional components. The shape can be a rectangle with o
 |   1 |  |  USB A to Mini B lead - not shown |
 |   1 | `pcb(WD2002SJ)` |  WD2002SJ Buck Boost DC-DC converter |
 |  16 | `washer(M2_washer)` |  Washer  M2 x 5mm x 0.3mm |
-|  34 | `washer(M2p5_washer)` |  Washer  M2.5 x 5.9mm x 0.5mm |
-|  17 | `washer(M3_washer)` |  Washer  M3 x 7mm x 0.5mm |
+|  30 | `washer(M2p5_washer)` |  Washer  M2.5 x 5.9mm x 0.5mm |
+|  22 | `washer(M3_washer)` |  Washer  M3 x 7mm x 0.5mm |
 |   8 | `washer(M4_washer)` |  Washer  M4 x 9mm x 0.8mm |
 |   1 | `pcb(ZC_A0591)` |  ZC-A0591 ULN2003 driver PCB |
 
@@ -2373,11 +2383,11 @@ PCBs and perfboard with optional components. The shape can be a rectangle with o
 |   4 | pcb_spacer25140.stl |
 |   4 | pcb_spacer25150_2.stl |
 |   4 | pcb_spacer25160_2.stl |
-|   4 | pcb_spacer25170_2.stl |
+|   4 | pcb_spacer25180.stl |
 |   4 | pcb_spacer25190.stl |
-|   4 | pcb_spacer25200.stl |
 |   2 | pcb_spacer2580.stl |
-|   4 | pcb_spacer30180.stl |
+|   4 | pcb_spacer30170.stl |
+|   5 | pcb_spacer30200.stl |
 |   5 | pcb_spacer30210.stl |
 |   4 | pcb_spacer30220.stl |
 |   4 | pcb_spacer3050.stl |
@@ -2612,8 +2622,8 @@ Timing belt pulleys, both toothed and plain with internal bearings for idlers.
 ### Modules
 | Module | Description |
 |:--- |:--- |
-| `pulley(type)` | Draw a pulley |
-| `pulley_assembly(type)` | Draw a pulley with its grub screws in place |
+| `pulley(type, colour = silver)` | Draw a pulley |
+| `pulley_assembly(type, colour = silver)` | Draw a pulley with its grub screws in place |
 
 ![pulleys](tests/png/pulleys.png)
 
@@ -2660,11 +2670,11 @@ Linear rails with carriages.
 | `carriage_length(type)` | Overall length |
 | `carriage_pitch_x(type)` | Screw hole x pitch |
 | `carriage_pitch_y(type)` | Screw hole y pitch |
+| `carriage_rail(type)` | Rail type |
 | `carriage_screw(type)` | Carriage screw type |
 | `carriage_width(type)` | Width of carriage |
 | `rail_bore(type)` | Counter bore diameter for screw head |
 | `rail_bore_depth(type)` | Counter bore depth |
-| `rail_carriage(type)` | Carriage type |
 | `rail_end(type)` | Minimum distance screw can be from the end |
 | `rail_end_screw(type)` | Screw used for ends only (Countersink used for better location) |
 | `rail_groove_offset(type)` | Offset of centre of groove from top of rail |
@@ -2680,17 +2690,17 @@ Linear rails with carriages.
 |:--- |:--- |
 | `carriage_screw_depth(type)` | Carriage thread depth |
 | `carriage_size(type)` | Size of carriage |
+| `carriage_travel(type, rail_length)` | How far the carriage can travel on a given length rail |
 | `rail_holes(type, length)` | Number of holes in a rail given its `length` |
 | `rail_screw_height(type, screw)` | Position screw taking into account countersink into counterbored hole |
-| `rail_travel(type, length)` | How far the carriage can travel |
 
 ### Modules
 | Module | Description |
 |:--- |:--- |
-| `carriage(type, rail, end_colour = grey(20)` | Draw the specified carriage |
+| `carriage(type, end_colour = grey(20)` | Draw the specified carriage |
 | `carriage_hole_positions(type)` | Position children over screw holes |
 | `rail(type, length, colour = grey(90)` | Draw the specified rail |
-| `rail_assembly(type, length, pos, carriage_end_colour = grey(20)` | Rail and carriage assembly |
+| `rail_assembly(carriage, length, pos, carriage_end_colour = grey(20)` | Rail and carriage assembly |
 | `rail_hole_positions(type, length, first = 0, screws = 100, both_ends = true)` | Position children over screw holes |
 | `rail_screws(type, length, thickness, screws = 100, index_screws = undef)` | Place screws in the rail |
 
@@ -2699,8 +2709,7 @@ Linear rails with carriages.
 ### Vitamins
 | Qty | Module call | BOM entry |
 | ---:|:--- |:---|
-|   1 | `rail(MGN12, 200)` |  Linear rail MGN12 x 200mm |
-|   1 | `rail(MGN12H, 200)` |  Linear rail MGN12H x 200mm |
+|   2 | `rail(MGN12, 200)` |  Linear rail MGN12 x 200mm |
 |   1 | `rail(MGN15, 200)` |  Linear rail MGN15 x 200mm |
 |   1 | `rail(MGN5, 200)` |  Linear rail MGN5 x 200mm |
 |   1 | `rail(MGN7, 200)` |  Linear rail MGN7 x 200mm |
@@ -2948,6 +2957,7 @@ For an explanation of `screw_polysink()` see <https://hydraraptor.blogspot.com/2
 |   1 | `screw(M4_pan_screw, 30)` |  Screw M4 pan x 30mm |
 |   1 | `screw(M5_cap_screw, 30)` |  Screw M5 cap x 30mm |
 |   1 | `screw(M5_cs_cap_screw, 30)` |  Screw M5 cs cap x 30mm |
+|   1 | `screw(M5_dome_screw, 30)` |  Screw M5 dome x 30mm |
 |   1 | `screw(M5_hex_screw, 30)` |  Screw M5 hex x 30mm |
 |   1 | `screw(M5_pan_screw, 30)` |  Screw M5 pan x 30mm |
 |   1 | `screw(M6_cap_screw, 30)` |  Screw M6 cap x 30mm |
@@ -3802,7 +3812,7 @@ Veroboard with mounting holes, track breaks, removed tracks, solder points and c
 | `vero_mounting_hole_positions(type)` | Positions children at the mounting holes |
 | `vero_mounting_holes(type, h = 100)` | Drill mounting holes in a panel |
 | `veroboard(type)` | Draw specified veroboard with missing tracks and track breaks |
-| `veroboard_assembly(type, height, thickness, flip = false)` | Draw the assembly with components and fasteners in place |
+| `veroboard_assembly(type, height, thickness, flip = false, ngb = false)` | Draw the assembly with components and fasteners in place |
 
 ![veroboard](tests/png/veroboard.png)
 
@@ -5996,9 +6006,16 @@ Assembly views shown in the instructions can be large or small and this is deduc
 parts are used.
 This heuristic isn't always correct, so the default can be overridden by setting the `big` parameter of `assembly` to `true` or `false`.
 
+Setting the `ngb` parameter of `assembly` to `true` removes its column from the global BOM and merges it parts into its parent assembly column of the global BOM.
+This is to prevent the global BOM page becoming too wide in large projects by having it include just the major assemblies.
+
 The example below shows how to define a vitamin and incorporate it into an assembly with sub-assemblies and make an exploded view.
 The resulting flat BOM is shown but heirachical BOMs are also generated for real projects.
 
+If the code to make an STL or DXF is made a child of the `stl()` or `dxf()` module then the STL or DXF will be used in the assembly views generated by `views.py` instead of generating
+it with code.
+This can speed up the generation of the build instructions greatly but isn't compatible with STLs that include support structures.
+
 [utils/core/bom.scad](utils/core/bom.scad) Implementation.
 
 [tests/BOM.scad](tests/BOM.scad) Code for this example.
@@ -6015,7 +6032,7 @@ The resulting flat BOM is shown but heirachical BOMs are also generated for real
 ### Modules
 | Module | Description |
 |:--- |:--- |
-| `assembly(name, big = undef)` | Name an assembly that will appear on the BOM, there needs to a module named `<name>_assembly` to make it. `big` can force big or small assembly diagrams. |
+| `assembly(name, big = undef, ngb = false)` | Name an assembly that will appear on the BOM, there needs to a module named `<name>_assembly` to make it. `big` can force big or small assembly diagrams. |
 | `dxf(name)` | Name a dxf that will appear on the BOM, there needs to a module named `<name>_dxf` to make it |
 | `explode(d, explode_children = false, offset = [0,0,0])` | Explode children by specified Z distance or vector `d`, option to explode grand children |
 | `hidden()` | Make item invisible, except on the BOM |
@@ -6027,7 +6044,9 @@ The resulting flat BOM is shown but heirachical BOMs are also generated for real
 | `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. |
 | `stl(name)` | Name an stl that will appear on the BOM, there needs to a module named `<name>_stl` to make it |
 | `stl_colour(colour = pp1_colour, alpha = 1)` | Colour an stl where it is placed in an assembly. `alpha` can be used to make it appear transparent. |
-| `vitamin(description)` | Describe a vitamin for the BOM entry and precede it with a module call that creates it, eg. "wigit(42): Type 42 widget" |
+| `use_dxf(name)` | Import a DXF to make a build panel |
+| `use_stl(name)` | Import an STL to make a build platter |
+| `vitamin(description)` | Describe a vitamin for the BOM entry and precede it with a module call that creates it, eg. "widget(42): Widget size 42" |
 
 ![bom](tests/png/bom.png)
 
@@ -6054,9 +6073,9 @@ The resulting flat BOM is shown but heirachical BOMs are also generated for real
 ### Assemblies
 | Qty | Name |
 | ---:|:--- |
+|   1 | widget_assembly |
+|   1 | widget_base_assembly |
 |   1 | widget_top_assembly |
-|   1 | widgit_base_assembly |
-|   1 | wigdit_assembly |
 
 
 <a href="#top">Top</a>
@@ -6217,9 +6236,10 @@ Rectangle with rounded corners.
 ### Modules
 | Module | Description |
 |:--- |:--- |
-| `rounded_rectangle(size, r, center = true, xy_center = true)` | Like `cube()` but corners rounded in XY plane and separate centre options for xy and z. |
-| `rounded_rectangle_xz(size, r, center = true, xy_center = true)` | Like `cube()` but corners rounded in XZ plane and separate centre options for xy and z. |
-| `rounded_rectangle_yz(size, r, center = true, xy_center = true)` | Like `cube()` but corners rounded in YX plane and separate centre options for xy and z. |
+| `rounded_cube_xy(size, r = 0, xy_center = false, z_center = false)` | Like `cube()` but corners rounded in XY plane and separate centre options for xy and z. |
+| `rounded_cube_xz(size, r = 0, xy_center = false, z_center = false)` | Like `cube()` but corners rounded in XZ plane and separate centre options for xy and z. |
+| `rounded_cube_yz(size, r = 0, xy_center = false, z_center = false)` | Like `cube()` but corners rounded in YX plane and separate centre options for xy and z. |
+| `rounded_rectangle(size, r, center = false, xy_center = true)` | Like `cube()` but corners rounded in XY plane and separate centre options for xy and z. |
 | `rounded_square(size, r, center = true)` | Like `square()` but with with rounded corners |
 
 ![rounded_rectangle](tests/png/rounded_rectangle.png)

scripts/bom.py

@@ -60,6 +60,7 @@ class BOM:
     def __init__(self, name):
         self.name = name
         self.big = None
+        self.ngb = False
         self.count = 1
         self.vitamins = {}
         self.printed = {}
@@ -73,6 +74,7 @@ class BOM:
         return {
              "name"       : self.name,
              "big"        : self.big,
+             "ngb"        : self.ngb,
              "count"      : self.count,
              "assemblies" : assemblies,
              "vitamins"   : {v : self.vitamins[v].data() for v in self.vitamins},

scripts/deps.py

@@ -18,6 +18,7 @@
 #
 import os
 from set_config import source_dir
+from colorama import Fore
 
 def mtime(file):
     if os.path.isfile(file):
@@ -41,13 +42,13 @@ def read_deps(dname):
 def check_deps(target, dname):
     target_mtime = mtime(target)
     if not target_mtime:
-        return target + " missing"
+        return Fore.CYAN + target + " missing" + Fore.WHITE
     if not os.path.isfile(dname):
-        return "no deps"
+        return Fore.CYAN + "no deps" + Fore.WHITE
     deps = read_deps(dname)
     for dep in deps:
         if mtime(dep) > target_mtime:
-            return dep + ' changed'
+            return Fore.CYAN + dep + ' changed' + Fore.WHITE
     return None
 
 def source_dirs(bom_dir):

scripts/exports.py

@@ -28,7 +28,10 @@ from set_config import *
 import time
 import times
 from deps import *
+from tmpdir import *
 import json
+import shutil
+from colorama import Fore, init
 
 def bom_to_parts(bom_dir, part_type, assembly = None):
     #
@@ -43,7 +46,7 @@ def bom_to_parts(bom_dir, part_type, assembly = None):
             if words:
                 last_word = words[-1]
                 if last_word.endswith(suffix):
-                   part_files.append(last_word[:-4] + '.' + part_type)
+                    part_files.append(last_word[:-4] + '.' + part_type)
     return part_files
 
 def usage(t):
@@ -62,20 +65,29 @@ def make_parts(target, part_type, parts = None):
     #
     top_dir = set_config(target, lambda: usage(part_type))
     target_dir = top_dir + part_type + 's'
-    deps_dir = top_dir + "deps"
+    deps_dir = target_dir + "/deps"
     bom_dir = top_dir + "bom"
+    tmp_dir = mktmpdir(top_dir)
+
     if not os.path.isdir(target_dir):
         os.makedirs(target_dir)
+
     if not os.path.isdir(deps_dir):
         os.makedirs(deps_dir)
+
+    old_deps = top_dir + 'deps'  #old location
+    if os.path.isdir(old_deps):
+         shutil.rmtree(old_deps)
+
     times.read_times(target_dir)
     #
     # Decide which files to make
     #
+    all_parts = bom_to_parts(bom_dir, part_type)
     if parts:
         targets = list(parts)           #copy the list so we dont modify the list passed in
     else:
-        targets = bom_to_parts(bom_dir, part_type)
+        targets = list(all_parts)
         for file in os.listdir(target_dir):
             if file.endswith('.' + part_type):
                 if not file in targets:
@@ -119,15 +131,15 @@ def make_parts(target, part_type, parts = None):
                                         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"
+                                            changed = Fore.CYAN + "No bounds" + Fore.WHITE
                                         if changed:
                                             print(changed)
                                             #
                                             # make a file to use the module
                                             #
-                                            part_maker_name = part_type + ".scad"
+                                            part_maker_name = tmp_dir + '/' + part_type + ".scad"
                                             with open(part_maker_name, "w") as f:
-                                                f.write("use <%s/%s>\n" % (dir, filename))
+                                                f.write("use <%s/%s>\n" % (reltmp(dir, target), filename))
                                                 f.write("%s();\n" % module);
                                             t = time.time()
                                             openscad.run("-D$bom=1", "-d", dname, "-o", part_file, part_maker_name)
@@ -144,10 +156,14 @@ def make_parts(target, part_type, parts = None):
         with open(bounds_fname, 'w') as outfile:
             json.dump(bounds_map, outfile, indent = 4)
     #
+    # Remove tmp dir
+    #
+    rmtmpdir(tmp_dir)
+    #
     # List the ones we didn't find
     #
     if targets:
         for part in targets:
             print("Could not find a module called", part[:-4] + module_suffix, "to make", part)
         usage(part_type)
-    times.print_times()
+    times.print_times(all_parts)

scripts/gallery.py

@@ -68,9 +68,10 @@ def gallery(force):
                             match = re.match(r"^(#+).*$", line)
                             if match:
                                 line = '#' + line
-                        if line == '---\n':
-                            break;
-                        print(line[:-1], file = output_file)
+                        if line == '---\n' or line == '<span></span>\n':
+                            break
+                        if line != '<a name="TOP"></a>\n':
+                            print(line[:-1], file = output_file)
             else:
                 print(Fore.MAGENTA + "Can't find", document, Fore.WHITE);
     with open(target_dir + "/readme.html", "wt") as html_file:

scripts/openscad.py

@@ -32,12 +32,18 @@ def run_list(args, silent = False, verbose = False):
         print()
     with open("openscad.log", "w") as log:
         rc = subprocess.call(cmd, stdout = log, stderr = log)
-    for line in open("openscad.log", "rt"):
+    log_file = "openscad.echo" if "openscad.echo" in cmd else "openscad.log"
+    bad = False
+    for line in open(log_file, "rt"):
         if verbose or 'ERROR:' in line or 'WARNING:' in line:
+            bad = True
             print(line[:-1])
     if rc:
         sys.exit(rc)
 
+    if bad:
+        sys.exit(1)
+
 def run(*args):
     run_list(list(args), False)
 

scripts/options.py

@@ -20,6 +20,7 @@
 # Set command line options from enviroment variables and check if they have changed
 
 import json, os, deps
+from colorama import Fore, init
 
 def check_options(dir = '.'):
     global options, options_mtime
@@ -37,7 +38,7 @@ def check_options(dir = '.'):
 
 def have_changed(changed, target):
     if not changed and deps.mtime(target) < options_mtime:
-        return "command line options changed"
+        return Fore.CYAN + "command line options changed" + Fore.WHITE
     return changed
 
 def list():

scripts/plateup.py

@@ -26,8 +26,10 @@ import sys
 import c14n_stl
 from set_config import *
 from deps import *
-from shutil import copyfile
+import shutil
 import re
+import time
+import times
 
 source_dirs = { "stl" : "platters", "dxf" : "panels" }
 target_dirs = { "stl" : "printed",  "dxf" : "routed" }
@@ -41,11 +43,14 @@ def plateup(target, part_type, usage = None):
     target_dir = parts_dir + '/' + target_dirs[part_type]
     source_dir1 = source_dirs[part_type]
     source_dir2 = top_dir + source_dirs[part_type]
+
+    times.read_times(target_dir)
     #
     # Loop through source directories
     #
-    used = []
+    all_used = []
     all_sources = []
+    all_parts = []
     for dir in [source_dir1, source_dir2]:
         if not os.path.isdir(dir):
             continue
@@ -54,9 +59,12 @@ def plateup(target, part_type, usage = None):
         #
         # Make the deps dir
         #
-        deps_dir = dir + "/deps"
+        deps_dir = parts_dir + "/deps"
         if not os.path.isdir(deps_dir):
             os.makedirs(deps_dir)
+
+        if os.path.isdir(dir + '/deps'): #old deps
+            shutil.rmtree(dir + '/deps')
         #
         # Decide which files to make
         #
@@ -65,40 +73,55 @@ def plateup(target, part_type, usage = None):
         #
         # Run OpenSCAD on the source files to make the targets
         #
+        target_def = ['-D$target="%s"' % target] if target else []
+        cwd_def = ['-D$cwd="%s"' % os.getcwd().replace('\\', '/')]
         for src in sources:
             src_file = dir + '/' + src
-            part_file = target_dir + '/' + src[:-4] + part_type
+            part =  src[:-4] + part_type
+            all_parts.append(part)
+            part_file = target_dir + '/' + part
+            uses_file = deps_dir + '/' + src[:-4] + 'txt'
             dname = deps_name(deps_dir, src)
-            changed = check_deps(part_file, dname)
+            oldest = part_file if mtime(part_file) < mtime(uses_file) else uses_file
+            changed = check_deps(oldest, dname)
+            used = []
             if changed:
                 print(changed)
-                openscad.run("-D$bom=1", "-d", dname, "-o", part_file, src_file)
+                t = time.time()
+                openscad.run_list(["-D$bom=1"] + target_def + cwd_def + ["-d", dname, "-o", part_file, src_file])
                 if part_type == 'stl':
                     c14n_stl.canonicalise(part_file)
+                times.add_time(part, t)
                 log_name = 'openscad.log'
+                #
+                # Add the files on the BOM to the used list
+                #
+                with open(log_name) as file:
+                    for line in file.readlines():
+                        match = re.match(r'^ECHO: "~(.*?\.' + part_type + r').*"$', line)
+                        if match:
+                            used.append(match.group(1))
+                with open(uses_file, "wt") as file:
+                    for part in used:
+                        print(part, file = file)
             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():
-                    match = re.match(r'^ECHO: "~(.*?\.' + part_type + r').*"$', line)
-                    if match:
-                        used.append(match.group(1))
+                with open(uses_file, "rt") as file:
+                    for line in file:
+                        used.append(line[:-1])
+            all_used += used
+
     copied = []
     if all_sources:
         #
         # Copy files that are not included
         #
         for file in os.listdir(parts_dir):
-            if file.endswith('.' + part_type) and not file in used:
+            if file.endswith('.' + part_type) and not file in all_used:
                 src = parts_dir + '/' + file
                 dst = target_dir + '/' + file
                 if mtime(src) > mtime(dst):
                     print("Copying %s to %s" % (src, dst))
-                    copyfile(src, dst)
+                    shutil.copyfile(src, dst)
                 copied.append(file)
         #
         # Remove any cruft
@@ -109,3 +132,12 @@ def plateup(target, part_type, usage = None):
                 if not file in targets and not file in copied:
                     print("Removing %s" % file)
                     os.remove(target_dir + '/' + file)
+
+        targets = [file[:-4] + 'txt' for file in all_sources]
+        for file in os.listdir(deps_dir):
+            if file.endswith('.' + 'txt'):
+                if not file in targets:
+                    print("Removing %s" % file)
+                    os.remove(deps_dir + '/' + file)
+
+    times.print_times(all_parts)

scripts/render.py

@@ -30,6 +30,7 @@ from tests import do_cmd, update_image, colour_scheme, background
 from deps import mtime
 from colorama import init
 import json
+from tmpdir import *
 
 def usage():
     print("\nusage:\n\trender [target_config] - Render images of the stl and dxf files.");
@@ -40,6 +41,7 @@ def render(target, type):
     # Make the target directory
     #
     top_dir = set_config(target, usage)
+    tmp_dir = mktmpdir(top_dir)
     target_dir = top_dir + type + 's'
     bom_dir = top_dir + 'bom'
     if not os.path.isdir(target_dir):
@@ -80,7 +82,7 @@ def render(target, type):
         # make a file to import the stl
         #
         if mtime(part_file) > mtime(png_name):
-            png_maker_name = "png.scad"
+            png_maker_name = tmp_dir + "/png.scad"
             pp1 = [0, 146/255, 0]
             colour = pp1
             if part in colours:
@@ -88,15 +90,19 @@ def render(target, type):
                 if not '[' in colour:
                     colour = '"' + colour + '"'
             with open(png_maker_name, "w") as f:
-                f.write('color(%s) import("%s");\n' % (colour, part_file))
+                f.write('color(%s) import("%s");\n' % (colour, reltmp(part_file, target)))
             cam = "--camera=0,0,0,70,0,315,500" if type == 'stl' else "--camera=0,0,0,0,0,0,500"
             render = "--preview" if type == 'stl' or colour != pp1 else "--render"
-            tmp_name = 'tmp.png'
+            tmp_name = tmp_dir + '/' + part[:-4] + '.png'
             openscad.run(colour_scheme, "--projection=p", "--imgsize=4096,4096", cam, render, "--autocenter", "--viewall", "-o", tmp_name, png_maker_name);
             do_cmd(("magick "+ tmp_name + " -trim -resize 280x280 -background %s -gravity Center -extent 280x280 -bordercolor %s -border 10 %s"
                     % (background, background, tmp_name)).split())
             update_image(tmp_name, png_name)
             os.remove(png_maker_name)
+    #
+    # Remove tmp dir
+    #
+    rmtmpdir(tmp_dir)
 
 if __name__ == '__main__':
     init()

scripts/set_config.py

@@ -69,17 +69,22 @@ def set_config(target, usage = None):
         sys.exit(1)
 
     fname = source_dir + "/target.scad"
-    text = "include <config_%s.scad>\n" % target;
-    line = ""
+    text = ['include <config_%s.scad>\n' % target,
+            '$target = "%s";\n' % target,
+            '$cwd="%s";\n' % os.getcwd().replace('\\', '/')
+    ]
+
+    lines = [""]
     try:
         with open(fname,"rt") as f:
-            line = f.read()
+            lines = f.readlines()
     except:
         pass
 
-    if line != text:
+    if lines != text:
         with open(fname,"wt") as f:
-            f. write(text);
+            for t in text:
+                f. write(t);
     return target + "/"
 
 def usage():

scripts/tests.py

@@ -34,6 +34,7 @@ import shutil
 from deps import *
 from blurb import *
 from colorama import Fore
+from tmpdir import *
 
 w = 4096
 h = w
@@ -94,6 +95,7 @@ def usage():
 
 def tests(tests):
     scad_dir = "tests"
+    tmp_dir = mktmpdir(scad_dir + '/')
     deps_dir = scad_dir + "/deps"
     png_dir  = scad_dir + "/png"
     bom_dir  = scad_dir + "/bom"
@@ -234,7 +236,7 @@ def tests(tests):
             if changed:
                 print(changed)
                 t = time.time()
-                tmp_name = 'tmp.png'
+                tmp_name = tmp_dir + '/tmp.png'
                 openscad.run_list(options.list() + ["-D$bom=2", colour_scheme, "--projection=p", "--imgsize=%d,%d" % (w, h), "--camera=0,0,0,70,0,315,500", "--autocenter", "--viewall", "-d", dname, "-o", tmp_name, scad_name]);
                 times.add_time(scad_name, t)
                 do_cmd(["magick", tmp_name, "-trim", "-resize", "1000x600", "-bordercolor", background, "-border", "10", tmp_name])
@@ -303,6 +305,11 @@ def tests(tests):
     with open(doc_base_name + ".html", "wt") as html_file:
         do_cmd(("python -m markdown -x tables " + doc_name).split(), html_file)
     times.print_times()
+    #
+    # Remove tmp dir
+    #
+    rmtmpdir(tmp_dir)
+
     do_cmd(('codespell -L od ' + doc_name).split())
 
 if __name__ == '__main__':

scripts/times.py

@@ -44,7 +44,7 @@ def got_time(name):
 
 def check_have_time(changed, name):
     if not changed and not got_time(name):
-        changed = "no previous time"
+        changed = Fore.CYAN + "no previous time" + Fore.WHITE
     return changed
 
 def add_time(name, start):
@@ -52,23 +52,34 @@ def add_time(name, start):
         del times[name.lower()]
     times[name] = round(time.time() - start, 3)
 
-def print_times():
-    write_times()
+def print_times(files = None):
     sorted_times = sorted(times.items(), key=lambda kv: kv[1])
     total = 0
+    old_total = 0
     for entry in sorted_times:
-        colour = Fore.WHITE
         key = entry[0]
-        new = entry[1]
-        delta = 0
-        if key in last_times:
-            old = last_times[key]
-            delta = new - old
-            if delta > 0.3:
-                colour = Fore.RED
-            if delta < -0.3:
-                colour = Fore.GREEN
-        print(colour + "%5.1f %5.1f %s" % (new, delta, key))
-        total += new
+        if files and not key in files:
+            del times[key]
+        else:
+            new = entry[1]
+            delta = 0
+            colour = Fore.WHITE
+            if key in last_times:
+                old = last_times[key]
+                old_total += old
+                delta = new - old
+                if delta > 0.3:
+                    colour = Fore.RED
+                if delta < -0.3:
+                    colour = Fore.GREEN
+            print(colour + "%6.1f %5.1f %s" % (new, delta, key))
+            total += new
+    write_times()
     if sorted_times:
-        print(Fore.WHITE + "%5.1f" % total)
+        colour = Fore.WHITE
+        delta = total - old_total
+        if delta > 1:
+            colour = Fore.RED
+        if delta < -1:
+            colour = Fore.GREEN
+        print(colour + "%6.1f %5.1f TOTAL%s" % (total, delta, Fore.WHITE))

scripts/tmpdir.py

@@ -0,0 +1,40 @@
+#
+# NopSCADlib Copyright Chris Palmer 2021
+# 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/>.
+#
+"""
+Make a directory for tmp files.
+"""
+import os
+import time
+
+def mktmpdir(top_dir):
+    tmp_dir = top_dir + 'tmp'
+    if not os.path.isdir(tmp_dir):
+        os.makedirs(tmp_dir)
+    else:
+        for file in os.listdir(tmp_dir):
+            os.remove(tmp_dir + '/' + file)
+    return tmp_dir
+
+def reltmp(dir, target):
+    return dir if os.path.isabs(dir) else '../../' + dir if target else '../' + dir
+
+def rmtmpdir(tmp_dir):
+    os.rmdir(tmp_dir)
+    while os.path.isdir(tmp_dir):
+        time.sleep(0.1)

scripts/views.py

@@ -36,7 +36,9 @@ import blurb
 import bom
 import shutil
 import re
+import copy
 from colorama import Fore
+from tmpdir import *
 
 def is_assembly(s):
     return s[-9:] == '_assembly' or s[-11:] == '_assemblies'
@@ -74,19 +76,17 @@ def bom_to_assemblies(bom_dir, bounds_map):
     # Remove the main assembly if it is a shell
     #
     if flat_bom:
-        ass =  flat_bom[-1]
+        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]
     return [assembly["name"] for  assembly in flat_bom]
 
-def eop(print_mode, doc_file, last = False, first = False):
-    if print_mode:
-         print('\n<div style="page-break-after: always;"></div>', file = doc_file)
-    else:
-        if not first:
-            print('[Top](#TOP)',   file = doc_file)
-        if not last:
-            print("\n---", file = doc_file)
+def eop(doc_file, last = False, first = False):
+    print('<span></span>', file = doc_file)     # An invisable marker for page breaks because markdown takes much longer if the document contains a div
+    if not first:
+        print('[Top](#TOP)', file = doc_file)
+    if not last:
+        print("\n---", file = doc_file)
 
 def pad(s, before, after = 0):
     return '&nbsp;' * before + str(s) + '&nbsp;' * after
@@ -103,14 +103,36 @@ def usage():
     print("\nusage:\n\t views [target_config] [<name1>_assembly] ... [<nameN>_assembly] - Create assembly images and readme.")
     sys.exit(1)
 
+types = ["vitamins", "printed", "routed"]
+
+def merged(bom):
+    bom = copy.deepcopy(bom)
+    for aname in bom["assemblies"]:
+        count = bom["assemblies"][aname]
+        for ass in flat_bom:
+            if ass['name'] == aname and ass['ngb']:
+                merged_assembly = merged(ass)
+                total = ass['count']
+                for t in types:
+                    for thing in merged_assembly[t]:
+                        items = merged_assembly[t][thing]['count'] * count // total
+                        if thing in bom[t]:
+                            bom[t][thing]['count'] += items
+                        else:
+                            bom[t][thing] = merged_assembly[t][thing]
+                            bom[t][thing]['count'] = items
+                break
+    return bom
+
 def views(target, do_assemblies = None):
     done_assemblies = []
     #
     # Make the target directory
     #
     top_dir = set_config(target, usage)
+    tmp_dir = mktmpdir(top_dir)
     target_dir = top_dir + 'assemblies'
-    deps_dir = top_dir + "deps"
+    deps_dir = target_dir + "/deps"
     bom_dir = top_dir + "bom"
     if not os.path.isdir(target_dir):
         os.makedirs(target_dir)
@@ -139,6 +161,7 @@ def views(target, do_assemblies = None):
     # Find all the scad files
     #
     main_blurb = None
+    pngs = []
     for dir in source_dirs(bom_dir):
         if os.path.isdir(dir):
             for filename in os.listdir(dir):
@@ -165,30 +188,38 @@ def views(target, do_assemblies = None):
                                             if not "blurb" in ass:
                                                 ass["blurb"] = blurb.scrape_module_blurb(lines[:line_no])
                                             break
-                                    if not do_assemblies or real_name in do_assemblies:
+
+                                    #
+                                    # Run openscad on the created file
+                                    #
+                                    dname = deps_name(deps_dir, filename)
+                                    for explode in [0, 1]:
                                         #
-                                        # Run openscad on the created file
+                                        # Generate png name
                                         #
-                                        dname = deps_name(deps_dir, filename)
-                                        for explode in [0, 1]:
-                                            png_name = target_dir + '/' + real_name + '.png'
-                                            if not explode:
-                                                png_name = png_name.replace('_assembly', '_assembled')
+                                        png_name = target_dir + '/' + real_name + '.png'
+                                        if not explode:
+                                            png_name = png_name.replace('_assembly', '_assembled')
+                                        pngs.append(png_name)
+
+                                        if not do_assemblies or real_name in do_assemblies:
                                             changed = check_deps(png_name, dname)
                                             changed = times.check_have_time(changed, png_name)
                                             changed = options.have_changed(changed, png_name)
-                                            tmp_name = 'tmp.png'
+                                            tmp_name = tmp_dir + '/' + real_name + '.png'
                                             if changed:
                                                 print(changed)
                                                 #
                                                 # make a file to use the module
                                                 #
-                                                png_maker_name = 'png.scad'
+                                                png_maker_name = tmp_dir + '/png.scad'
                                                 with open(png_maker_name, "w") as f:
-                                                    f.write("use <%s/%s>\n" % (dir, filename))
+                                                    f.write("use <%s/%s>\n" % (reltmp(dir, target), filename))
                                                     f.write("%s();\n" % module);
                                                 t = time.time()
-                                                openscad.run_list(options.list() + ["-D$pose=1", "-D$explode=%d" % explode, colour_scheme, "--projection=p", "--imgsize=4096,4096", "--autocenter", "--viewall", "-d", dname, "-o", tmp_name, png_maker_name]);
+                                                target_def = ['-D$target="%s"' % target] if target else []
+                                                cwd_def = ['-D$cwd="%s"' % os.getcwd().replace('\\', '/')]
+                                                openscad.run_list(options.list() + target_def + cwd_def + ["-D$pose=1", "-D$explode=%d" % explode, colour_scheme, "--projection=p", "--imgsize=4096,4096", "--autocenter", "--viewall", "-d", dname, "-o", tmp_name, png_maker_name]);
                                                 times.add_time(png_name, t)
                                                 do_cmd(["magick", tmp_name, "-trim", "-resize", "1004x1004", "-bordercolor", background, "-border", "10", tmp_name])
                                                 update_image(tmp_name, png_name)
@@ -202,193 +233,221 @@ def views(target, do_assemblies = None):
                                     if module == 'main_assembly':
                                         main_blurb = blurb.scrape_module_blurb(lines[:line_no])
                         line_no += 1
-    times.print_times()
     #
     # Build the document
     #
-    for print_mode in [True, False]:
-        doc_name = top_dir + "readme.md"
-        with open(doc_name, "wt") as doc_file:
-            #
-            # Title, description and picture
-            #
-            project = ' '.join(word[0].upper() + word[1:] for word in os.path.basename(os.getcwd()).split('_'))
-            print('<a name="TOP"></a>\n# %s' % project, file = doc_file)
-            main_file = bom.find_scad_file('main_assembly')
-            if not main_file:
-                raise Exception("can't find source for main_assembly")
-            text = blurb.scrape_blurb(source_dir + '/' + main_file)
-            blurbs = blurb.split_blurb(text)
-            if len(text):
-                print(blurbs[0], file = doc_file)
-            else:
-                if print_mode:
-                    print(Fore.MAGENTA + "Missing project description" + Fore.WHITE)
-            #
-            # Only add the image if the first blurb section doesn't contain one.
-            #
-            if not re.search(r'\!\[.*\]\(.*\)', blurbs[0], re.MULTILINE):
-                print('![Main Assembly](assemblies/%s.png)\n' % flat_bom[-1]["name"].replace('_assembly', '_assembled'), file = doc_file)
-            eop(print_mode, doc_file, first = True)
-            #
-            # Build TOC
-            #
-            print('## Table of Contents', file = doc_file)
-            print('1. [Parts list](#Parts_list)', file = doc_file)
-            for ass in flat_bom:
-                name =  ass["name"]
-                cap_name = titalise(name)
-                print('1. [%s](#%s)' % (cap_name, name), file = doc_file)
-            print(file = doc_file)
-            if len(blurbs) > 1:
-                print(blurbs[1], file = doc_file)
-            eop(print_mode, doc_file)
-            #
-            # Global BOM
-            #
-            print('<a name="Parts_list"></a>\n## Parts list', file = doc_file)
-            types = ["vitamins", "printed", "routed"]
-            headings = {"vitamins" : "vitamins", "printed" : "3D printed parts", "routed" : "CNC routed parts"}
-            things = {}
+    doc_name = top_dir + "readme.md"
+    with open(doc_name, "wt") as doc_file:
+        #
+        # Title, description and picture
+        #
+        project = ' '.join(word[0].upper() + word[1:] for word in os.path.basename(os.getcwd()).split('_'))
+        print('<a name="TOP"></a>', file = doc_file)
+        print('# %s' % project, file = doc_file)
+        main_file = bom.find_scad_file('main_assembly')
+        if not main_file:
+            raise Exception("can't find source for main_assembly")
+        text = blurb.scrape_blurb(source_dir + '/' + main_file)
+        blurbs = blurb.split_blurb(text)
+        if len(text):
+            print(blurbs[0], file = doc_file)
+        else:
+            print(Fore.MAGENTA + "Missing project description" + Fore.WHITE)
+        #
+        # Only add the image if the first blurb section doesn't contain one.
+        #
+        if not re.search(r'\!\[.*\]\(.*\)', blurbs[0], re.MULTILINE):
+            print('![Main Assembly](assemblies/%s.png)\n' % flat_bom[-1]["name"].replace('_assembly', '_assembled'), file = doc_file)
+        eop(doc_file, first = True)
+        #
+        # Build TOC
+        #
+        print('## Table of Contents', file = doc_file)
+        print('1. [Parts list](#Parts_list)', file = doc_file)
+        for ass in flat_bom:
+            name =  ass["name"]
+            cap_name = titalise(name)
+            print('1. [%s](#%s)' % (cap_name, name), file = doc_file)
+        print(file = doc_file)
+        if len(blurbs) > 1:
+            print(blurbs[1], file = doc_file)
+        eop(doc_file)
+        #
+        # Global BOM
+        #
+        global_bom = [merged(ass) for ass in flat_bom if not ass['ngb']]
+        print('<a name="Parts_list"></a>\n## Parts list', file = doc_file)
+        headings = {"vitamins" : "vitamins", "printed" : "3D printed parts", "routed" : "CNC routed parts"}
+        things = {}
+        for t in types:
+            things[t] = {}
+        for ass in flat_bom:
             for t in types:
-                things[t] = {}
-            for ass in flat_bom:
-                for t in types:
-                    for thing in ass[t]:
-                        if thing in things[t]:
-                            things[t][thing] += ass[t][thing]["count"]
-                        else:
-                            things[t][thing] = ass[t][thing]["count"]
-            for ass in flat_bom:
-                name = titalise(ass["name"][:-9]).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)
+                for thing in ass[t]:
+                    if thing in things[t]:
+                        things[t][thing] += ass[t][thing]["count"]
+                    else:
+                        things[t][thing] = ass[t][thing]["count"]
+        for ass in global_bom:
+            name = titalise(ass["name"][:-9]).replace(' ','&nbsp;')
+            if ass["count"] > 1:
+                name = "%d x %s" % (ass["count"], name)
+            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(global_bom) + '|---:|:---|'), file = doc_file)
 
-            print(('|---:' * len(flat_bom) + '|---:|:---|'), 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]["count"] 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:
+        for t in types:
+            if things[t]:
+                totals = {}
+                grand_total2 = 0
+                heading = headings[t][0].upper() + headings[t][1:]
+                print(('|  ' * len(global_bom) + '| | **%s** |') % heading, file = doc_file)
+                for thing in sorted(things[t], key = lambda s: s.split(":")[-1]):
+                    for ass in global_bom:
+                        count = ass[t][thing]["count"] if thing in ass[t] else 0
+                        print('| %s ' % pad(count if count else '.', 2, 1), file = doc_file, end = '')
                         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)
+                        if name in totals:
+                            totals[name] += count
+                        else:
+                            totals[name] = count
+                        grand_total2 += count
+                    print('|  %s | %s |' % (pad(things[t][thing], 2, 1), pad(thing.split(":")[-1], 2)), file = doc_file)
 
-            print(file = doc_file)
-            if len(blurbs) > 2:
-                print(blurbs[2], file = doc_file)
-            eop(print_mode, doc_file)
-            #
-            # Assembly instructions
-            #
-            for ass in flat_bom:
-                name = ass["name"]
-                cap_name = titalise(name)
-
-                if ass["count"] > 1:
-                    print('<a name="%s"></a>\n## %d x %s' % (name, ass["count"], cap_name), file = doc_file)
-                else:
-                    print('<a name="%s"></a>\n## %s' % (name, cap_name), file = doc_file)
-                vitamins = ass["vitamins"]
-                if vitamins:
-                    print("### Vitamins",         file = doc_file)
-                    print("|Qty|Description|",    file = doc_file)
-                    print("|---:|:----------|",    file = doc_file)
-                    for v in sorted(vitamins, key = lambda s: s.split(":")[-1]):
-                        print("|%d|%s|" % (vitamins[v]["count"], v.split(":")[1]),     file = doc_file)
-                    print("\n", file = doc_file)
-
-                printed = ass["printed"]
-                if printed:
-                    print('### 3D Printed parts', file = doc_file)
-                    keys = sorted(list(printed.keys()))
-                    for i, p in enumerate(keys):
-                        print('%s %d x %s |' % ('\n|' if not (i % 3) else '', printed[p]["count"], 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 = 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)
-                    print('\n', file  = doc_file)
-
-                routed = ass["routed"]
-                if routed:
-                    print("### CNC Routed parts", file = doc_file)
-                    keys = sorted(list(routed.keys()))
-                    for i, r in enumerate(keys):
-                        print('%s %d x %s |' % ('\n|' if not (i % 3) else '', routed[r]["count"], 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 = 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)
-                    print('\n', file  = doc_file)
-
-                sub_assemblies = ass["assemblies"]
-                if sub_assemblies:
-                    print("### Sub-assemblies", file = doc_file)
-                    keys = sorted(list(sub_assemblies.keys()))
-                    for i, a in enumerate(keys):
-                        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 = 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)
-                    print('\n', file  = doc_file)
-
-                small = not ass["big"]
-                suffix = '_tn.png' if small else '.png'
-                print('### Assembly instructions', file = doc_file)
-                print('![%s](assemblies/%s)\n' % (name, name + suffix), file = doc_file)
-
-                if "blurb" in ass and ass["blurb"]:
-                    print(ass["blurb"], file = doc_file)
-                else:
-                    if print_mode:
-                        print(Fore.MAGENTA + "Missing instructions for %s" % name, Fore.WHITE)
-
-                name = name.replace('_assembly', '_assembled')
-                print('![%s](assemblies/%s)\n' % (name, name + suffix), file = doc_file)
-                eop(print_mode, doc_file, last = ass == flat_bom[-1] and not main_blurb)
-            #
-            # If main module is suppressed print any blurb here
-            #
-            if main_blurb:
-                print(main_blurb, file = doc_file)
-                eop(print_mode, doc_file, last = True)
+                grand_total = 0
+                for ass in global_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)
+                assert grand_total == grand_total2
+        print(file = doc_file)
+        if len(blurbs) > 2:
+            print(blurbs[2], file = doc_file)
+        eop(doc_file)
         #
-        # Convert to HTML
+        # Assembly instructions
         #
-        html_name = "printme.html" if print_mode else "readme.html"
-        with open(top_dir + html_name, "wt") as html_file:
-            do_cmd(("python -m markdown -x tables -x sane_lists " + doc_name).split(), html_file)
+        for ass in flat_bom:
+            name = ass["name"]
+            cap_name = titalise(name)
+
+            print('<a name="%s"></a>' % name, file = doc_file)
+            if ass["count"] > 1:
+                print('## %d x %s' % (ass["count"], cap_name), file = doc_file)
+            else:
+                print('## %s' % cap_name, file = doc_file)
+            vitamins = ass["vitamins"]
+            if vitamins:
+                print("### Vitamins",         file = doc_file)
+                print("|Qty|Description|",    file = doc_file)
+                print("|---:|:----------|",    file = doc_file)
+                for v in sorted(vitamins, key = lambda s: s.split(":")[-1]):
+                    print("|%d|%s|" % (vitamins[v]["count"], v.split(":")[1]),     file = doc_file)
+                print("\n", file = doc_file)
+
+            printed = ass["printed"]
+            if printed:
+                print('### 3D Printed parts', file = doc_file)
+                keys = sorted(list(printed.keys()))
+                for i, p in enumerate(keys):
+                    print('%s %d x %s |' % ('\n|' if not (i % 3) else '', printed[p]["count"], 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 = 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)
+                print('\n', file  = doc_file)
+
+            routed = ass["routed"]
+            if routed:
+                print("### CNC Routed parts", file = doc_file)
+                keys = sorted(list(routed.keys()))
+                for i, r in enumerate(keys):
+                    print('%s %d x %s |' % ('\n|' if not (i % 3) else '', routed[r]["count"], 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 = 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)
+                print('\n', file  = doc_file)
+
+            sub_assemblies = ass["assemblies"]
+            if sub_assemblies:
+                print("### Sub-assemblies", file = doc_file)
+                keys = sorted(list(sub_assemblies.keys()))
+                for i, a in enumerate(keys):
+                    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 = 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)
+                print('\n', file  = doc_file)
+
+            small = not ass["big"]
+            suffix = '_tn.png' if small else '.png'
+            print('### Assembly instructions', file = doc_file)
+            print('![%s](assemblies/%s)\n' % (name, name + suffix), file = doc_file)
+
+            if "blurb" in ass and ass["blurb"]:
+                print(ass["blurb"], file = doc_file)
+            else:
+                print(Fore.MAGENTA + "Missing instructions for %s" % name, Fore.WHITE)
+
+            name = name.replace('_assembly', '_assembled')
+            print('![%s](assemblies/%s)\n' % (name, name + suffix), file = doc_file)
+            eop(doc_file, last = ass == flat_bom[-1] and not main_blurb)
+        #
+        # If main module is suppressed print any blurb here
+        #
+        if main_blurb:
+            print(main_blurb, file = doc_file)
+            eop(doc_file, last = True)
+    #
+    # Convert to HTML
+    #
+    html_name = top_dir + 'readme.html'
+    t = time.time()
+    with open(html_name, "wt") as html_file:
+        do_cmd(("python -m markdown -x tables -x sane_lists " + doc_name).split(), html_file)
+    times.add_time(html_name, t)
+    times.print_times(pngs + [html_name])
+    #
+    # Make the printme.html by replacing empty spans that invisbly mark the page breaks by page break divs.
+    #
+    with open(html_name, 'rt') as src:
+        lines = src.readlines()
+
+    i = 0
+    with open(top_dir + 'printme.html', 'wt') as dst:
+        while i < len(lines):
+            line = lines[i]
+            if line.startswith('<p><span></span>'):                # Empty span used to mark page breaks
+                i += 1
+                if lines[i].startswith('<a href="#TOP">Top</a>'):  # The first page break won't have one
+                    i += 1
+                if i < len(lines) and lines[i] == '<hr />\n':      # The last page break doesn't have one
+                    dst.write('<div style="page-break-after: always;"></div>\n')
+                    i += 1
+            else:
+                dst.write(line)
+                i += 1
+    #
+    # Remove tmp dir
+    #
+    rmtmpdir(tmp_dir)
     #
     # Spell check
     #
-    do_cmd('codespell -L od readme.md'.split())
+    do_cmd(('codespell -L od ' + top_dir + 'readme.md').split())
     #
     # List the ones we didn't find
     #

tests/BOM.scad

@@ -43,31 +43,29 @@ module widget(thickness) {
     }
 }
 
-module widgit_stl() {
-    stl("widget");
+module widget_stl() {
+    stl("widget")
+        union() {
+            rounded_rectangle([30, 30, 3], 2, true);
 
-    union() {
-        rounded_rectangle([30, 30, 3], 2);
-
-        render() insert_boss(insert, height, 2.2);
-    }
+            render() insert_boss(insert, height, 2.2);
+        }
 }
 
-module widgit_dxf() {
-    dxf("widget");
+module widget_dxf() {
+    dxf("widget")
+        difference() {
+            sheet_2D(sheet, 20, 20, 1);
 
-    difference() {
-        sheet_2D(sheet, 20, 20, 1);
-
-        drill(screw_clearance_radius(screw), 0);
-    }
+            drill(screw_clearance_radius(screw), 0);
+        }
 }
 
 //! * Push the insert into the base with a soldering iron heated to 200°C
-module widgit_base_assembly()
-assembly("widgit_base") {
+module widget_base_assembly()
+assembly("widget_base") {
     stl_colour(pp1_colour)
-        widgit_stl();
+        widget_stl();
 
     translate_z(height)
         insert(insert);
@@ -80,14 +78,14 @@ assembly("widget_top") {
         widget(sheet_thickness(sheet));
 
     render_2D_sheet(sheet)      // Must be last because it is transparent
-        widgit_dxf();
+        widget_dxf();
 }
 
 //! * Screw the two assemblies together
-module widgit_assembly()
-assembly("wigdit") {
+module widget_assembly()
+assembly("widget") {
 
-    widgit_base_assembly();                 // Note this is not exloded because it is sub-assembly
+    widget_base_assembly();                 // Note this is not exloded because it is sub-assembly
 
     translate_z(height) {
         translate_z(sheet_thickness(sheet))
@@ -100,7 +98,7 @@ assembly("wigdit") {
 }
 
 module boms() {
-    widgit_assembly();
+    widget_assembly();
 }
 
 boms();

tests/blowers.scad

@@ -22,7 +22,7 @@ use <../utils/layout.scad>
 include <../vitamins/blowers.scad>
 
 module blowers()
-    layout([for(b = blowers) blower_width(b)], 10, true) let(b = blowers[$i]){
+    layout([for(b = blowers) blower_width(b)], 5, true) let(b = blowers[$i]){
         screw = blower_screw(b);
         h = blower_lug(b);
 

tests/horiholes.scad

@@ -56,7 +56,7 @@ module horiholes_stl(t = thickness) {
         }
     if(t == thickness)
         translate([length / 2, 0])
-            rounded_rectangle([length + 2 * overlap_x, thickness + 2 * overlap_y, 2], 5);
+            rounded_rectangle([length + 2 * overlap_x, thickness + 2 * overlap_y, 2], 5, true);
 }
 
 module horiholes() {

tests/rails.scad

@@ -26,15 +26,16 @@ sheet = 3;
 pos = 1; //[-1 : 0.1 : 1]
 
 module rails()
-    layout([for(l = rails) carriage_width(rail_carriage(l))], 20)
+    layout([for(l = carriages) carriage_width(l)], 20)
         rotate(-90) {
-            rail = rails[$i];
+            carriage = carriages[$i];
+            rail = carriage_rail(carriage);
             length = 200;
             screw = rail_screw(rail);
             nut = screw_nut(screw);
             washer = screw_washer(screw);
 
-            rail_assembly(rail, length, pos * rail_travel(rail, length) / 2, $i<2 ? grey(20) : "green", $i<2 ? grey(20) : "red");
+            rail_assembly(carriage, length, pos * carriage_travel(carriage, length) / 2, $i<2 ? grey(20) : "green", $i<2 ? grey(20) : "red");
 
             rail_screws(rail, length, sheet + nut_thickness(nut, true) + washer_thickness(washer));
 

tests/rounded_rectangle.scad

@@ -27,10 +27,13 @@ module rounded_rectangles() {
         rounded_rectangle([30, 20, 10], 3);
 
     translate([80, 0])
-        rounded_rectangle_xz([30, 20, 10], 3);
+        rounded_cube_xy([30, 20, 10], 3);
 
     translate([120, 0])
-        rounded_rectangle_yz([30, 20, 10], 3);
+        rounded_cube_xz([30, 20, 10], 3);
+
+    translate([160, 0])
+        rounded_cube_yz([30, 20, 10], 3);
 }
 
 rounded_rectangles();

utils/core/bom.scad

@@ -25,8 +25,15 @@
 //! parts are used.
 //! This heuristic isn't always correct, so the default can be overridden by setting the `big` parameter of `assembly` to `true` or `false`.
 //!
+//! Setting the `ngb` parameter of `assembly` to `true` removes its column from the global BOM and merges it parts into its parent assembly column of the global BOM.
+//! This is to prevent the global BOM page becoming too wide in large projects by having it include just the major assemblies.
+//!
 //! The example below shows how to define a vitamin and incorporate it into an assembly with sub-assemblies and make an exploded view.
 //! The resulting flat BOM is shown but heirachical BOMs are also generated for real projects.
+//!
+//! If the code to make an STL or DXF is made a child of the `stl()` or `dxf()` module then the STL or DXF will be used in the assembly views generated by `views.py` instead of generating
+//! it with code.
+//! This can speed up the generation of the build instructions greatly but isn't compatible with STLs that include support structures.
 //
 function bom_mode(n = 1) = $_bom >= n && (is_undef($on_bom) || $on_bom);  //! Current BOM mode, 0 = none, 1 = printed and routed parts and assemblies, 2 includes vitamins as well
 function exploded() = is_undef($exploded_parent) ? $exploded : 0;   //! Returns the value of `$exploded` if it is defined, else `0`
@@ -84,9 +91,9 @@ module pose_vflip(exploded = undef)       //! Pose an STL or assembly for render
                 children();
 
 
-module assembly(name, big = undef) {    //! Name an assembly that will appear on the BOM, there needs to a module named `<name>_assembly` to make it. `big` can force big or small assembly diagrams.
+module assembly(name, big = undef, ngb = false) {    //! Name an assembly that will appear on the BOM, there needs to a module named `<name>_assembly` to make it. `big` can force big or small assembly diagrams.
     if(bom_mode()) {
-        args = is_undef(big) ? "" : str("(big=", big, ")");
+        args = is_undef(big) && !ngb ? "" : str("(big=", big, ", ngb=", ngb, ")");
         echo(str("~", name, "_assembly", args, "{"));
     }
     no_pose()
@@ -108,21 +115,43 @@ module stl_colour(colour = pp1_colour, alpha = 1) { //! Colour an stl where it i
 }
 
 module stl(name) {                      //! Name an stl that will appear on the BOM, there needs to a module named `<name>_stl` to make it
-    if(bom_mode()) {
+    if(bom_mode() && is_undef($in_stl)) {
         colour = is_undef($stl_colour) ? pp1_colour : $stl_colour;
         echo(str("~", name, ".stl(colour='", colour, "')"));
     }
+    if($children)
+        if(is_undef($pose))
+            let($in_stl = true)
+                children();
+        else {
+            path = is_undef($target) ? "/stls/" : str("/", $target, "/stls/");
+            import(str($cwd, path, name, ".stl"));
+        }
 }
 
 module dxf(name) {                      //! Name a dxf that will appear on the BOM, there needs to a module named `<name>_dxf` to make it
-    if(bom_mode()) {
+    if(bom_mode() && is_undef($in_dxf)) {
         if(is_undef($dxf_colour))
             echo(str("~", name, ".dxf"));
         else
             echo(str("~", name, ".dxf(colour='", $dxf_colour, "')"));
     }
+    if($children)
+        if(is_undef($pose))
+            let($in_dfx = true)
+                children();
+        else {
+            path = is_undef($target) ? "/dxfs/" : str("/", $target, "/dxfs/");
+            import(str($cwd, path, name, ".dxf"));
+        }
 }
 
+module use_stl(name)                //! Import an STL to make a build platter
+    assert(false);                  // Here for documentation only, real version in core.scad
+
+module use_dxf(name)                //! Import a DXF to make a build panel
+    assert(false);                  // Here for documentation only, real version in core.scad
+
 function value_string(value) = is_string(value) ? str("\"", value, "\"") : str(value); //! Convert `value` to a string or quote it if it is already a string
 
 function arg(value, default, name = "") =   //! Create string for arg if not default, helper for `vitamin()`
@@ -130,7 +159,7 @@ function arg(value, default, name = "") =   //! Create string for arg if not def
                      : name ? str(", ", name, " = ", value_string(value))
                             : str(", ", value_string(value));
 
-module vitamin(description) {                //! Describe a vitamin for the BOM entry and precede it with a module call that creates it, eg. "wigit(42): Type 42 widget"
+module vitamin(description) {                //! Describe a vitamin for the BOM entry and precede it with a module call that creates it, eg. "widget(42): Widget size 42"
     if(bom_mode(2))
         echo(str("~", description, !is_undef($hidden) ? " - not shown" : ""));
 }

utils/core/core.scad

@@ -28,12 +28,12 @@ use <global.scad>
 
 module use_stl(name) {               //! Import an STL to make a build platter
     stl(name);
-    path = is_undef($target) ? "../stls/" : str("../", $target, "/stls/");
+    path = is_undef($target) ? "../stls/" : str($cwd, "/", $target, "/stls/");
     import(str(path, name, ".stl"));
 }
 
 module use_dxf(name) {               //! Import a DXF to make a build panel
     dxf(name);
-    path = is_undef($target) ? "../dxfs/" : str("../", $target, "/dxfs/");
+    path = is_undef($target) ? "../dxfs/" : str($cwd, "/", $target, "/dxfs/");
     import(str(path, name, ".dxf"));
 }

utils/core/rounded_rectangle.scad

@@ -22,26 +22,33 @@
 //
 module rounded_square(size, r, center = true) //! Like `square()` but with with rounded corners
 {
+    assert(r < min(size.x, size.y) / 2);
     $fn = r2sides4n(r);
     offset(r) offset(-r) square(size, center = center);
 }
 
-module rounded_rectangle(size, r, center = true, xy_center = true) //! Like `cube()` but corners rounded in XY plane and separate centre options for xy and z.
+module rounded_rectangle(size, r, center = false, xy_center = true) //! Like `cube()` but corners rounded in XY plane and separate centre options for xy and z.
 {
-    linear_extrude(size.z, center = center)
+    extrude_if(size.z, center = center)
         rounded_square([size.x, size.y], r, xy_center);
 }
 
-module rounded_rectangle_xz(size, r, center = true, xy_center = true) //! Like `cube()` but corners rounded in XZ plane and separate centre options for xy and z.
+module rounded_cube_xy(size, r = 0, xy_center = false, z_center = false) //! Like `cube()` but corners rounded in XY plane and separate centre options for xy and z.
 {
-    translate([xy_center ? 0 : size.x / 2, xy_center ? 0 : size.y / 2, center ? 0 : size.z / 2])
-        rotate([90, 0, 0])
-            rounded_rectangle([size.x, size.z, size.y], r, center = true, xy_center = true);
+    extrude_if(size.z, center = z_center)
+        rounded_square([size.x, size.y], r, xy_center);
 }
 
-module rounded_rectangle_yz(size, r, center = true, xy_center = true) //! Like `cube()` but corners rounded in YX plane and separate centre options for xy and z.
+module rounded_cube_xz(size, r = 0, xy_center = false, z_center = false) //! Like `cube()` but corners rounded in XZ plane and separate centre options for xy and z.
 {
-    translate([xy_center ? 0 : size.x / 2, xy_center ? 0 : size.y / 2, center ? 0 : size.z / 2])
-        rotate([90, 0, 90])
-            rounded_rectangle([size.y, size.z, size.x], r, center = true, xy_center = true);
+    translate([xy_center ? 0 : size.x / 2, xy_center ? 0 : size.y / 2, z_center ? 0 : size.z / 2])
+        rotate([90, 0, 0])
+            rounded_cube_xy([size.x, size.z, size.y], r, xy_center = true, z_center = true);
+}
+
+module rounded_cube_yz(size, r = 0, xy_center = false, z_center = false) //! Like `cube()` but corners rounded in YX plane and separate centre options for xy and z.
+{
+    translate([xy_center ? 0 : size.x / 2, xy_center ? 0 : size.y / 2, z_center ? 0 : size.z / 2])
+        rotate([90, 0, 90])
+            rounded_cube_xy([size.y, size.z, size.x], r, xy_center = true, z_center = true);
 }

utils/rounded_right_triangle.scad

@@ -31,15 +31,15 @@ module rounded_right_triangle(x, y, z, fillet, center = true, offset = false) {
         hull() {
             translate([0, fillet, size.z / 2])
                 rotate([90, 90, 0])
-                    rounded_rectangle([size.z, 2 * fillet, eps], fillet - eps, center = false, xy_center = false);
+                    rounded_rectangle([size.z, 2 * fillet, eps], fillet - eps, xy_center = false);
             translate([0, size.y, size.z / 2])
                 rotate([90, 90, 0])
-                    rounded_rectangle([size.z, 2 * fillet, eps], fillet - eps, center = false, xy_center = false);
+                    rounded_rectangle([size.z, 2 * fillet, eps], fillet - eps, xy_center = false);
             translate([fillet, 0, size.z / 2])
                 rotate([0, 90, 0])
-                    rounded_rectangle([size.z, 2 * fillet, eps], fillet - eps, center = false, xy_center = false);
+                    rounded_rectangle([size.z, 2 * fillet, eps], fillet - eps, xy_center = false);
             translate([size.x, 0, size.z / 2])
                 rotate([0, 90, 0])
-                    rounded_rectangle([size.z, 2 * fillet, eps], fillet - eps, center = false, xy_center = false);
+                    rounded_rectangle([size.z, 2 * fillet, eps], fillet - eps, xy_center = false);
         }
 }

vitamins/battery.scad

@@ -128,7 +128,7 @@ module battery_contact(type, pos = true) { //! Draw a positive or negative batte
     t = contact_thickness(type);
 
     color("silver") {
-        rounded_rectangle([contact_width(type), h, t], r = 1, center = false);
+        rounded_rectangle([contact_width(type), h, t], r = 1);
 
         translate([0, -h / 2, t])
             rotate([90, 0, 0])

vitamins/blower.scad

@@ -40,8 +40,10 @@ function blower_base(type)        = type[13]; //! Thickness of the base
 function blower_top(type)         = type[14]; //! Thickness of the top
 function blower_wall(type)        = type[15]; //! Side wall thickness
 function blower_lug(type)         = type[16]; //! Height of the lugs
+function blower_wall_left(type)   = type[15]; //! Left side wall thickness
+function blower_wall_right(type)  = type[17]; //! Right wall thickness (for square fans)
 
-function blower_casing_is_square(type) = len(blower_screw_holes(type)) > 3; //! True for square radial fans, false for spiral shape radial blowers
+function blower_casing_is_square(type) = blower_depth(type) < 15; //! True for square radial fans, false for spiral shape radial blowers
 function blower_exit_offset(type) = blower_casing_is_square(type) ? blower_length(type) / 2 : blower_exit(type) / 2; //! Offset of exit's centre from the edge
 
 fan_colour = grey(20);
@@ -74,41 +76,54 @@ module blower_fan(type, casing_is_square) {
 module blower_square(type) { //! Draw a square blower
     width = blower_width(type);
     depth = blower_depth(type);
-    wall = blower_wall(type);
+    wall_left = blower_wall_left(type);
+    wall_right = blower_wall_right(type);
+    hole_count = len(blower_screw_holes(type));
     hole_pitch = (blower_screw_holes(type)[1].x - blower_screw_holes(type)[0].x) / 2;
     corner_radius = width / 2 - hole_pitch;
-    corner_inset = (width - blower_exit(type)) / 2;
+    corner_inset = (width - blower_exit(type) - wall_left - wall_right) / (hole_count == 2 ? 1 : 2);
+
+    module inset_corners()
+        translate([width / 2, width / 2])
+            for(i = hole_count == 2 ? [1, 3] : [0 : 3])
+                rotate(i * 90)
+                    translate([-width / 2 - eps, -width/ 2 - eps])
+                        quadrant(corner_inset, corner_inset - corner_radius);
 
     module square_inset_corners(remove_center = false)
         difference() {
             //overall outside
-                square([width, width], center = false);
+            rounded_square([width, width], corner_radius, center = false);
 
             if (remove_center) {
                 // cut out the inside, leaving the corners
-                translate([corner_inset + wall, -eps])
-                    square([width - 2 * (wall + corner_inset), width - wall + eps], center = false);
-
-                translate([wall, corner_inset + wall])
-                    square([width - 2 * wall, width - 2 * (wall + corner_inset)], center = false);
+                translate([hole_count == 2 ? wall_left : corner_inset + wall_left, -eps])
+                    square([blower_exit(type), width / 2], center = false);
+                translate(blower_axis(type))
+                    circle(d = blower_bore(type) + 1);
             } else {
                 // cut out the bore for the fan
                 translate(blower_axis(type))
                     circle(d = blower_bore(type));
             }
-            // corner inset
-            translate([width / 2, width / 2])
-            for(i = [0 : 3])
-                rotate(i * 90)
-                    translate([-width / 2 - eps, -width/ 2 - eps])
-                        quadrant(corner_inset, corner_inset - corner_radius);
+            inset_corners();
         }
 
     base_height = blower_base(type);
     linear_extrude(base_height)
         difference () {
             rounded_square([width, width], corner_radius, center = false);
+            blower_hole_positions(type)
+                circle(d = blower_screw_hole(type));
+        }
 
+    // add the lugs which may be higher than the base
+    linear_extrude(blower_lug(type))
+        difference () {
+            intersection() {
+                rounded_square([width, width], corner_radius, center = false);
+                inset_corners();
+            }
             blower_hole_positions(type)
                 circle(d = blower_screw_hole(type));
         }

vitamins/blowers.scad

@@ -24,8 +24,9 @@
 //                                                   h                                                   h    s                                         t         t
 RB5015 = ["RB5015", "Blower Runda RB5015",           51.3, 51, 15, 31.5, M4_cap_screw, 26, [27.3, 25.4], 4.5, [[4.3, 45.4], [47.3,7.4]],     20,   14,  1.5, 1.3, 1.2, 15];
 PE4020 = ["PE4020", "Blower Pengda Technology 4020", 40,   40, 20, 27.5, M3_cap_screw, 22, [21.5, 20  ], 3.2, [[37,3],[3,37],[37,37]],       29.3, 17,  1.7, 1.2, 1.3, 13];
-BL40x10 =["BL40x10","Square radial fan 4010",        40,   40,9.5, 27,   M2_cap_screw, 16, [24,   20  ], 2.4, [[2,2],[38,2],[2,38],[38,38]], 30  , 9.5, 1.5, 1.5, 1.1, 1.5];
+BL30x10 =["BL30x10","Square radial fan 3010",        30,   30,10.1,25,   M2_cap_screw, 16, [16,   15  ], 2.4, [[3,27],[27,3]],               21.2, 9.5, 1.1, 1.2, 2.5, 2.8, 0.9];
+BL40x10 =["BL40x10","Square radial fan 4010",        40,   40,9.5, 27,   M2_cap_screw, 16, [24,   20  ], 2.4, [[2,2],[38,2],[2,38],[38,38]], 27.8, 9.5, 1.5, 1.5, 1.1, 1.5, 1.1];
 
-blowers = [BL40x10, PE4020, RB5015];
+blowers = [BL30x10, BL40x10, PE4020, RB5015];
 
 use <blower.scad>

vitamins/button.scad

@@ -47,7 +47,7 @@ module square_button(type, colour = "yellow") { //! Draw square button with spec
     stem = square_button_cap_stem(type);
 
     color(grey(20)) {
-        rounded_rectangle([w, w, h - 0.5], r = wall, center = false);
+        rounded_rectangle([w, w, h - 0.5], r = wall);
 
         for(x = [-1, 1], y = [-1, 1])
             translate([x * pitch, y * pitch])

vitamins/camera.scad

@@ -37,7 +37,7 @@ module camera_lens(type, offset = 0, show_lens = true) //! Draw the lens stack,
                 r = p[1] + offset;
                 app = p[2];
                 if(size.x)
-                    rounded_rectangle(size + [2 * offset, 2 * offset, round_to_layer(offset)], r, center = false);
+                    rounded_rectangle(size + [2 * offset, 2 * offset, round_to_layer(offset)], r);
                 else
                     if (show_lens)
                         translate_z(size.y)
@@ -72,7 +72,7 @@ module camera(type, show_lens = true) {           //! Draw specified PCB camera
             pos = camera_connector_pos(type);
             color(grey(20))
                 translate(pos)
-                    rounded_rectangle(conn, 0.5, center = false);
+                    rounded_rectangle(conn, 0.5);
 
             flex = [5, 0.1];
             color("orange")

vitamins/component.scad

@@ -326,7 +326,7 @@ module panel_USBA() { //! Draw a panel mount USBA connector
                 dx = (length2 / 2 - r2);
                 dy = (width / 2 - r1);
                 translate_z(l)
-                    rounded_rectangle([length2, width, 1], r = r1, center = false);
+                    rounded_rectangle([length2, width, 1], r = r1);
 
                 translate([-dx, -dy, height2 - r2])
                     rotate([90, 0, 0])

vitamins/display.scad

@@ -80,7 +80,7 @@ module display(type) { //! Draw specified display
         translate_z(display_ts_thickness(type)) {
             difference() {
                 color("silver")
-                    rounded_rectangle([w, h, t], 0.5, center = false);
+                    rounded_rectangle([w, h, t], 0.5);
 
                 color("black")
                     translate([aperture[0].x, aperture[0].y, - eps])

vitamins/microswitch.scad

@@ -18,7 +18,11 @@
 //
 
 //
-//! Used for limit switches.
+//! Used for limit switches. Currently only the button type is supported as the lever and roller types are less accurate.
+//!
+//! The switch is drawn with the button at the nominal operation point. This can be plus or minus `microswitch_op_tol(type)`.
+//!
+//! When the button is released it comes out by a maximum of `microswitch_fp_max(type)` from the nominal operating point.
 //
 include <../utils/core/core.scad>
 
@@ -32,11 +36,13 @@ function microswitch_hole_d(type)    = type[6];     //! Screw hole diameter
 function microswitch_holes(type)     = type[7];     //! Hole positions
 function microswitch_button_w(type)  = type[8];     //! Button width
 function microswitch_button_t(type)  = type[9];     //! Button thickness
-function microswitch_button_pos(type)= type[10];    //! Button position
-function microswitch_legs(type)      = type[11];    //! Leg positions
-function microswitch_leg(type)       = type[12];    //! Leg types
-function microswitch_body_clr(type)  = type[13];    //! Body colour
-function microswitch_button_clr(type)= type[14];    //! Button colour
+function microswitch_button_pos(type)= type[10];    //! Button position at operating point
+function microswitch_op_tol(type)    = type[11];    //! Operating position +/- tolerance
+function microswitch_fp_max(type)    = type[12];    //! Free position maximum
+function microswitch_legs(type)      = type[13];    //! Leg positions
+function microswitch_leg(type)       = type[14];    //! Leg types
+function microswitch_body_clr(type)  = type[15];    //! Body colour
+function microswitch_button_clr(type)= type[16];    //! Button colour
 
 function microswitch_lower_extent(type) = let(leg = microswitch_leg(type)) min([for(pos = microswitch_legs(type)) pos.y - leg.y / 2]); //! How far legs extend downwards
 function microswitch_right_extent(type) = let(leg = microswitch_leg(type)) max([microswitch_length(type) / 2, for(pos = microswitch_legs(type)) pos.x + leg.x / 2]); //! How far legs extend right

vitamins/microswitches.scad

@@ -23,10 +23,19 @@
 small_leg  = [0.9,  3.3, 0.4, 0];
 medium_leg = [0.5,  3.9, 3.2, 1.6, [0, -0.5]];
 large_leg  = [11.4, 0.8, 6.3, 1.8, [1.7, 0]];
-
-small_microswitch  = ["small_microswitch", "DM1-00P-110-3",      5.8, 6.5,  12.8, 0, 2,    [[-3.25, -1.65], [3.25, -1.65]], 2.9, 1.2, [-1.95, 3.75], [[-5.08, -4.95], [0,    -4.9],  [5.08, -4.9]  ], small_leg,  grey(20), "white"  ];
-medium_microswitch = ["medium_microswitch","SS-01 or SS-5GL",    6.4, 10.2, 19.8, 1, 2.35, [[-4.8,  -2.6 ], [4.7,  -2.6 ]], 3.2, 2,   [-2.8,  5.8 ], [[-8.05, -7.05], [0.75, -7.05], [8.05, -7.05] ], medium_leg, grey(20), "burlywood" ];
-large_microswitch  = ["large_microswitch", "Saia G3 low force", 10.4, 15.9, 28.0, 2, 3.1,  [[-11.1, -5.15], [11.2,  5.15]], 4,   2.75,[-9.1,  9.55], [[19.7,   2.19], [19.7, -3.45],  [8.3, -10.45] ], large_leg,  "ivory", "white" ];
+//                                                               t    w     l     r  h     h                               b     b    b             o     f     l                                                l           b         b
+//                                                               h    i     e     a  o     o                               u     u    u             p     p     e                                                e           o         u
+//                                                               i    d     n     d  l     l                               t     t    t                         g                                                g           d         t
+//                                                               c    t     g     i  e     e                               t     t    t             t     m                                                                  y         t
+//                                                               k    h     t     u                                        o     o    o             o     a     p                                                t                     o
+//                                                               n          h     s  d     p                               n     n    n             l     x     o                                                y           c         n
+//                                                               e                   i     o                                                                    s                                                p           l
+//                                                               s                   a     s                               w     t    p                         n                                                e           r         c
+//                                                               n                         n                                          o                         s                                                                      l
+//                                                                                         s                                          s                                                                                                r
+small_microswitch  = ["small_microswitch", "DM1-00P-110-3",      5.8, 6.5,  12.8, 0, 2,    [[-3.25, -1.65], [3.25, -1.65]], 2.9, 1.2, [-1.95, 3.75], 0.2, 0.55, [[-5.08, -4.95], [0,    -4.9],  [5.08, -4.9]  ], small_leg,  grey(20), "white"  ];
+medium_microswitch = ["medium_microswitch","SS-01 or SS-5GL",    6.4, 10.2, 19.8, 1, 2.35, [[-4.8,  -2.6 ], [4.7,  -2.6 ]], 3.2, 2,   [-2.8,  5.8 ], 0.5, 1.00, [[-8.05, -7.05], [0.75, -7.05], [8.05, -7.05] ], medium_leg, grey(20), "burlywood" ];
+large_microswitch  = ["large_microswitch", "Saia G3 low force", 10.4, 15.9, 28.0, 2, 3.1,  [[-11.1, -5.15], [11.2,  5.15]], 4,   2.75,[-9.1,  9.55], 0.3, 1.2,  [[19.7,   2.19], [19.7, -3.45], [8.3, -10.45] ], large_leg,  "ivory",  "white" ]; //G3M1T1PUL
 
 microswitches = [small_microswitch, medium_microswitch, large_microswitch];
 

vitamins/panel_meter.scad

@@ -59,7 +59,7 @@ module panel_meter_button(type) { //! Draw panel meter button
     color(pmeter_button_colour(type))
         translate(pmeter_button_pos(type))
             if(size.x)
-                rounded_rectangle(pmeter_button_size(type), r, center = false);
+                rounded_rectangle(pmeter_button_size(type), r);
             else
                 cylinder(r = r, h = size.z);
 }
@@ -93,8 +93,8 @@ module panel_meter(type) { //! Draw panel mounted LCD meter module
         difference() {
             if(is_list(bevel))
                 hull() {
-                    rounded_rectangle([bezel.x - 2 * bevel.x, bezel.y - 2 * bevel.x, bezel.z], r - bevel.x, center = false);
-                    rounded_rectangle([bezel.x, bezel.y, bevel[1]], r, center = false);
+                    rounded_rectangle([bezel.x - 2 * bevel.x, bezel.y - 2 * bevel.x, bezel.z], r - bevel.x);
+                    rounded_rectangle([bezel.x, bezel.y, bevel[1]], r);
                 }
             else
                 hull() {
@@ -111,7 +111,7 @@ module panel_meter(type) { //! Draw panel mounted LCD meter module
                         cube([ap.x + ap.z, ap.y + ap.z, eps], center = true);
 
                 translate_z(bezel.z + eps)
-                    rounded_rectangle([ap.x, ap.y, bezel.z * 2], r, center = true);
+                    rounded_rectangle([ap.x, ap.y, bezel.z * 2], r, true);
             }
         }
         //

vitamins/pcb.scad

@@ -126,7 +126,7 @@ module usb_A(h, v_flange_l, bar, cutout) {
         if(cutout)
             rotate([90, 0, 90])
                 rounded_rectangle([w + 2 * v_flange_h + 2 * panel_clearance,
-                                   h + 2 * h_flange_h + 2 * panel_clearance, 100], r = cnc_bit_r, center = false);
+                                   h + 2 * h_flange_h + 2 * panel_clearance, 100], r = cnc_bit_r);
         else {
             color("silver") rotate([0, 90, 0]) {
                 linear_extrude(l, center = true)

vitamins/pcbs.scad

@@ -205,37 +205,34 @@ BTT_SKR_MINI_E3_V2_0 = [
     grey(30), // color
     false, // true if parts should be separate BOM items
     [ // hole positions
-        [ 19.3,              -2.89 ],
-        [ 19.3   + 62.15,    -2.89 ],
-        [  2.535,            -2.89 - 34.98 ],
-        [  2.535 + 31.80,    -2.89 - 37.63 ],
-        [  2.535 + 95.68,    -2.89 - 64.47 ]
+        for (i = [ [0, 0], [62.15, 0] ])
+            (i + [20.3, -2.89]),
+        for (i = [ [0, -34.98], [31.80, -37.63], [95.68, -64.47] ])
+            (i + [2.535, -2.89])
     ],
     [ // components
         // cpu
         [ 55,   33,     0, "chip", 10, 10,   1,   grey(15) ],
-        // hotend and heated bed
-        [ 26,   16,     0, "chip", 9.5, 8.5, 4,   grey(15) ],
-        [ 37,   14,     0, "chip", 6,   6,   2.5, grey(15) ],
         // driver chips
-        [ 10.5,-17.5,   0, "chip",  5,  5, 1, grey(15) ],
-        [ 30.5,-17.5,   0, "chip",  5,  5, 1, grey(15) ],
-        [ 50.5,-17.5,   0, "chip",  5,  5, 1, grey(15) ],
-        [ 70.5,-17.5,   0, "chip",  5,  5, 1, grey(15) ],
-        // heat dissipation under board
-        [ 43,  -17.5,   0, "-block", 85, 8, 0.1, gold ],
-        [ 40,   16,     0, "-block", 10, 8, 0.1, gold ],
-        [ 27,   19,     0, "-block", 13,14, 0.1, gold ],
-        [ 12,   28.5,   0, "-block", 11, 7, 0.1, gold ],
+        for (x = [10.5, 30.5, 50.5, 70.5])
+            [ x, -17.5,  0, "chip",  5,  5, 1, grey(15) ],
         // mock up heat sinks over the chips
-        [  10.5,  -17.5,  0, "chip",  9, 8.5,  2, "DeepSkyBlue" ],
-        for(x = [10.5], y = [-4,-2,0,2,4]) [ x, -17.5 + y,  0, "chip",  9, 0.75, 11, "DeepSkyBlue" ],
-        [  30.5,  -17.5,  0, "chip",  9, 8.5,  2, "DeepSkyBlue" ],
-        for(x = [30.5], y = [-4,-2,0,2,4]) [ x, -17.5 + y,  0, "chip",  9, 0.75, 11, "DeepSkyBlue" ],
-        [  50.5,  -17.5,  0, "chip",  9, 8.5,  2, "DeepSkyBlue" ],
-        for(x = [50.5], y = [-4,-2,0,2,4]) [ x, -17.5 + y,  0, "chip",  9, 0.75, 11, "DeepSkyBlue" ],
-        [  70.5,  -17.5,  0, "chip",  9, 8.5,  2, "DeepSkyBlue" ],
-        for(x = [70.5], y = [-4,-2,0,2,4]) [ x, -17.5 + y,  0, "chip",  9, 0.75, 11, "DeepSkyBlue" ],
+        for (x = [10.5, 30.5, 50.5, 70.5])
+            [ x, -17.5,  0, "block",  9, 8.5,  2, "DeepSkyBlue" ],
+        for(x = [10.5, 30.5, 50.5, 70.5], y = [-4,-2,0,2,4])
+            [ x, -17.5 + y,  0, "block",  9, 0.75, 11, "DeepSkyBlue" ],
+        // heat dissipation for drivers under board
+        [ 43,  -17.5,   0, "-block", 85, 8, 0.1, gold ],
+
+        // heated bed
+        [ 26,   16,     0, "chip",    9.5, 8.5, 4,   grey(15) ],
+        [ 27,   19,     0, "-block", 13,  14,   0.1, gold ],
+        // hotend
+        [ 37,   14,     0, "chip",    6,   6,   2.5, grey(15) ],
+        [ 40,   16,     0, "-block", 10,   8,   0.1, gold ],
+
+        // voltage regulator heat dissipation
+        [ 12,   28.5,   0, "-block", 11,   7,   0.1, gold ],
 
         // terminals
         [  5.25, 5.3, 180, "gterm", gt_5x17, 2, undef, grey(20) ],
@@ -295,6 +292,99 @@ BTT_SKR_MINI_E3_V2_0 = [
     [] // accessories
 ];
 
+BTT_SKR_E3_TURBO = [
+    "BTT_SKR_E3_TURBO", "BigTreeTech SKR E3 Turbo",
+    102, 90.25, 1.6, // size
+    1, // corner radius
+    3.5, // mounting hole diameter
+    5, // pad around mounting hole
+    grey(30), // color
+    false, // true if parts should be separate BOM items
+    [ // hole positions
+        for ( i=[ [0, 0], [62.15, 0.25] ])
+            (i + [21.6, -13.3]),
+        for( i=[ [0, -34.98 ], [31.80, -37.62 ], [95.68, -64.47] ])
+            (i + [3.75, -13.25])
+    ],
+    [ // components
+        // cpu
+        [  62.8,   42.5,   0, "chip", 14, 14,   1,   grey(15) ],
+        // driver chips
+        for (x = [8.5, 27.5, 43.2, 58.5, 74])
+            [x, -20, 0, "chip",  5,  5, 1, grey(15)],
+        // mock up heat sinks over the chips
+        for (x = [8.5, 27.5, 43.2, 58.5, 74])
+            [x, -20,  0, "chip",  9, 8.5,  2, "DeepSkyBlue" ],
+        for (x = [8.5, 27.5, 43.2, 58.5, 74], y = [-4,-2,0,2,4])
+            [x, -20 + y,  0, "chip",  9, 0.75, 11, "DeepSkyBlue" ],
+        // heat dissipation for drivers under board
+        [ 43,     -21,     0, "-block", 85,   8,   0.1, gold ],
+        // hotend and heated bed
+        [ 25.5,    20,     0, "chip",   10,   8.5, 4,   grey(15) ],
+        [ 25.5,    20,     0, "-block", 11,   11,  0.1, gold ],
+        [ 36.25,   16.75,  0, "chip",    6.5, 6,   2.5, grey(15) ],
+        [ 36.25,   17,     0, "-block",  7.5, 7.5, 0.1, gold ],
+        [ 44.25,   16.75,  0, "chip",    6.5, 6,   2.5, grey(15) ],
+        [ 44.25,   17,     0, "-block",  7.5, 7.5, 0.1, gold ],
+        // voltage regulator
+        [ 15.1,    44.2,   0, "chip",    4,   5,   2,   grey(15) ],
+        [ 12.1,    44.2,   0, "-block", 10,  10,   0.1, gold ],
+
+        // terminals
+        [   5.25,  5.3, 180, "gterm", gt_5x17, 2, undef, grey(20) ],
+        [  16.25,  5.4, -90, "gterm", gt_5x17, 2, undef, grey(20) ],
+        [  26.25,  5.4, -90, "gterm", gt_5x17, 2, undef, grey(20) ],
+        [  36.1,   6.7, -90, "gterm", gt_5x11, 2, undef, "lightgreen" ],
+        [  45.0,   6.7, -90, "gterm", gt_5x11, 2, undef, "lightgreen" ],
+        [  -3, -(32.27 + 39.92)/2, 0, "usb_uA" ],
+        [  -8, -(12.13 + 27.17)/2, 0, "uSD", [17.17 - 2.13, 16, 2] ],
+        [ -22.2,   51.6,   0, "button_6mm" ],
+        // EXP
+        [  -4.45,  27.2, -90, "2p54boxhdr", 5, 2 ],
+        // AUX-2
+        [  -3.4,   42.5, -90, "2p54header", 4, 2 ],
+        // TFT
+        [  73.7,   21,     0, "2p54header", 5, 1 ],
+        // FAN0
+        [  52.1,   15.3, 180, "jst_xh", 2, false, grey(20) ],
+        // FAN1
+        [  60.1,  15.3,  180, "jst_xh", 2, false, grey(20) ],
+        // PS-ON
+        [  67.9,  15.3,  180, "jst_xh", 2, false, grey(20) ],
+        // E0-STOP
+        [  77.1,  15.3,  180, "jst_xh", 3, false, grey(20) ],
+        // E1-STOP
+        [  87.5,  15.3,  180, "jst_xh", 3, false, grey(20) ],
+        // Z-PROBE
+        [  85.05,  34.6, 180, "jst_xh", 5, false, grey(20) ],
+        // NEO Pixel
+        [  77,     26.8, 180, "jst_xh", 3, false, grey(20) ],
+        // PWR-DET
+        [  87.7,   26.8, 180, "jst_xh", 3, false, grey(20) ],
+        // FAN2
+        [  52.1,    3.8,   0, "2p54header", 1, 2],
+        // end stops and thermistors
+        for (x = [58.5 : 7.9 : 98.1])
+            [x,  3.7,  180, "jst_xh", 2, false, grey(20)],
+        // motor connections
+        for (x = [7, 27.1, 47.3, 67.5, 87.9])
+            [x, -3.9,  0, "jst_xh", 4, false, grey(20)],
+        [47.3, -10.4,  0, "jst_xh", 4, false, grey(20)], // second Z connector
+        // motor jumpers
+        for (x = [9.4, 26.4, 42.5, 58.7, 75.3])
+            [x, -33.7,  0, "2p54header", 2, 1],
+        // SWD
+        [  45.4,   35.7,   0, "2p54header", 5, 1 ],
+        // USB power jumber
+        [ -12.6,   40.3,   0, "2p54header", 3, 1 ],
+        // VOUT
+        [ -13.9,   44.5,   0, "2p54header", 2, 2 ],
+        // VIN
+        [  18.6,   29.8,   0, "2p54header", 2, 2 ],
+    ],
+    [] // accessories
+];
+
 TMC2130 = [
     "TMC2130", "TMC2130",
     20, 14, 1.6, // size
@@ -657,9 +747,9 @@ ESP_01 = [
     [] // accessories
 ];
 
-pcbs = [MP1584EN, TP4056, ESP_01, RAMPSEndstop, MT3608, PI_IO, ExtruderPCB, ZC_A0591, RPI0, EnviroPlus, ArduinoUno3, ArduinoLeonardo, Keyes5p1, WD2002SJ, RPI3, RPI4, BTT_SKR_MINI_E3_V2_0, BTT_SKR_V1_4_TURBO, DuetE, Duex5];
+pcbs = [MP1584EN, TP4056, ESP_01, RAMPSEndstop, MT3608, PI_IO, ExtruderPCB, ZC_A0591, RPI0, EnviroPlus, ArduinoUno3, ArduinoLeonardo, WD2002SJ, RPI3, RPI4, BTT_SKR_MINI_E3_V2_0, BTT_SKR_E3_TURBO, BTT_SKR_V1_4_TURBO, DuetE, Duex5];
 
-pcbs_not_shown = [Melzi, Duex2, PSU12V1A];
+pcbs_not_shown = [Melzi, Duex2, PSU12V1A, Keyes5p1];
 
 perfboards = [PERF74x51, PERF70x50, PERF60x40, PERF70x30, PERF80x20];
 

vitamins/pulley.scad

@@ -53,7 +53,7 @@ function pulley_extent(type) = max(pulley_flange_dia(type), pulley_hub_dia(type)
 T_angle = 40;
 GT_r = 0.555;
 
-module pulley(type) { //! Draw a pulley
+module pulley(type, colour = silver) { //! Draw a pulley
     teeth = pulley_teeth(type);
     od = pulley_od(type);
 
@@ -117,7 +117,7 @@ module pulley(type) { //! Draw a pulley
                 rotate([-90, 0, i * -90])
                     cylinder(r = screw_radius(pulley_screw(type)), h = 100);
 
-    color(silver) {
+    color(colour) {
         if(screw_z && screw_z < hl)
             render()
                 difference() {
@@ -140,9 +140,9 @@ module pulley(type) { //! Draw a pulley
     }
 }
 
-module pulley_assembly(type) { //! Draw a pulley with its grub screws in place
+module pulley_assembly(type, colour = silver) { //! Draw a pulley with its grub screws in place
     translate_z(pulley_offset(type)) {
-        pulley(type);
+        pulley(type, colour);
 
         if(pulley_screws(type))
             translate_z(pulley_screw_z(type))

vitamins/rail.scad

@@ -31,13 +31,11 @@ function rail_bore(type)       = type[5];   //! Counter bore diameter for screw
 function rail_hole(type)       = type[6];   //! Screw hole diameter
 function rail_bore_depth(type) = type[7];   //! Counter bore depth
 function rail_screw(type)      = type[8];   //! Screw type
-function rail_carriage(type)   = type[9];   //! Carriage type
-function rail_end_screw(type)  = type[10];  //! Screw used for ends only (Countersink used for better location)
-function rail_groove_offset(type)=type[11]; //! Offset of centre of groove from top of rail
-function rail_groove_width(type)=type[12];  //! Groove width
+function rail_end_screw(type)  = type[9];   //! Screw used for ends only (Countersink used for better location)
+function rail_groove_offset(type)=type[10]; //! Offset of centre of groove from top of rail
+function rail_groove_width(type)=type[11];  //! Groove width
 
 function rail_screw_height(type, screw) = rail_height(type) - rail_bore_depth(type) + screw_head_depth(screw, rail_hole(type)); //! Position screw taking into account countersink into counterbored hole
-function rail_travel(type, length) = length - carriage_length(rail_carriage(type)); //! How far the carriage can travel
 
 function carriage_length(type)       = type[0]; //! Overall length
 function carriage_block_length(type) = type[1]; //! Length of the metal part
@@ -48,7 +46,9 @@ function carriage_clearance(type)    = type[4]; //! Gap under the carriage
 function carriage_pitch_x(type)      = type[5]; //! Screw hole x pitch
 function carriage_pitch_y(type)      = type[6]; //! Screw hole y pitch
 function carriage_screw(type)        = type[7]; //! Carriage screw type
+function carriage_rail(type)         = type[8]; //! Rail type
 function carriage_screw_depth(type)  = 2 * screw_radius(carriage_screw(type)); //! Carriage thread depth
+function carriage_travel(type, rail_length) = rail_length - carriage_length(type); //! How far the carriage can travel on a given length rail
 
 function rail_holes(type, length) = //! Number of holes in a rail given its `length`
     floor((length - 2 * rail_end(type)) / rail_pitch(type)) + 1;
@@ -73,7 +73,7 @@ module carriage_hole_positions(type) { //! Position children over screw holes
                 children();
 }
 
-module carriage(type, rail, end_colour = grey(20), wiper_colour = grey(20)) { //! Draw the specified carriage
+module carriage(type, end_colour = grey(20), wiper_colour = grey(20)) { //! Draw the specified carriage
     total_l = carriage_length(type);
     block_l = carriage_block_length(type);
     block_w = carriage_width(type);
@@ -85,9 +85,9 @@ module carriage(type, rail, end_colour = grey(20), wiper_colour = grey(20)) { //
     screw_depth = carriage_screw_depth(type);
 
     module cutout() {
-        w = rail_width(rail) + 0.4;
+        w = rail_width(carriage_rail(type)) + 0.4;
         translate([-w / 2, 0])
-            square([w , rail_height(rail) + 0.2]);
+            square([w , rail_height(carriage_rail(type)) + 0.2]);
     }
 
     color(grey(90)) {
@@ -179,11 +179,11 @@ module rail(type, length, colour = grey(90), use_polycircles = false) { //! Draw
     }
 }
 
-module rail_assembly(type, length, pos, carriage_end_colour = grey(20), carriage_wiper_colour = grey(20)) { //! Rail and carriage assembly
-    rail(type, length);
+module rail_assembly(carriage, length, pos, carriage_end_colour = grey(20), carriage_wiper_colour = grey(20)) { //! Rail and carriage assembly
+    rail(carriage_rail(carriage), length);
 
     translate([pos, 0])
-        carriage(rail_carriage(type), type,  carriage_end_colour, carriage_wiper_colour);
+        carriage(carriage, carriage_end_colour, carriage_wiper_colour);
 }
 
 module rail_screws(type, length, thickness, screws = 100, index_screws = undef) { //! Place screws in the rail

vitamins/rails.scad

@@ -17,30 +17,29 @@
 // If not, see <https://www.gnu.org/licenses/>.
 //
 
-//
-// Carriages
-//
-//                 L     L1    W   H   H1   C   B
-MGN5_carriage  = [ 16,   9.6,  12, 6,  1.5, 0,  8 , M2_cap_screw ];
-MGN7_carriage  = [ 23,   14.3, 17, 8,  1.5, 8,  12, M2_cap_screw ];
-MGN9_carriage  = [ 29.7, 20.8, 20, 10, 2,   10, 15, M3_cap_screw ];
-MGN12_carriage = [ 34.7, 21.7, 27, 13, 3,   15, 20, M3_cap_screw ];
-MGN12H_carriage= [ 45.4, 32.4, 27, 13, 3,   20, 20, M3_cap_screw ];
-MGN15_carriage = [ 43.3, 27.7, 32, 16, 4,   20, 25, M3_cap_screw ];
-SSR15_carriage = [ 40.3, 23.3, 34, 24, 4.5, 0,  26, M4_cap_screw ];
 //
 // Rails
 //
+//                Wr  Hr    E     P   D    d    h                                       go    gw
+MGN5 = [ "MGN5",   5,  3.6,  5,   15, 3.6, 2.4, 0.8, M2_cs_cap_screw, M2_cs_cap_screw,  1,    1 ]; // Screw holes too small for M2 heads
+MGN7 = [ "MGN7",   7,  5,    5,   15, 4.3, 2.4, 2.6, M2_cap_screw,    M2_cs_cap_screw,  1.5,  1.5 ];
+MGN9 = [ "MGN9",   9,  6,    5,   20, 6.0, 3.5, 3.5, M3_cap_screw,    M3_cs_cap_screw,  1.5,  1.5 ];
+MGN12 =[ "MGN12", 12,  8,   10,   25, 6.0, 3.5, 4.5, M3_cap_screw,    M3_cs_cap_screw,  2.25, 2.75];
+MGN15 =[ "MGN15", 15, 10,   10,   40, 6.0, 3.5, 5.0, M3_cap_screw,    M3_cs_cap_screw,  2.5,  2.75 ];
+SSR15= [ "SSR15", 15, 12.5, 10,   60, 7.5, 4.5, 5.3, M4_cap_screw,    M4_cs_cap_screw,  2.5,  2.75 ];
 //
-//                Wr  Hr   E    P   D    d    h                                                      go    gw
-MGN5 = [ "MGN5",  5,  3.6, 5,   15, 3.6, 2.4, 0.8, M2_cs_cap_screw, MGN5_carriage, M2_cs_cap_screw,  1,    1 ]; // Screw holes too small for M2 heads
-MGN7 = [ "MGN7",  7,  5,   5,   15, 4.3, 2.4, 2.6, M2_cap_screw,    MGN7_carriage, M2_cs_cap_screw,  1.5,  1.5 ];
-MGN9 = [ "MGN9",  9,  6,   7.5, 20, 6.0, 3.5, 3.5, M3_cap_screw,    MGN9_carriage, M3_cs_cap_screw,  1.5,  1.5 ];
-MGN12= [ "MGN12", 12, 8,   10,  25, 6.0, 3.5, 4.5, M3_cap_screw,   MGN12_carriage, M3_cs_cap_screw,  2.25, 2.75 ];
-MGN12H=[ "MGN12H",12, 8,   10,  25, 6.0, 3.5, 4.5, M3_cap_screw,   MGN12H_carriage,M3_cs_cap_screw,  2.25, 2.75];
-MGN15= [ "MGN15", 15, 10,  10,  40, 6.0, 3.5, 5.0, M3_cap_screw,   MGN15_carriage, M3_cs_cap_screw,  2.5,  2.75 ];
-SSR15= [ "SSR15", 15, 12.5,10,  60, 7.5, 4.5, 5.3, M4_cap_screw,   SSR15_carriage, M4_cs_cap_screw,  2.5,  2.75 ];
+// Carriages
+//
+//                  L     L1    W   H   H1   C   B
+MGN5_carriage   = [ 16,    9.6, 12,  6, 1.5, 0,   8, M2_cap_screw, MGN5 ];
+MGN7C_carriage  = [ 23,   14.3, 17,  8, 1.5, 8,  12, M2_cap_screw, MGN7 ];
+MGN9C_carriage  = [ 29.7, 20.8, 20, 10, 2,  10,  15, M3_cap_screw, MGN9 ];
+MGN12C_carriage = [ 34.7, 21.7, 27, 13, 3,  15,  20, M3_cap_screw, MGN12 ];
+MGN12H_carriage = [ 45.4, 32.4, 27, 13, 3,  20,  20, M3_cap_screw, MGN12 ];
+MGN15C_carriage = [ 43.3, 27.7, 32, 16, 4,  20,  25, M3_cap_screw, MGN15 ];
+SSR15_carriage  = [ 40.3, 23.3, 34, 24, 4.5, 0,  26, M4_cap_screw, SSR15 ];
 
-rails = [MGN5, MGN7, MGN9, MGN12, MGN12H, MGN15, SSR15];
+
+carriages = [MGN5_carriage, MGN7C_carriage, MGN9C_carriage, MGN12C_carriage, MGN12H_carriage, MGN15C_carriage, SSR15_carriage];
 
 use <rail.scad>

vitamins/screws.scad

@@ -83,6 +83,7 @@ M5_cs_cap_screw  = ["M5_cs_cap","M5 cs cap",    hs_cs_cap,5,10.0, 0,    3.00,3.0
 M2_dome_screw    = ["M2_dome", "M2 dome",       hs_dome,  2, 3.5, 1.3,  0.6, 1.3, 16,  M2_washer, M2_nut,   M2_tap_radius,    M2_clearance_radius];
 M3_dome_screw    = ["M3_dome", "M3 dome",       hs_dome,  3, 5.7, 1.65, 1.04,2.0, 18,  M3_washer, M3_nut,   M3_tap_radius,    M3_clearance_radius];
 M4_dome_screw    = ["M4_dome", "M4 dome",       hs_dome,  4, 7.6, 2.2,  1.3, 2.5, 20,  M4_washer, M4_nut,   M4_tap_radius,    M4_clearance_radius];
+M5_dome_screw    = ["M5_dome", "M5 dome",       hs_dome,  5, 9.5, 2.75, 1.56,3.0, 22,  M5_washer, M5_nut,   M5_tap_radius,    M5_clearance_radius];
 
 M2p5_pan_screw   = ["M2p5_pan", "M2.5 pan",     hs_pan, 2.5, 4.7, 1.7,    0,   0, 0, M2p5_washer, M2p5_nut, M2p5_tap_radius,  M2p5_clearance_radius];
 M3_pan_screw     = ["M3_pan", "M3 pan",         hs_pan,   3, 5.4, 2.0,    0,   0, 0,   M3_washer, M3_nut,   M3_tap_radius,    M3_clearance_radius];
@@ -111,7 +112,7 @@ screw_lists = [
 [ M2_cap_screw,    M2p5_cap_screw, M3_cap_screw,    M4_cap_screw,    M5_cap_screw, M6_cap_screw, M8_cap_screw],
 [ 0,               0,              M3_low_cap_screw],
 [ M2_cs_cap_screw, 0,              M3_cs_cap_screw, M4_cs_cap_screw, M5_cs_cap_screw],
-[ M2_dome_screw,   0,              M3_dome_screw,   M4_dome_screw],
+[ M2_dome_screw,   0,              M3_dome_screw,   M4_dome_screw,   M5_dome_screw],
 [ 0,               0,              M3_hex_screw,    M4_hex_screw,    M5_hex_screw, M6_hex_screw, M8_hex_screw],
 [ 0,               M2p5_pan_screw, M3_pan_screw,    M4_pan_screw,    M5_pan_screw, M6_pan_screw, No632_pan_screw],
 [ No2_screw,       0,              No4_screw,       No6_screw,       No6_cs_screw],

vitamins/sk_bracket.scad

@@ -62,7 +62,7 @@ module sk_bracket(type) { //! SK shaft support bracket
                     }
             for(x = [W / 2 - 2 * fillet, -W / 2 + 2 * fillet])
                 translate([x, G / 2, 0])
-                    rounded_rectangle([4 * fillet, G, L], fillet);
+                    rounded_rectangle([4 * fillet, G, L], fillet, true);
         }
 
         translate([0, -h, -L /2])

vitamins/transformer.scad

@@ -56,10 +56,10 @@ module transformer(type) { //! Draw specified transformer
 
     }
 
-    color("white") {
+    color("white")
         translate_z(tx_lamination_height(type) / 2 + tx_bobbin_offset(type) / 2)
-            rounded_rectangle([tx_bobbin_width(type), tx_depth(type), tx_bobbin_height(type)], r = tx_bobbin_radius(type));
-    }
+            rounded_rectangle([tx_bobbin_width(type), tx_depth(type), tx_bobbin_height(type)], tx_bobbin_radius(type), true);
+
     terminal_height = tx_height(type) - tx_lamination_height(type);
 
     if(terminal_height)

vitamins/veroboard.scad

@@ -143,8 +143,8 @@ module vero_components(type, cutouts = false, angle = undef)
 
 module vero_cutouts(type, angle = undef) vero_components(type, true, angle); //! Make cutouts to clear components
 
-module veroboard_assembly(type, height, thickness, flip = false) //! Draw the assembly with components and fasteners in place
-assembly(vero_assembly(type)) {
+module veroboard_assembly(type, height, thickness, flip = false, ngb = false) //! Draw the assembly with components and fasteners in place
+assembly(vero_assembly(type), ngb = ngb) {
     screw = vero_screw(type);
     nut = screw_nut(screw);
     screw_length = screw_length(screw, height + thickness + vero_thickness(type), 2, nyloc = true);

vitamins/ziptie.scad

@@ -62,7 +62,7 @@ module ziptie(type, r, t = 0) //! Draw specified ziptie wrapped around radius `r
         translate([lx, -r])
              rotate([90, 0, 0])
                 union() {
-                    rounded_rectangle(latch, 0.5, center = false);
+                    rounded_rectangle(latch, 0.5);
 
                     translate_z((latch.z + 1) / 2)
                         cube([ziptie_thickness(type), ziptie_width(type), latch.z + 1], center = true);