Added printed pocket_handle().

Added times to plateup.py.

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
 
 
 
-

libtest.scad

@@ -117,6 +117,7 @@ use <tests/flat_hinge.scad>
 use <tests/foot.scad>
 use <tests/handle.scad>
 use <tests/PCB_mount.scad>
+use <tests/pocket_handle.scad>
 use <tests/printed_box.scad>
 use <tests/printed_pulleys.scad>
 use <tests/ribbon_clamp.scad>
@@ -180,7 +181,10 @@ translate([x5, cable_grommets_y + 250])
 translate([950, 600])
     box_test();
 
-translate([890, 750])
+translate([830, 770])
+    pocket_handles();
+
+translate([950, 750])
     printed_boxes();
 
 translate([850, 1330])

printed/box.scad

@@ -227,7 +227,7 @@ module box_bezel(type, bottom) { //! Generates top and bottom bezel STLs
             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);
+                rounded_rectangle([tw, td, feet ? foot_height : height], box_corner_rad(type));
                 //
                 // Remove edges between the feet
                 //
@@ -264,7 +264,7 @@ module box_bezel(type, bottom) { //! Generates top and bottom bezel STLs
             // recess for top / bottom panel
             //
             translate_z(cgap)
-                rounded_rectangle([w + bezel_clearance, d + bezel_clearance, height], inner_r + bezel_clearance / 2, false);
+                rounded_rectangle([w + bezel_clearance, d + bezel_clearance, height], inner_r + bezel_clearance / 2);
             //
             // leave plastic over the corner profiles
             //

printed/carriers.scad

@@ -116,10 +116,10 @@ module MT3608_carrier_stl() { //! Generate the STL for an MT3608 carrier, two re
         difference() {
             hull() {
                 translate([offset, 0, height - eps / 2])
-                    rounded_rectangle([width, pcb_width - 2, eps], 1);
+                    rounded_rectangle([width, pcb_width - 2, eps], 1, true);
 
                 translate_z(eps / 2)
-                    rounded_rectangle([width, pcb_width - 2, eps], 1);
+                    rounded_rectangle([width, pcb_width - 2, eps], 1, true);
             }
             for(side = [-1, 1])
                 hull() {

printed/door_latch.scad

@@ -44,7 +44,7 @@ module door_latch_stl() { //! Generates the STL for the printed part
         difference() {
             union() {
                 hull() {
-                    rounded_rectangle([length, width, thickness - tan(30) * (width -  ridge) / 2], rad, center = false);
+                    rounded_rectangle([length, width, thickness - tan(30) * (width -  ridge) / 2], rad);
 
                     translate_z(thickness / 2)
                         cube([length, ridge, thickness], center = true);

printed/pocket_handle.scad

@@ -0,0 +1,154 @@
+//
+// 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/>.
+//
+
+//
+//! Customisable pocket handle
+//
+include <../core.scad>
+
+function pocket_handle(hand_size = [90, 40, 40], slant = 35, screw = M3_cs_cap_screw, panel_t = 3, wall = 4, rad = 4) = //! Construct a pocket_handle property list
+    [hand_size, slant, screw, panel_t, wall, rad];
+
+function pocket_handle_hand_size(type) = type[0]; //! Size of the hole for the fingers
+function pocket_handle_slant(type)     = type[1]; //! Upward slant of the hand hole
+function pocket_handle_screw(type)     = type[2]; //! Screw type, can be countersunk or not
+function pocket_handle_panel_t(type)   = type[3]; //! Thickness of the panel it is mounted in
+function pocket_handle_wall(type)      = type[4]; //! Wall thickness
+function pocket_handle_rad(type)       = type[5]; //! Min corner rad
+
+function pocket_handle_flange(type) = //! Size of the flange
+    let(w = pocket_handle_wall(type),
+        f = washer_diameter(screw_washer(pocket_handle_screw(type))) + 2 + w,
+        s = pocket_handle_hand_size(type))
+             [s.x + 2 * f, s.y + 2 * f, w];
+
+module pocket_handle_hole_positions(type) { //! Place children at screw hole positions
+    f = pocket_handle_flange(type);
+    h = pocket_handle_hand_size(type);
+    x_pitch = (f.x + h.x) / 4;
+    y_pitch = (f.y + h.y) / 4;
+
+    for(x = [-1, 1], y = [-1, 1])
+        translate([x * x_pitch, y * y_pitch])
+            children();
+}
+
+module pocket_handle_holes(type, h = 0) { //! Panel cutout and screw holes
+    hand = pocket_handle_hand_size(type);
+    w = pocket_handle_wall(type);
+    slot = [hand.x + 2 * w, hand.y + 2 * w];
+    t = pocket_handle_panel_t(type);
+    clearance = norm([slot.y, t]) - slot.y + 0.2; // has to be enough clearance for the diagonal to swing it in
+
+    extrude_if(h) {
+        pocket_handle_hole_positions(type)
+            drill(screw_clearance_radius(pocket_handle_screw(type)), 0);
+
+        rounded_square([slot.x  + clearance, slot.y + clearance], pocket_handle_rad(type) + w + clearance / 2);
+    }
+}
+
+module pocket_handle(type) { //! Generate STL for pocket_handle
+    f = pocket_handle_flange(type);
+    r = pocket_handle_rad(type);
+    s = pocket_handle_slant(type);
+    o = f.z * tan(s);
+    h = pocket_handle_hand_size(type);
+    t = pocket_handle_panel_t(type);
+    w = pocket_handle_wall(type);
+    screw = pocket_handle_screw(type) ;
+
+    stl("pocket_handle")
+        union() {
+            difference() {
+                hull() {
+                    rounded_rectangle(f, r);
+
+                    translate_z(f.z - eps)
+                        rounded_rectangle([f.x + 2 * o, f.y + 2 * o, eps], r + o);
+                }
+                hull() {
+                    rounded_rectangle([h.x, h.y, f.z + eps], r);
+
+                    translate_z(-eps)
+                        rounded_rectangle([h.x + 2 * o, h.y + 2 * o, eps], r + o);
+                }
+                pocket_handle_hole_positions(type) {
+                    if(screw_head_height(screw))
+                        translate_z(-eps)
+                            poly_cylinder(r = screw_clearance_radius(screw), h = f.z + 2 * eps, center = false);
+                    else
+                        screw_polysink(screw, h = 2 * f.z + eps, alt = true);
+                }
+            }
+
+            translate_z(f.z)
+                linear_extrude(t)
+                    difference() {
+                        rounded_square([h.x + 2 * w, h.y + 2 * w], r + w);
+
+                        rounded_square([h.x, h.y], r);
+                    }
+
+            translate_z(f.z + t)
+                difference() {
+                    height = h.z - f.z - t;
+                    hull() {
+                        rounded_rectangle([h.x + 2 * w, h.y + 2 * w, eps], r + w);
+
+                        translate((height + w) * [0, sin(s), cos(s)])
+                            rounded_rectangle([h.x + 2 * w, h.y + 2 * w, eps], r + w);
+                    }
+
+                    hull() {
+                        translate_z(-eps)
+                            rounded_rectangle([h.x, h.y, eps], r);
+
+                        translate(height * [0, sin(s), cos(s)])
+                            rounded_rectangle([h.x, h.y, eps], r);
+                    }
+                }
+        }
+}
+
+module pocket_handle_assembly(type) { //! Assembly with fasteners in place
+    f = pocket_handle_flange(type);
+    screw = pocket_handle_screw(type);
+    nut = screw_nut(screw);
+    t = pocket_handle_panel_t(type);
+    washers = screw_head_height(screw) ? 2 : 1;
+    screw_length = screw_length(screw, f.z + t, washers, nyloc = true);
+
+    translate_z(f.z + t / 2) hflip() {
+        stl_colour(pp1_colour)
+            pocket_handle(type);
+
+        pocket_handle_hole_positions(type) {
+            translate_z(f.z + t)
+                explode(15, true)
+                    nut_and_washer(nut, true);
+
+            vflip()
+                if(washers == 2)
+                    screw_and_washer(screw, screw_length);
+                else
+                    screw(screw, screw_length);
+        }
+    }
+}

printed/printed_box.scad

@@ -182,7 +182,7 @@ module pbox(type) { //! Generate the STL for the main case
                 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);
+                            rounded_rectangle([pbox_width(type) + 2 * outset, pbox_depth(type) + 2 * outset, ledge_h], 1);
 
                             hull() {
                                 linear_extrude(ledge_h + eps)

printed/psu_shroud.scad

@@ -110,7 +110,7 @@ module psu_shroud(type, cable_d, name, cables = 1) { //! Generate the STL file f
     stl(str("psu_shroud_", name)) {
         // base and sides
         translate([centre_x, -centre_y]) {
-            rounded_rectangle([depth - eps, width - eps, top], rad, center = false);
+            rounded_rectangle([depth - eps, width - eps, top], rad);
 
             linear_extrude(height)
                 difference() {

printed/ssr_shroud.scad

@@ -71,7 +71,7 @@ module ssr_shroud(type, cable_d, name) {    //! Generate the STL file for a spec
     stl(str("ssr_shroud_", name)) {
         // base and sides
         translate([center_x, 0]) {
-            rounded_rectangle([depth - eps, width - eps, top], rad, center = false);
+            rounded_rectangle([depth - eps, width - eps, top], rad);
 
             linear_extrude(height) difference() {
                 round(or = wall / 2 - eps, ir = 0) difference() {

readme.md

@@ -35,15 +35,15 @@ See [usage](docs/usage.md) for requirements, installation instructions and a usa
 <tr><td> <a href = "#Displays">Displays</a> </td><td> <a href = "#Nuts">Nuts</a> </td><td> <a href = "#Spools">Spools</a> </td><td> <a href = "#Handle">Handle</a> </td><td> <a href = "#Rounded_cylinder">Rounded_cylinder</a> </td><td></td></tr>
 <tr><td> <a href = "#Extrusion_brackets">Extrusion_brackets</a> </td><td> <a href = "#O_ring">O_ring</a> </td><td> <a href = "#Springs">Springs</a> </td><td> <a href = "#PCB_mount">PCB_mount</a> </td><td> <a href = "#Rounded_polygon">Rounded_polygon</a> </td><td></td></tr>
 <tr><td> <a href = "#Extrusions">Extrusions</a> </td><td> <a href = "#Opengrab">Opengrab</a> </td><td> <a href = "#Stepper_motors">Stepper_motors</a> </td><td> <a href = "#PSU_shroud">PSU_shroud</a> </td><td> <a href = "#Rounded_right_triangle">Rounded_right_triangle</a> </td><td></td></tr>
-<tr><td> <a href = "#Fans">Fans</a> </td><td> <a href = "#PCB">PCB</a> </td><td> <a href = "#Swiss_clips">Swiss_clips</a> </td><td> <a href = "#Press_fit">Press_fit</a> </td><td> <a href = "#Sector">Sector</a> </td><td></td></tr>
-<tr><td> <a href = "#Fuseholder">Fuseholder</a> </td><td> <a href = "#PCBs">PCBs</a> </td><td> <a href = "#Toggles">Toggles</a> </td><td> <a href = "#Printed_box">Printed_box</a> </td><td> <a href = "#Sweep">Sweep</a> </td><td></td></tr>
-<tr><td> <a href = "#Geared_steppers">Geared_steppers</a> </td><td> <a href = "#PSUs">PSUs</a> </td><td> <a href = "#Transformers">Transformers</a> </td><td> <a href = "#Printed_pulleys">Printed_pulleys</a> </td><td> <a href = "#Thread">Thread</a> </td><td></td></tr>
-<tr><td> <a href = "#Green_terminals">Green_terminals</a> </td><td> <a href = "#Panel_meters">Panel_meters</a> </td><td> <a href = "#Tubings">Tubings</a> </td><td> <a href = "#Ribbon_clamp">Ribbon_clamp</a> </td><td> <a href = "#Tube">Tube</a> </td><td></td></tr>
-<tr><td> <a href = "#Hot_ends">Hot_ends</a> </td><td> <a href = "#Pillars">Pillars</a> </td><td> <a href = "#Variacs">Variacs</a> </td><td> <a href = "#SSR_shroud">SSR_shroud</a> </td><td></td><td></td></tr>
-<tr><td> <a href = "#Hygrometer">Hygrometer</a> </td><td> <a href = "#Pin_headers">Pin_headers</a> </td><td> <a href = "#Veroboard">Veroboard</a> </td><td> <a href = "#Screw_knob">Screw_knob</a> </td><td></td><td></td></tr>
-<tr><td> <a href = "#IECs">IECs</a> </td><td> <a href = "#Pulleys">Pulleys</a> </td><td> <a href = "#Washers">Washers</a> </td><td> <a href = "#Socket_box">Socket_box</a> </td><td></td><td></td></tr>
-<tr><td> <a href = "#Inserts">Inserts</a> </td><td></td><td> <a href = "#Wire">Wire</a> </td><td> <a href = "#Strap_handle">Strap_handle</a> </td><td></td><td></td></tr>
-<tr><td></td><td></td><td> <a href = "#Zipties">Zipties</a> </td><td></td><td></td><td></td></tr>
+<tr><td> <a href = "#Fans">Fans</a> </td><td> <a href = "#PCB">PCB</a> </td><td> <a href = "#Swiss_clips">Swiss_clips</a> </td><td> <a href = "#Pocket_handle">Pocket_handle</a> </td><td> <a href = "#Sector">Sector</a> </td><td></td></tr>
+<tr><td> <a href = "#Fuseholder">Fuseholder</a> </td><td> <a href = "#PCBs">PCBs</a> </td><td> <a href = "#Toggles">Toggles</a> </td><td> <a href = "#Press_fit">Press_fit</a> </td><td> <a href = "#Sweep">Sweep</a> </td><td></td></tr>
+<tr><td> <a href = "#Geared_steppers">Geared_steppers</a> </td><td> <a href = "#PSUs">PSUs</a> </td><td> <a href = "#Transformers">Transformers</a> </td><td> <a href = "#Printed_box">Printed_box</a> </td><td> <a href = "#Thread">Thread</a> </td><td></td></tr>
+<tr><td> <a href = "#Green_terminals">Green_terminals</a> </td><td> <a href = "#Panel_meters">Panel_meters</a> </td><td> <a href = "#Tubings">Tubings</a> </td><td> <a href = "#Printed_pulleys">Printed_pulleys</a> </td><td> <a href = "#Tube">Tube</a> </td><td></td></tr>
+<tr><td> <a href = "#Hot_ends">Hot_ends</a> </td><td> <a href = "#Pillars">Pillars</a> </td><td> <a href = "#Variacs">Variacs</a> </td><td> <a href = "#Ribbon_clamp">Ribbon_clamp</a> </td><td></td><td></td></tr>
+<tr><td> <a href = "#Hygrometer">Hygrometer</a> </td><td> <a href = "#Pin_headers">Pin_headers</a> </td><td> <a href = "#Veroboard">Veroboard</a> </td><td> <a href = "#SSR_shroud">SSR_shroud</a> </td><td></td><td></td></tr>
+<tr><td> <a href = "#IECs">IECs</a> </td><td> <a href = "#Pulleys">Pulleys</a> </td><td> <a href = "#Washers">Washers</a> </td><td> <a href = "#Screw_knob">Screw_knob</a> </td><td></td><td></td></tr>
+<tr><td> <a href = "#Inserts">Inserts</a> </td><td></td><td> <a href = "#Wire">Wire</a> </td><td> <a href = "#Socket_box">Socket_box</a> </td><td></td><td></td></tr>
+<tr><td></td><td></td><td> <a href = "#Zipties">Zipties</a> </td><td> <a href = "#Strap_handle">Strap_handle</a> </td><td></td><td></td></tr>
 </table>
 
 ---
@@ -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 |
 
@@ -2311,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 |
@@ -2321,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 |
@@ -2330,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 |
@@ -2351,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 |
@@ -2362,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 |
 
@@ -2379,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 |
@@ -4952,6 +4956,56 @@ The stl must be given a parameterless wrapper in the project that uses it.
 |   1 | pcb_mount_PI_IO_5.stl |
 
 
+<a href="#top">Top</a>
+
+---
+<a name="Pocket_handle"></a>
+## Pocket_handle
+Customisable pocket handle
+
+[printed/pocket_handle.scad](printed/pocket_handle.scad) Implementation.
+
+[tests/pocket_handle.scad](tests/pocket_handle.scad) Code for this example.
+
+### Properties
+| Function | Description |
+|:--- |:--- |
+| `pocket_handle_hand_size(type)` | Size of the hole for the fingers |
+| `pocket_handle_panel_t(type)` | Thickness of the panel it is mounted in |
+| `pocket_handle_rad(type)` | Min corner rad |
+| `pocket_handle_screw(type)` | Screw type, can be countersunk or not |
+| `pocket_handle_slant(type)` | Upward slant of the hand hole |
+| `pocket_handle_wall(type)` | Wall thickness |
+
+### Functions
+| Function | Description |
+|:--- |:--- |
+| `pocket_handle(hand_size = [90, 40, 40], slant = 35, screw = M3_cs_cap_screw, panel_t = 3, wall = 4, rad = 4)` | Construct a pocket_handle property list |
+| `pocket_handle_flange(type)` | Size of the flange |
+
+### Modules
+| Module | Description |
+|:--- |:--- |
+| `pocket_handle(type)` | Generate STL for pocket_handle |
+| `pocket_handle_assembly(type)` | Assembly with fasteners in place |
+| `pocket_handle_hole_positions(type)` | Place children at screw hole positions |
+| `pocket_handle_holes(type, h = 0)` | Panel cutout and screw holes |
+
+![pocket_handle](tests/png/pocket_handle.png)
+
+### Vitamins
+| Qty | Module call | BOM entry |
+| ---:|:--- |:---|
+|   4 | `nut(M3_nut, nyloc = true)` |  Nut M3 x 2.4mm nyloc |
+|   4 | `screw(M3_cs_cap_screw, 12)` |  Screw M3 cs cap x 12mm |
+|   4 | `washer(M3_washer)` |  Washer  M3 x 7mm x 0.5mm |
+
+### Printed
+| Qty | Filename |
+| ---:|:--- |
+|   1 | pocket_handle.stl |
+
+
 <a href="#top">Top</a>
 
 ---
@@ -6169,18 +6223,18 @@ leaving a scar on either surface.
 ### Functions
 | Function | Description |
 |:--- |:--- |
-| `corrected_diameter(d, n = 0)` | Adjusted diameter to make flats lie on the circle |
-| `corrected_radius(r, n = 0)` | Adjusted radius to make flats lie on the circle |
-| `sides(r)` | Optimium number of sides for specified radius |
+| `corrected_diameter(d, n = undef)` | Adjusted diameter to make flats lie on the circle |
+| `corrected_radius(r, n = undef)` | Adjusted radius to make flats lie on the circle |
+| `sides(r, n = undef)` | Optimium number of sides for specified radius |
 
 ### Modules
 | Module | Description |
 |:--- |:--- |
 | `drill(r, h = 100, center = true)` | Make a cylinder for drilling holes suitable for CNC routing, set h = 0 for circle |
-| `poly_circle(r, sides = 0)` | Make a circle adjusted to print the correct size |
-| `poly_cylinder(r, h, center = false, sides = 0, chamfer = false, twist = 0)` | Make a cylinder adjusted to print the correct size |
+| `poly_circle(r, sides = undef)` | Make a circle adjusted to print the correct size |
+| `poly_cylinder(r, h, center = false, sides = undef, chamfer = false, twist = 0)` | Make a cylinder adjusted to print the correct size |
 | `poly_drill(r, h = 100, center = true)` | Make a cylinder for drilling holes suitable for CNC routing if cnc_bit_r is non zero, otherwise a poly_cylinder. |
-| `poly_ring(or, ir, sides = 0)` | Make a 2D ring adjusted to have the correct internal radius |
+| `poly_ring(or, ir, sides = undef)` | Make a 2D ring adjusted to have the correct internal radius |
 | `poly_tube(or, ir, h, center = false)` | Make a tube adjusted to have the correct internal radius |
 | `slot(r, l, h = 100)` | Make a horizontal slot suitable for CNC routing, set h = 0 for 2D version |
 
@@ -6232,9 +6286,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/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,12 +65,20 @@ 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
@@ -120,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)
@@ -145,6 +156,10 @@ 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:

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,42 +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)
-                target_def = ['-D$target="%s"' % target] if target else []
-                cwd_def = ['-D$cwd="%s"' % os.getcwd().replace('\\', '/')]
+                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
@@ -111,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):

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

@@ -38,6 +38,7 @@ 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'
@@ -129,8 +130,9 @@ def views(target, do_assemblies = None):
     # 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)
@@ -204,15 +206,15 @@ def views(target, do_assemblies = None):
                                             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()
                                                 target_def = ['-D$target="%s"' % target] if target else []
@@ -439,6 +441,10 @@ def views(target, do_assemblies = None):
                 dst.write(line)
                 i += 1
     #
+    # Remove tmp dir
+    #
+    rmtmpdir(tmp_dir)
+    #
     # Spell check
     #
     do_cmd(('codespell -L od ' + top_dir + 'readme.md').split())

tests/BOM.scad

@@ -46,7 +46,7 @@ module widget(thickness) {
 module widget_stl() {
     stl("widget")
         union() {
-            rounded_rectangle([30, 30, 3], 2);
+            rounded_rectangle([30, 30, 3], 2, true);
 
             render() insert_boss(insert, height, 2.2);
         }

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

@@ -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/>.
+//
+include <../core.scad>
+
+include <../vitamins/sheets.scad>
+
+use <../printed/pocket_handle.scad>
+
+show_holes = false;
+
+handle = pocket_handle();
+
+module pocket_handles() {
+    if($preview) {
+        pocket_handle_assembly(handle);
+
+        if(show_holes)
+            #pocket_handle_holes(handle);
+    }
+    else
+        pocket_handle(handle);
+}
+
+pocket_handles();

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

@@ -146,17 +146,11 @@ module dxf(name) {                      //! Name a dxf that will appear on the B
         }
 }
 
-module use_stl(name) {               //! Import an STL to make a build platter
-    stl(name);
-    path = is_undef($target) ? "/stls/" : str("/", $target, "/stls/");
-    import(str($cwd, path, name, ".stl"));
-}
+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
-    dxf(name);
-    path = is_undef($target) ? "/dxfs/" : str("/", $target, "/dxfs/");
-    import(str($cwd, path, name, ".dxf"));
-}
+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
 

utils/core/core.scad

@@ -25,3 +25,15 @@ include <../../global_defs.scad>
 // Global functions and modules
 //
 use <global.scad>
+
+module use_stl(name) {               //! Import an STL to make a build platter
+    stl(name);
+    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($cwd, "/", $target, "/dxfs/");
+    import(str(path, name, ".dxf"));
+}

utils/core/polyholes.scad

@@ -33,20 +33,20 @@
 //! When `twist` is set the resulting cylinder is extended by `eps` at each end so that the exact length of the hole can be used without
 //! leaving a scar on either surface.
 //
-function sides(r) = max(round(4 * r), 3);                                       //! Optimium number of sides for specified radius
-function corrected_radius(r, n = 0)   = r / cos(180 / (n ? n : sides(r)));      //! Adjusted radius to make flats lie on the circle
-function corrected_diameter(d, n = 0) = d / cos(180 / (n ? n : sides(d / 2)));  //! Adjusted diameter to make flats lie on the circle
+function sides(r, n = undef) = is_undef(n) ? max(round(4 * r), 3) : n ? max(n, 3) : r2sides(r); //! Optimium number of sides for specified radius
+function corrected_radius(r, n = undef)   = r / cos(180 / sides(r, n));                         //! Adjusted radius to make flats lie on the circle
+function corrected_diameter(d, n = undef) = 2 * corrected_radius(d / 2 , n);                    //! Adjusted diameter to make flats lie on the circle
 
-module poly_circle(r, sides = 0) { //! Make a circle adjusted to print the correct size
-    n = sides ? sides : sides(r);
-    circle(r = corrected_radius(r,n), $fn = n);
+module poly_circle(r, sides = undef) { //! Make a circle adjusted to print the correct size
+    n = sides(r, sides);
+    circle(r = corrected_radius(r, n), $fn = n);
 }
 
-module poly_cylinder(r, h, center = false, sides = 0, chamfer = false, twist = 0) {//! Make a cylinder adjusted to print the correct size
+module poly_cylinder(r, h, center = false, sides = undef, chamfer = false, twist = 0) {//! Make a cylinder adjusted to print the correct size
     if(twist) {
         slices = ceil(h / layer_height);
         twists = min(twist + 1, slices);
-        sides = sides ? sides : sides(r);
+        sides = sides(r, sides);
         rot = 360 / sides / twists * (twists < slices ? (1 + 1 / slices) : 1);
         if(center)
             for(side = [0, 1])
@@ -64,10 +64,10 @@ module poly_cylinder(r, h, center = false, sides = 0, chamfer = false, twist = 0
             poly_circle(r, sides);
 
     if(h && chamfer)
-        poly_cylinder(r + layer_height, center ? layer_height * 2 : layer_height, center, sides = sides ? sides : sides(r));
+        poly_cylinder(r + layer_height, center ? layer_height * 2 : layer_height, center, sides = sides(r, sides));
 }
 
-module poly_ring(or, ir, sides = 0) { //! Make a 2D ring adjusted to have the correct internal radius
+module poly_ring(or, ir, sides = undef) { //! Make a 2D ring adjusted to have the correct internal radius
     cir = corrected_radius(ir, sides);
     filaments = (or - cir) / extrusion_width;
     if(filaments > 3 + eps)

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/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

@@ -292,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
@@ -654,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/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/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);