Better test coverage of stepper earth tag position.

Extrusion bracket examples rotated for clearer view and made optional.
Added missing description for scs_bearing_blocks.
Extrusion no longer shows centre parameter but does show no default cornerHole.

.gitattributes

@@ -0,0 +1,16 @@
+# Set the default behavior, in case people don't have core.autocrlf set.
+* text=auto eol=lf
+
+# Declare text files that are normalized and converted on checkout.
+*.scad text
+*.py   text
+*.md   text
+
+# Handle Windows batch and command files 
+*.{bat,[bB][aA][tT]} text eol=crlf
+*.{cmd,[cC][mM][dD]} text eol=crlf
+
+# Denote files that are binary and should not be modified.
+*.png binary
+*.jpg binary
+

.gitignore

@@ -7,6 +7,7 @@ tests/bom/
 *.log
 *.html
 bounds.json
+options.json
 times.txt
 *_diff.png
 *.echo

core.scad

@@ -25,3 +25,15 @@ include <global_defs.scad>
 // Global functions and modules
 //
 use <utils/core/global.scad>
+
+module use_stl(name) {               //! Import an STL to make a build platter
+    stl(name);
+
+    import(str("../stls/", name, ".stl"));
+}
+
+module use_dxf(name) {               //! Import a DXF to make a build panel
+    dxf(name);
+
+    import(str("../dxfs/", name, ".dxf"));
+}

docs/usage.md

@@ -26,7 +26,7 @@ OpenSCAD has to be setup to find libraries by setting the ```OPENSCADPATH``` env
 in the directory it points to. This can be done with ```git clone https://github.com/nophead/NopSCADlib.git``` while in that directory or, if you don't want to use GIT,
 by downloading https://github.com/nophead/NopSCADlib/archive/master.zip and unzipping it to a directory called NopSCADlib.
 
-The ```NopSCADlib/scripts``` directory needs to be added to the executable search path.
+The ```NopSCADlib/scripts``` directory needs to be added to the executable search path, ```PATH``` on Windows and ```path``` on Linux and Mac.
 
 The installation can be tested by opening ```NopSCADlib/libtest.scad``` in the OpenSCAD GUI. It should render all the objects in the library in about 1 minute.
 

examples/MainsBreakOutBox/readme.md

@@ -30,7 +30,7 @@ Earth leakage can be measured Canadian CSA style by disconnected the neutral lin
 <a name="Parts_list"></a>
 ## Parts list
 | <span style="writing-mode: vertical-rl; text-orientation: mixed;">Base</span> | <span style="writing-mode: vertical-rl; text-orientation: mixed;">Feet</span> | <span style="writing-mode: vertical-rl; text-orientation: mixed;">Mains&nbsp;In</span> | <span style="writing-mode: vertical-rl; text-orientation: mixed;">Main</span> | <span style="writing-mode: vertical-rl; text-orientation: mixed;">TOTALS</span> |  |
-|--:|--:|--:|--:|--:|:--|
+|---:|---:|---:|---:|---:|:---|
 |  |  |  |  | | **Vitamins** |
 | &nbsp;&nbsp;.&nbsp; | &nbsp;&nbsp;.&nbsp; | &nbsp;&nbsp;.&nbsp; | &nbsp;&nbsp;2&nbsp; |  &nbsp;&nbsp;2&nbsp; | &nbsp;&nbsp; 4mm shielded jack socket blue |
 | &nbsp;&nbsp;.&nbsp; | &nbsp;&nbsp;.&nbsp; | &nbsp;&nbsp;.&nbsp; | &nbsp;&nbsp;1&nbsp; |  &nbsp;&nbsp;1&nbsp; | &nbsp;&nbsp; 4mm shielded jack socket brown |
@@ -61,14 +61,14 @@ Earth leakage can be measured Canadian CSA style by disconnected the neutral lin
 ## Base Assembly
 ### Vitamins
 |Qty|Description|
-|--:|:----------|
+|---:|:----------|
 |2| Heatfit insert M3|
 
 
 ### 3D Printed parts
 
 | 1 x socket_box.stl |
-|--|
+|---|
 | ![socket_box.stl](stls/socket_box.png) 
 
 
@@ -88,7 +88,7 @@ Earth leakage can be measured Canadian CSA style by disconnected the neutral lin
 ## Feet Assembly
 ### Vitamins
 |Qty|Description|
-|--:|:----------|
+|---:|:----------|
 |4| Nut M3 x 2.4mm nyloc|
 |4| Screw M3 dome x 10mm|
 |8| Washer  M3 x 7mm x 0.5mm|
@@ -97,7 +97,7 @@ Earth leakage can be measured Canadian CSA style by disconnected the neutral lin
 ### 3D Printed parts
 
 | 4 x foot.stl |
-|--|
+|---|
 | ![foot.stl](stls/foot.png) 
 
 
@@ -105,7 +105,7 @@ Earth leakage can be measured Canadian CSA style by disconnected the neutral lin
 ### Sub-assemblies
 
 | 1 x base_assembly |
-|--|
+|---|
 | ![base_assembled](assemblies/base_assembled_tn.png) 
 
 
@@ -124,7 +124,7 @@ Earth leakage can be measured Canadian CSA style by disconnected the neutral lin
 ## Mains In Assembly
 ### Vitamins
 |Qty|Description|
-|--:|:----------|
+|---:|:----------|
 |3| Heatshrink sleeving ID 3.2mm x 15mm - not shown|
 |1| IEC inlet for ATX|
 |2| Nut M3 x 2.4mm nyloc|
@@ -138,7 +138,7 @@ Earth leakage can be measured Canadian CSA style by disconnected the neutral lin
 ### Sub-assemblies
 
 | 1 x feet_assembly |
-|--|
+|---|
 | ![feet_assembled](assemblies/feet_assembled_tn.png) 
 
 
@@ -163,7 +163,7 @@ Earth leakage can be measured Canadian CSA style by disconnected the neutral lin
 ## Main Assembly
 ### Vitamins
 |Qty|Description|
-|--:|:----------|
+|---:|:----------|
 |2| 4mm shielded jack socket blue|
 |1| 4mm shielded jack socket brown|
 |2| 4mm shielded jack socket green|
@@ -178,7 +178,7 @@ Earth leakage can be measured Canadian CSA style by disconnected the neutral lin
 ### Sub-assemblies
 
 | 1 x mains_in_assembly |
-|--|
+|---|
 | ![mains_in_assembled](assemblies/mains_in_assembled_tn.png) 
 
 

gallery/readme.md

