Fixed markdown numbered points in core_xy.

Changlog upated.

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();
 
@@ -182,7 +182,7 @@ This is achieved by having a pair of modules: -
     }
 
     module handle_fastened_assembly(thickness) { //! Assembly with fasteners in place
-        screw_length = screw_longer_than(thickness + insert_length(insert) + 2 * washer_thickness(screw_washer(screw)));
+        screw_length = screw_length(screw, thickness, 2, true, longer = true);
 
         handle_assembly();
 
@@ -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,8 @@
     {
         "name": "base_assembly",
         "big": null,
+        "ngb": false,
+        "zoomed": 0,
         "count": 1,
         "assemblies": {},
         "vitamins": {
@@ -20,6 +22,8 @@
     {
         "name": "feet_assembly",
         "big": null,
+        "ngb": false,
+        "zoomed": 0,
         "count": 1,
         "assemblies": {
             "base_assembly": 1
@@ -46,6 +50,8 @@
     {
         "name": "mains_in_assembly",
         "big": null,
+        "ngb": false,
+        "zoomed": 0,
         "count": 1,
         "assemblies": {
             "feet_assembly": 1
@@ -82,6 +88,8 @@
     {
         "name": "main_assembly",
         "big": null,
+        "ngb": false,
+        "zoomed": 0,
         "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
 
 
 
-

global_defs.scad

@@ -26,7 +26,7 @@
 //  Setting $bom after including lib overrides bom in the libs but not in the local file.
 //  Setting $_bom in the local file overrides it in the local file but not in the libs.
 //
-//function is_undef(x) = x == undef;
+rr_green = [0, 146/255, 0];                                               // RepRap logo colour
 
 $_bom           = is_undef($bom)             ? 0      : $bom;             // 0 no bom, 1 assemblies and stls, 2 vitamins as well
 $exploded       = is_undef($explode)         ? 0      : $explode;         // 1 for exploded view
@@ -34,7 +34,7 @@ layer_height    = is_undef($layer_height)    ? 0.25   : $layer_height;    // lay
 extrusion_width = is_undef($extrusion_width) ? 0.5    : $extrusion_width; // filament width when printing
 nozzle          = is_undef($nozzle)          ? 0.45   : $nozzle;          // 3D printer nozzle
 cnc_bit_r       = is_undef($cnc_bit_r)       ? 1.2    : $cnc_bit_r;       // minimum tool radius when milling 2D objects
-pp1_colour      = is_undef($pp1_colour)      ? [0, 146/255, 0] : $pp1_colour; // printed part colour 1, RepRap logo colour
+pp1_colour      = is_undef($pp1_colour)      ? rr_green : $pp1_colour;    // printed part colour 1, RepRap logo colour
 pp2_colour      = is_undef($pp2_colour)      ? "Crimson"  : $pp2_colour;  // printed part colour 2
 pp3_colour      = is_undef($pp3_colour)      ? "SteelBlue" : $pp3_colour; // printed part colour 3
 pp4_colour      = is_undef($pp4_colour)      ? "darkorange" : $pp4_colour;// printed part colour 4

lib.scad

@@ -26,6 +26,7 @@ include <vitamins/psus.scad>
 include <vitamins/pcbs.scad>
 
 include <vitamins/batteries.scad>
+include <vitamins/bearing_blocks.scad>
 include <vitamins/blowers.scad>
 include <vitamins/bulldogs.scad>
 include <vitamins/buttons.scad>
@@ -35,10 +36,8 @@ include <vitamins/displays.scad>
 include <vitamins/extrusions.scad>
 include <vitamins/extrusion_brackets.scad>
 include <vitamins/geared_steppers.scad>
-include <vitamins/green_terminals.scad>
 include <vitamins/hot_ends.scad>
 include <vitamins/inserts.scad>
-include <vitamins/kp_pillow_blocks.scad>
 include <vitamins/ldrs.scad>
 include <vitamins/leadnuts.scad>
 include <vitamins/led_meter.scad>
@@ -48,12 +47,12 @@ include <vitamins/mains_sockets.scad>
 include <vitamins/modules.scad>
 include <vitamins/panel_meters.scad>
 include <vitamins/pillars.scad>
+include <vitamins/pillow_blocks.scad>
 include <vitamins/pin_headers.scad>
 include <vitamins/pulleys.scad>
 include <vitamins/ring_terminals.scad>
 include <vitamins/rails.scad>
 include <vitamins/rod.scad>
-include <vitamins/scs_bearing_blocks.scad>
 include <vitamins/shaft_couplings.scad>
 include <vitamins/sheets.scad>
 include <vitamins/sk_brackets.scad>
@@ -90,7 +89,7 @@ use <utils/gears.scad>
 use <utils/hanging_hole.scad>
 use <utils/fillet.scad>
 use <utils/rounded_polygon.scad>
-use <utils/rounded_right_triangle.scad>
+use <utils/rounded_triangle.scad>
 use <utils/layout.scad>
 use <utils/round.scad>
 use <utils/offset.scad>

libtest.scad

@@ -33,6 +33,8 @@
 //!
 //! See [usage](docs/usage.md) for requirements, installation instructions and a usage guide.
 //!
+//! A list of changes classified as breaking, additions or fixes is maintained in [CHANGELOG.md](CHANGELOG.md).
+//!
 //! <img src="libtest.png" width="100%"/>
 //
 // This file shows all the parts in the library.
@@ -41,6 +43,7 @@ include <lib.scad>
 
 use <tests/ball_bearings.scad>
 use <tests/batteries.scad>
+use <tests/bearing_blocks.scad>
 use <tests/belts.scad>
 use <tests/blowers.scad>
 use <tests/bulldogs.scad>
@@ -62,7 +65,6 @@ use <tests/hot_ends.scad>
 use <tests/IECs.scad>
 use <tests/inserts.scad>
 use <tests/jack.scad>
-use <tests/KP_pillow_blocks.scad>
 use <tests/leadnuts.scad>
 use <tests/LDRs.scad>
 use <tests/LEDs.scad>
@@ -78,6 +80,7 @@ use <tests/opengrab.scad>
 use <tests/panel_meters.scad>
 use <tests/PCBs.scad>
 use <tests/pillars.scad>
+use <tests/pillow_blocks.scad>
 use <tests/press_fit.scad>
 use <tests/PSUs.scad>
 use <tests/pulleys.scad>
@@ -86,7 +89,6 @@ use <tests/ring_terminals.scad>
 use <tests/rockers.scad>
 use <tests/rod.scad>
 use <tests/screws.scad>
-use <tests/SCS_bearing_blocks.scad>
 use <tests/sealing_strip.scad>
 use <tests/shaft_couplings.scad>
 use <tests/sheets.scad>
@@ -117,7 +119,9 @@ 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>
 use <tests/screw_knob.scad>
 use <tests/socket_box.scad>
@@ -170,13 +174,19 @@ translate([x5, cable_grommets_y + 370])
 translate([x5 + 60, cable_grommets_y + 200])
     strap_handles();
 
+translate([640, cable_grommets_y + 200])
+    printed_pulley_test();
+
 translate([x5, cable_grommets_y + 250])
     handle();
 
 translate([950, 600])
     box_test();
 
-translate([890, 750])
+translate([830, 770])
+    pocket_handles();
+
+translate([950, 750])
     printed_boxes();
 
 translate([850, 1330])
@@ -197,8 +207,8 @@ ball_bearings_y = pillars_y + 40;
 pulleys_y = ball_bearings_y +40;
 hot_ends_y = pulleys_y + 60;
 linear_bearings_y = hot_ends_y + 50;
-sheets_y = linear_bearings_y + 100;
-pcbs_y = sheets_y + 40;
+sheets_y = linear_bearings_y + 90;
+pcbs_y = sheets_y + 60;
 displays_y = pcbs_y + 170;
 fans_y = displays_y + 80;
 transformers_y = fans_y + 120;
@@ -351,7 +361,7 @@ modules_y = iecs_y + 60;
 ssrs_y = modules_y + 80;
 blowers_y = ssrs_y + 60;
 batteries_y = blowers_y + 100;
-steppers_y = batteries_y + 70;
+steppers_y = batteries_y + 55;
 panel_meters_y = steppers_y + 70;
 extrusions_y = panel_meters_y + 80;
 

printed/box.scad

@@ -75,9 +75,9 @@ function box_corner_overlap(type) = box_wall(type);
 function box_corner_rad(type) = box_sheet_slot(type) - sheet_slot_clearance / 2 + box_corner_gap(type) + box_corner_overlap(type);
 function box_sheet_r(type) = box_corner_rad(type) - box_sheet_slot(type) - box_corner_overlap(type);
 
-function box_screw_length(type, top) = screw_longer_than(2 * washer_thickness(box_washer(type))
-                                                    + sheet_thickness(top ? box_top_sheet(type) : box_base_sheet(type))
-                                                    + box_corner_gap(type) + box_profile_overlap(type) + box_insert_l(type) - 1);
+function box_screw_length(type, top) =
+    let(s = top ? box_top_sheet(type) : box_base_sheet(type))
+        screw_length(box_screw(type), sheet_thickness(s) + box_corner_gap(type) + box_profile_overlap(type) - 1, washers = 2, insert = true, longer = true);
 
 function box_wall_clearance(type) = box_sheet_slot(type) / 2 - sheet_thickness(box_sheets(type)) / 2;
 function box_margin(type) = box_profile_overlap(type) + box_corner_gap(type); //! How much the bezel intrudes on the specified height
@@ -139,9 +139,9 @@ 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);
+
+    stl("box_corner_profile")
         difference() {
             linear_extrude(length, center = true, convexity = 5)
                 box_corner_profile_2D(type);
@@ -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,13 +220,14 @@ module box_bezel(type, bottom) { //! Generates top and bottom bezel STLs
     height = box_bezel_height(type, bottom);
     foot_extension = foot_height - height;
 
+    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), 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
             //
@@ -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,6 +512,7 @@ module box_shelf_bracket(type, screw_positions, wall = undef) { //! Generates a
                         square([lip, eps]);
                 }
 
+    stl("shelf_bracket")
         difference() {
             union() {
                 linear_extrude(w)

printed/cable_grommets.scad

@@ -49,12 +49,12 @@ 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;
 
+    stl(str("ribbon_grommet_", ways, "_", thickness))
         rotate([90, 0, 0])
             union() {
                 for(side = [-1, 1])
@@ -84,13 +84,13 @@ module ribbon_grommet(ways, thickness) { //! Generate the STL for a printed ribb
 }
 
 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;
+    stl(str("round_grommet_top_", round(diameter * 10), "_", thickness))
         union() {
             rotate_extrude()
                 polygon([
@@ -113,11 +113,11 @@ module round_grommet_top(diameter, thickness, od = undef) { //! Generate the STL
 }
 
 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);
+    stl(str("round_grommet_bottom_", round(diameter * 10)))
         rotate_extrude()
             polygon([
                 [r2, chamfer],
@@ -161,11 +161,11 @@ 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;
 
+    stl(str("mouse_grommet_", r * 10, "_", thickness))
         rotate([90, 0, 0])
             union() {
                 for(side = [-1, 1])

printed/camera_housing.scad

@@ -68,7 +68,7 @@ function cam_screw_length(cam) = let(
     front = cam_front_size(cam),
     screw = pcb_screw(camera_pcb(cam)),
     nut = screw_nut(screw)
-    ) screw_longer_than(front.z + washer_thickness(screw_washer(screw)) - nut_trap_depth(nut) + nut_thickness(nut, true));
+    ) screw_length(screw, front.z - nut_trap_depth(nut), 1, nyloc = true);
 
 function hinge_z(cam) = cam_screw_length(cam) - hinge_r;
 
@@ -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,6 +92,7 @@ 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);
 
+    stl("rpi_camera_focus_ring")
         difference() {
             linear_extrude(height = thickness, convexity = 5)
                 difference() {
@@ -118,12 +118,12 @@ module rpi_camera_focus_ring_stl() { //! Focus ring the glue onto RPI lens
 }
 
 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);
 
+    stl(str("camera_back_", cam[0]))
         translate_z(back.z)
             hflip()
                 difference() {
@@ -144,7 +144,6 @@ module camera_back(cam) { //! Make the STL for a camera case back
 }
 
 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,6 +169,7 @@ 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();
 
+    stl(str("camera_front_", cam[0]))
         difference() {
             union() {
                 hull()
@@ -253,10 +253,10 @@ 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);
+
+    stl(str("camera_bracket_", cam[0])) union() {
         translate([hinge_h / 2, 0])
             difference() {
                 hull() {
@@ -282,9 +282,10 @@ module camera_bracket(cam) { //! Make the STL for the camera bracket
                     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);
@@ -344,9 +345,8 @@ module camera_fastened_assembly(cam, thickness, angle = 0) {
     camera_bracket_position(cam)
         camera_bracket_screw_positions(cam) {
             nut = screw_nut(bracket_screw);
-            washer = screw_washer(bracket_screw);
             t = bracket_thickness(cam);
-            screw_length = screw_longer_than(thickness + t + nut_thickness(nut, true) + 2 * washer_thickness(washer));
+            screw_length = screw_length(bracket_screw, thickness + t, 2, nyloc = true);
             vflip()
                 translate_z(thickness)
                     screw_and_washer(bracket_screw, screw_length);

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,6 +42,7 @@ module ESP12F_carrier_stl() { //! Generate the STL for an ESP12 carrier
     width1 = wpitch1 + hole + squeezed_wall * 2;
     width2 = wpitch2 + hole2 + squeezed_wall * 2;
 
+    stl("ESP12F_carrier")
         difference() {
             hull() {
                 translate_z(height - eps / 2)
@@ -65,7 +65,6 @@ module ESP12F_carrier_stl() { //! Generate the STL for an ESP12 carrier
 }
 
 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,6 +77,7 @@ module TP4056_carrier_stl() { //! Generate the STL for an TP4056 carrier, two re
     width = hole + squeezed_wall * 2;
     spacing = inch(0.9);
 
+    stl("TP4056_carrier")
         difference() {
             hull() {
                 translate_z(height - eps / 2)
@@ -101,7 +101,6 @@ module TP4056_carrier_stl() { //! Generate the STL for an TP4056 carrier, two re
 }
 
 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,13 +112,14 @@ 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;
 
+    stl("MT3608_carrier")
         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/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,6 +79,8 @@ 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);
+
+    stl(name ? name : str("corner_block", "_M", screw_radius(screw) * 20))
         difference() {
             hull()  {
                 translate([r, r])
@@ -117,7 +117,7 @@ module corner_block(screw = def_screw, name = false) { //! Generate the STL for
 }
 
 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)
@@ -133,12 +133,10 @@ assembly(str("corner_block_M", 20 * screw_radius(screw))) {
 module fastened_corner_block_assembly(thickness, screw = def_screw, thickness_below = undef, thickness_side2 = undef, name = false, show_block = true, star_washers = true) { //! Printed block with all fasteners
     thickness2 = !is_undef(thickness_below) ? thickness_below : thickness;
     thickness3 = !is_undef(thickness_side2) ? thickness_side2 : thickness;
-    washer = screw_washer(screw);
-    insert = screw_insert(screw);
-    function screw_length(t) = screw_shorter_than((star_washers ? 2 : 1) * washer_thickness(washer) + t + insert_length(insert) + overshoot);
-    screw_length = screw_length(thickness);
-    screw_length2 = screw_length(thickness2);
-    screw_length3 = screw_length(thickness3);
+    function screw_len(t) = screw_length(screw, t + overshoot, star_washers ? 2 : 1, true);
+    screw_length = screw_len(thickness);
+    screw_length2 = screw_len(thickness2);
+    screw_length3 = screw_len(thickness3);
 
     if(show_block)
         corner_block_assembly(screw, name) children();

printed/door_hinge.scad

@@ -54,10 +54,10 @@ 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;
 
+    stl(str("door_hinge_", door_thickness))
         union() {
             rotate([90, 0, 0])
                 linear_extrude(width, center = true)
@@ -136,8 +136,7 @@ module door_hinge_assembly(top, door_thickness = 6) { //! The moving assembly th
     dir = top ? -1 : 1;
     pin_x = door_hinge_pin_x();
     pin_y = door_hinge_pin_y();
-    washer = screw_washer(screw);
-    screw_length = screw_shorter_than(thickness + door_thickness +  washer_thickness(washer));
+    screw_length = screw_length(screw, thickness + door_thickness, 1);
 
     translate([0, pin_y - (thickness + door_thickness / 2), dir * width / 2]) {
         rotate([90, 0, 180])
@@ -148,20 +147,20 @@ module door_hinge_assembly(top, door_thickness = 6) { //! The moving assembly th
                 screw_and_washer(screw, screw_length);
     }
 
-    translate([pin_x, pin_y, top ? 0 : -washer_thickness(screw_washer(pin_screw))])
-        washer(screw_washer(pin_screw));
+    washer = screw_washer(pin_screw);
+    wt = washer_thickness(washer);
+    translate([pin_x, pin_y, top ? 0 : -wt])
+        washer(washer);
 
-    translate([pin_x, pin_y, top ? washer_thickness(screw_washer(pin_screw)) + stat_width : width])
-        screw_and_washer(pin_screw, screw_longer_than(2 * washer_thickness(screw_washer(pin_screw)) + width + stat_width));
+    translate([pin_x, pin_y, top ? wt + stat_width : width])
+        screw_and_washer(pin_screw, screw_length(pin_screw, width + stat_width, 2, longer = true));
 }
 
 module door_hinge_static_assembly(top, sheet_thickness = 3) { //! The stationary assembly
     dir = top ? -1 : 1;
     pin_x = door_hinge_pin_x();
 
-    stat_washer = screw_washer(stat_screw);
-    stat_nut = screw_nut(stat_screw);
-    stat_screw_length = screw_longer_than(thickness + sheet_thickness + 2 * washer_thickness(stat_washer) + nut_thickness(stat_nut, true));
+    stat_screw_length = screw_length(stat_screw, thickness + sheet_thickness, 2, nyloc = true);
 
     translate([pin_x, 0, -dir * (stat_width / 2 + washer_thickness(screw_washer(pin_screw)))])
         rotate([90, 0, 0]) {
@@ -169,9 +168,10 @@ module door_hinge_static_assembly(top, sheet_thickness = 3) { //! The stationary
 
             door_hinge_stat_hole_positions() {
                 screw_and_washer(stat_screw, stat_screw_length);
+
                 translate_z(-thickness - sheet_thickness)
                     vflip()
-                        nut_and_washer(stat_nut, true);
+                        nut_and_washer(screw_nut(stat_screw), true);
             }
         }
 }

printed/door_latch.scad

@@ -38,13 +38,13 @@ 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;
+
+    stl("door_latch")
         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);
@@ -61,7 +61,7 @@ module door_latch_assembly(sheet_thickness = 3) { //! The assembly for a specifi
     washer = screw_washer(screw);
     nut = screw_nut(screw);
 
-    screw_length = screw_longer_than(height - nut_trap_depth + sheet_thickness + 2 * washer_thickness(washer) + nut_thickness(nut, true));
+    screw_length = screw_length(screw, height - nut_trap_depth + sheet_thickness, 2, nyloc = true);
 
     translate([0, -height - washer_thickness(washer)])
         rotate([-90, 0, 0]) {

printed/drag_chain.scad

@@ -251,7 +251,7 @@ module drag_chain_link(type, start = false, end = false, check_kids = true) { //
 }
 
 // Need to use a wrapper because can't define nested modules in an assembly
-module _drag_chain_assembly(type, pos = 0) {
+module _drag_chain_assembly(type, pos = 0, render = false) {
     s = drag_chain_size(type);
     x = (1 + exploded()) * s.x;
     r = drag_chain_radius(type) * x / s.x;
@@ -278,8 +278,11 @@ module _drag_chain_assembly(type, pos = 0) {
     module link(n)                                  // Position and colour link with origin at the hinge hole
         translate([-z / 2, 0, -z / 2]) {
             stl_colour(n < 0 || n == npoints - 1 ? pp3_colour : n % 2 ? pp1_colour : pp2_colour)
+                render_if(render)
                     drag_chain_link(type, start = n == -1, end = n == npoints - 1, check_kids = false)
-                    let($fasteners = 0) children();
+                        let($fasteners = 0)
+                            children();
+
             let($fasteners = 1) children();
         }
 
@@ -307,15 +310,15 @@ module _drag_chain_assembly(type, pos = 0) {
 
 //! 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)  //! Drag chain assembly
-    assembly(str(drag_chain_name(type), "_drag_chain"), big = true)
+module drag_chain_assembly(type, pos = 0, render = false)  //! Drag chain assembly
+    assembly(str(drag_chain_name(type), "_drag_chain"), big = true, ngb = true)
         if($children == 2)
-            _drag_chain_assembly(type, pos) {
+            _drag_chain_assembly(type, pos, render) {
                 children(0);
                 children(1);
             }
         else if($children == 1)
-            _drag_chain_assembly(type, pos)
+            _drag_chain_assembly(type, pos, render)
                 children(0);
         else
-            _drag_chain_assembly(type, pos);
+            _drag_chain_assembly(type, pos, render);

printed/fixing_block.scad

@@ -71,7 +71,6 @@ 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;
     insert = screw_insert(screw);
     corner_rad = insert_outer_d(insert) / 2 + wall;
@@ -79,6 +78,7 @@ module fixing_block(screw = def_screw) { //! Generate the STL
     fb_height = fixing_block_height(screw);
     fb_depth = fixing_block_depth(screw);
 
+    stl(str("fixing_block_M", screw_radius(screw) * 20))
         difference() {
             union() {
                 linear_extrude(fb_height, convexity = 5)
@@ -106,7 +106,7 @@ module fixing_block(screw = def_screw) { //! Generate the STL
 }
 
 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);
@@ -122,9 +122,7 @@ assembly(str("fixing_block_M", 20 * screw_radius(screw))) {
 
 module fastened_fixing_block_assembly(thickness, screw = def_screw, screw2 = undef, thickness2 = undef, show_block = true, star_washers = true) { //! Assembly with fasteners in place
     module fb_screw(screw, thickness) {
-        washer = screw_washer(screw);
-        insert = screw_insert(screw);
-        screw_length = screw_longer_than((star_washers ? 2 : 1) * washer_thickness(washer) + thickness + insert_length(insert));
+        screw_length = screw_length(screw, thickness, star_washers ? 2 : 1, true, longer = true);
 
         if(thickness)
             translate_z(thickness)

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,6 +83,8 @@ 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;
 
+    stl(str("hinge_", female ? "fe": "", "male_", type[0]))
+        union() {
             linear_extrude(t)
                 difference() {
                     hull() {
@@ -117,6 +117,7 @@ module hinge_male(type, female = false) {       //! The half with the stationary
                                     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);
@@ -155,9 +156,7 @@ module hinge_fastened_assembly(type, thickness1, thickness2, angle, show_hinge =
         hinge_assembly(type, angle);
 
     screw = hinge_screw(type);
-    washer_t = 2 * washer_thickness(screw_washer(screw));
     nut = screw_nut(screw);
-    nut_t = nut_thickness(nut, true);
     t = hinge_thickness(type);
     kr = hinge_knuckle_dia(type) / 2;
 
@@ -165,7 +164,7 @@ module hinge_fastened_assembly(type, thickness1, thickness2, angle, show_hinge =
         if(thickness)
             hinge_screw_positions(type) {
                 translate_z(t)
-                    screw_and_washer(screw, screw_longer_than(t + thickness + washer_t + nut_t));
+                    screw_and_washer(screw, screw_length(screw, t + thickness, 2, nyloc = true));
 
                 translate_z(-thickness)
                     vflip()

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,6 +46,7 @@ module foot(type = foot) { //! Generate STL
     r2 = r3 - h * tan(foot_slant(type));
     r =  foot_rad(type);
 
+    stl("foot")
         union() {
             rotate_extrude(convexity = 3) {
                 hull() {
@@ -69,10 +69,9 @@ module foot(type = foot) { //! Generate STL
 
 module foot_assembly(t = 0, type = foot, flip = false) { //! Assembly with fasteners in place for specified sheet thickness
     screw = foot_screw(type);
-    washer = screw_washer(screw);
     nut = screw_nut(screw);
     squeeze = 0.5;
-    screw_length = screw_longer_than(foot_thickness(type) + t + 2 * washer_thickness(washer) + nut_thickness(nut, true) - squeeze);
+    screw_length = screw_length(screw, foot_thickness(type) + t - squeeze, 2, nyloc = true);
 
     vflip() explode(15, true) {
         stl_colour(pp4_colour) foot(type);
@@ -94,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));
@@ -104,6 +102,7 @@ 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;
+    stl("insert_foot")
         union() {
             rotate_extrude() {
                 union() {
@@ -133,7 +132,7 @@ module insert_foot(type = insert_foot) { //! Generate STL for foot with insert
 //! 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);
 
@@ -146,9 +145,7 @@ assembly("insert_foot") {
 
 module fastened_insert_foot_assembly(t = 3, type = insert_foot) { //! Assembly with fasteners in place for specified sheet thickness
     screw = foot_screw(type);
-    washer = screw_washer(screw);
-    insert = screw_insert(screw);
-    screw_length = screw_shorter_than(insert_length(insert) + t + 2 * washer_thickness(washer));
+    screw_length = screw_length(screw, t, 2, insert = true);
 
     explode(-10) insert_foot_assembly(type);
 

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,6 +57,7 @@ module handle_stl() { //! generate the STL
                         square([dia / 2 + 1, dia + 1]);
                 }
 
+    stl("handle")
         translate_z(dia / 2)
             union() {
                 hull() {
@@ -81,7 +80,7 @@ module handle_stl() { //! generate the STL
 //! 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();
 
@@ -91,7 +90,7 @@ assembly("handle") {
 }
 
 module handle_fastened_assembly(thickness) { //! Assembly with fasteners in place
-    screw_length = screw_longer_than(thickness + insert_length(insert) + 2 * washer_thickness(screw_washer(screw)));
+    screw_length = screw_length(screw, thickness, 2, true, longer = true);
 
     handle_assembly();
 

printed/pcb_mount.scad

@@ -66,11 +66,10 @@ 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;
 
+    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])
@@ -96,6 +95,7 @@ module pcb_mount(pcb, height = 5, washers = true) { //! Make the STL of a pcb mo
                 square([pcb_length(pcb) + 2 * clearance, pcb_width(pcb) + 2 * clearance], center = true);
             }
     }
+}
 
 module pcb_mount_assembly(pcb, thickness, height = 5) { //! A PCB mount assembly with fasteners
     translate_z(height)
@@ -103,10 +103,9 @@ module pcb_mount_assembly(pcb, thickness, height = 5) { //! A PCB mount assembly
 
     stl_colour(pp1_colour) pcb_mount(pcb, washers = false);
 
-    washer = screw_washer(screw);
     nut = screw_nut(screw);
     t = pcb_thickness(pcb);
-    screw_length = screw_longer_than(height + t + washer_thickness + thickness + washer_thickness(washer) + nut_thickness(nut, true));
+    screw_length = screw_length(screw, height + t + washer_thickness + thickness, 1, nyloc = true);
 
     pcb_mount_screw_positions(pcb) {
         translate_z(height + t) {

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

@@ -65,10 +65,8 @@ function pbox_insert(type) = screw_insert(pbox_screw(type)); //! The insert for
 function pbox_washer(type) = screw_washer(pbox_screw(type)); //! The washer for the base screws
 
 function pbox_screw_length(type, panel_thickness = 0) =  //! Length of the base screw
-    let(foot = pbox_foot(type))
-        screw_shorter_than(pbox_base(type) + washer_thickness(pbox_washer(type))
-                            + insert_length(pbox_insert(type))
-                            + (foot ? foot_thickness(foot) : panel_thickness));
+    let(foot = pbox_foot(type), screw = pbox_screw(type))
+        screw_length(screw, pbox_base(type) + (foot ? foot_thickness(foot) : panel_thickness), 1, true);
 
 function pbox_mid_offset(type) = pbox_ridges(type).y + pbox_wall(type) / 2; // Offset to wall midpoint
 
@@ -131,8 +129,9 @@ 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);
+
+    stl(str(pbox_name(type),"_base"))
         difference() {
             union() {
                 linear_extrude(t)
@@ -151,8 +150,6 @@ module pbox_base(type) { //! Generate the STL for the base
 }
 
 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);
@@ -161,6 +158,7 @@ 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;
 
+    stl(pbox_name(type))
         difference() {
             union() {
                 linear_extrude(total_height)
@@ -184,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/printed_pulleys.scad

@@ -0,0 +1,200 @@
+//
+// NopSCADlib Copyright Chris Palmer 2020
+// nop.head@gmail.com
+// hydraraptor.blogspot.com
+//
+// This file is part of NopSCADlib.
+//
+// NopSCADlib is free software: you can redistribute it and/or modify it under the terms of the
+// GNU General Public License as published by the Free Software Foundation, either version 3 of
+// the License, or (at your option) any later version.
+//
+// NopSCADlib is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+// without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+// See the GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License along with NopSCADlib.
+// If not, see <https://www.gnu.org/licenses/>.
+//
+//! Printed pulleys are a remix of droftarts's (see <https://www.thingiverse.com/droftarts/designs>) Parametric Pulleys
+//! on Thingiverse (see <https://www.thingiverse.com/thing:16627>) and are licensed under the
+//! Creative Commons - Attribution - Share Alike license (see <https://creativecommons.org/licenses/by-sa/3.0/>)
+//
+
+include <../core.scad>
+include <../vitamins/pulleys.scad>
+
+printed_pulley_GT2_profile = [[0.747183,-0.5],[0.747183,0],[0.647876,0.037218],[0.598311,0.130528],[0.578556,0.238423],[0.547158,0.343077],[0.504649,0.443762],[0.451556,0.53975],[0.358229,0.636924],[0.2484,0.707276],[0.127259,0.750044],[0,0.76447],[-0.127259,0.750044],[-0.2484,0.707276],[-0.358229,0.636924],[-0.451556,0.53975],[-0.504797,0.443762],[-0.547291,0.343077],[-0.578605,0.238423],[-0.598311,0.130528],[-0.648009,0.037218],[-0.747183,0],[-0.747183,-0.5]];
+
+function printed_pulley_inverted(type) = pulley_hub_dia(type) < pulley_flange_dia(type); //! Need to print upside down to prevent overhang
+
+function printed_pulley_od(tooth_count, tooth_pitch, pitch_line_offset)
+    = tooth_count * tooth_pitch / PI - 2 * pitch_line_offset;
+
+module printed_pulley_teeth_from_profile(tooth_count, tooth_depth, tooth_width, tooth_profile) {
+    pulley_od = printed_pulley_od(tooth_count, 2, 0.254);
+
+    difference() {
+        rotate (90 / tooth_count)
+            circle(r = pulley_od / 2, $fn = tooth_count * 4);
+        tooth_distance_from_centre = sqrt(pulley_od * pulley_od - (tooth_width + 0.2) * (tooth_width + 0.2)) / 2;
+        for(i = [1 : tooth_count])
+            rotate(i * 360 / tooth_count)
+                translate([0, -tooth_distance_from_centre])
+                    scale([(tooth_width + 0.2) / tooth_width, 1])
+                        polygon(tooth_profile);
+    }
+}
+
+module printed_pulley_GT2_teeth(type) {
+    tooth_count = pulley_teeth(type);
+    if (tooth_count == 0)
+        circle(r = pulley_od(type) / 2);
+    else
+        printed_pulley_teeth_from_profile(tooth_count, 0.764, 1.494, printed_pulley_GT2_profile);
+}
+
+
+module printed_pulley_teeth(type) { //! Draw the pulley's teeth
+    tooth_count = pulley_teeth(type);
+    tw = pulley_od(type) * PI / (tooth_count * 2);
+    ir = pulley_ir(type);
+    or = pulley_od(type) / 2;
+
+    T_angle = 40;
+    GT_r = 0.555;
+    for (i = [0 : 1 : tooth_count - 1])
+        rotate(i * 360 / tooth_count)
+            if (pulley_type(type)[0] == "G")
+                translate([0, ir + GT_r])
+                    hull() {
+                        circle(GT_r);
+                        translate([0, GT_r])
+                            square(2 * GT_r, center = true);
+                    }
+            else
+                translate([0, (ir + or) / 2])
+                    hull() {
+                        for(side = [-1, 1])
+                            translate([side * tw / 2, 0])
+                                rotate(-side * T_angle / 2)
+                                    square([eps, (or - ir)], center = true);
+
+                        translate([0, 1])
+                            square([tw, eps], center = true);
+                    }
+}
+
+module printed_pulley(type) { //! Draw a printable pulley
+    ft = pulley_flange_thickness(type);
+    hl = pulley_hub_length(type);
+    w = pulley_width(type);
+    r1 = pulley_bore(type) / 2;
+    or = pulley_od(type) / 2;
+    screw_z = pulley_screw_z(type);
+
+
+    module core() {
+        translate_z(pulley_hub_length(type) + ft)
+            linear_extrude(w + 1) let($fa  = 1, $fs = 0.1)
+                if ("GT2" == str(pulley_type(type)[0], pulley_type(type)[1], pulley_type(type)[2]))
+                    difference() {
+                        printed_pulley_GT2_teeth(type);
+                        circle(d = pulley_bore(type));
+                    }
+                else
+                    difference() {
+                        circle(or);
+                        printed_pulley_teeth(type);
+                        circle(d = pulley_bore(type));
+                    }
+    }
+
+    module screw_holes() {
+        if(pulley_screws(type))
+            translate_z(screw_z)
+                for(i = [0 : pulley_screws(type) - 1])
+                    rotate([-90, 180, i * -90])
+                        if(show_supports())
+                            teardrop(r = screw_pilot_hole(pulley_screw(type)), h = pulley_flange_dia(type) / 2 + 1, center = false);
+                        else
+                            cylinder(r = screw_radius(pulley_screw(type)), h = pulley_flange_dia(type) / 2 + 1);
+    }
+
+    module hub()
+        linear_extrude(hl)
+            difference() {
+                circle(d= pulley_hub_dia(type));
+                circle(d = pulley_bore(type));
+            }
+
+    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
+                    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]), ngb = true) {
+    translate_z(pulley_offset(type)) {
+        stl_colour(colour)
+            if(printed_pulley_inverted(type))
+                translate_z(pulley_height(type))
+                    hflip()
+                        printed_pulley(type);
+            else
+                printed_pulley(type);
+
+        if(pulley_screws(type))
+            translate_z(pulley_screw_z(type))
+                for(i = [0 : pulley_screws(type) - 1])
+                    rotate([-90, 0, i * -90])
+                        translate_z(pulley_bore(type) / 2 + pulley_screw_length(type))
+                            screw(pulley_screw(type), pulley_screw_length(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,9 +107,10 @@ 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() {
@@ -141,9 +140,10 @@ module psu_shroud(type, cable_d, name, cables = 1) { //! Generate the STL file f
                     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()
@@ -156,8 +156,7 @@ assembly(str("PSU_shroud_", name)) {
 
 module psu_shroud_fastened_assembly(type, cable_d, thickness, name, cables = 1) //! Assembly with screws in place
 {
-    washer = screw_washer(screw);
-    screw_length = screw_shorter_than(2 * washer_thickness(washer) + thickness + insert_length(insert) + counter_bore);
+    screw_length = screw_length(screw,thickness + counter_bore, 2, true);
 
     psu_shroud_assembly(type, cable_d, name, cables);
 

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,6 +54,7 @@ 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);
 
+    stl(str("ribbon_clamp_", ways, screw_d != 3 ? str("_", screw_d) : ""))
         difference() {
             union() {
                 hull() {
@@ -82,7 +82,7 @@ module ribbon_clamp(ways, screw = screw) { //! Generate STL for given number of
 }
 
 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);
 
@@ -101,8 +101,7 @@ module ribbon_clamp_fastened_assembly(ways, thickness, screw = screw) { //! Clam
 
     vitamin(str(": Tape self amalgamating silicone ",tape_l," x 25mm"));
 
-    washer = screw_washer(screw);
-    screw_length = screw_shorter_than(2 * washer_thickness(washer) + thickness + ribbon_clamp_screw_depth(screw));
+    screw_length = screw_length(screw, thickness + ribbon_clamp_screw_depth(screw), 2);
 
     ribbon_clamp_assembly(ways, screw);
 

printed/screw_knob.scad

@@ -34,12 +34,11 @@ 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;
 
+    stl(str("screw_knob_M", screw_radius(screw) * 20))
         union() {
             render() difference() {
                 cylinder(r = knob_stem_r, h = knob_thickness + knob_stem_h);
@@ -59,7 +58,7 @@ module screw_knob(screw) { //! Generate the STL for a knob to fit the specified
 
 //! 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,6 +50,7 @@ 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);
 
+    stl(str("socket_box_",type[0]))
         difference() {
             linear_extrude(height, convexity = 5)
                 face_plate(type);
@@ -105,8 +105,7 @@ module socket_box_MKLOGIC_assembly() socket_box_assembly(MKLOGIC);
 
 module socket_box_fastened_assembly(type, thickness) { //! The socket and backbox on each side of the specified panel thickness
     screw = mains_socket_screw(type);
-    insert = screw_insert(screw);
-    screw_length = screw_longer_than(mains_socket_height(type) + thickness + insert_length(insert));
+    screw_length = screw_length(screw, mains_socket_height(type) + thickness, 0, true, longer = true);
 
     explode(-50)
         translate_z(-height - thickness)

printed/ssr_shroud.scad

@@ -61,17 +61,17 @@ 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;
 
+
+    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() {
@@ -105,9 +105,10 @@ module ssr_shroud(type, cable_d, name) {    //! Generate the STL file for a spec
                     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()
@@ -119,8 +120,7 @@ assembly(str("SSR_shroud_", name)) {
 
 module ssr_shroud_fastened_assembly(type, cable_d, thickness, name) //! Assembly with screws in place
 {
-    washer = screw_washer(screw);
-    screw_length = screw_shorter_than(2 * washer_thickness(washer) + thickness + insert_length(insert) + counter_bore);
+    screw_length = screw_length(screw, thickness + counter_bore, 2, true);
 
     ssr_shroud_assembly(type, cable_d, name);
 

printed/strap_handle.scad

@@ -75,11 +75,10 @@ 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);
 
+    stl("strap")
         linear_extrude(strap_thickness(type), convexity = 3)
             difference() {
                 rounded_square([len, w], w / 2 - eps);
@@ -99,8 +98,6 @@ module strap(length, type = strap) { //! Generate the STL for the rubber strap
 }
 
 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,6 +118,7 @@ module strap_end(type = strap) { //! Generate the STL for end piece
             circle(r1);
         }
 
+    stl("strap_end")
         union() {
             linear_extrude(z1)
                 with_hole()
@@ -162,7 +160,7 @@ module strap_end(type = strap) { //! Generate the STL for end piece
 //! * 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);
 
@@ -172,11 +170,9 @@ assembly("strap_end") {
 
 module strap_assembly(length, type = strap) { //! Assembly with screws in place
     screw = strap_screw(type);
-    washer = screw_washer(screw);
-    penny = penny_washer(washer);
-    insert = strap_insert(type);
+    penny = penny_washer(screw_washer(screw));
 
-    screw_length = screw_shorter_than(washer_thickness(washer) + washer_thickness(penny) + insert_length(insert) + panel_clearance + counterbore);
+    screw_length = screw_length(screw, washer_thickness(penny) + panel_clearance + counterbore, 1, true);
 
     stl_colour(pp4_colour) strap(length, type);
 

scripts/bom.py

@@ -60,6 +60,8 @@ class BOM:
     def __init__(self, name):
         self.name = name
         self.big = None
+        self.ngb = False
+        self.zoomed = 0
         self.count = 1
         self.vitamins = {}
         self.printed = {}
@@ -73,6 +75,8 @@ class BOM:
         return {
              "name"       : self.name,
              "big"        : self.big,
+             "ngb"        : self.ngb,
+             "zoomed"     : self.zoomed,
              "count"      : self.count,
              "assemblies" : assemblies,
              "vitamins"   : {v : self.vitamins[v].data() for v in self.vitamins},
@@ -249,7 +253,7 @@ def boms(target = None, assembly = None):
         #
         # Run openscad
         #
-        openscad.run("-D", "$bom=2", "-D", "$preview=true", "--hardwarnings", "-o", "openscad.echo", "-d", bom_dir + "/bom.deps", bom_maker_name)
+        openscad.run("-D", "$bom=2", "-D", "$preview=true", "-o", "openscad.echo", "-d", bom_dir + "/bom.deps", bom_maker_name)
         os.remove(bom_maker_name)
         print("Generating bom ...", end=" ")
 

scripts/changelog.py

@@ -0,0 +1,163 @@
+#!/usr/bin/env python
+
+#
+# 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/>.
+#
+#! Creates the changelog from the git log
+
+from __future__ import print_function
+import sys
+import subprocess
+import re
+
+filename = 'CHANGELOG.md'
+
+def tag_version(t):
+    """ Format a version tag """
+    return 'v%d.%d.%d' % t
+
+def initials(name):
+    """ Convert full name to initials with a tooltip """
+    i = ''.join([n[0].upper() + '.' for n in name.split(' ')])
+    return '[%s](# "%s")' % (i, name)
+
+def get_remote_url():
+    """ Get the git remote URL for the repository """
+    url = subprocess.check_output(["git", "config", "--get", "remote.origin.url"]).decode("utf-8").strip("\n")
+    if url.startswith("git@"):
+        url = url.replace(":", "/", 1).replace("git@", "https://", 1)
+    if url.endswith(".git"):
+        url = url[:-4]
+    return url
+
+def iscode(word):
+    """ try to guess if the word is code """
+    endings = ['()', '*']
+    starts = ['$', '--']
+    anywhere = ['.', '_', '=', '[', '/']
+    words = ['center', 'false', 'true', 'ngb']
+
+    for w in words:
+        if word == w:
+            return True
+
+    for end in endings:
+        if word.endswith(end):
+            return True
+
+    for start in starts:
+        if word.startswith(start):
+            return True
+
+    for any in anywhere:
+        if word.find(any) >= 0:
+            return True
+
+    return False
+
+def codify(word, url):
+    """ if a word is deemed code enclose it backticks """
+    if word:
+        if re.match(r'#[0-9]+', word):
+            return '[%s](%s "show issue")' % (word, url + '/issues/' + word[1:])
+        if iscode(word):
+            return  '`' + word + '`'
+    return word
+
+
+def fixup_comment(comment, url):
+    """ markup code words and fix new paragraphs """
+    result = ''
+    word = ''
+    code = False
+    for i, c in enumerate(comment):
+        if c == '`' or code:                # Already a code block
+            result += c                     # Copy verbatim
+            if c == '`': code = not code    # Keep track of state
+        else:
+            if c in ' \n' or (c == '.' and (i + 1 == len(comment) or comment[i + 1] in ' \n')): # if a word terminator
+                result += codify(word, url) + c  # Add codified word before terminator
+                word = ''
+            else:
+                word += c                   # Accumulate next word
+    result += codify(word, url)             # In case comment ends without a terminator
+    return result.replace('\n\n','\n\n * ') # Give new paragraphs a bullet point
+
+class Commit(): # members dynamically added from commit_fields
+    pass
+
+blurb = """
+# %s Changelog
+This changelog is generated by `changelog.py` using manually added semantic version tags to classify commits as breaking changes, additions or fixes.
+
+"""
+
+if __name__ == '__main__':
+    url = get_remote_url()
+
+    commit_fields = {
+        'hash':    "%H|",       # commit commit_hash
+        'tag':     "%D|",       # tag
+        'author': "%aN|",       # author name
+        'date': "  %as|",       # author date short form
+        'comment': "%B~"        # body
+    }
+
+    # Produce the git log
+    format = ''.join([v for k, v in commit_fields.items()])
+    text = subprocess.check_output(["git", "log", "--topo-order", "--format=" + format]).decode("utf-8")
+
+    # Process the log into a list of Commit objects
+    commits = []
+    for line in text.split('~'):
+        line = line.strip('\n')
+        if line:
+            fields = line.split('|')
+            commit = Commit()
+            for i, k in enumerate(commit_fields):
+                exec('commit.%s = """%s"""' % (k, fields[i]), locals())
+            # Convert version tag to tuple
+            if commit.tag:
+                match = re.match(r'.*tag: v([0-9]+)\.([0-9]+)\.([0-9]+).*', commit.tag)
+                commit.tag = (int(match.group(1)), int(match.group(2)), int(match.group(3))) if match else ''
+            commits.append(commit)
+
+    # Format the results from the Commit objects
+    with open(filename, "wt") as file:
+        print(blurb % url.split('/')[-1], file = file)
+        for i, c in enumerate(commits):
+            if c.tag:
+                ver = tag_version(c.tag)
+                level, type = (3, 'Fixes') if c.tag[2] else (2, 'Additions') if c.tag[1] else (1, 'Breaking Changes') if c.tag[0] else (1, 'First publicised version')
+
+                # Find the previous tagged commit
+                j = i + 1
+                diff = ''
+                while j < len(commits):
+                    if commits[j].tag:
+                        last_ver = tag_version(commits[j].tag)
+                        diff = '[...](%s "diff with %s")' % (url + '/compare/' + last_ver + '...' + ver, last_ver)
+                        break
+                    j += 1
+
+                # Print verson info
+                print('%s [%s](%s "show release") %s %s' % ('#' * (level + 1), ver, url + '/releases/tag/' + ver, type, diff), file = file)
+
+            # Print commits excluding merges
+            if not c.comment.startswith('Merge branch') and not c.comment.startswith('Merge pull'):
+                print('* %s [`%s`](%s "show commit") %s %s\n' % (c.date, c.hash[:7], url + '/commit/' + c.hash, initials(c.author), fixup_comment(c.comment, url)), file = file)

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):
     #
@@ -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,18 +131,18 @@ 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)
+                                            openscad.run("-o", part_file, part_maker_name, "-D$bom=1", "-d", dname)
                                             times.add_time(part, t)
                                             if part_type == 'stl':
                                                 bounds = c14n_stl.canonicalise(part_file)
@@ -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,8 +68,9 @@ def gallery(force):
                             match = re.match(r"^(#+).*$", line)
                             if match:
                                 line = '#' + line
-                        if line == '---\n':
-                            break;
+                        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);

scripts/openscad.py

@@ -25,19 +25,25 @@ from __future__ import print_function
 import subprocess, sys
 
 def run_list(args, silent = False, verbose = False):
-    cmd = ["openscad.exe"] + args
+    cmd = ["openscad"] + args + ["--hardwarnings"]
     if not silent:
         for arg in cmd:
             print(arg, end=" ")
         print()
     with open("openscad.log", "w") as log:
         rc = subprocess.call(cmd, stdout = log, stderr = log)
-    for line in open("openscad.log", "rt"):
+    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,22 +43,32 @@ 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]
+
     #
     # Loop through source directories
     #
-    used = []
+    all_used = []
     all_sources = []
+    all_parts = []
+    read_times = False
     for dir in [source_dir1, source_dir2]:
         if not os.path.isdir(dir):
             continue
         if not os.path.isdir(target_dir):
             os.makedirs(target_dir)
+
+        if not read_times:
+            times.read_times(target_dir)
+            read_times = True
         #
         # 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,20 +77,26 @@ 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'
-            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
                 #
@@ -87,18 +105,27 @@ def plateup(target, part_type, usage = None):
                         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:
+                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 +136,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/readme.md

@@ -8,6 +8,7 @@ They should work with both Python 2 and Python 3.
 |:---|:---|
 | `bom.py` | Generates BOM files for the project. |
 | `c14n_stl.py` | OpenSCAD produces randomly ordered STL files. This script re-orders them consistently so that GIT can tell if they have changed or not. |
+| `changelog.py` | Creates the changelog from the git log |
 | `doc_scripts.py` | Makes this document and doc/usage.md. |
 | `dxfs.py` | Generates DXF files for all the routed parts listed on the BOM or a specified list. |
 | `gallery.py` | Finds projects and adds them to the gallery. |

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'
-            openscad.run(colour_scheme, "--projection=p", "--imgsize=4096,4096", cam, render, "--autocenter", "--viewall", "-o", tmp_name, png_maker_name);
+            tmp_name = tmp_dir + '/' + part[:-4] + '.png'
+            openscad.run("-o", tmp_name, png_maker_name, colour_scheme, "--projection=p", "--imgsize=4096,4096", cam, render, "--autocenter", "--viewall");
             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
@@ -50,13 +51,17 @@ def do_cmd(cmd, output = sys.stdout):
     return subprocess.call(cmd, stdout = output, stderr = output)
 
 def compare_images(a, b, c):
+    if not os.path.isfile(b):
+        print(Fore.MAGENTA + "Failed to generate %s while making %s" % (b, a), Fore.WHITE)
+        sys.exit(1)
     if not os.path.isfile(a):
         return -1
     log_name = 'magick.log'
     with open(log_name, 'w') as output:
         do_cmd(("magick compare -metric AE -fuzz %d%% %s %s %s" % (fuzz, a, b, c)).split(), output = output)
     with open(log_name, 'r') as f:
-        pixels = int(f.read().strip())
+        pixels = f.read().strip()
+        pixels = int(float(pixels if pixels.isnumeric() else -1))
     os.remove(log_name)
     return pixels
 
@@ -91,6 +96,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"
@@ -111,7 +117,7 @@ def tests(tests):
         libtest = True
         lib_blurb = scrape_blurb(scad_name)
         if not os.path.isfile(png_name):
-            openscad.run(colour_scheme, "--projection=p", "--imgsize=%d,%d" % (w, h), "--camera=0,0,0,50,0,340,500", "--autocenter", "--viewall", "-o", png_name, scad_name);
+            openscad.run(scad_name, "-o", png_name, colour_scheme, "--projection=p", "--imgsize=%d,%d" % (w, h), "--camera=0,0,0,50,0,340,500", "--autocenter", "--viewall");
             do_cmd(["magick", png_name, "-trim", "-resize", "1280", "-bordercolor", background, "-border", "10", png_name])
     else:
         #
@@ -126,14 +132,13 @@ def tests(tests):
     #
     # List of individual part files
     #
-
     scads = [i for i in sorted(os.listdir(scad_dir), key = lambda s: s.lower()) if i[-5:] == ".scad"]
     types = []
     for scad in scads:
         base_name = scad[:-5]
         if not tests or base_name in tests:
             done.append(base_name)
-            print('\n'+base_name)
+            print(base_name)
             cap_name = base_name[0].capitalize() + base_name[1:]
             base_name = base_name.lower()
             scad_name = scad_dir + '/' + scad
@@ -232,14 +237,15 @@ def tests(tests):
             if changed:
                 print(changed)
                 t = time.time()
-                tmp_name = '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]);
+                tmp_name = tmp_dir + '/tmp.png'
+                openscad.run_list([scad_name, "-o", tmp_name] + 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]);
                 times.add_time(scad_name, t)
                 do_cmd(["magick", tmp_name, "-trim", "-resize", "1000x600", "-bordercolor", background, "-border", "10", tmp_name])
                 update_image(tmp_name, png_name)
                 BOM = bom.parse_bom()
                 with open(bom_name, 'wt') as outfile:
                     json.dump(BOM.flat_data(), outfile, indent = 4)
+                print()
 
             with open(bom_name, "rt") as bom_file:
                 BOM = json.load(bom_file)
@@ -300,6 +306,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]
+        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 + "%5.1f %5.1f %s" % (new, delta, key))
+            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'
@@ -79,10 +81,8 @@ def bom_to_assemblies(bom_dir, bounds_map):
             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:
+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:
@@ -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):
@@ -162,33 +185,43 @@ def views(target, do_assemblies = None):
                                     #
                                     for ass in flat_bom:
                                         if ass["name"] == real_name:
+                                            zoomed = ass['zoomed']
                                             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]:
+                                        #
+                                        # Generate png name
+                                        #
                                         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('\\', '/')]
+                                                view_def = ['--viewall', '--autocenter'] if not (zoomed & (1 << explode)) else ['--camera=0,0,0,55,0,25,140']
+                                                openscad.run_list(["-o", tmp_name, png_maker_name] + options.list() + target_def + cwd_def + view_def + ["-D$pose=1", "-D$explode=%d" % explode, colour_scheme, "--projection=p", "--imgsize=4096,4096", "-d", dname]);
                                                 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,18 +235,17 @@ 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)
+        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")
@@ -222,14 +254,13 @@ def views(target, do_assemblies = None):
         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)
+        eop(doc_file, first = True)
         #
         # Build TOC
         #
@@ -242,12 +273,12 @@ def views(target, do_assemblies = None):
         print(file = doc_file)
         if len(blurbs) > 1:
             print(blurbs[1], file = doc_file)
-            eop(print_mode, 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)
-            types = ["vitamins", "printed", "routed"]
         headings = {"vitamins" : "vitamins", "printed" : "3D printed parts", "routed" : "CNC routed parts"}
         things = {}
         for t in types:
@@ -259,20 +290,22 @@ def views(target, do_assemblies = None):
                         things[t][thing] += ass[t][thing]["count"]
                     else:
                         things[t][thing] = ass[t][thing]["count"]
-            for ass in flat_bom:
+        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(flat_bom) + '|---:|:---|'), file = doc_file)
+        print(('|---:' * len(global_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)
+                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 flat_bom:
+                    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"]
@@ -280,20 +313,21 @@ def views(target, do_assemblies = None):
                             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)
 
                 grand_total = 0
-                    for ass in flat_bom:
+                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(print_mode, doc_file)
+        eop(doc_file)
         #
         # Assembly instructions
         #
@@ -301,10 +335,11 @@ def views(target, do_assemblies = None):
             name = ass["name"]
             cap_name = titalise(name)
 
+            print('<a name="%s"></a>' % name, file = doc_file)
             if ass["count"] > 1:
-                    print('<a name="%s"></a>\n## %d x %s' % (name, ass["count"], cap_name), file = doc_file)
+                print('## %d x %s' % (ass["count"], cap_name), file = doc_file)
             else:
-                    print('<a name="%s"></a>\n## %s' % (name, cap_name), file = doc_file)
+                print('## %s' % cap_name, file = doc_file)
             vitamins = ass["vitamins"]
             if vitamins:
                 print("### Vitamins",         file = doc_file)
@@ -367,28 +402,54 @@ def views(target, do_assemblies = None):
             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)
+            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(print_mode, doc_file, last = True)
+            eop(doc_file, last = True)
     #
     # Convert to HTML
     #
-        html_name = "printme.html" if print_mode else "readme.html"
-        with open(top_dir + html_name, "wt") as html_file:
+    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

@@ -30,7 +30,6 @@ sheet = PMMA3;
 height = 10;
 
 insert = screw_insert(screw);
-washer = screw_washer(screw);
 
 module widget(thickness) {
     vitamin(str("widget(", thickness, "): Rivit like thing for ", thickness, "mm sheets"));
@@ -44,19 +43,17 @@ module widget(thickness) {
     }
 }
 
-module widgit_stl() {
-    stl("widget");
-
+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);
         }
 }
 
-module widgit_dxf() {
-    dxf("widget");
-
+module widget_dxf() {
+    dxf("widget")
         difference() {
             sheet_2D(sheet, 20, 20, 1);
 
@@ -65,10 +62,10 @@ module widgit_dxf() {
 }
 
 //! * 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);
@@ -81,18 +78,18 @@ 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))
-            screw_and_washer(screw, screw_longer_than(sheet_thickness(sheet) + 2 * washer_thickness(washer) + 3), true);
+            screw_and_washer(screw, screw_length(screw, sheet_thickness(sheet) + 3, 2, longer = true), true);
 
         explode(5)
             translate_z(sheet_thickness(sheet) / 2 + eps)
@@ -101,7 +98,7 @@ assembly("wigdit") {
 }
 
 module boms() {
-    widgit_assembly();
+    widget_assembly();
 }
 
 boms();

tests/PCBs.scad

@@ -21,16 +21,22 @@ include <../vitamins/pcbs.scad>
 
 use <../utils/layout.scad>
 
+function spacing(p) = let(w = pcb_width(p)) w < 22 ? w + 3 : w + 10;
+
 module pcbs() {
-    layout([for(p = pcbs) pcb_width(p)], 10)
+    layout([for(p = pcbs) spacing(p)], 0)
         translate([0, pcb_length(pcbs[$i]) / 2])
             rotate(90)
                 pcb_assembly(pcbs[$i], 5 + $i, 3);
 
-    translate([0, 120])
+    translate([0, 110])
         layout([for(p = perfboards) pcb_length(p)], 10)
             translate([0, -pcb_width(perfboards[$i]) / 2])
                 pcb_assembly(perfboards[$i], 5 + $i, 3);
+
+    for(p = pcbs_not_shown)
+        hidden()
+            pcb(p);
 }
 if($preview)
     pcbs();

tests/bearing_blocks.scad

@@ -17,7 +17,7 @@
 // If not, see <https://www.gnu.org/licenses/>.
 //
 include <../core.scad>
-include <../vitamins/scs_bearing_blocks.scad>
+include <../vitamins/bearing_blocks.scad>
 
 use <../utils/layout.scad>
 

tests/blowers.scad

@@ -22,18 +22,15 @@ 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);
-        washer = screw_washer(screw);
         h = blower_lug(b);
 
         blower(b);
 
         blower_hole_positions(b)
             translate_z(h)
-                screw_and_washer(screw, screw_longer_than(h + washer_thickness(washer) + 5));
-
-
+                screw_and_washer(screw, screw_length(screw, h + 5, 1, longer = true));
     }
 
 if($preview)

tests/core_xy.scad

@@ -0,0 +1,134 @@
+//
+// NopSCADlib Copyright Chris Palmer 2020
+// nop.head@gmail.com
+// hydraraptor.blogspot.com
+//
+// This file is part of NopSCADlib.
+//
+// NopSCADlib is free software: you can redistribute it and/or modify it under the terms of the
+// GNU General Public License as published by the Free Software Foundation, either version 3 of
+// the License, or (at your option) any later version.
+//
+// NopSCADlib is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+// without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+// See the GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License along with NopSCADlib.
+// If not, see <https://www.gnu.org/licenses/>.
+//
+
+include <../core.scad>
+include <../vitamins/pulleys.scad>
+include <../vitamins/screws.scad>
+include <../vitamins/stepper_motors.scad>
+include <../vitamins/washers.scad>
+
+include <../utils/core_xy.scad>
+
+
+module coreXY_belts_test() {
+    coreXY_type = coreXY_GT2_20_16;
+    plain_idler = coreXY_plain_idler(coreXY_type);
+    toothed_idler = coreXY_toothed_idler(coreXY_type);
+
+    coreXYPosBL = [0, 0, 0];
+    coreXYPosTR = [200, 150, 0];
+    separation = [0, coreXY_coincident_separation(coreXY_type).y, pulley_height(plain_idler) + washer_thickness(M3_washer)];
+    pos = [100, 50];
+
+    upper_drive_pulley_offset = [40, 10];
+    lower_drive_pulley_offset = [0, 0];
+
+    coreXY_belts(coreXY_type,
+        carriagePosition = pos,
+        coreXYPosBL = coreXYPosBL,
+        coreXYPosTR = coreXYPosTR,
+        separation = separation,
+        x_gap = 10,
+        upper_drive_pulley_offset = upper_drive_pulley_offset,
+        lower_drive_pulley_offset = lower_drive_pulley_offset,
+        show_pulleys = true);
+
+
+    translate([coreXYPosBL.x + separation.x/2, coreXYPosTR.y + upper_drive_pulley_offset.y, separation.z/2]) {
+        // add the upper drive pulley stepper motor
+        translate([coreXY_drive_pulley_x_alignment(coreXY_type) + upper_drive_pulley_offset.x, 0, -pulley_height(coreXY_drive_pulley(coreXY_type))])
+            NEMA(NEMA17M);
+
+        // add the screws for the upper drive offset idler pulleys if required
+        if (upper_drive_pulley_offset.x > 0) {
+            translate(coreXY_drive_plain_idler_offset(coreXY_type))
+                translate_z(-pulley_offset(plain_idler))
+                    screw(M3_cap_screw, 20);
+            translate(coreXY_drive_toothed_idler_offset(coreXY_type))
+                translate_z(-pulley_offset(toothed_idler))
+                    screw(M3_cap_screw, 20);
+         } else if (upper_drive_pulley_offset.x < 0) {
+            translate([-pulley_od(plain_idler), coreXY_drive_plain_idler_offset(coreXY_type).y])
+                translate_z(-pulley_offset(plain_idler))
+                    screw(M3_cap_screw, 20);
+            translate([2*coreXY_drive_pulley_x_alignment(coreXY_type), coreXY_drive_toothed_idler_offset(coreXY_type).y])
+                translate_z(-pulley_offset(toothed_idler))
+                    screw(M3_cap_screw, 20);
+        }
+    }
+
+    translate([coreXYPosTR.x - separation.x/2, coreXYPosTR.y + lower_drive_pulley_offset.y, -separation.z/2]) {
+        // add the lower drive pulley stepper motor
+        translate([-coreXY_drive_pulley_x_alignment(coreXY_type) + lower_drive_pulley_offset.x, 0, -pulley_height(coreXY_drive_pulley(coreXY_type))])
+            NEMA(NEMA17M);
+
+        // add the screws for the lower drive offset idler pulleys if required
+        if (lower_drive_pulley_offset.x < 0) {
+            translate([-coreXY_drive_plain_idler_offset(coreXY_type).x, coreXY_drive_plain_idler_offset(coreXY_type).y])
+                translate_z(-pulley_offset(plain_idler))
+                    screw(M3_cap_screw, 20);
+            translate(coreXY_drive_toothed_idler_offset(coreXY_type))
+                translate_z(-pulley_offset(toothed_idler))
+                    screw(M3_cap_screw, 20);
+        } else if (lower_drive_pulley_offset.x > 0) {
+            translate([pulley_od(plain_idler), coreXY_drive_plain_idler_offset(coreXY_type).y])
+                translate_z(-pulley_offset(plain_idler))
+                    screw(M3_cap_screw, 20);
+            translate([-2*coreXY_drive_pulley_x_alignment(coreXY_type), coreXY_drive_toothed_idler_offset(coreXY_type).y])
+                translate_z(-pulley_offset(toothed_idler))
+                    screw(M3_cap_screw, 20);
+        }
+    }
+
+    // add the screw for the left upper idler pulley
+    translate([coreXYPosBL.x + separation.x/2, coreXYPosBL.y, separation.z])
+        screw(M3_cap_screw, 20);
+
+    // add the screw for the right upper idler pulley
+    translate([coreXYPosTR.x + separation.x/2, coreXYPosBL.y, separation.z])
+        screw(M3_cap_screw, 20);
+
+    if (separation.x != 0) {
+        // add the screw for the left lower idler pulley
+        translate([coreXYPosBL.x - separation.x/2, coreXYPosBL.y, 0])
+            screw(M3_cap_screw, 20);
+
+        // add the screw for the right lower idler pulley
+        translate([coreXYPosTR.x - separation.x/2, coreXYPosBL.y, 0])
+            screw(M3_cap_screw, 20);
+    }
+
+    translate([-separation.x/2, pos.y + coreXYPosBL.y -separation.y/2, -separation.z/2 + pulley_height(plain_idler)/2]) {
+        // add the screw for the left Y carriage toothed idler
+        translate([coreXYPosBL.x, coreXY_toothed_idler_offset(coreXY_type).y, 0])
+            screw(M3_cap_screw, 20);
+        // add the screw for the left Y carriage plain idler
+        translate([coreXYPosBL.x + separation.x + coreXY_plain_idler_offset(coreXY_type).x, separation.y + coreXY_plain_idler_offset(coreXY_type).y, separation.z])
+            screw(M3_cap_screw, 20);
+        // add the screw for the right Y carriage toothed idler
+        translate([coreXYPosTR.x + separation.x, coreXY_toothed_idler_offset(coreXY_type).y, separation.z])
+            screw(M3_cap_screw, 20);
+        // add the screw for the right Y carriage plain idler
+        translate([coreXYPosTR.x - coreXY_plain_idler_offset(coreXY_type).x, separation.y + coreXY_plain_idler_offset(coreXY_type).y, 0])
+            screw(M3_cap_screw, 20);
+    }
+}
+
+if ($preview)
+    coreXY_belts_test();

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

@@ -17,7 +17,7 @@
 // If not, see <https://www.gnu.org/licenses/>.
 //
 include <../core.scad>
-include <../vitamins/kp_pillow_blocks.scad>
+include <../vitamins/pillow_blocks.scad>
 
 use <../utils/layout.scad>
 

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

@@ -107,7 +107,7 @@ assembly("box1") {
                 screw_and_washer(foot_screw(foot), 6);
     }
 
-    translate_z(height + top_thickness + base_thickness + eps) vflip()
+    translate_z(height + top_thickness + base_thickness + 2 * eps) vflip()
          %render() box1_base_stl();
 }
 

tests/printed_pulleys.scad

@@ -0,0 +1,45 @@
+//
+// NopSCADlib Copyright Chris Palmer 2020
+// nop.head@gmail.com
+// hydraraptor.blogspot.com
+//
+// This file is part of NopSCADlib.
+//
+// NopSCADlib is free software: you can redistribute it and/or modify it under the terms of the
+// GNU General Public License as published by the Free Software Foundation, either version 3 of
+// the License, or (at your option) any later version.
+//
+// NopSCADlib is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+// without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+// See the GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License along with NopSCADlib.
+// If not, see <https://www.gnu.org/licenses/>.
+//
+
+include <../core.scad>
+include <../vitamins/pulleys.scad>
+include <../printed/printed_pulleys.scad>
+use <../utils/layout.scad>
+
+
+module printed_pulley_test(show_metal = false) {
+    layout([for (p = pulleys) pulley_flange_dia(p)]) let(p = pulleys[$i]) {
+        rotate(-145)
+            if($preview)
+                printed_pulley_assembly(p);
+            else
+                printed_pulley(p);
+
+        if(show_metal)
+            not_on_bom()
+                translate([0, 20])
+                    rotate(-145)
+                        pulley_assembly(p);
+    }
+}
+
+if($preview)
+    printed_pulley_test(true);
+else
+    printed_pulley_test();

tests/pulleys.scad

@@ -23,7 +23,7 @@ include <../vitamins/pulleys.scad>
 
 module pulleys()
     layout([for(p = pulleys) pulley_flange_dia(p)])
-        rotate(-45)
+        rotate(-145)
             pulley_assembly(pulleys[$i]);
 
 if($preview)

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

tests/rounded_triangle.scad

@@ -18,7 +18,7 @@
 //
 
 include <../global_defs.scad>
-use <../utils/rounded_right_triangle.scad>
+use <../utils/rounded_triangle.scad>
 
 
 module rounded_right_triangles() {

tests/sheets.scad

@@ -25,9 +25,14 @@ include <../vitamins/screws.scad>
 width = 30;
 2d = true;
 
-module sheets()
-    layout([for(s = sheets) width], 5)
-        let(sheet = sheets[$i], w = sheet_is_woven(sheet) ? width : undef)
+module sheets() {
+    rows = 2;
+    n = ceil(len(sheets) / rows);
+    w = width + 5;
+    for(y = [0 : rows - 1], x = [0 : n - 1], s = y * n + x)
+        if(s < len(sheets))
+            translate([width / 2 + x * w, y * w])
+                let(sheet = sheets[s], w = sheet_is_woven(sheet) ? width : undef)
                 if(2d)
                     render_2D_sheet(sheet, w = w, d = w)
                         difference() {
@@ -43,7 +48,7 @@ module sheets()
                             translate_z(sheet_thickness(sheet) / 2)
                                 screw_countersink(M3_cs_cap_screw);
                         }
-
+}
 
 if($preview)
     sheets();

tests/stepper_motors.scad

@@ -22,9 +22,9 @@ include <../vitamins/stepper_motors.scad>
 use <../utils/layout.scad>
 
 module stepper_motors()
-    layout([for(s = stepper_motors) NEMA_width(s)], 5) let(m = stepper_motors[$i]) {
+    layout([for(s = stepper_motors) NEMA_width(s)], 5, no_offset = true) let(m = stepper_motors[$i]) {
         rotate(180)
-            NEMA(m, 0, m == NEMA17M || m == NEMA17M8);
+            NEMA(m, 0, m == NEMA17P || m == NEMA17M || m == NEMA17M8);
 
         translate_z(4)
             NEMA_screws(m, M3_pan_screw, n = $i, earth = $i > 4 ? undef : $i - 1);

tests/tube.scad

@@ -27,6 +27,9 @@ module tubes() {
 
     translate([50, 10])
         tube(10, 8, 30);
+
+    translate([100, 10])
+        rectangular_tube([10, 20, 30]);
 }
 
 tubes();

utils/core/bom.scad

@@ -25,16 +25,28 @@
 //! 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.
+//!
+//! The `pose()` module allows assembly views in the readme to be posed differently to the default view in the GUI:
+//!
+//! * Setting the `exploded` parameter to `true` allows just the exploded version to be posed and setting to `false` allows just the assembled view to be posed, the default is both.
+//! * If the `d` parameter is set to specify the camera distance then the normal `viewall` and `autocenter` options are suppressed allowing a small section to be zoomed in to fill the view.
+//! * To get the parameter values make the GUI window square, pose the view with the mouse and then copy the viewport parameters from the Edit menu and paste them into the pose invocation.
+//! * Two `pose()` modules can be chained to allow different poses for exploded and assembled views.
 //
 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`
 function show_supports() = !$preview || exploded();                 //! True if printed support material should be shown
 
 module no_explode() let($exploded_parent = true) children();        //! Prevent children being exploded
-module no_pose() let($posed = true) children();                     //! Force children not to be posed even if parent is
-
 module explode(d, explode_children = false, offset = [0,0,0]) {     //! Explode children by specified Z distance or vector `d`, option to explode grand children
     v = is_list(d) ? d : [0, 0, d];
     o = is_list(offset) ? offset : [0, 0, offset];
@@ -55,12 +67,24 @@ module explode(d, explode_children = false, offset = [0,0,0]) {     //! Explode
         children();
 }
 
-module pose(a = [55, 0, 25], t = [0, 0, 0], exploded = undef)       //! Pose an STL or assembly for rendering to png by specifying rotation `a` and translation `t`, `exploded = true for` just the exploded view or `false` for unexploded only.
+module no_pose() let($posed = true, $zoomed = undef) children();    //! Force children not to be posed even if parent is
+
+module pose(a = [55, 0, 25], t = [0, 0, 0], exploded = undef, d = undef)       //! Pose an STL or assembly for rendering to png by specifying rotation `a`, translation `t` and optionally `d`, `exploded = true for` just the exploded view or `false` for unexploded only.
+    let($zoomed = is_undef(d)
+            ? is_undef($zoomed)
+                ? undef
+                : $zoomed
+            : is_undef(exploded)
+                ? 3
+                : exploded
+                    ? 2
+                    : 1)
         if(is_undef($pose) || !is_undef($posed) || (!is_undef(exploded) && exploded != !!exploded()))
             children();
         else
             let($posed = true) // only pose the top level
                 rotate([55, 0, 25])
+                    translate_z(is_undef(d) ? 0 : 140 - d)
                         rotate([-a.x, 0, 0])
                             rotate([0, -a.y, 0])
                                 rotate([0, 0, -a.z])
@@ -84,9 +108,11 @@ 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, ")");
+        zoom = is_undef($zoomed) ? 0 : $zoomed;
+        arglist = str(arg(big, undef, "big"), arg(ngb, false, "ngb"), arg(zoom, 0, "zoomed"));
+        args = len(arglist) ? str("(", slice(arglist, 2), ")") : "";
         echo(str("~", name, "_assembly", args, "{"));
     }
     no_pose()
@@ -108,20 +134,42 @@ 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
 
@@ -130,7 +178,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/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);
+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/core/teardrops.scad

@@ -24,7 +24,7 @@
 //! Using teardrop_plus() or setting the plus option on other modules will elongate the teardrop vertically by the layer height, so when sliced the staircase tips
 //! do not intrude into the circle. See <https://hydraraptor.blogspot.com/2020/07/horiholes-2.html>
 //
-module teardrop(h, r, center = true, truncate = true, chamfer = 0, plus = false) { //! For making horizontal holes that don't need support material, set `truncate = false` to make traditional RepRap teardrops that don't even need bridging
+module teardrop(h, r, center = true, truncate = true, chamfer = 0, chamfer_both_ends = true, plus = false) { //! For making horizontal holes that don't need support material, set `truncate = false` to make traditional RepRap teardrops that don't even need bridging
     module teardrop_2d(r, truncate) {
         er = layer_height / 2 - eps;    // Extrustion edge radius
         R = plus ? r + er : r;          // Corrected radius
@@ -52,7 +52,7 @@ module teardrop(h, r, center = true, truncate = true, chamfer = 0, plus = false)
         extrude_if(h, center)
             teardrop_2d(r, truncate);
 
-    teardrop_chamfer(h, center, chamfer) {
+    teardrop_chamfer(h, center, chamfer, chamfer_both_ends) {
         linear_extrude(eps, center = true)
             teardrop_2d(r + chamfer / 2, truncate);
 
@@ -62,7 +62,7 @@ module teardrop(h, r, center = true, truncate = true, chamfer = 0, plus = false)
     }
 }
 
-module semi_teardrop(h, r, d = undef, center = true, chamfer = 0, plus = false) { //! A semi teardrop in the positive Y domain
+module semi_teardrop(h, r, d = undef, center = true, chamfer = 0, chamfer_both_ends = true, plus = false) { //! A semi teardrop in the positive Y domain
     module semi_teardrop_2d(r, d)
         intersection() {
             R = is_undef(d) ? r : d / 2;
@@ -77,7 +77,7 @@ module semi_teardrop(h, r, d = undef, center = true, chamfer = 0, plus = false)
         extrude_if(h, center)
             semi_teardrop_2d(r, d);
 
-    teardrop_chamfer(h, center, chamfer) {
+    teardrop_chamfer(h, center, chamfer, chamfer_both_ends) {
         linear_extrude(eps, center = true)
             semi_teardrop_2d(r + chamfer / 2, d);
 
@@ -87,10 +87,10 @@ module semi_teardrop(h, r, d = undef, center = true, chamfer = 0, plus = false)
     }
 }
 
-module teardrop_plus(h, r, center = true, truncate = true, chamfer = 0) //! Slightly elongated teardrop to allow for the 3D printing staircase effect
-    teardrop(h, r, center, truncate, chamfer, plus = true);
+module teardrop_plus(h, r, center = true, truncate = true, chamfer = 0, chamfer_both_ends = true) //! Slightly elongated teardrop to allow for the 3D printing staircase effect
+    teardrop(h, r, center, truncate, chamfer, chamfer_both_ends, plus = true);
 
-module tearslot(h, r, w, center = true, chamfer = 0, plus = false) { //! A horizontal slot that doesn't need support material
+module tearslot(h, r, w, center = true, chamfer = 0, chamfer_both_ends = true, plus = false) { //! A horizontal slot that doesn't need support material
     module tearslot_2d(r, w)
         hull()
             for(x = [-1, 1])
@@ -99,7 +99,7 @@ module tearslot(h, r, w, center = true, chamfer = 0, plus = false) { //! A horiz
     extrude_if(h, center)
         tearslot_2d(r, w);
 
-    teardrop_chamfer(h, center, chamfer) {
+    teardrop_chamfer(h, center, chamfer, chamfer_both_ends) {
         linear_extrude(eps, center = true)
             tearslot_2d(r + chamfer / 2, w);
 
@@ -109,7 +109,7 @@ module tearslot(h, r, w, center = true, chamfer = 0, plus = false) { //! A horiz
     }
 }
 
-module vertical_tearslot(h, r, l, center = true, chamfer = 0, plus = false) { //! A vertical slot that doesn't need support material
+module vertical_tearslot(h, r, l, center = true, chamfer = 0, chamfer_both_ends = true, plus = false) { //! A vertical slot that doesn't need support material
     module vertical_tearslot_2d(r, l)
         hull()
             for(y = [-1, 1])
@@ -119,7 +119,7 @@ module vertical_tearslot(h, r, l, center = true, chamfer = 0, plus = false) { //
     extrude_if(h, center)
         vertical_tearslot_2d(r, l);
 
-    teardrop_chamfer(h, center, chamfer) {
+    teardrop_chamfer(h, center, chamfer, chamfer_both_ends) {
         linear_extrude(eps, center = true)
             vertical_tearslot_2d(r + chamfer / 2, l);
 
@@ -129,10 +129,10 @@ module vertical_tearslot(h, r, l, center = true, chamfer = 0, plus = false) { //
     }
 }
 
-module teardrop_chamfer(h, center, chamfer) { //! Helper module for adding chamfer to a teardrop
+module teardrop_chamfer(h, center, chamfer, chamfer_both_ends) { //! Helper module for adding chamfer to a teardrop
     if(h && chamfer)
         translate_z(center ? 0 : h / 2)
-            for(m = [0, 1])
+            for(m = chamfer_both_ends ? [0, 1] : [1])
                 mirror([0, 0, m])
                     translate_z((h - eps ) / 2)
                         hull()

utils/core_xy.scad

@@ -0,0 +1,197 @@
+//
+// NopSCADlib Copyright Chris Palmer 2020
+// nop.head@gmail.com
+// hydraraptor.blogspot.com
+//
+// This file is part of NopSCADlib.
+//
+// NopSCADlib is free software: you can redistribute it and/or modify it under the terms of the
+// GNU General Public License as published by the Free Software Foundation, either version 3 of
+// the License, or (at your option) any later version.
+//
+// NopSCADlib is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+// without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+// See the GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License along with NopSCADlib.
+// If not, see <https://www.gnu.org/licenses/>.
+//
+
+//
+//! Parameterised Core XY implementation. Draws the belts and provides utilities for positioning the pulleys.
+//!
+//! The belts are positioned according the bottom left "anchor" pulley and the top right drive pulley.
+//! Implementation has the following features:
+//!
+//! 1. The drive and idler pulleys may be different sizes.
+//! 2. The belt separation is parameterised.
+//! 3. The separation of the plain and toothed pulleys on the Y carriages is parameterised, in both the X and the Y direction.
+//! 4. The drive pulleys may be offset in the X and Y directions. If this is done, extra idler pulleys are added. This
+//! allows flexible positioning of the motors.
+//
+include <../core.scad>
+include <../vitamins/belts.scad>
+include <../vitamins/pulleys.scad>
+
+
+coreXY_GT2_20_20 = ["coreXY_20_20", GT2x6, GT2x20ob_pulley, GT2x20_toothed_idler, GT2x20_plain_idler, [0, 0, 1], [0, 0, 0.5, 1], [0, 1, 0], [0, 0.5, 0, 1] ];
+coreXY_GT2_20_16 = ["coreXY_20_16", GT2x6, GT2x20ob_pulley, GT2x16_toothed_idler, GT2x16_plain_idler, [0, 0, 1], [0, 0, 0.5, 1], [0, 1, 0], [0, 0.5, 0, 1] ];
+coreXY_GT2_16_16 = ["coreXY_16_16", GT2x6, GT2x16_pulley,   GT2x16_toothed_idler, GT2x16_plain_idler, [0, 0, 1], [0, 0, 0.5, 1], [0, 1, 0], [0, 0.5, 0, 1] ];
+
+function coreXY_belt(type)                  = type[1]; //! Belt type
+function coreXY_drive_pulley(type)          = type[2]; //! Drive pulley type
+function coreXY_toothed_idler(type)         = type[3]; //! Toothed idler type
+function coreXY_plain_idler(type)           = type[4]; //! Plain idler type
+function coreXY_upper_belt_colour(type)     = type[5]; //! Colour of the upper belt
+function coreXY_upper_tooth_colour(type)    = type[6]; //! Colour of the upper belt's teeth
+function coreXY_lower_belt_colour(type)     = type[7]; //! Colour of the lower belt
+function coreXY_lower_tooth_colour(type)    = type[8]; //! Colour of the lower belt's teeth
+
+// used to offset the position of the drive pulley and the y-carriage plain idler pulley
+// relative to the anchor pulley so that the belts align properly
+function coreXY_drive_pulley_x_alignment(type) = //! Belt alignment offset of the drive pulley relative to the anchor pulley
+    (pulley_od(coreXY_drive_pulley(type)) - pulley_od(coreXY_toothed_idler(type))) / 2;
+function coreXY_coincident_separation(type) = //! Value of x, y separation to make y-carriage pulleys coincident
+    [ -coreXY_plain_idler_offset(type).x, -(pulley_od(coreXY_plain_idler(type)) + pulley_od(coreXY_toothed_idler(type)))/2, 0 ];
+function coreXY_plain_idler_offset(type)    = //! Offset of y-carriage plain idler
+    [ (pulley_od(coreXY_plain_idler(type)) + pulley_od(coreXY_drive_pulley(type))) / 2 + coreXY_drive_pulley_x_alignment(type), pulley_od(coreXY_plain_idler(type))/2, 0 ];
+function coreXY_toothed_idler_offset(type)  = //! offset of y-carriage toothed idler
+    [ 0, -pulley_pr(coreXY_toothed_idler(type)), 0 ];
+// helper functions for positioning idlers when the stepper motor drive pulley is offset
+function coreXY_drive_toothed_idler_offset(type) = //! Offset of toothed drive idler pulley
+    [ 0, coreXY_drive_pulley_x_alignment(type), 0 ];
+function coreXY_drive_plain_idler_offset(type) = //! Offset of plain drive idler pulley
+    [ coreXY_plain_idler_offset(type).x, -(pulley_od(coreXY_plain_idler(type)) + pulley_od(coreXY_drive_pulley(type))) / 2, 0 ];
+
+
+module coreXY_half(type, size, pos, separation_y = 0, x_gap = 0, plain_idler_offset = 0, drive_pulley_offset = [0, 0], show_pulleys = false, lower_belt = false, hflip = false) { //! Draw one belt of a coreXY setup
+
+    // y-carriage toothed pulley
+    p0_type = coreXY_toothed_idler(type);
+    p0 = [ size.x / 2, -size.y / 2 - pulley_od(p0_type) / 2 + pos.y - separation_y / 2 ];
+
+    // bottom right toothed idler pulley
+    p1_type = p0_type;
+    p1 = [ size.x / 2, -size.y / 2 ];
+
+    // bottom left anchor toothed idler pulley
+    p2_type = p0_type;
+    p2 = [ -size.x / 2, -size.y / 2 ];
+
+    // stepper motor drive pulley
+    p3d_type = coreXY_drive_pulley(type);
+    p3d = [ -size.x / 2 + coreXY_drive_pulley_x_alignment(type) + drive_pulley_offset.x,
+             size.y / 2 + drive_pulley_offset.y
+    ];
+
+    // toothed idler for offset stepper motor drive pulley
+    p3t_type = coreXY_toothed_idler(type);
+    p3t = [ -size.x / 2 + (drive_pulley_offset.x > 0 ? 0 : 2*coreXY_drive_pulley_x_alignment(type)),
+            size.y / 2 + coreXY_drive_pulley_x_alignment(type) + drive_pulley_offset.y
+    ];
+
+    // y-carriage plain pulley
+    p4_type = coreXY_plain_idler(type);
+    p4 = [ -size.x / 2 + pulley_od(p4_type) / 2 + pulley_od(p3d_type) / 2 + coreXY_drive_pulley_x_alignment(type) + plain_idler_offset,
+           -size.y / 2 + pulley_od(p4_type) / 2 + pos.y + separation_y / 2
+    ];
+
+    // plain idler for offset stepper motor drive pulley
+    p3p_type = p4_type;
+    p3p = [ drive_pulley_offset.x > 0 ? p4.x : -p0.x - pulley_od(p0_type),
+            size.y / 2 - pulley_od(p3p_type) / 2 - pulley_od(p3d_type) / 2 + drive_pulley_offset.y
+    ];
+
+    // dummy pulleys for y separation
+    p5_type = p4_type;
+    p5 = [ pos.x - size.x / 2, -size.y / 2 + pos.y + separation_y / 2 ];
+    p6_type = p0_type;
+    p6 = [ pos.x - size.x / 2, -size.y / 2 + pos.y - separation_y / 2 ];
+
+    module show_pulleys(show_pulleys) {// Allows the pulley colour to be set for debugging
+        if (is_list(show_pulleys))
+            color(show_pulleys)
+                children();
+        else if (show_pulleys)
+            children();
+    }
+
+    show_pulleys(show_pulleys) {
+        translate(p0)
+            pulley_assembly(p0_type); // y-carriage toothed pulley
+        translate(p1)
+            pulley_assembly(p1_type); // bottom right toothed idler pulley
+        translate(p2)
+            pulley_assembly(p2_type); // bottom left anchor toothed idler pulley
+        translate(p3d)
+            hflip(hflip)
+                pulley_assembly(p3d_type); // top left stepper motor drive pulley
+        if (drive_pulley_offset.x) { // idler pulleys for offset stepper motor drive pulley
+            translate(p3t)
+                pulley_assembly(p3t_type); // toothed idler
+            translate(p3p)
+                pulley_assembly(p3p_type); // plain idler
+        }
+        translate(p4)
+            pulley_assembly(p4_type); // y-carriage plain pulley
+    }
+
+    path0a = [
+        [ p0.x, p0.y, pulley_od(p0_type) / 2 ],
+        [ p1.x, p1.y, pulley_od(p1_type) / 2 ],
+        [ p2.x, p2.y, pulley_od(p2_type) / 2 ]
+    ];
+    path0b = [
+        [ p3d.x, p3d.y, pulley_od(p3d_type) / 2 ],
+        [ p4.x, p4.y, -pulley_od(p4_type) / 2 ]
+    ];
+    path0c = [
+        [ p3t.x, p3t.y, pulley_od(p3t_type) / 2 ],
+        [ p3d.x, p3d.y, pulley_od(p3d_type) / 2 ],
+        [ p3p.x, p3p.y, -pulley_od(p3p_type) / 2 ],
+        [ p4.x, p4.y, -pulley_od(p4_type) / 2 ]
+    ];
+    path0d = [
+        [ p3p.x, p3p.y, -pulley_od(p3p_type) / 2 ],
+        [ p3d.x, p3d.y, pulley_od(p3d_type) / 2 ],
+        [ p3t.x, p3t.y, pulley_od(p3t_type) / 2 ],
+        [ p4.x, p4.y, -pulley_od(p4_type) / 2 ]
+    ];
+    path1 = [ // use eps for corner radius to get sharp corners so this part of the belt is deleted by the gap
+        [ p5.x, p5.y, eps ],
+        [ p6.x, p6.y, eps ]
+    ];
+
+    belt = coreXY_belt(type);
+
+    path0 = drive_pulley_offset.x == 0 ? concat(path0a, path0b) : drive_pulley_offset.x > 0 ? concat(path0a, path0c) : concat(path0a, path0d);
+    path = separation_y == 0 ? path0 : concat(path0, path1);
+
+    belt(type = belt,
+        points = path,
+        gap = [ x_gap + eps, abs(separation_y) + 2 ],
+        gap_pos = [ pos.x - size.x / 2, pos.y - size.y / 2 + belt_pitch_height(belt) - belt_thickness(belt) / 2 ],
+        belt_colour  = lower_belt ? coreXY_lower_belt_colour(type) : coreXY_upper_belt_colour(type),
+        tooth_colour = lower_belt ? coreXY_lower_tooth_colour(type) : coreXY_upper_tooth_colour(type));
+}
+
+module coreXY(type, size, pos, separation, x_gap, plain_idler_offset = 0, upper_drive_pulley_offset, lower_drive_pulley_offset, show_pulleys = false) { //! Wrapper module to draw both belts of a coreXY setup
+    translate([size.x / 2 - separation.x / 2, size.y / 2, -separation.z / 2]) {
+        // lower belt
+        hflip()
+            explode(25)
+                coreXY_half(type, size, [size.x - pos.x - separation.x, pos.y], separation.y, x_gap, plain_idler_offset, [-lower_drive_pulley_offset.x, lower_drive_pulley_offset.y], show_pulleys, lower_belt = true, hflip = true);
+        // upper belt
+        translate([separation.x, 0, separation.z])
+            explode(25)
+                coreXY_half(type, size, [pos.x, pos.y], separation.y, x_gap, plain_idler_offset, upper_drive_pulley_offset, show_pulleys, lower_belt = false, hflip=false);
+    }
+}
+
+module coreXY_belts(type, carriagePosition, coreXYPosBL, coreXYPosTR, separation, x_gap = 20, upper_drive_pulley_offset = [0, 0], lower_drive_pulley_offset = [0, 0], show_pulleys = false) { //! Draw the coreXY belts
+    assert(coreXYPosBL.z == coreXYPosTR.z);
+
+    coreXYSize = coreXYPosTR - coreXYPosBL;
+    translate(coreXYPosBL)
+        coreXY(type, coreXYSize, [carriagePosition.x - coreXYPosBL.x + separation.x / 2, carriagePosition.y - coreXYPosBL.y], separation = separation, x_gap = x_gap, plain_idler_offset = 0, upper_drive_pulley_offset = upper_drive_pulley_offset, lower_drive_pulley_offset = lower_drive_pulley_offset, show_pulleys = show_pulleys);
+}

utils/rounded_polygon.scad

@@ -18,13 +18,14 @@
 //
 
 //
-//! Draw a polygon with rounded corners. Each element of the vector is the XY coordinate and a radius. Radius can be negative for a concave corner.
+//! Draw a polygon with rounded corners. Each element of the vector is the XY coordinate and a radius in clockwise order.
+//! Radius can be negative for a concave corner.
 //!
 //! Because the tangents need to be calculated to find the length these can be calculated separately and re-used when drawing to save calculating them twice.
 //
 include <../utils/core/core.scad>
 
-function circle_tangent(p1, p2) =
+function circle_tangent(p1, p2) = //! Compute the clockwise tangent between two circles represented as [x,y,r]
     let(
         r1 = p1[2],
         r2 = p2[2],
@@ -32,11 +33,8 @@ function circle_tangent(p1, p2) =
         dy = p2.y - p1.y,
         d = sqrt(dx * dx + dy * dy),
         theta = atan2(dy, dx) + acos((r1 - r2) / d),
-        xa = p1.x +(cos(theta) * r1),
-        ya = p1.y +(sin(theta) * r1),
-        xb = p2.x +(cos(theta) * r2),
-        yb = p2.y +(sin(theta) * r2)
-    )[ [xa, ya], [xb, yb] ];
+        v = [cos(theta), sin(theta)]
+    )[ p1 + r1 * v, p2 + r2 * v ];
 
 function rounded_polygon_tangents(points) = //! Compute the straight sections needed to draw and to compute the lengths
     let(len = len(points))

utils/rounded_triangle.scad

@@ -21,7 +21,6 @@
 //! Draw a 3D right triangle with rounded edges. Intended to be embedded in other parts. Can be optionally offset by the filleted amount.
 //
 include <../utils/core/core.scad>
-include <NopSCADlib/utils/core/rounded_rectangle.scad>
 
 module rounded_right_triangle(x, y, z, fillet, center = true, offset = false) { //! Draw a 3D right triangle with rounded edges.
     fillet = max(fillet, eps);
@@ -31,16 +30,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);
         }
 }
-

utils/tube.scad

@@ -68,3 +68,11 @@ module woven_tube(or, ir, h, center= true, colour = grey(30), colour2, warp = 2,
         }
     }
 }
+
+module rectangular_tube(size, center = true, thickness = 1, fillet = 0.5) { //! Create a retangular tube with filleted corners
+    extrude_if(size.z, center = center)
+        difference() {
+            rounded_square([size.x, size.y], fillet);
+            rounded_square([size.x - 2 * thickness, size.y - 2 * thickness], fillet);
+        }
+}

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

@@ -40,4 +40,4 @@ SCS16LUU  = ["SCS16LUU",  9, 19, 25, 50, 85, 38.5, 32.5, 36, 60, 7,    M5_cap_sc
 scs_bearing_blocks = [SCS6UU, SCS8UU,  SCS10UU, SCS12UU, SCS16UU];
 scs_bearing_blocks_long = [SCS8LUU,  SCS10LUU, SCS12LUU, SCS16LUU];
 
-use <scs_bearing_block.scad>
+use <bearing_block.scad>

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