@@ -6,6 +6,13 @@ Arduino thermostat to control a beer fridge to use it as an environmental chambe
 ![](ArduinoThermostat.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.
@@ -68,6 +75,13 @@ Mains isolated and variable supply with metering.
 ![](Mains_Box.png)
 
 
+<a name="TOP"></a>
+## SunBot
+A solar tracker to keep solar powerbanks pointing at the sun.
+
+![](SunBot.png)
+
+
 <a name="TOP"></a>
 ## Turntable
 WiFi enabled remote control turntable for photography

global_defs.scad

@@ -39,6 +39,7 @@ pp2_colour      = is_undef($pp2_colour)      ? "red"  : $pp2_colour;      // pri
 pp3_colour      = is_undef($pp3_colour)      ? "blue" : $pp3_colour;      // printed part colour 3
 pp4_colour      = is_undef($pp4_colour)      ? "darkorange" : $pp4_colour;// printed part colour 4
 show_rays       = is_undef($show_rays)       ? false  : $show_rays;       // show camera sight lines and light direction
+show_threads    = is_undef($show_threads)    ? false  : $show_threads;    // show screw threads
 
 // Minimum wall is about two filaments wide but we extrude it closer to get better bonding
 squeezed_wall = $preview ? 2 * extrusion_width - layer_height * (1 - PI / 4)
@@ -59,7 +60,9 @@ grey60                          = [0.6, 0.6, 0.6];
 grey70                          = [0.7, 0.7, 0.7];
 grey80                          = [0.8, 0.8, 0.8];
 grey90                          = [0.9, 0.9, 0.9];
-brass                           = "gold";
+gold                            = [255/255, 215/255, 0/255];
+brass                           = [255/255, 220/255, 100/255];
+silver                          = [0.75, 0.75, 0.75];
 
 /*
  * Enums

lib.scad

@@ -22,7 +22,7 @@
 //
 include <core.scad>
 
-include <vitamins/fans.scad>
+include <vitamins/psus.scad>
 include <vitamins/inserts.scad>
 include <vitamins/ring_terminals.scad>
 include <vitamins/rails.scad>
@@ -34,14 +34,11 @@ include <vitamins/components.scad>
 include <vitamins/hot_ends.scad>
 include <vitamins/tubings.scad>
 include <vitamins/zipties.scad>
-include <vitamins/linear_bearings.scad>
+include <vitamins/scs_bearing_blocks.scad>
 include <vitamins/rod.scad>
 include <vitamins/leadnuts.scad>
 include <vitamins/bulldogs.scad>
 include <vitamins/pillars.scad>
-include <vitamins/psus.scad>
-include <vitamins/iecs.scad>
-include <vitamins/rockers.scad>
 include <vitamins/ssrs.scad>
 include <vitamins/d_connectors.scad>
 include <vitamins/buttons.scad>
@@ -55,16 +52,19 @@ include <vitamins/transformers.scad>
 include <vitamins/variacs.scad>
 include <vitamins/springs.scad>
 include <vitamins/batteries.scad>
-include <vitamins/microswitches.scad>
 include <vitamins/ball_bearings.scad>
 include <vitamins/light_strips.scad>
 include <vitamins/spools.scad>
 include <vitamins/mains_sockets.scad>
 include <vitamins/ldrs.scad>
+include <vitamins/geared_steppers.scad>
+include <vitamins/extrusions.scad>
+include <vitamins/sk_brackets.scad>
 
 use <vitamins/jack.scad>
 use <vitamins/meter.scad>
 use <vitamins/fuseholder.scad>
+use <vitamins/hygrometer.scad>
 
 use <vitamins/opengrab.scad>
 use <vitamins/wire.scad>
@@ -88,3 +88,4 @@ use <utils/layout.scad>
 use <utils/round.scad>
 use <utils/offset.scad>
 use <utils/sector.scad>
+use <utils/thread.scad>

libtest.scad

@@ -32,12 +32,16 @@ use <tests/cable_strips.scad>
 use <tests/components.scad>
 use <tests/d_connectors.scad>
 use <tests/displays.scad>
+use <tests/extrusions.scad>
+use <tests/extrusion_brackets.scad>
 use <tests/fans.scad>
 use <tests/fuseholder.scad>
+use <tests/geared_steppers.scad>
 use <tests/hot_ends.scad>
 use <tests/iecs.scad>
 use <tests/inserts.scad>
 use <tests/jack.scad>
+use <tests/kp_pillow_blocks.scad>
 use <tests/leadnuts.scad>
 use <tests/leds.scad>
 use <tests/ldrs.scad>
@@ -58,8 +62,10 @@ 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/sheets.scad>
+use <tests/sk_brackets.scad>
 use <tests/spades.scad>
 use <tests/springs.scad>
 use <tests/ssrs.scad>
@@ -90,8 +96,15 @@ use <tests/strap_handle.scad>
 use <tests/ssr_shroud.scad>
 use <tests/psu_shroud.scad>
 use <tests/flat_hinge.scad>
+use <tests/pcb_mount.scad>
 
-x5 = 800;
+x0 = 0;
+x1 = x0 + 100;
+x2 = x1 + 90;
+x3 = x2 + 130;
+x4 = x3 + 200;
+x5 = 850;
+x6 = x5 + 150;
 
 cable_grommets_y = 0;
 
@@ -130,16 +143,15 @@ translate([x5 + 60, cable_grommets_y + 200])
 translate([x5, cable_grommets_y + 250])
     handle();
 
-translate([900, 600])
+translate([950, 600])
     box_test();
 
-translate([850, 1170])
+translate([850, 1260])
     bbox_test();
 
-x0 = 0;
 inserts_y = 0;
 nuts_y = inserts_y + 20;
-washers_y = nuts_y + 60;
+washers_y = nuts_y + 100;
 screws_y = washers_y + 120;
 o_rings_y = screws_y + 130;
 springs_y = o_rings_y + 20;
@@ -150,7 +162,7 @@ leadnuts_y = pillars_y + 40;
 pulleys_y = leadnuts_y +40;
 hot_ends_y = pulleys_y + 60;
 linear_bearings_y = hot_ends_y + 50;
-sheets_y = linear_bearings_y + 50;
+sheets_y = linear_bearings_y + 100;
 pcbs_y = sheets_y + 40;
 displays_y = pcbs_y + 150;
 fans_y = displays_y + 100;
@@ -229,7 +241,6 @@ translate([x0, psus_y]) {
     psu_shrouds();
 }
 
-x1 = x0 + 100;
 zipties_y = 0;
 bulldogs_y = zipties_y + 40;
 
@@ -239,7 +250,6 @@ translate([x1, zipties_y])
 translate([x1, bulldogs_y])
     bulldogs();
 
-x2 = x1 + 90;
 leds_y = 0;
 carriers_y = leds_y + 40;
 spades_y = carriers_y + 40;
@@ -247,7 +257,7 @@ buttons_y = spades_y + 40;
 jacks_y = buttons_y + 40;
 microswitches_y = jacks_y + 40;
 rockers_y = microswitches_y + 40;
-toggles_y = rockers_y + 40;
+toggles_y = rockers_y + 60;
 components_y = toggles_y + 40;
 
 translate([x2, leds_y])
@@ -286,8 +296,6 @@ translate([x2, toggles_y])
 translate([x2, components_y])
     components();
 
-
-x3 = x2 + 150;
 veroboard_y = 0;
 d_connectors_y = veroboard_y + 110;
 iecs_y = d_connectors_y + 80;
@@ -296,10 +304,17 @@ ssrs_y = modules_y + 80;
 blowers_y = ssrs_y + 60;
 batteries_y = blowers_y + 100;
 steppers_y = batteries_y + 70;
+extrusions_y = steppers_y + 100;
 
 translate([x3, veroboard_y])
     veroboard_test();
 
+translate([x3 + 70, veroboard_y + 30])
+    geared_steppers();
+
+translate([x3 + 140, veroboard_y + 20])
+    pcb_mounts();
+
 translate([x3, d_connectors_y])
     d_connectors();
 
@@ -309,7 +324,10 @@ translate([x3, iecs_y])
 translate([x3 + 15, modules_y])
     microview();
 
-translate([x3 + 40, modules_y])
+translate([x3 + 60, modules_y])
+    hygrometer();
+
+translate([x3 + 90, modules_y])
     modules();
 
 translate([x3, ssrs_y]) {
@@ -327,16 +345,22 @@ translate([x3, batteries_y])
 translate([x2, steppers_y])  // interloper
     stepper_motors();
 
+translate([x2, extrusions_y]) {
+    extrusions();
+}
+
 translate([x3, transformers_y])
     transformers();
 
 
-x4 = x3 + 220;
 belts_y = 0;
 rails_y = belts_y + 200;
-cable_strips_y = rails_y + 300;
+extrusion_brackets_y = rails_y + 250;
+sk_brackets_y = extrusion_brackets_y + 80;
+kp_pillow_blocks_y = sk_brackets_y + 50;
+scs_bearing_blocks_y = kp_pillow_blocks_y + 60;
 
-translate([x4 + 112, belts_y + 58]) {
+translate([x4 + 130, belts_y + 58]) {
     belt_test();
 
     translate([0, 60])
@@ -346,9 +370,22 @@ translate([x4 + 112, belts_y + 58]) {
 translate([x4, rails_y + 130])
     rails();
 
-translate([x4, cable_strips_y])
-    cable_strips();
+translate([780, 0])
+    rotate(90)
+        cable_strips();
+
+translate([x4, kp_pillow_blocks_y])
+    kp_pillow_blocks();
+
+translate([x4, sk_brackets_y])
+    sk_brackets();
+
+translate([x4, extrusion_brackets_y])
+    extrusion_brackets();
+
+translate([x4, scs_bearing_blocks_y])
+    scs_bearing_blocks();
+
 
-x6 = x5 + 150;
 translate([x6, 125])
     light_strips();

printed/box.scad

@@ -35,8 +35,7 @@ include <../core.scad>
 use <../vitamins/sheet.scad>
 use <../vitamins/screw.scad>
 use <../vitamins/washer.scad>
-
-include <../vitamins/inserts.scad>
+use <../vitamins/insert.scad>
 use <../utils/quadrant.scad>
 
 bezel_clearance = 0.2;

printed/butt_box.scad

@@ -27,6 +27,10 @@
 //! A list specifies the internal dimensions, screw type, top, bottom and side sheet types and the block
 //! maximum spacing.
 //!
+//!  * An optional name can be specified to allow more then one box in a project.
+//!  * An optional list of fixing blocks to be omitted can be given.
+//!  * Star washers can be omitted by setting the 11th parameter to false.
+//!
 //! Uses [fixing blocks](#fixing_block) and [corner blocks](#corner_block).
 //
 
@@ -34,17 +38,24 @@ use <fixing_block.scad>
 use <corner_block.scad>
 use <../utils/maths.scad>
 
-function bbox_screw(type)     = type[0]; //! Screw type for corner blocks
-function bbox_sheets(type)    = type[1]; //! Sheet type for the sides
-function bbox_base_sheet(type)= type[2]; //! Sheet type for the base
-function bbox_top_sheet(type) = type[3]; //! Sheet type for the top
-function bbox_span(type)      = type[4]; //! Maximum span between fixing blocks
-function bbox_width(type)     = type[5]; //! Internal width
-function bbox_depth(type)     = type[6]; //! Internal depth
-function bbox_height(type)    = type[7]; //! Internal height
+function bbox_screw(type)      = type[0]; //! Screw type for corner blocks
+function bbox_sheets(type)     = type[1]; //! Sheet type for the sides
+function bbox_base_sheet(type) = type[2]; //! Sheet type for the base
+function bbox_top_sheet(type)  = type[3]; //! Sheet type for the top
+function bbox_span(type)       = type[4]; //! Maximum span between fixing blocks
+function bbox_width(type)      = type[5]; //! Internal width
+function bbox_depth(type)      = type[6]; //! Internal depth
+function bbox_height(type)     = type[7]; //! Internal height
+function bbox_name(type)       = type[8] ? type[8] : "bbox"; //! Optional name if there is more than one box in a project
+function bbox_skip_blocks(type)= type[9] ? type[9] : [];  //! List of fixing blocks to skip, used to allow a hinged panel for example
+function star_washers(type)    = type[10] ? type[10] : is_undef(type[10]); //! Set to false to remove star washers.
+
+function bbox_volume(type) = bbox_width(type) * bbox_depth(type) * bbox_height(type) / 1000000; //! Internal volume in litres
+function bbox_area(type) = let(w =  bbox_width(type), d = bbox_depth(type), h = bbox_height(type)) //! Internal surdface area in m^2
+    2 * (w * d + w * h + d * h) / 1000000;
 
 module bbox_shelf_blank(type) { //! 2D template for a shelf
-    dxf("bbox_shelf");
+    dxf(str(bbox_name(type), "_shelf"));
 
     sheet_2D(bbox_sheets(type), bbox_width(type), bbox_depth(type), 1);
 }
@@ -60,18 +71,8 @@ function corner_block_positions(type) = let(
             y = [-1,-1,1,1][corner]
         ) translate([x * (width / 2), y * (depth / 2), z * height / 2]) *
           rotate([z > 0 ? 180 : 0, 0, corner * 90 + (z > 0 ? 90 : 0)])
-
     ];
 
-module corner_block_positions(type) {
-    bt = sheet_thickness(bbox_base_sheet(type));
-    tt = sheet_thickness(bbox_top_sheet(type));
-    for(p = corner_block_positions(type))
-        let($thickness = transform([0, 0, 0], p).z > 0 ? tt : bt)
-            multmatrix(p)
-                children();
-}
-
 function corner_holes(type) = [for(p = corner_block_positions(type), q = corner_block_holes(bbox_screw(type))) p * q];
 
 function fixing_block_positions(type) = let(
@@ -84,36 +85,28 @@ function fixing_block_positions(type) = let(
         dspans = floor(depth / span),
         dspan = depth / (dspans + 1),
         hspans = floor(height / span),
-        hspan = height / (hspans + 1)
+        hspan = height / (hspans + 1),
+        skips = bbox_skip_blocks(type)
     )
     [
         for(i = [0 : 1 : wspans - 1], y = [-1, 1], z = [-1, 1])
-            translate([(i - (wspans - 1) / 2) * wspan, y * depth / 2, z * height / 2]) *
-            rotate([0, z * 90 + 90, y * 90 + 90]),
+            if(!in(skips, [0, y, z]))
+                translate([(i - (wspans - 1) / 2) * wspan, y * depth / 2, z * height / 2]) *
+                rotate([0, z * 90 + 90, y * 90 + 90]),
 
         for(i = [0 : 1 : dspans - 1], x = [-1, 1], z = [-1, 1])
-            translate([x * width / 2, (i - (dspans - 1) / 2) * dspan, z * height / 2]) *
-            rotate([0, z * 90 + 90, x * 90]),
+            if(!in(skips, [x, 0, z]))
+                translate([x * width / 2, (i - (dspans - 1) / 2) * dspan, z * height / 2]) *
+                rotate([0, z * 90 + 90, x * 90]),
 
         for(i = [0 : 1 : hspans - 1], x = [-1, 1], y = [-1, 1])
-            translate([x * width / 2, y * depth / 2, (i - (hspans - 1) / 2) * hspan]) *
-            rotate([y > 0 ? 180 : 0, x * y * 90, 0]),
-
+            if(!in(skips, [x, y, 0]))
+                translate([x * width / 2, y * depth / 2, (i - (hspans - 1) / 2) * hspan]) *
+                rotate([y > 0 ? 180 : 0, x * y * 90, 0]),
     ];
 
 function side_holes(type) = [for(p = fixing_block_positions(type), q = fixing_block_holes(bbox_screw(type))) p * q];
 
-module fixing_block_positions(type) {
-    t = sheet_thickness(bbox_sheets(type));
-    bt = sheet_thickness(bbox_base_sheet(type));
-    tt = sheet_thickness(bbox_top_sheet(type));
-    h = bbox_height(type) / 2 - 1;
-    for(p = fixing_block_positions(type))
-        let(z = transform([0, 0, 0], p).z, $thickness = z > h ? tt : z < -h ? bt : t)
-            multmatrix(p)
-                children();
-}
-
 module drill_holes(type, t)
     for(list = [corner_holes(type), side_holes(type)], p = list)
         let(q = t * p)
@@ -122,7 +115,7 @@ module drill_holes(type, t)
                     drill(screw_clearance_radius(bbox_screw(type)), 0);
 
 module bbox_base_blank(type) { //! 2D template for the base
-    dxf("bbox_base");
+    dxf(str(bbox_name(type), "_base"));
 
     difference() {
         sheet_2D(bbox_base_sheet(type), bbox_width(type), bbox_depth(type), 1);
@@ -132,7 +125,7 @@ module bbox_base_blank(type) { //! 2D template for the base
 }
 
 module bbox_top_blank(type) { //! 2D template for the top
-    dxf("bbox_top");
+    dxf(str(bbox_name(type), "_top"));
 
     t = sheet_thickness(bbox_sheets(type));
 
@@ -144,36 +137,40 @@ module bbox_top_blank(type) { //! 2D template for the top
     }
 }
 
-module bbox_left_blank(type) { //! 2D template for the left side
-    dxf("bbox_left");
+function subst_sheet(type, sheet) =
+    let(s = bbox_sheets(type))
+        sheet ? assert(sheet_thickness(sheet) == sheet_thickness(s)) sheet : s;
+
+module bbox_left_blank(type, sheet = false) { //! 2D template for the left side
+    dxf(str(bbox_name(type), "_left"));
 
     t = sheet_thickness(bbox_sheets(type));
     bb = sheet_thickness(bbox_base_sheet(type));
 
     difference() {
         translate([-t / 2, -bb / 2])
-            sheet_2D(bbox_sheets(type), bbox_depth(type) + t, bbox_height(type) + bb);
+            sheet_2D(subst_sheet(type, sheet), bbox_depth(type) + t, bbox_height(type) + bb);
 
         drill_holes(type, rotate([0, 90, 90]) * translate([bbox_width(type) / 2, 0]));
     }
 }
 
-module bbox_right_blank(type) { //! 2D template for the right side
-    dxf("bbox_right");
+module bbox_right_blank(type, sheet = false) { //! 2D template for the right side
+    dxf(str(bbox_name(type), "_right"));
 
     t = sheet_thickness(bbox_sheets(type));
     bb = sheet_thickness(bbox_base_sheet(type));
 
     difference() {
         translate([t / 2, -bb / 2])
-            sheet_2D(bbox_sheets(type), bbox_depth(type) + t, bbox_height(type) + bb);
+            sheet_2D(subst_sheet(type, sheet), bbox_depth(type) + t, bbox_height(type) + bb);
 
-        drill_holes(type, rotate([0, -90, 90]) * translate([-bbox_width(type) / 2, 0]));
+        drill_holes(type, rotate([0, 90, 90]) * translate([-bbox_width(type) / 2, 0]));
     }
 }
 
-module bbox_front_blank(type) { //! 2D template for the front
-    dxf("bbox_front");
+module bbox_front_blank(type, sheet = false, width = 0) { //! 2D template for the front
+    dxf(str(bbox_name(type), "_front"));
 
     t = sheet_thickness(bbox_sheets(type));
     bb = sheet_thickness(bbox_base_sheet(type));
@@ -181,23 +178,23 @@ module bbox_front_blank(type) { //! 2D template for the front
 
     difference() {
         translate([0, (bt - bb) / 2])
-            sheet_2D(bbox_sheets(type), bbox_width(type) + 2 * t, bbox_height(type) + bb + bt);
+            sheet_2D(subst_sheet(type, sheet), max(bbox_width(type) + 2 * t, width), bbox_height(type) + bb + bt);
 
         drill_holes(type, rotate([-90, 0, 0]) * translate([0, bbox_depth(type) / 2]));
     }
 }
 
-module bbox_back_blank(type) { //! 2D template for the back
-    dxf("bbox_back");
+module bbox_back_blank(type, sheet = false) { //! 2D template for the back
+    dxf(str(bbox_name(type), "_back"));
 
     bb = sheet_thickness(bbox_base_sheet(type));
     t = sheet_thickness(bbox_sheets(type));
 
     difference() {
         translate([0, -bb / 2])
-            sheet_2D(bbox_sheets(type), bbox_width(type), bbox_height(type) + bb);
+            sheet_2D(subst_sheet(type, sheet), bbox_width(type), bbox_height(type) + bb);
 
-        drill_holes(type, rotate([90, 0, 0]) * translate([0, -bbox_depth(type) / 2]));
+        drill_holes(type, rotate([-90, 0, 0]) * translate([0, -bbox_depth(type) / 2]));
     }
 }
 
@@ -208,54 +205,64 @@ module bbox_front(type) render_2D_sheet(bbox_sheets(type)) bbox_front_blank(type
 module bbox_left(type)  render_2D_sheet(bbox_sheets(type)) bbox_left_blank(type);       //! Default left side, can be overridden to customise
 module bbox_right(type) render_2D_sheet(bbox_sheets(type)) bbox_right_blank(type);      //! Default right side, can be overridden to customise
 
-module _bbox_assembly(type, top = true, base = true, left = true, right = true, back = true, front = true) //! The box assembly, wrap with a local copy without parameters
-assembly("bbox") {
+module _bbox_assembly(type, top = true, base = true, left = true, right = true, back = true, front = true) { //! The box assembly, wrap with a local copy without parameters
     width = bbox_width(type);
     depth = bbox_depth(type);
     height = bbox_height(type);
-    echo("Box:", width, depth, height);
+    echo("Box:", width, depth, height, volume = bbox_volume(type), area = bbox_area(type));
 
     t = sheet_thickness(bbox_sheets(type));
     bt = sheet_thickness(bbox_base_sheet(type));
     tt = sheet_thickness(bbox_top_sheet(type));
 
-    corner_block_positions(type)
-        fastened_corner_block_assembly(t, bbox_screw(type), $thickness);
+    function is_missing_screw(p) = p.y > depth / 2 - 1 ? !back : false;
 
-    fixing_block_positions(type)
-        fastened_fixing_block_assembly(t, bbox_screw(type), thickness2 = $thickness);
+    assembly(bbox_name(type)) {
 
-    for(x = [-1, 1])
-        translate([x * (width / 2 + t / 2 + eps + 25 * exploded()), 0])
-            rotate([90, 0, x * 90])
-                if(x > 0) {
-                    if(right)
-                        bbox_right(type);
+        for(p = corner_block_positions(type))
+            let(q = transform([0, 0, 0], p), thickness = q.z > 0 ? tt : bt)
+                multmatrix(p)
+                    fastened_corner_block_assembly(is_missing_screw(q) && ((q.z > 0) != (q.x > 0)) ? 0 : t, bbox_screw(type), thickness,
+                                                   is_missing_screw(q) && ((q.z > 0) == (q.x > 0)) ? 0 : t, star_washers = star_washers(type));
+
+        h = height / 2 - 1;
+        for(p = fixing_block_positions(type))
+            let(q = transform([0, 0, 0], p), thickness = q.z > h ? tt : q.z < -h ? bt : t)
+                multmatrix(p)
+                    fastened_fixing_block_assembly(is_missing_screw(q) ? 0 : t, bbox_screw(type), thickness2 = thickness, star_washers = star_washers(type));
+
+        for(x = [-1, 1])
+            translate([x * (width / 2 + t / 2 + eps + 25 * exploded()), 0])
+                rotate([90, 0, x * 90])
+                    if(x > 0) {
+                        if(right)
+                            bbox_right(type);
+                    }
+                    else
+                        if(left)
+                            bbox_left(type);
+
+        for(y = [1, -1])
+            translate([0, y * (depth / 2 + t / 2 + eps + 25 * exploded())])
+                rotate([90, 0, y * 90 + 90])
+                    if(y < 0) {
+                        if(front)
+                            bbox_front(type);
+                    }
+                    else
+                        if(back)
+                            bbox_back(type);
+
+        for(z = [-1, 1]) {
+            sheet_thickness = z > 0 ? tt : bt;
+            translate_z(z * (height / 2 + sheet_thickness / 2 + eps + 100 * exploded()))
+                if(z > 0) {
+                    if(top)
+                        bbox_top(type);
                 }
                 else
-                    if(left)
-                        bbox_left(type);
-
-    for(y = [-1, 1])
-        translate([0, y * (depth / 2 + t / 2 + eps + 25 * exploded())])
-            rotate([90, 0, y * 90 + 90])
-                if(y < 0) {
-                    if(front)
-                        bbox_front(type);
-                }
-                else
-                    if(back)
-                        bbox_back(type);
-
-    for(z = [-1, 1]) {
-        sheet_thickness = z > 0 ? tt : bt;
-        translate_z(z * (height / 2 + sheet_thickness / 2 + eps + 100 * exploded()))
-            if(z > 0) {
-                if(top)
-                    bbox_top(type);
-            }
-            else
-                if(base)
-                    bbox_base(type);
+                    if(base)
+                        bbox_base(type);
+        }
     }
 }

printed/cable_grommets.scad

@@ -195,12 +195,15 @@ module mouse_grommet_assembly(r, thickness)
 module ribbon_grommet_20_3_stl() ribbon_grommet(20, 3);
 module mouse_grommet_15_3_stl() mouse_grommet(1.5, 3);
 module mouse_grommet_20_3_stl() mouse_grommet(2, 3);
+module mouse_grommet_25_3_stl() mouse_grommet(2.5, 3);
 module mouse_grommet_30_3_stl() mouse_grommet(3, 3);
 
 module round_grommet_bottom_30_stl() round_grommet_bottom(3);
 module round_grommet_bottom_40_stl() round_grommet_bottom(4);
+module round_grommet_bottom_50_stl() round_grommet_bottom(5);
 module round_grommet_bottom_60_stl() round_grommet_bottom(6);
 
 module round_grommet_top_30_3_stl() round_grommet_top(3, 3);
 module round_grommet_top_40_3_stl() round_grommet_top(4, 3);
+module round_grommet_top_50_3_stl() round_grommet_top(5, 3);
 module round_grommet_top_60_3_stl() round_grommet_top(6, 3);

printed/corner_block.scad

@@ -24,10 +24,15 @@
 //! See [butt_box](#Butt_box) for an example of usage.
 //!
 //! Note that the block with its inserts is defined as a sub assembly, but its fasteners get added to the parent assembly.
+//!
+//! Specific fasteners can be omitted by setting a side's thickness to 0 and the block omitted by setting ```show_block``` to false.
+//! This allows the block and one set of fasteners to be on one assembly and the other fasteners on the mating assemblies.
+//!
+//! Star washers can be omitted by setting ```star_washers``` to false.
 //
 include <../core.scad>
 include <../vitamins/screws.scad>
-include <../vitamins/inserts.scad>
+use <../vitamins/insert.scad>
 use <../utils/rounded_cylinder.scad>
 use <../utils/maths.scad>
 
@@ -57,8 +62,8 @@ module corner_block_v_hole(screw = def_screw) //! Place children at the bottom s
     multmatrix(corner_block_v_hole(screw))
         children();
 
-module corner_block_h_holes(screw = def_screw) //! Place children at the side screw holes
-    for(p = corner_block_h_holes(screw))
+module corner_block_h_holes(screw = def_screw, index = undef) //! Place children at the side screw holes
+    for(p = !is_undef(index) ? [corner_block_h_holes(screw)[index]] : corner_block_h_holes(screw))
         multmatrix(p)
             children();
 
@@ -126,22 +131,33 @@ assembly(str("corner_block_M", 20 * screw_radius(screw))) {
         insert(insert);
 }
 
-module fastened_corner_block_assembly(thickness, screw = def_screw, thickness_below = undef, name = false) { //! Printed block with all fasteners
+module fastened_corner_block_assembly(thickness, screw = def_screw, thickness_below = undef, thickness_side2 = undef, name = false, show_block = true, star_washers = true) { //! Printed block with all fasteners
+    thickness2 = !is_undef(thickness_below) ? thickness_below : thickness;
+    thickness3 = !is_undef(thickness_side2) ? thickness_side2 : thickness;
     washer = screw_washer(screw);
     insert = screw_insert(screw);
-    screw_length = screw_shorter_than(2 * washer_thickness(washer) + thickness + insert_length(insert) + overshoot);
+    function screw_length(t) = screw_shorter_than((star_washers ? 2 : 1) * washer_thickness(washer) + t + insert_length(insert) + overshoot);
+    screw_length = screw_length(thickness);
+    screw_length2 = screw_length(thickness2);
+    screw_length3 = screw_length(thickness3);
 
-    corner_block_assembly(screw, name) children();
+    if(show_block)
+        corner_block_assembly(screw, name) children();
 
-    corner_block_h_holes(screw)
-        translate_z(thickness)
-            screw_and_washer(screw, screw_length, true);
+    if(thickness)
+        corner_block_h_holes(screw, 0)
+            translate_z(thickness)
+                screw_and_washer(screw, screw_length, star_washers);
 
-    thickness2 = thickness_below ? thickness_below : thickness;
-    screw_length2 = screw_shorter_than(2 * washer_thickness(washer) + thickness2 + insert_length(insert) + overshoot);
-    corner_block_v_hole(screw)
-        translate_z(thickness2)
-            screw_and_washer(screw, screw_length2, true);
+    if(thickness3)
+        corner_block_h_holes(screw, 1)
+            translate_z(thickness3)
+                screw_and_washer(screw, screw_length3, star_washers);
+
+    if(thickness2)
+        corner_block_v_hole(screw)
+            translate_z(thickness2)
+                screw_and_washer(screw, screw_length2, star_washers);
 }
 
 module corner_block_M20_stl() corner_block(M2_cap_screw);

printed/fixing_block.scad

@@ -24,10 +24,15 @@
 //! See [butt_box](#Butt_box) for an example of usage.
 //!
 //! Note that the block with its inserts is defined as a sub assembly, but its fasteners get added to the parent assembly.
+//!
+//! Specific fasteners can be omitted by setting a side's thickness to 0 and the block omitted by setting ```show_block``` to false.
+//! This allows the block and one set of fasteners to be on one assembly and the other fasteners on the mating assemblies.
+//!
+//! Star washers can be omitted by setting ```star_washers``` to false.
 //
 include <../core.scad>
 include <../vitamins/screws.scad>
-include <../vitamins/inserts.scad>
+use <../vitamins/insert.scad>
 use <../utils/maths.scad>
 
 def_screw = M3_cap_screw;
@@ -116,20 +121,24 @@ assembly(str("fixing_block_M", 20 * screw_radius(screw))) {
         insert(insert);
 }
 
-module fastened_fixing_block_assembly(thickness, screw = def_screw, screw2 = undef, thickness2 = undef) { //! Assembly with fasteners in place
+module fastened_fixing_block_assembly(thickness, screw = def_screw, screw2 = undef, thickness2 = undef, show_block = true, star_washers = true) { //! Assembly with fasteners in place
     module fb_screw(screw, thickness) {
         washer = screw_washer(screw);
         insert = screw_insert(screw);
-        screw_length = screw_longer_than(2 * washer_thickness(washer) + thickness + insert_length(insert));
+        screw_length = screw_longer_than((star_washers ? 2 : 1) * washer_thickness(washer) + thickness + insert_length(insert));
 
-        translate_z(thickness)
-            screw_and_washer(screw, screw_length, true);
+        if(thickness)
+            translate_z(thickness)
+                screw_and_washer(screw, screw_length, star_washers);
     }
 
-    no_pose() fixing_block_assembly(screw);
+    if(show_block)
+        no_pose()
+            fixing_block_assembly(screw);
 
+    t2 = !is_undef(thickness2) ? thickness2 : thickness;
     fixing_block_v_holes(screw)
-        fb_screw(screw, thickness2 ? thickness2 : thickness);
+        fb_screw(screw, t2);
 
     fixing_block_h_hole(screw)
         fb_screw(screw2 ? screw2 : screw, thickness);

printed/foot.scad

@@ -23,7 +23,7 @@
 //
 include <../core.scad>
 include <../vitamins/screws.scad>
-include <../vitamins/inserts.scad>
+use <../vitamins/insert.scad>
 
 foot        = [25, 12, 3, 2, M4_cap_screw, 10];
 insert_foot = [20, 10, 0, 2, M3_cap_screw, 10];
@@ -66,7 +66,7 @@ module foot(type = foot) { //! Generate STL
     }
 }
 
-module foot_assembly(t = 0, type = foot) { //! Assembly with fasteners in place for specified sheet thickness
+module foot_assembly(t = 0, type = foot, flip = false) { //! Assembly with fasteners in place for specified sheet thickness
     screw = foot_screw(type);
     washer = screw_washer(screw);
     nut = screw_nut(screw);
@@ -79,11 +79,17 @@ module foot_assembly(t = 0, type = foot) { //! Assembly with fasteners in place
         if(t)
             explode(15, true)
                 translate_z(foot_thickness(type))
-                    screw_and_washer(screw, screw_length);
+                    if(flip)
+                        nut_and_washer(nut, true);
+                    else
+                        screw_and_washer(screw, screw_length);
     }
     if(t)
         translate_z(t)
-            nut_and_washer(nut, true);
+            if(flip)
+                screw_and_washer(screw, screw_length);
+            else
+                nut_and_washer(nut, true);
 }
 
 module insert_foot(type = insert_foot) { //! Generate STL for foot with insert

printed/handle.scad

@@ -22,7 +22,7 @@
 //
 include <../core.scad>
 include <../vitamins/screws.scad>
-include <../vitamins/inserts.scad>
+use <../vitamins/insert.scad>
 
 dia = 18;
 length = 90; // inside length

printed/pcb_mount.scad

@@ -0,0 +1,124 @@
+//
+// NopSCADlib Copyright Chris Palmer 2019
+// nop.head@gmail.com
+// hydraraptor.blogspot.com
+//
+// This file is part of NopSCADlib.
+//
+// NopSCADlib is free software: you can redistribute it and/or modify it under the terms of the
+// GNU General Public License as published by the Free Software Foundation, either version 3 of
+// the License, or (at your option) any later version.
+//
+// NopSCADlib is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+// without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+// See the GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License along with NopSCADlib.
+// If not, see <https://www.gnu.org/licenses/>.
+//
+
+//
+//! A frame to mount a PCB by its corners when it has no mounting holes.
+//! The stl must be given a parameterless wrapper in the project that uses it.
+//
+include <../core.scad>
+include <../vitamins/screws.scad>
+use <../vitamins/pcb.scad>
+
+clearance = 0.2;
+min_wall = extrusion_width * 2;
+wall = 2;
+
+overlap = 2;
+
+screw = M3_cap_screw;
+screw_clearance_r = 3.1 / 2;
+pillar_r = corrected_radius(screw_clearance_r) + wall;
+
+function pillar_x_pitch(pcb) = pcb_length(pcb) + 2 * clearance + 2 * (pillar_r - overlap) / sqrt(2); //! x pitch of screw pillars
+function pillar_y_pitch(pcb) = pcb_width(pcb)  + 2 * clearance + 2 * (pillar_r - overlap) / sqrt(2); //! y pitch of screw pillars
+
+function pcb_mount_length(pcb) = pillar_x_pitch(pcb) + 2 * pillar_r; //! Outside length of the mount
+function pcb_mount_width(pcb)  = pillar_y_pitch(pcb) + 2 * pillar_r; //! Outside width of the mount
+
+frame_w = 3;
+frame_t = 2;
+
+washer_thickness = 1.25;
+
+module pcb_mount_screw_positions(pcb) //! Positions of the screws and pillars
+    for(x = [-1, 1], y = [-1, 1])
+        translate([x * pillar_x_pitch(pcb) / 2, y * pillar_y_pitch(pcb) / 2])
+            children();
+
+module pcb_mount_holes(pcb, h = 0)          //! Drill holes for PCB mount
+    pcb_mount_screw_positions(pcb)
+        drill(screw_clearance_radius(screw), h);
+
+module pcb_mount_ring()
+    difference() {
+        circle(pillar_r);
+
+        poly_circle(screw_clearance_r);
+    }
+
+module pcb_mount_washer_stl() //! A plastic washer to clamp a PCB
+    linear_extrude(height = washer_thickness)
+        pcb_mount_ring();
+
+module pcb_mount(pcb, height = 5, washers = true) { //! Make the STL of a pcb mount for the specified PCB.
+    stl(str("pcb_mount_", pcb[0], "_", height));
+
+    y_pitch = pcb_width(pcb) > 4 * pillar_r + 4 ? pillar_r + 1
+                                                : pcb_width(pcb) / 2 + frame_w + 1 + pillar_r;
+
+    if(washers)
+        for(x = [-1, 1], y = [-1, 1])
+            translate([x * (pillar_r + 1), y * y_pitch, 0])
+                pcb_mount_washer_stl();
+
+    for(x = [-1, 1])
+        translate([x * pillar_x_pitch(pcb) / 2, 0, frame_t / 2])
+            cube([frame_w, pillar_y_pitch(pcb) - 2 * wall, frame_t], center = true);
+
+    for(y = [-1, 1])
+        translate([0, y * pillar_y_pitch(pcb) / 2, frame_t / 2])
+            cube([pillar_x_pitch(pcb) - 2 * wall, frame_w, frame_t], center = true);
+
+    pcb_mount_screw_positions(pcb)
+        linear_extrude(height = height)
+            pcb_mount_ring();
+
+    linear_extrude(height = height + pcb_thickness(pcb) - layer_height)
+        difference() {
+            pcb_mount_screw_positions(pcb)
+                pcb_mount_ring();
+
+            square([pcb_length(pcb) + 2 * clearance, pcb_width(pcb) + 2 * clearance], center = true);
+        }
+}
+
+module pcb_mount_assembly(pcb, thickness, height = 5) { //! A PCB mount assembly with fasteners
+    translate_z(height)
+        pcb(pcb);
+
+    color(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));
+
+    pcb_mount_screw_positions(pcb) {
+        translate_z(height + t) {
+            color(pp2_colour) pcb_mount_washer_stl();
+
+            translate_z(washer_thickness)
+                screw(screw, screw_length);
+        }
+
+        translate_z(-thickness)
+            vflip()
+                nut_and_washer(nut, true);
+    }
+}

printed/psu_shroud.scad

@@ -23,7 +23,7 @@
 //
 include <../core.scad>
 include <../vitamins/screws.scad>
-include <../vitamins/inserts.scad>
+use <../vitamins/insert.scad>
 
 use <../vitamins/wire.scad>
 use <../vitamins/psu.scad>
@@ -139,8 +139,8 @@ module psu_shroud(type, cable_d, name, cables = 1) { //! Generate the STL file f
     mirror([0, 1, 0])
         psu_shroud_hole_positions(type)
             translate_z(height)
-                rotate(90)
-                    insert_lug(insert, wall, $side, counter_bore);
+                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

printed/ribbon_clamp.scad

@@ -22,7 +22,7 @@
 //
 include <../core.scad>
 include <../vitamins/screws.scad>
-include <../vitamins/inserts.scad>
+use <../vitamins/insert.scad>
 use <../vitamins/cable_strip.scad>
 
 wall = 2;

printed/screw_knob.scad

@@ -34,7 +34,7 @@ knob_waves = 5;
 knob_height = knob_stem_h + knob_thickness;
 function knob_height() = knob_height;
 
-module screw_knob(screw) { //! Generate the STL foe a knob to fit the specified hex screw
+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;

printed/socket_box.scad

@@ -23,7 +23,7 @@
 include <../core.scad>
 include <../vitamins/mains_sockets.scad>
 include <../vitamins/screws.scad>
-include <../vitamins/inserts.scad>
+use <../vitamins/insert.scad>
 include <../vitamins/ring_terminals.scad>
 
 box_height = 19;

printed/ssr_shroud.scad

@@ -23,7 +23,7 @@
 //
 include <../core.scad>
 include <../vitamins/screws.scad>
-include <../vitamins/inserts.scad>
+use <../vitamins/insert.scad>
 
 use <../vitamins/wire.scad>
 use <../vitamins/ssr.scad>
@@ -103,8 +103,8 @@ module ssr_shroud(type, cable_d, name) {    //! Generate the STL file for a spec
     ssr_shroud_hole_positions(type)
         vflip()
             translate_z(height)
-                rotate(90)
-                    insert_lug(insert, wall, $side, counter_bore);
+                rotate($side * 90)
+                    insert_lug(insert, wall, counter_bore);
 }
 
 module ssr_shroud_assembly(type, cable_d, name) //! The printed parts with inserts fitted

printed/strap_handle.scad

@@ -23,7 +23,7 @@
 //
 include <../core.scad>
 include <../vitamins/screws.scad>
-include <../vitamins/inserts.scad>
+use <../vitamins/insert.scad>
 
 strap = [18, 2, M3_pan_screw, 3, 25];
 function strap() = strap;

scripts/doc_scripts.py

@@ -40,7 +40,7 @@ These are located in the ```scripts``` subdirectory, which needs to be added to
 They should work with both Python 2 and Python 3.
 
 | Script  | Function  |
-|:--|:--|''', file = doc_file)
+|:---|:---|''', file = doc_file)
         for file in os.listdir('scripts'):
             if file.endswith('.py'):
                 blurb = ''

scripts/exports.py

@@ -85,48 +85,49 @@ def make_parts(target, part_type, parts = None):
     #
     lib_dir = os.environ['OPENSCADPATH'] + '/NopSCADlib/printed'
     module_suffix = '_dxf' if part_type == 'svg' else '_' + part_type
-    for dir in [source_dir, lib_dir]:
-        for filename in os.listdir(dir):
-            if filename[-5:] == ".scad":
-                #
-                # find any modules ending in _<part_type>
-                #
-                with open(dir + "/" + filename, "r") as f:
-                    for line in f.readlines():
-                        words = line.split()
-                        if(len(words) and words[0] == "module"):
-                            module = words[1].split('(')[0]
-                            if module.endswith(module_suffix):
-                                base_name = module[:-4]
-                                part = base_name + '.' + part_type
-                                if part in targets:
-                                    #
-                                    # make a file to use the module
-                                    #
-                                    part_maker_name = part_type + ".scad"
-                                    with open(part_maker_name, "w") as f:
-                                        f.write("use <%s/%s>\n" % (dir, filename))
-                                        f.write("%s();\n" % module);
-                                    #
-                                    # Run openscad on the created file
-                                    #
-                                    part_file = target_dir + "/" + part
-                                    dname = deps_name(deps_dir, filename)
-                                    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"
-                                    if changed:
-                                        print(changed)
-                                        t = time.time()
-                                        openscad.run("-D$bom=1", "-d", dname, "-o", part_file, part_maker_name)
-                                        times.add_time(part, t)
-                                        if part_type == 'stl':
-                                            bounds = c14n_stl.canonicalise(part_file)
-                                            bounds_map[part] = bounds
+    for dir in [source_dir, source_dir + '/printed', lib_dir]:
+        if os.path.isdir(dir):
+            for filename in os.listdir(dir):
+                if filename[-5:] == ".scad":
+                    #
+                    # find any modules ending in _<part_type>
+                    #
+                    with open(dir + "/" + filename, "r") as f:
+                        for line in f.readlines():
+                            words = line.split()
+                            if(len(words) and words[0] == "module"):
+                                module = words[1].split('(')[0]
+                                if module.endswith(module_suffix):
+                                    base_name = module[:-4]
+                                    part = base_name + '.' + part_type
+                                    if part in targets:
+                                        #
+                                        # make a file to use the module
+                                        #
+                                        part_maker_name = part_type + ".scad"
+                                        with open(part_maker_name, "w") as f:
+                                            f.write("use <%s/%s>\n" % (dir, filename))
+                                            f.write("%s();\n" % module);
+                                        #
+                                        # Run openscad on the created file
+                                        #
+                                        part_file = target_dir + "/" + part
+                                        dname = deps_name(deps_dir, filename)
+                                        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"
+                                        if changed:
+                                            print(changed)
+                                            t = time.time()
+                                            openscad.run("-D$bom=1", "-d", dname, "-o", part_file, part_maker_name)
+                                            times.add_time(part, t)
+                                            if part_type == 'stl':
+                                                bounds = c14n_stl.canonicalise(part_file)
+                                                bounds_map[part] = bounds
 
-                                    targets.remove(part)
-                                    os.remove(part_maker_name)
+                                        targets.remove(part)
+                                        os.remove(part_maker_name)
     #
     # Write new bounds file
     #

scripts/make_all.py

@@ -26,6 +26,7 @@ from exports import make_parts
 from bom import boms
 from render import render
 from views import views
+from plateup import plateup
 
 if __name__ == '__main__':
     target = None if len(sys.argv) == 1 else sys.argv[1]
@@ -33,4 +34,6 @@ if __name__ == '__main__':
     for part in ['stl', 'dxf']:
         make_parts(target, part)
         render(target, part)
+        plateup(target, part)
+
     views(target)

scripts/openscad.py

@@ -24,11 +24,12 @@ from __future__ import print_function
 
 import subprocess, sys
 
-def run(*args):
-    cmd = ["openscad"] + list(args)
-    for arg in cmd:
-        print(arg, end=" ")
-    print()
+def run_list(args, silent = False):
+    cmd = ["openscad"] + args
+    if not silent:
+        for arg in cmd:
+            print(arg, end=" ")
+        print()
     with open("openscad.log", "w") as log:
         rc = subprocess.call(cmd, stdout = log, stderr = log)
     for line in open("openscad.log", "rt"):
@@ -36,3 +37,9 @@ def run(*args):
             print(line[:-1])
     if rc:
         sys.exit(rc)
+
+def run(*args):
+    run_list(list(args), False)
+
+def run_silent(*args):
+    run_list(list(args), True);

scripts/options.py

@@ -0,0 +1,49 @@
+#
+# 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/>.
+#
+
+# Set command line options from enviroment variables and check if they have changed
+
+import json, os, deps
+
+def check_options(dir = '.'):
+    global options, options_mtime
+    options = { "show_threads": str(os.getenv("SHOW_THREADS")) }
+    options_fname = dir + '/options.json'
+    try:
+        with open(options_fname) as json_file:
+            last_options = json.load(json_file)
+    except:
+        last_options = {}
+    if last_options != options:
+        with open(options_fname, 'w') as outfile:
+            json.dump(options, outfile, indent = 4)
+    options_mtime = deps.mtime(options_fname)
+
+def have_changed(changed, target):
+    if not changed and deps.mtime(target) < options_mtime:
+        return "command line options changed"
+    return changed
+
+def list():
+    result = []
+    for name in options.keys():
+        value = options[name]
+        if value != 'None':
+            result.append('-D$' + name + '=' + value)
+    return result

scripts/panels.py

@@ -0,0 +1,33 @@
+#!/usr/bin/env python
+
+#
+# NopSCADlib Copyright Chris Palmer 2018
+# nop.head@gmail.com
+# hydraraptor.blogspot.com
+#
+# This file is part of NopSCADlib.
+#
+# NopSCADlib is free software: you can redistribute it and/or modify it under the terms of the
+# GNU General Public License as published by the Free Software Foundation, either version 3 of
+# the License, or (at your option) any later version.
+#
+# NopSCADlib is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+# without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+# See the GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along with NopSCADlib.
+# If not, see <https://www.gnu.org/licenses/>.
+#
+#! Panelises DXF files so they can be routed together by running scad files found in the ```panels``` directory.
+
+from __future__ import print_function
+import sys
+
+from plateup import plateup
+
+if __name__ == '__main__':
+    if len(sys.argv) > 1:
+        target = sys.argv[1]
+    else:
+        target = None
+    plateup(target, 'dxf')

scripts/plateup.py

@@ -0,0 +1,98 @@
+#!/usr/bin/env python
+
+#
+# NopSCADlib Copyright Chris Palmer 2018
+# nop.head@gmail.com
+# hydraraptor.blogspot.com
+#
+# This file is part of NopSCADlib.
+#
+# NopSCADlib is free software: you can redistribute it and/or modify it under the terms of the
+# GNU General Public License as published by the Free Software Foundation, either version 3 of
+# the License, or (at your option) any later version.
+#
+# NopSCADlib is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+# without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+# See the GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along with NopSCADlib.
+# If not, see <https://www.gnu.org/licenses/>.
+#
+
+from __future__ import print_function
+import os
+import openscad
+import sys
+import c14n_stl
+from set_config import *
+from deps import *
+from shutil import copyfile
+
+source_dirs = { "stl" : "platters", "dxf" : "panels" }
+target_dirs = { "stl" : "printed",  "dxf" : "routed" }
+
+def plateup(target, part_type):
+    #
+    # Make the target directory
+    #
+    top_dir = set_config(target)
+    parts_dir = top_dir + part_type + 's'
+    target_dir = parts_dir + '/' + target_dirs[part_type]
+    source_dir = top_dir + source_dirs[part_type]
+    deps_dir = source_dir + "/deps"
+    if not os.path.isdir(source_dir):
+        return
+    if not os.path.isdir(target_dir):
+        os.makedirs(target_dir)
+    if not os.path.isdir(deps_dir):
+        os.makedirs(deps_dir)
+    #
+    # Decide which files to make
+    #
+    sources = [file for file in os.listdir(source_dir) if file.endswith('.scad')]
+    #
+    # Run OpenSCAD on the source files to make the targets
+    #
+    used = []
+    for src in sources:
+        src_file = source_dir + '/' + src
+        part_file = target_dir + '/' + src[:-4] + part_type
+        dname = deps_name(deps_dir, src)
+        changed = check_deps(part_file, dname)
+        if changed:
+            print(changed)
+            openscad.run("-D$bom=1", "-d", dname, "-o", part_file, src_file)
+            if part_type == 'stl':
+                c14n_stl.canonicalise(part_file)
+            log_name = 'openscad.log'
+        else:
+            log_name = 'openscad.echo'
+            openscad.run_silent("-D$bom=1", "-o", log_name, src_file)
+        #
+        # Add the files on the BOM to the used list
+        #
+        with open(log_name) as file:
+            for line in file.readlines():
+                if line.startswith('ECHO: "~') and line.endswith('.' + part_type + '"\n'):
+                    used.append(line[8:-2])
+    #
+    # Copy file that are not included
+    #
+    copied = []
+    for file in os.listdir(parts_dir):
+        if file.endswith('.' + part_type) and not file in used:
+            src = parts_dir + '/' + file
+            dst = target_dir + '/' + file
+            if mtime(src) > mtime(dst):
+                print("Copying %s to %s" % (src, dst))
+                copyfile(src, dst)
+            copied.append(file)
+    #
+    # Remove any cruft
+    #
+    targets = [file[:-4] + part_type for file in sources]
+    for file in os.listdir(target_dir):
+        if file.endswith('.' + part_type):
+            if not file in targets and not file in copied:
+                print("Removing %s" % file)
+                os.remove(target_dir + '/' + file)

scripts/platters.py

@@ -0,0 +1,33 @@
+#!/usr/bin/env python
+
+#
+# NopSCADlib Copyright Chris Palmer 2018
+# nop.head@gmail.com
+# hydraraptor.blogspot.com
+#
+# This file is part of NopSCADlib.
+#
+# NopSCADlib is free software: you can redistribute it and/or modify it under the terms of the
+# GNU General Public License as published by the Free Software Foundation, either version 3 of
+# the License, or (at your option) any later version.
+#
+# NopSCADlib is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+# without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+# See the GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along with NopSCADlib.
+# If not, see <https://www.gnu.org/licenses/>.
+#
+#! Generates build plates of STL files for efficient printing by running scad files found in the ```platters``` directory.
+
+from __future__ import print_function
+import sys
+
+from plateup import plateup
+
+if __name__ == '__main__':
+    if len(sys.argv) > 1:
+        target = sys.argv[1]
+    else:
+        target = None
+    plateup(target, 'stl')

scripts/readme.md

@@ -5,13 +5,15 @@ These are located in the ```scripts``` subdirectory, which needs to be added to
 They should work with both Python 2 and Python 3.
 
 | Script  | Function  |
-|:--|:--|
+|:---|:---|
 | ```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. |
 | ```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. |
 | ```make_all.py``` | Generates all the files for a project by running ```bom.py```, ```stls.py```, ```dxfs.py```, ```render.py``` and ```views.py```. |
+| ```panels.py``` | Panelises DXF files so they can be routed together by running scad files found in the ```panels``` directory. |
+| ```platters.py``` | Generates build plates of STL files for efficient printing by running scad files found in the ```platters``` directory. |
 | ```render.py``` | Renders STL and DXF files to PNG for inclusion in the build instructions. |
 | ```set_config.py``` | Sets the target configuration for multi-target projects that have variable configurations. |
 | ```stls.py``` | Generates STL files for all the printed parts listed on the BOM or a specified list. |

scripts/tests.py

@@ -27,6 +27,7 @@ import openscad
 import subprocess
 import bom
 import times
+import options
 import time
 import json
 import shutil
@@ -96,6 +97,7 @@ def tests(tests):
     index = {}
     bodies = {}
     times.read_times()
+    options.check_options(deps_dir)
     #
     # Make cover pic if does not exist as very slow. Delete it to force an update.
     #
@@ -107,7 +109,7 @@ def tests(tests):
     #
     # List of individual part files
     #
-    scads = [i for i in os.listdir(scad_dir) if i[-5:] == ".scad"]
+    scads = [i for i in sorted(os.listdir(scad_dir)) if i[-5:] == ".scad"]
 
     for scad in scads:
         base_name = scad[:-5]
@@ -138,7 +140,7 @@ def tests(tests):
                 print("Can't find implementation!")
                 continue
 
-            vsplit = "N"
+            vsplit = "M"
             vtype = locations[0][1]
             types = [vtype + ' A-' + vsplit[0], vtype + ' ' + chr(ord(vsplit) + 1) + '-Z'] + [loc[1] for loc in locations[1 :]]
             if type == vtype:
@@ -190,11 +192,12 @@ def tests(tests):
             oldest = png_name if mtime(png_name) < mtime(bom_name) else bom_name
             changed = check_deps(oldest, dname)
             changed = times.check_have_time(changed, scad_name)
+            changed = options.have_changed(changed, oldest)
             if changed:
                 print(changed)
                 t = time.time()
                 tmp_name = 'tmp.png'
-                openscad.run("-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);
+                openscad.run_list(options.list() + ["-D$bom=2", colour_scheme, "--projection=p", "--imgsize=%d,%d" % (w, h), "--camera=0,0,0,70,0,315,500", "--autocenter", "--viewall", "-d", dname, "-o", tmp_name, scad_name]);
                 times.add_time(scad_name, t)
                 do_cmd(["magick", tmp_name, "-trim", "-resize", "1000x600", "-bordercolor", background, "-border", "10", tmp_name])
                 update_image(tmp_name, png_name)
@@ -257,7 +260,7 @@ See [usage](docs/usage.md) for requirements, installation instructions and a usa
             print('<tr>',  file = doc_file, end = '')
             for type in types:
                 if i < len(index[type]):
-                    name = index[type][i]
+                    name = sorted(index[type])[i]
                     print('<td> <a href = "#' + name + '">' + name + '</a> </td>', file = doc_file, end = '')
                 else:
                     print('<td></td>', file = doc_file, end = '')

scripts/views.py

@@ -28,6 +28,7 @@ import openscad
 from tests import do_cmd, update_image, colour_scheme, background
 import time
 import times
+import options
 from deps import *
 import os
 import json
@@ -70,9 +71,10 @@ def bom_to_assemblies(bom_dir, bounds_map):
     #
     # Remove the main assembly if it is a shell
     #
-    ass =  flat_bom[-1]
-    if len(ass["assemblies"]) < 2 and not ass["vitamins"] and not ass["printed"] and not ass["routed"]:
-        flat_bom = flat_bom[:-1]
+    if flat_bom:
+        ass =  flat_bom[-1]
+        if len(ass["assemblies"]) < 2 and not ass["vitamins"] and not ass["printed"] and not ass["routed"]:
+            flat_bom = flat_bom[:-1]
     return [assembly["name"] for  assembly in flat_bom]
 
 def eop(print_mode, doc_file, last = False, first = False):
@@ -102,6 +104,7 @@ def views(target, do_assemblies = None):
         os.makedirs(deps_dir)
 
     times.read_times(target_dir)
+    options.check_options(deps_dir)
     bounds_fname = top_dir + 'stls/bounds.json'
     with open(bounds_fname) as json_file:
         bounds_map = json.load(json_file)
@@ -122,65 +125,67 @@ def views(target, do_assemblies = None):
     #
     main_blurb = None
     lib_dir = os.environ['OPENSCADPATH'] + '/NopSCADlib/printed'
-    for dir in [source_dir, lib_dir]:
-        for filename in os.listdir(dir):
-            if filename.endswith('.scad'):
-                #
-                # find any modules with names ending in _assembly
-                #
-                with open(dir + "/" + filename, "r") as f:
-                    lines = f.readlines()
-                line_no = 0
-                for line in lines:
-                    words = line.split()
-                    if len(words) and words[0] == "module":
-                        module = words[1].split('(')[0]
-                        if is_assembly(module):
-                            if module in assemblies:
-                                #
-                                # Scrape the assembly instructions
-                                #
-                                for ass in flat_bom:
-                                    if ass["name"] == module:
-                                        if not "blurb" in ass:
-                                            ass["blurb"] = blurb.scrape_module_blurb(lines[:line_no])
-                                        break
-                                if not do_assemblies or module in do_assemblies:
+    for dir in [source_dir, source_dir + '/printed', lib_dir]:
+        if os.path.isdir(dir):
+            for filename in os.listdir(dir):
+                if filename.endswith('.scad'):
+                    #
+                    # find any modules with names ending in _assembly
+                    #
+                    with open(dir + "/" + filename, "r") as f:
+                        lines = f.readlines()
+                    line_no = 0
+                    for line in lines:
+                        words = line.split()
+                        if len(words) and words[0] == "module":
+                            module = words[1].split('(')[0]
+                            if is_assembly(module):
+                                if module in assemblies:
                                     #
-                                    # make a file to use the module
+                                    # Scrape the assembly instructions
                                     #
-                                    png_maker_name = 'png.scad'
-                                    with open(png_maker_name, "w") as f:
-                                        f.write("use <%s/%s>\n" % (dir, filename))
-                                        f.write("%s();\n" % module);
-                                    #
-                                    # Run openscad on th created file
-                                    #
-                                    dname = deps_name(deps_dir, filename)
-                                    for explode in [0, 1]:
-                                        png_name = target_dir + '/' + module + '.png'
-                                        if not explode:
-                                            png_name = png_name.replace('_assembly', '_assembled')
-                                        changed = check_deps(png_name, dname)
-                                        changed = times.check_have_time(changed, png_name)
-                                        tmp_name = 'tmp.png'
-                                        if changed:
-                                            print(changed)
-                                            t = time.time()
-                                            openscad.run("-D$pose=1", "-D$explode=%d" % explode, colour_scheme, "--projection=p", "--imgsize=4096,4096", "--autocenter", "--viewall", "-d", dname, "-o", tmp_name, png_maker_name);
-                                            times.add_time(png_name, t)
-                                            do_cmd(["magick", tmp_name, "-trim", "-resize", "1004x1004", "-bordercolor", background, "-border", "10", tmp_name])
-                                            update_image(tmp_name, png_name)
-                                        tn_name = png_name.replace('.png', '_tn.png')
-                                        if mtime(png_name) > mtime(tn_name):
-                                            do_cmd(("magick "+ png_name + " -trim -resize 280x280 -background " + background + " -gravity Center -extent 280x280 -bordercolor " + background + " -border 10 " + tmp_name).split())
-                                            update_image(tmp_name, tn_name)
-                                    os.remove(png_maker_name)
-                                done_assemblies.append(module)
-                            else:
-                                if module == 'main_assembly':
-                                    main_blurb = blurb.scrape_module_blurb(lines[:line_no])
-                    line_no += 1
+                                    for ass in flat_bom:
+                                        if ass["name"] == module:
+                                            if not "blurb" in ass:
+                                                ass["blurb"] = blurb.scrape_module_blurb(lines[:line_no])
+                                            break
+                                    if not do_assemblies or module in do_assemblies:
+                                        #
+                                        # make a file to use the module
+                                        #
+                                        png_maker_name = 'png.scad'
+                                        with open(png_maker_name, "w") as f:
+                                            f.write("use <%s/%s>\n" % (dir, filename))
+                                            f.write("%s();\n" % module);
+                                        #
+                                        # Run openscad on the created file
+                                        #
+                                        dname = deps_name(deps_dir, filename)
+                                        for explode in [0, 1]:
+                                            png_name = target_dir + '/' + module + '.png'
+                                            if not explode:
+                                                png_name = png_name.replace('_assembly', '_assembled')
+                                            changed = check_deps(png_name, dname)
+                                            changed = times.check_have_time(changed, png_name)
+                                            changed = options.have_changed(changed, png_name)
+                                            tmp_name = 'tmp.png'
+                                            if changed:
+                                                print(changed)
+                                                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]);
+                                                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)
+                                            tn_name = png_name.replace('.png', '_tn.png')
+                                            if mtime(png_name) > mtime(tn_name):
+                                                do_cmd(("magick "+ png_name + " -trim -resize 280x280 -background " + background + " -gravity Center -extent 280x280 -bordercolor " + background + " -border 10 " + tmp_name).split())
+                                                update_image(tmp_name, tn_name)
+                                        os.remove(png_maker_name)
+                                    done_assemblies.append(module)
+                                else:
+                                    if module == 'main_assembly':
+                                        main_blurb = blurb.scrape_module_blurb(lines[:line_no])
+                        line_no += 1
     times.print_times()
     #
     # Build the document
@@ -236,7 +241,7 @@ def views(target, do_assemblies = None):
                 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(flat_bom) + '|---:|:---|'), file = doc_file)
 
             for t in types:
                 if things[t]:
@@ -279,7 +284,7 @@ def views(target, do_assemblies = None):
                 if vitamins:
                     print("### Vitamins",         file = doc_file)
                     print("|Qty|Description|",    file = doc_file)
-                    print("|--:|:----------|",    file = doc_file)
+                    print("|---:|:----------|",    file = doc_file)
                     for v in sorted(vitamins, key = lambda s: s.split(":")[-1]):
                         print("|%d|%s|" % (vitamins[v], v.split(":")[1]),     file = doc_file)
                     print("\n", file = doc_file)
@@ -293,7 +298,7 @@ def views(target, do_assemblies = None):
                         print('%s %d x %s |' % ('\n|' if not (i % 3) else '', printed[p], p), file = doc_file, end = '')
                         if (i % 3) == 2 or i == len(printed) - 1:
                             n = (i % 3) + 1
-                            print('\n|%s' % ('--|' * n), file =  doc_file)
+                            print('\n|%s' % ('---|' * n), file =  doc_file)
                             for j in range(n):
                                 part = keys[i - n + j + 1]
                                 print('| ![%s](stls/%s) %s' % (part, part.replace('.stl','.png'), '|\n' if j == j - 1 else ''), end = '', file = doc_file)
@@ -309,7 +314,7 @@ def views(target, do_assemblies = None):
                         print('%s %d x %s |' % ('\n|' if not (i % 3) else '', routed[r], r), file = doc_file, end = '')
                         if (i % 3) == 2 or i == len(routed) - 1:
                             n = (i % 3) + 1
-                            print('\n|%s' % ('--|' * n), file =  doc_file)
+                            print('\n|%s' % ('---|' * n), file =  doc_file)
                             for j in range(n):
                                 part = keys[i - n + j + 1]
                                 print('| ![%s](dxfs/%s) %s' % (part, part.replace('.dxf','.png'), '|\n' if j == j - 1 else ''), end = '', file = doc_file)
@@ -325,7 +330,7 @@ def views(target, do_assemblies = None):
                         print('%s %d x %s |' % ('\n|' if not (i % 3) else '', sub_assemblies[a], a), file = doc_file, end = '')
                         if (i % 3) == 2 or i == len(keys) - 1:
                             n = (i % 3) + 1
-                            print('\n|%s' % ('--|' * n), file =  doc_file)
+                            print('\n|%s' % ('---|' * n), file =  doc_file)
                             for j in range(n):
                                 a = keys[i - n + j + 1].replace('_assembly', '_assembled')
                                 print('| ![%s](assemblies/%s) %s' % (a, a + '_tn.png', '|\n' if j == j - 1 else ''), end = '', file = doc_file)

tests/belts.scad

@@ -20,8 +20,8 @@ include <../core.scad>
 
 include <../vitamins/belts.scad>
 include <../vitamins/screws.scad>
-include <../vitamins/inserts.scad>
 include <../vitamins/pulleys.scad>
+use <../vitamins/insert.scad>
 use <../utils/layout.scad>
 
 module belt_test() {
@@ -67,7 +67,7 @@ module belt_test() {
     translate([-25, 0])
         layout([for(b = belts) belt_width(b)], 10)
             rotate([0, 90, 0])
-                belt(belts[$i], [[0, 0, 20], [0, 1, 20]]);
+                belt(belts[$i], [[0, 0, 20], [0, 1, 20]], belt_colour = $i%2==0 ? grey90 : grey20, tooth_colour = $i%2==0 ? grey70 : grey50);
 }
 
 if($preview)

tests/bom.scad

@@ -22,8 +22,8 @@
 //
 include <../core.scad>
 include <../vitamins/screws.scad>
-include <../vitamins/inserts.scad>
 include <../vitamins/sheets.scad>
+use <../vitamins/insert.scad>
 $explode = 1; // Normally set on the command line when generating assembly views with views.py
 
 screw = M3_cap_screw;

tests/box.scad

@@ -20,7 +20,7 @@ include <../core.scad>
 
 include <../vitamins/screws.scad>
 include <../vitamins/sheets.scad>
-include <../vitamins/inserts.scad>
+use <../vitamins/insert.scad>
 
 use <../printed/box.scad>
 

tests/butt_box.scad

@@ -20,7 +20,7 @@ include <../core.scad>
 
 include <../vitamins/screws.scad>
 include <../vitamins/sheets.scad>
-include <../vitamins/inserts.scad>
+use <../vitamins/insert.scad>
 
 include <../printed/butt_box.scad>
 

tests/d_connectors.scad

@@ -35,4 +35,5 @@ module d_connectors()
                 }
 
 if($preview)
-    d_connectors();
+    let($show_threads = true)
+        d_connectors();

tests/extrusion_brackets.scad

@@ -0,0 +1,65 @@
+//
+// 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/extrusion_brackets.scad>
+include <../vitamins/extrusions.scad>
+include <../vitamins/washers.scad>
+include <../vitamins/nuts.scad>
+
+module extrusion_brackets(examples = false) {
+    extrusion_inner_corner_bracket(E20_inner_corner_bracket);
+
+    translate([30, 0])
+        extrusion_inner_corner_bracket(E20_inner_corner_bracket, grub_screws = false);
+
+    translate([60, 0])
+        extrusion_corner_bracket_assembly(E20_corner_bracket);
+
+    eWidth = extrusion_width(E2020);
+
+    if(examples) {
+        translate([20, 60, 10]) rotate([90, 0, 180]) {
+            extrusion_inner_corner_bracket(E20_inner_corner_bracket);
+
+            translate([-eWidth / 2, 0, 0])
+                rotate([-90, 0, 0])
+                    extrusion(E2020, 20, false);
+
+            translate([-eWidth, -eWidth / 2, 0])
+                rotate([0, 90, 0])
+                    extrusion(E2020, 40, false);
+        }
+
+        translate([100, 60, 10]) rotate([90, 0, 180]) {
+            extrusion_corner_bracket_assembly(E20_corner_bracket);
+
+            translate([-eWidth / 2, 0, 0])
+                rotate([-90, 0, 0])
+                    extrusion(E2020, 30, false);
+
+            translate([-eWidth, -eWidth / 2, 0])
+                rotate([0, 90, 0])
+                    extrusion(E2020, 50, false);
+        }
+    }
+}
+
+if($preview)
+    extrusion_brackets(true);

tests/extrusions.scad

@@ -0,0 +1,30 @@
+//
+// 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>
+use <../utils/layout.scad>
+
+include <../vitamins/extrusions.scad>
+
+module extrusions()
+    layout([for(e = extrusions) extrusion_width(e)], 10)
+        extrusion(extrusions[$i], 80);
+
+if ($preview)
+    extrusions();
+

tests/geared_steppers.scad

@@ -0,0 +1,27 @@
+//
+// NopSCADlib Copyright Chris Palmer 2019
+// nop.head@gmail.com
+// hydraraptor.blogspot.com
+//
+// This file is part of NopSCADlib.
+//
+// NopSCADlib is free software: you can redistribute it and/or modify it under the terms of the
+// GNU General Public License as published by the Free Software Foundation, either version 3 of
+// the License, or (at your option) any later version.
+//
+// NopSCADlib is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+// without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+// See the GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License along with NopSCADlib.
+// If not, see <https://www.gnu.org/licenses/>.
+//
+include <../vitamins/geared_steppers.scad>
+
+use <../utils/layout.scad>
+
+module geared_steppers()
+    layout([for(g = geared_steppers) gs_diameter(g)], 5)
+        geared_stepper(geared_steppers[$i]);
+
+geared_steppers();

tests/hygrometer.scad

@@ -0,0 +1,22 @@
+//
+// NopSCADlib Copyright Chris Palmer 2018
+// nop.head@gmail.com
+// hydraraptor.blogspot.com
+//
+// This file is part of NopSCADlib.
+//
+// NopSCADlib is free software: you can redistribute it and/or modify it under the terms of the
+// GNU General Public License as published by the Free Software Foundation, either version 3 of
+// the License, or (at your option) any later version.
+//
+// NopSCADlib is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+// without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+// See the GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License along with NopSCADlib.
+// If not, see <https://www.gnu.org/licenses/>.
+//
+use <../vitamins/hygrometer.scad>
+
+if($preview)
+    hygrometer();

tests/inserts.scad

@@ -21,10 +21,21 @@ use <../utils/layout.scad>
 
 include <../vitamins/inserts.scad>
 
-module inserts()
+module inserts() {
+
     for(i = [0: len(inserts) -1])
         translate([10 * i, 0])
             insert(inserts[i]);
 
+    color(pp1_colour)
+        translate([len(inserts) * 10, 0]) {
+            insert_lug(inserts[0], 2, 1);
+
+            translate([10, 0])
+                insert_boss(inserts[0], z = 10, wall = 2);
+        }
+}
+
 if($preview)
-    inserts();
+    let($show_threads = true)
+        inserts();

tests/kp_pillow_blocks.scad

@@ -0,0 +1,34 @@
+//
+// NopSCADlib Copyright Chris Palmer 2018
+// nop.head@gmail.com
+// hydraraptor.blogspot.com
+//
+// This file is part of NopSCADlib.
+//
+// NopSCADlib is free software: you can redistribute it and/or modify it under the terms of the
+// GNU General Public License as published by the Free Software Foundation, either version 3 of
+// the License, or (at your option) any later version.
+//
+// NopSCADlib is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+// without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+// See the GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License along with NopSCADlib.
+// If not, see <https://www.gnu.org/licenses/>.
+//
+include <../core.scad>
+use <../utils/layout.scad>
+
+include <../vitamins/kp_pillow_blocks.scad>
+include <../vitamins/nuts.scad>
+
+module kp_pillow_blocks() {
+    screws = [M4_cap_screw, M4_cap_screw, M5_cap_screw, M5_cap_screw];
+    nuts = [M4_sliding_t_nut, M4_hammer_nut, M5_sliding_t_nut, M5_nut];
+    assert(len(screws) == len(kp_pillow_blocks) && len(nuts) == len(kp_pillow_blocks));
+    layout([for(k = kp_pillow_blocks) 2 * kp_size(k)[1]])
+        kp_pillow_block_assembly(kp_pillow_blocks[$i], screw_type = screws[$i], nut_type = nuts[$i]);
+}
+
+if($preview)
+    kp_pillow_blocks();

tests/leadnuts.scad

@@ -27,4 +27,5 @@ module leadnuts()
         leadnut(leadnuts[$i]);
 
 if($preview)
-    leadnuts();
+    let($show_threads = true)
+        leadnuts();

tests/linear_bearings.scad

@@ -22,8 +22,12 @@ use <../utils/layout.scad>
 include <../vitamins/linear_bearings.scad>
 
 module linear_bearings()
-    layout([for(b = linear_bearings) 2 * bearing_radius(b)])
+    layout([for(b = linear_bearings) 2 * bearing_radius(b)]) {
         linear_bearing(linear_bearings[$i]);
 
+        translate([0, 30])
+            linear_bearing(long_linear_bearings[$i]);
+    }
+
 if($preview)
     linear_bearings();

tests/maths.scad

@@ -56,7 +56,7 @@ module maths() {
     //
     z = [0, 0, 1];
     v = cross(u, z);
-    a = acos(u * z);
+    a = angle_between(u, z);
 
 
     l = 20;
@@ -64,6 +64,11 @@ module maths() {
         translate_z(l)
             vflip()
                 arrow(l);
+
+    //
+    // Test Euler
+    //
+    assert(euler(rotate(r)) == r, "euler() failed");
 }
 
 rotate(45)

tests/nuts.scad

@@ -22,13 +22,12 @@ use <../utils/layout.scad>
 include <../vitamins/screws.scad>
 
 module nuts() {
-    for(nyloc = [false, true])
-        translate([0, nyloc ? 20 : 0])
-            layout([for(n = nuts) 2 * nut_radius(n)], 5)
-                nut(nuts[$i], nyloc);
+    layout([for(n = nuts) 2 * nut_radius(n)], 5) let(n = nuts[$i]) {
+        for(nyloc = [false, true])
+            translate([0, nyloc ? 20 : 0])
+                nut(n, nyloc);
 
-    translate([0, 40])
-        layout([for(n = nuts) 2 * nut_radius(n)], 5) let(n = nuts[$i]) {
+        translate([0, 40]) {
             if(n == M3_nut)
                 nut(n, brass = true);
 
@@ -45,7 +44,28 @@ module nuts() {
             if(n == M8_nut)
                 #nut_trap(M8_cap_screw, n, h = 30);
         }
+
+        translate([0, 60]) {
+            if(n == M3_nut)
+                sliding_t_nut(M3_sliding_t_nut);
+
+            if(n == M4_nut)
+                sliding_t_nut(M4_sliding_t_nut);
+
+            if(n == M5_nut)
+                sliding_t_nut(M5_sliding_t_nut);
+        }
+
+        translate([0, 80]) {
+            if(n == M3_nut)
+                sliding_t_nut(M3_hammer_nut);
+
+            if(n == M4_nut)
+                sliding_t_nut(M4_hammer_nut);
+       }
+    }
 }
 
 if($preview)
-    nuts();
+    let($show_threads = true)
+        nuts();

tests/opengrab.scad

@@ -29,4 +29,5 @@ module opengrab_test() {
 }
 
 if($preview)
-    opengrab_test();
+    let($show_threads = true)
+        opengrab_test();

tests/pcb.scad

@@ -0,0 +1,109 @@
+//
+// 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>
+
+use <../vitamins/pcb.scad>
+include <../vitamins/microswitches.scad>
+include <../vitamins/d_connectors.scad>
+
+gt_5x17 = ["gt_5x17",    5,   10,   17, 5,   11, 0.4,  9,   2,1.5,     1,  3,   6,     0,  0,   0];
+gt_5x11 = ["gt_5x11",    5,    8,   11, 5,    7, 0.4,  7,   1.5,1.5,   1,2.5,   6,     0,  0,   0];
+
+TMC2130HeatSinkColor = "DeepSkyBlue";
+TMC2130 = ["TMC2130", "TMC2130",
+    20, 14, 1.6, 0, 3, 0, "white", false, [],
+    [
+        [  10,  1,  0, "-2p54header", 8, 1 ,undef, "blue" ],
+        [  10, 13,  0, "-2p54header", 8, 1],
+        [  12,  7,  0, "-chip", 6, 4, 1, grey20 ],
+        // mock up a heat sink
+        [  10,  7,  0, "block", 9, 9,  2, TMC2130HeatSinkColor ],
+        [  10, 11,  0, "block", 9, 1, 11, TMC2130HeatSinkColor ],
+        [  10,  9,  0, "block", 9, 1, 11, TMC2130HeatSinkColor ],
+        [  10,  7,  0, "block", 9, 1, 11, TMC2130HeatSinkColor ],
+        [  10,  5,  0, "block", 9, 1, 11, TMC2130HeatSinkColor ],
+        [  10,  3,  0, "block", 9, 1, 11, TMC2130HeatSinkColor ],
+    ],
+    []
+];
+
+test_pcb = ["TestPCB", "Test PCB",
+    50, 500, 1.6, // length, width, thickness
+    3,      // Corner radius
+    2.75,   // Mounting hole diameter
+    6,      // Pad around mounting hole
+    "green",// Color
+    false,  // True if the parts should be separate BOM items
+    // hole offsets
+    [ [3, 3], [3, -3], [-3, 3], [-3, -3] ],
+    // components
+    [
+        [ 10,  10,   0, "2p54header", 4, 1],
+        [ 25,  10,   0, "2p54header", 5, 1, undef, "blue" ],
+        [ 10,  20,   0, "2p54boxhdr", 4, 2],
+        [ 10,  30,   0, "2p54socket", 6, 1],
+        [ 25,  30,   0, "2p54socket", 4, 1, undef, undef, undef, "red" ],
+        [ 10,  40,   0, "chip", 10, 5, 1, grey20],
+        [ 10,  60, 180, "rj45"],
+        [  8,  80, 180, "usb_A"],
+        [  8, 100, 180, "usb_Ax2"],
+        [  3, 120, 180, "usb_uA"],
+        [  8, 140, 180, "usb_B"],
+        [ 10, 160,   0, "buzzer"],
+        [ 25, 160,   0, "buzzer", 4.5, 8.5],
+        [ 10, 175,   0, "potentiometer"],
+        [ 30, 175,   0, "potentiometer", 7, 8],
+        [  8, 190, 180, "jack"],
+        [  6, 200, 180, "barrel_jack"],
+        [  5, 220, 180, "hdmi"],
+        [  3, 240, 180, "mini_hdmi"],
+        [ 10, 250,   0, "flex"],
+        [ 10, 265,   0, "flat_flex"],
+        [ 10, 280,   0, "D_plug", DCONN9],
+        [ 10, 300,   0, "molex_hdr", 2],
+        [ 10, 310,   0, "jst_xh", 2],
+        [ 10, 320, 180, "term254", 3],
+        [ 20, 320, 180, "term254", 3, undef, grey20],
+        [ 10, 340, 180, "gterm35", 4, [1,2]],
+        [ 20, 340, 180, "gterm35", 4, [1,2], "red"],
+        [ 30, 340, 180, "gterm", gt_5x11, 3],
+        [ 10, 360, 180, "gterm635", 2],
+        [ 25, 360, 180, "gterm635", 2, undef, "blue"],
+        [ 40, 360, 180, "gterm", gt_5x17, 2, undef, grey20],
+        [ 40, 340, 180, "gterm", gt_5x17, 3, [1], "red"],
+        [ 10, 380, 180, "term35", 4],
+        [ 20, 380, 180, "term35", 3, "lime"],
+        [ 10, 400,   0, "transition", 5],
+        [ 10, 410,   0, "block", 10, 5, 8, "orange"],
+        [ 10, 420,   0, "button_6mm"],
+        [ 10, 435,   0, "microswitch", small_microswitch],
+        [ 12, 450,   0, "pcb", 11, TMC2130 ],
+        [ 12, 456,   0, "2p54socket", 8, 1 ],
+        [ 12, 444,   0, "2p54socket", 8, 1, undef, undef, undef, "red" ],
+        [ 10, 470,   0, "standoff",  5, 4.5, 12.5, 2.54],
+        [  6, 480, 180, "uSD", [12, 11.5, 1.4]],
+    ],
+    // accessories
+    []
+];
+
+
+if($preview)
+    let($show_threads = true)
+        pcb(test_pcb);

tests/pcb_mount.scad

@@ -0,0 +1,35 @@
+//
+// NopSCADlib Copyright Chris Palmer 2019
+// nop.head@gmail.com
+// hydraraptor.blogspot.com
+//
+// This file is part of NopSCADlib.
+//
+// NopSCADlib is free software: you can redistribute it and/or modify it under the terms of the
+// GNU General Public License as published by the Free Software Foundation, either version 3 of
+// the License, or (at your option) any later version.
+//
+// NopSCADlib is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+// without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+// See the GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License along with NopSCADlib.
+// If not, see <https://www.gnu.org/licenses/>.
+//
+include <../core.scad>
+use <../printed/pcb_mount.scad>
+
+PI_IO = ["PI_IO", "PI_IO V2",       35.56, 25.4, 1.6, 0,    0,   0, "green", true, [],
+    [[(3.015 - 2.7) * 25.4 - 3.5 /2, (4.5 - 3.685) * 25.4, 90, "term35", 2],
+     [(3.46  - 2.7) * 25.4 - 3.5 /2, (4.5 - 3.69)  * 25.4, 90, "term35", 2],
+     [(3.91  - 2.7) * 25.4 - 3.5 /2, (4.5 - 3.69)  * 25.4, 90, "term35", 2],
+     [(3.4   - 2.7) * 25.4,          (4.5 - 4.15)  * 25.4,  0, "2p54socket", 13, 2],
+    ], []];
+
+module pcb_mounts()
+    if($preview)
+        pcb_mount_assembly(PI_IO, 3);
+    else
+        pcb_mount(PI_IO);
+
+pcb_mounts();

tests/pcbs.scad

@@ -23,7 +23,7 @@ include <../vitamins/d_connectors.scad>
 include <../vitamins/pcbs.scad>
 
 module pcbs()
-    layout([for(p = pcbs) pcb_width(p)], 15)
+    layout([for(p = pcbs) pcb_width(p)], 10)
         translate([0, pcb_length(pcbs[$i]) / 2])
             rotate(90)
                 pcb_assembly(pcbs[$i], 5 + $i, 3);

tests/pillars.scad

@@ -26,4 +26,5 @@ module pillars()
         pillar(pillars[$i]);
 
 if($preview)
-    pillars();
+    let($show_threads = true)
+        pillars();

tests/pin_headers.scad

@@ -28,15 +28,18 @@ module pin_headers()
         idc_transition(pin_headers[$i], 10);
 
         translate([0, 20])
-            pin_header(pin_headers[$i], 10, 2);
+            pin_header(pin_headers[$i], 10, 2, right_angle = true);
 
         translate([0, 40])
+            pin_header(pin_headers[$i], 10, 2);
+
+        translate([0, 60])
             box_header(pin_headers[$i], 10, 2);
 
-        translate([0, 65])
+        translate([0, 80])
             pin_socket(pin_headers[$i], 10, 2);
 
-        translate([0, 95])
+        translate([0, 110])
             pin_socket(pin_headers[$i], 10, 2, right_angle = true);
 
     }