Can now have PCB screw holes without screws for RAMPS endstop.

allowing the module name string to specify the capitalisaing used in the
build instructions.

core.scad

@@ -18,22 +18,10 @@
 //
 
 //
-// Include this file to use the miniumum library
+// Include this file to use the miniumum library plus screws, nuts and washers
 //
-include <global_defs.scad>
+include <utils/core/core.scad>
 //
-// Global functions and modules
+// Fasteners used by a lot of other vitamins
 //
-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"));
-}
+include <vitamins/screws.scad>

docs/usage.md

@@ -116,8 +116,8 @@ get shared if other files in the project include ```lib.scad``` as well, or if y
 
 One downside is that any change to the library will mean all the project files need regenerating.
 A more optimised approach for large projects is to include [NopSCADlib/core.scad](../core.scad) instead.
-That only has the a small set of utilities and the global settings in [global_defs.scad](../global_defs.scad). Any vitamins used need to be included explicitly.
-One can copy the include or use line from [NopSCADlib/lib.scad](../lib.scad).
+That only has the a small set of utilities and the global settings in [global_defs.scad](../global_defs.scad) plus screws, nuts and washers that are required by a lot of other vitamins.
+Any other vitamins used need to be included explicitly. One can copy the includes or use a line from [NopSCADlib/lib.scad](../lib.scad).
 
 ### Parametric parts.
 

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) 
 
 

examples/MainsBreakOutBox/scad/bob_main.scad

@@ -35,7 +35,14 @@ $extrusion_width = 0.5;
 $pp1_colour = "dimgrey";
 $pp2_colour = [0.9, 0.9, 0.9];
 
-include <NopSCADlib/lib.scad>
+include <NopSCADlib/core.scad>
+include <NopSCADlib/vitamins/iecs.scad>
+include <NopSCADlib/vitamins/mains_sockets.scad>
+include <NopSCADlib/vitamins/tubings.scad>
+
+use <NopSCADlib/vitamins/insert.scad>
+use <NopSCADlib/vitamins/wire.scad>
+use <NopSCADlib/vitamins/jack.scad>
 use <NopSCADlib/printed/foot.scad>
 
 echo(extrusion_width = extrusion_width, layer_height = layer_height);

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>
+## EnviroPlus
+Environmental monitor using Enviro+ sensor board and a Raspberry Pi Zero.
+
+![](EnviroPlus.png)
+
+
 <a name="TOP"></a>
 ## FilamentDryBox
 A small fan oven with a spool holder to keep the filament warm and dry.

global_defs.scad

@@ -34,7 +34,7 @@ layer_height    = is_undef($layer_height)    ? 0.25   : $layer_height;    // lay
 extrusion_width = is_undef($extrusion_width) ? 0.5    : $extrusion_width; // filament width when printing
 nozzle          = is_undef($nozzle)          ? 0.45   : $nozzle;          // 3D printer nozzle
 cnc_bit_r       = is_undef($cnc_bit_r)       ? 1.2    : $cnc_bit_r;       // miniumum tool radius when milling 2D objects
-pp1_colour      = is_undef($pp1_colour)      ? "lime" : $pp1_colour;      // printed part colour 1
+pp1_colour      = is_undef($pp1_colour)      ? [0, 146/255, 0] : $pp1_colour; // printed part colour 1, RepRap logo colour
 pp2_colour      = is_undef($pp2_colour)      ? "red"  : $pp2_colour;      // printed part colour 2
 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

lib.scad

@@ -23,43 +23,44 @@
 include <core.scad>
 
 include <vitamins/psus.scad>
+include <vitamins/pcbs.scad>
+
+include <vitamins/batteries.scad>
+include <vitamins/blowers.scad>
+include <vitamins/bulldogs.scad>
+include <vitamins/buttons.scad>
+include <vitamins/components.scad>
+include <vitamins/displays.scad>
+include <vitamins/extrusions.scad>
+include <vitamins/extrusion_brackets.scad>
+include <vitamins/geared_steppers.scad>
+include <vitamins/green_terminals.scad>
+include <vitamins/hot_ends.scad>
 include <vitamins/inserts.scad>
+include <vitamins/kp_pillow_blocks.scad>
+include <vitamins/ldrs.scad>
+include <vitamins/leadnuts.scad>
+include <vitamins/leds.scad>
+include <vitamins/light_strips.scad>
+include <vitamins/mains_sockets.scad>
+include <vitamins/modules.scad>
+include <vitamins/pillars.scad>
+include <vitamins/pin_headers.scad>
+include <vitamins/pulleys.scad>
 include <vitamins/ring_terminals.scad>
 include <vitamins/rails.scad>
-include <vitamins/belts.scad>
-include <vitamins/pulleys.scad>
-include <vitamins/sheets.scad>
-include <vitamins/stepper_motors.scad>
-include <vitamins/components.scad>
-include <vitamins/hot_ends.scad>
-include <vitamins/tubings.scad>
-include <vitamins/zipties.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/scs_bearing_blocks.scad>
+include <vitamins/sheets.scad>
+include <vitamins/sk_brackets.scad>
+include <vitamins/spools.scad>
 include <vitamins/ssrs.scad>
-include <vitamins/d_connectors.scad>
-include <vitamins/buttons.scad>
-include <vitamins/pcbs.scad>
-include <vitamins/modules.scad>
-include <vitamins/displays.scad>
-include <vitamins/blowers.scad>
-include <vitamins/leds.scad>
+include <vitamins/stepper_motors.scad>
 include <vitamins/toggles.scad>
 include <vitamins/transformers.scad>
+include <vitamins/tubings.scad>
 include <vitamins/variacs.scad>
-include <vitamins/springs.scad>
-include <vitamins/batteries.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>
+include <vitamins/zipties.scad>
 
 use <vitamins/jack.scad>
 use <vitamins/meter.scad>

libtest.scad

@@ -33,16 +33,18 @@ 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/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>
+use <tests/LDRs.scad>
+use <tests/LEDs.scad>
 use <tests/light_strips.scad>
 use <tests/linear_bearings.scad>
 use <tests/meter.scad>
@@ -51,20 +53,22 @@ use <tests/modules.scad>
 use <tests/nuts.scad>
 use <tests/o_ring.scad>
 use <tests/opengrab.scad>
-use <tests/pcbs.scad>
+use <tests/PCBs.scad>
 use <tests/pillars.scad>
-use <tests/psus.scad>
+use <tests/PSUs.scad>
 use <tests/pulleys.scad>
 use <tests/rails.scad>
 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>
+use <tests/SSRs.scad>
 use <tests/stepper_motors.scad>
 use <tests/toggles.scad>
 use <tests/transformers.scad>
@@ -83,18 +87,25 @@ use <tests/door_hinge.scad>
 use <tests/door_latch.scad>
 use <tests/fan_guard.scad>
 use <tests/fixing_block.scad>
+use <tests/flat_hinge.scad>
 use <tests/foot.scad>
 use <tests/handle.scad>
+use <tests/PCB_mount.scad>
+use <tests/printed_box.scad>
 use <tests/ribbon_clamp.scad>
 use <tests/screw_knob.scad>
 use <tests/socket_box.scad>
 use <tests/strap_handle.scad>
-use <tests/ssr_shroud.scad>
-use <tests/psu_shroud.scad>
-use <tests/flat_hinge.scad>
-use <tests/pcb_mount.scad>
+use <tests/SSR_shroud.scad>
+use <tests/PSU_shroud.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;
 
@@ -133,13 +144,17 @@ translate([x5 + 60, cable_grommets_y + 200])
 translate([x5, cable_grommets_y + 250])
     handle();
 
-translate([900, 600])
+translate([950, 600])
     box_test();
 
+translate([890, 730])
+    printed_boxes();
+
+
 translate([850, 1260])
     bbox_test();
 
-x0 = 0;
+
 inserts_y = 0;
 nuts_y = inserts_y + 20;
 washers_y = nuts_y + 100;
@@ -204,10 +219,6 @@ translate([x0, linear_bearings_y]) {
     rods();
 }
 
-translate([x0+150, linear_bearings_y+30]) {
-    extrusions();
-}
-
 translate([x0 + 10, hot_ends_y])
     hot_ends();
 
@@ -236,7 +247,6 @@ translate([x0, psus_y]) {
     psu_shrouds();
 }
 
-x1 = x0 + 100;
 zipties_y = 0;
 bulldogs_y = zipties_y + 40;
 
@@ -246,7 +256,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;
@@ -293,8 +302,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;
@@ -303,6 +310,7 @@ 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();
@@ -343,16 +351,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 + 150, belts_y + 58]) {
     belt_test();
 
     translate([0, 60])
@@ -362,9 +376,21 @@ translate([x4 + 112, belts_y + 58]) {
 translate([x4, rails_y + 130])
     rails();
 
-translate([x4, cable_strips_y])
+translate([900, fans_y + 50])
     cable_strips();
 
-x6 = x5 + 150;
+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();
+
+
 translate([x6, 125])
     light_strips();

printed/box.scad

@@ -31,7 +31,7 @@
 //!
 //! Normally the side sheets are the same type but they can be overridden individually as long as the substitute has the same thickness.
 //
-include <../core.scad>
+include <../utils/core/core.scad>
 use <../vitamins/sheet.scad>
 use <../vitamins/screw.scad>
 use <../vitamins/washer.scad>

printed/cable_grommets.scad

@@ -21,7 +21,7 @@
 //! Printed cable grommets for passing cables through panels avoiding sharp edges and in the case
 //! of conductive panels, an extra layer of insulation.
 //
-include <../core.scad>
+include <../utils/core/core.scad>
 use <../vitamins/cable_strip.scad>
 
 base = 1.25;

printed/carriers.scad

@@ -22,7 +22,7 @@
 //
 $extrusion_width = 0.5;
 
-include <../core.scad>
+include <../utils/core/core.scad>
 
 module ESP12F_carrier_stl() { //! Generate the STL for an ESP12 carrier
     stl("ESP12F_carrier");

printed/corner_block.scad

@@ -31,7 +31,6 @@
 //! Star washers can be omitted by setting ```star_washers``` to false.
 //
 include <../core.scad>
-include <../vitamins/screws.scad>
 use <../vitamins/insert.scad>
 use <../utils/rounded_cylinder.scad>
 use <../utils/maths.scad>

printed/door_hinge.scad

@@ -24,7 +24,6 @@
 //! Rubber door [sealing strip](#sealing_strip) is used to make it airtight and a [door_latch](#door_latch) holds it closed.
 //
 include <../core.scad>
-include <../vitamins/screws.scad>
 
 width = 18;
 thickness = 4;
@@ -142,7 +141,7 @@ module door_hinge_assembly(top, door_thickness = 6) { //! The moving assembly th
 
     translate([0, pin_y - (thickness + door_thickness / 2), dir * width / 2]) {
         rotate([90, 0, 180])
-            color("red") door_hinge(door_thickness);
+            color(pp2_colour) door_hinge(door_thickness);
 
         rotate([90, 0, 0])
             door_hinge_hole_positions()
@@ -166,7 +165,7 @@ module door_hinge_static_assembly(top, sheet_thickness = 3) { //! The stationary
 
     translate([pin_x, 0, -dir * (stat_width / 2 + washer_thickness(screw_washer(pin_screw)))])
         rotate([90, 0, 0]) {
-            color("lime") door_hinge_stat_stl();
+            color(pp1_colour) door_hinge_stat_stl();
 
             door_hinge_stat_hole_positions() {
                 screw_and_washer(stat_screw, stat_screw_length);

printed/door_latch.scad

@@ -22,7 +22,6 @@
 //
 include <../core.scad>
 use <../utils/hanging_hole.scad>
-include <../vitamins/screws.scad>
 
 length = 35;
 width = 12;
@@ -66,7 +65,7 @@ module door_latch_assembly(sheet_thickness = 3) { //! The assembly for a specifi
 
     translate([0, -height - washer_thickness(washer)])
         rotate([-90, 0, 0]) {
-            color("lime") render() door_latch_stl();
+            color(pp1_colour) render() door_latch_stl();
 
             translate_z(nut_trap_depth)
                 vflip()

printed/fixing_block.scad

@@ -31,7 +31,6 @@
 //! Star washers can be omitted by setting ```star_washers``` to false.
 //
 include <../core.scad>
-include <../vitamins/screws.scad>
 use <../vitamins/insert.scad>
 use <../utils/maths.scad>
 

printed/flat_hinge.scad

@@ -30,7 +30,6 @@
 //! This allows the hinges and one set of screws to belong to one assembly and the other set of screws to another assembly.
 //
 include <../core.scad>
-include <../vitamins/screws.scad>
 
 function hinge_width(type)       = type[1]; //! Width
 function hinge_depth(type)       = type[2]; //! Depth of each leaf

printed/foot.scad

@@ -22,7 +22,6 @@
 //! inserts don't grip well in rubber.
 //
 include <../core.scad>
-include <../vitamins/screws.scad>
 use <../vitamins/insert.scad>
 
 foot        = [25, 12, 3, 2, M4_cap_screw, 10];

printed/handle.scad

@@ -21,7 +21,6 @@
 //! Printed handle that can be printed without needing support material due to its truncated teardrop profile.
 //
 include <../core.scad>
-include <../vitamins/screws.scad>
 use <../vitamins/insert.scad>
 
 dia = 18;

printed/pcb_mount.scad

@@ -22,7 +22,6 @@
 //! 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;

printed/printed_box.scad

@@ -0,0 +1,229 @@
+//
+// 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/>.
+//
+
+//
+//! A fully parametric 3D printed case that can be customised with cutouts and additions specified by children.
+//!
+//! The walls can be made wavy, which possibly reduces warping when printing and looks nice, however if holes need to be made
+//! in the sides you can't print a wavy bridge. Any holes need to be surrounded by a 45&deg; chamfer to make the bridges straight.
+//! See the mounting points for the feet in the first example.
+//!
+//! It can also have printed feet on the base with the screws doubling up to hold the base on.
+//
+include <../core.scad>
+use <../vitamins/insert.scad>
+use <foot.scad>
+
+function pbox_name(type)       = type[0]; //! Name to allow more than one box in a project
+function pbox_wall(type)       = type[1]; //! Wall thickness
+function pbox_top(type)        = type[2]; //! Top thickness
+function pbox_base(type)       = type[3]; //! Base thickness, can be zero for no base
+function pbox_foot(type)       = type[4]; //! Printed foot, can be false to suppress feet
+function pbox_base_screw(type) = type[5]; //! Screw type if no feet
+function pbox_radius(type)     = type[6]; //! Internal corner radius
+function pbox_ridges(type)     = type[7]; //! Ridge wavelength and amplitude
+function pbox_width(type)      = type[8]; //! Internal width
+function pbox_depth(type)      = type[9]; //! Internal depth
+function pbox_height(type)     = type[10]; //! Internal height
+
+base_outset = 1;    // How much the base overlaps the inner dimensions
+base_overlap = 2;   // The width of ledge the base sits on
+height_overlap = 1; // How far the edges sit below the base
+
+function pbox_inclusion(type) = pbox_base(type) ? base_overlap - base_outset : 0; //! How far the ledge for the base extends inwards
+
+function pbox_total_height(type) =  //! Total height including base overlap
+    let(base = pbox_base(type),
+        foot = pbox_foot(type),
+        washer = pbox_washer(type),
+        screw = pbox_screw(type))
+        pbox_height(type) + pbox_top(type) + base + (base ? height_overlap : 0) + (foot || !base ? 0 : washer_thickness(washer) + screw_head_height(screw));
+
+function pbox_screw(type) =         //! Foot screw if got feet else base_screw
+    let(foot = pbox_foot(type)) foot ? foot_screw(foot) : pbox_base_screw(type);
+
+function pbox_insert(type) = screw_insert(pbox_screw(type)); //! The insert for the base screws
+function pbox_washer(type) = screw_washer(pbox_screw(type)); //! The washer for the base screws
+
+function pbox_screw_length(type, panel_thickness = 0) =  //! Length of the base screw
+    let(foot = pbox_foot(type))
+        screw_shorter_than(pbox_base(type) + washer_thickness(pbox_washer(type))
+                            + insert_length(pbox_insert(type))
+                            + (foot ? foot_thickness(foot) : panel_thickness));
+
+function pbox_mid_offset(type) = pbox_ridges(type).y + pbox_wall(type) / 2; // Offset to wall midpoint
+
+function pbox_screw_inset(type) = //! How far the base screws are inset
+    let(foot = pbox_foot(type),
+        r = foot ? foot_diameter(foot) / 2 : washer_radius(pbox_washer(type)),
+        R =  pbox_radius(type)
+    ) max(r, R - (R - r) / sqrt(2));
+
+module pbox_screw_positions(type) {
+    foot = pbox_foot(type);
+    inset = pbox_screw_inset(type);
+    for(x = [-1, 1], y = [-1, 1])
+         translate([x * (pbox_width(type) / 2 - inset), y * (pbox_depth(type) / 2 - inset)])
+            rotate((y > 0 ? -x * 45 : -x * 135) + 90)
+                children();
+}
+
+module pbox_mid_shape(type) {
+    ridges = pbox_ridges(type);
+    offset = ridges.y + pbox_wall(type) / 2;
+    rad = pbox_radius(type) + offset;
+    w = pbox_width(type) + 2 * offset;
+    d = pbox_depth(type) + 2 * offset;
+
+    module waves(length) {
+        l = length - 2 * rad;
+
+        waves = round(l / ridges.x);
+        points = 16;
+        translate([-l / 2, ridges.y / 2])
+            polygon(concat([[0, -10]], [for(i = [0 : waves * points], a = 360 * i / points) [i * l / waves / points, -cos(a) * ridges.y / 2] ], [[l, -10]]));
+    }
+
+    difference() {
+        rounded_square([w, d], rad, center = true);
+
+        if(ridges.y)
+            for(side = [-1, 1]) {
+                translate([0,  side * d / 2])
+                    rotate(90 + side * 90)
+                        waves(w);
+
+                translate([side * w / 2, 0])
+                    rotate(side * 90)
+                        waves(d);
+            }
+     }
+}
+
+module pbox_inner_shape(type) {
+    rad = pbox_radius(type);
+    w = pbox_width(type);
+    d = pbox_depth(type);
+
+    rounded_square([w, d], rad, center = true);
+}
+
+module pbox_base(type) { //! Generate the STL for the base
+    stl(str(pbox_name(type),"_base"));
+    t = pbox_base(type);
+    difference() {
+        union() {
+            linear_extrude(height = t)
+                offset(base_outset - 0.2)
+                    pbox_inner_shape(type);
+
+            if($children > 0)
+                children(0);
+        }
+        pbox_screw_positions(type)
+            poly_cylinder(r = screw_clearance_radius(pbox_screw(type)), h = 2 * t + eps, center = true);
+
+        if($children > 1)
+            children(1);
+    }
+}
+
+module pbox(type) { //! Generate the STL for the main case
+    stl(pbox_name(type));
+
+    height = pbox_height(type);
+    total_height = pbox_total_height(type);
+    top_thickness = pbox_top(type);
+    wall = pbox_wall(type);
+    ledge_outset = pbox_ridges(type).y;
+    ledge_inset = base_outset - base_overlap;
+    ledge_h = pbox_base(type) ? (ledge_outset - ledge_inset) * 2 : 0;
+
+    difference() {
+        union() {
+            linear_extrude(height = total_height)
+                offset(wall / 2) pbox_mid_shape(type);
+
+            if($children > 2)
+                children(2);
+        }
+        difference() {
+            translate_z(top_thickness)
+                union() {
+                    linear_extrude(height = height + eps)
+                         offset(-wall / 2) pbox_mid_shape(type);
+
+                     translate_z(height)                                     // Recess for the base
+                        linear_extrude(height = total_height - height)
+                            offset(base_outset)
+                                pbox_inner_shape(type);
+                }
+            // Ledge to support the lid
+            if(ledge_h)
+                translate_z(top_thickness + height - ledge_h)
+                    difference() {
+                        rounded_rectangle([pbox_width(type) + 2 * outset, pbox_depth(type) + 2 * outset, ledge_h], 1, center = false);
+
+                        hull() {
+                            linear_extrude(height = ledge_h + eps)
+                                offset(ledge_inset)
+                                    pbox_inner_shape(type);
+
+                            linear_extrude(height = eps)
+                                offset(ledge_outset)
+                                     pbox_inner_shape(type);
+                        }
+                        pbox_screw_positions(type)
+                            insert_hole(pbox_insert(type));
+                    }
+
+            // Corner lugs for inserts
+            outset = wall + pbox_ridges(type).y;
+            or = pbox_radius(type) + outset;
+            inset = pbox_screw_inset(type) + outset;
+            br = insert_boss_radius(pbox_insert(type), wall);
+            ext = sqrt(2) * inset - or * (sqrt(2) - 1) - br;
+            translate_z(height + top_thickness)
+                pbox_screw_positions(type)
+                    insert_lug(pbox_insert(type), wall, counter_bore = 0, extension = ext, corner_r = or);
+
+            if($children > 0)
+                children(0);
+        }
+        if($children > 1)
+            children(1);
+    }
+}
+
+module pbox_inserts(type) //! Place the inserts for the base screws
+    translate_z(pbox_height(type) + pbox_top(type))
+        pbox_screw_positions(type)
+            insert(pbox_insert(type));
+
+module pbox_base_screws(type, thickness = 0)           //! Place the screws and feet
+    translate_z(pbox_height(type) + pbox_top(type) + pbox_base(type))
+        pbox_screw_positions(type) {
+            foot = pbox_foot(type);
+            if(foot)
+                color(pp4_colour)
+                    foot(foot);
+
+            translate_z(foot ? foot_thickness(foot) : thickness)
+                screw_and_washer(pbox_screw(type), pbox_screw_length(type, thickness));
+        }

printed/psu_shroud.scad

@@ -22,7 +22,6 @@
 //! The stl and assembly must be given a name and parameterless wrappers for the stl and assembly added to the project.
 //
 include <../core.scad>
-include <../vitamins/screws.scad>
 use <../vitamins/insert.scad>
 
 use <../vitamins/wire.scad>
@@ -144,7 +143,7 @@ module psu_shroud(type, cable_d, name, cables = 1) { //! Generate the STL file f
  }
 
 module psu_shroud_assembly(type, cable_d, name, cables = 1) //! The printed parts with inserts fitted
-assembly(str("psu_shroud_", name)) {
+assembly(str("PSU_shroud_", name)) {
 
     translate_z(psu_shroud_height(type))
         vflip()

printed/ribbon_clamp.scad

@@ -21,7 +21,6 @@
 //! Clamp for ribbon cable and polypropylene strip.
 //
 include <../core.scad>
-include <../vitamins/screws.scad>
 use <../vitamins/insert.scad>
 use <../vitamins/cable_strip.scad>
 

printed/screw_knob.scad

@@ -21,7 +21,6 @@
 //! Knob with embedded hex head screw.
 //
 include <../core.scad>
-include <../vitamins/screws.scad>
 use <../utils/hanging_hole.scad>
 
 knob_wall = 2;

printed/socket_box.scad

@@ -22,9 +22,8 @@
 //
 include <../core.scad>
 include <../vitamins/mains_sockets.scad>
-include <../vitamins/screws.scad>
-use <../vitamins/insert.scad>
 include <../vitamins/ring_terminals.scad>
+use <../vitamins/insert.scad>
 
 box_height = 19;
 base_thickness = 2;
@@ -93,7 +92,7 @@ assembly(str("socket_box_", type[0])) {
     screw = mains_socket_screw(type);
     insert = screw_insert(screw);
 
-    color("lime") render() socket_box(type);
+    color(pp1_colour) render() socket_box(type);
 
     mains_socket_hole_positions(type)
         translate_z(height)

printed/ssr_shroud.scad

@@ -19,10 +19,9 @@
 
 //
 //! A cover to go over the mains end of an SSR to make it safe to be touched.
-//! The stl and assembly must be given a name and parameterless wrappers for the stl and assembly added to the project.
+//! The STL and assembly must be given a name and parameterless wrappers for the stl and assembly added to the project.
 //
 include <../core.scad>
-include <../vitamins/screws.scad>
 use <../vitamins/insert.scad>
 
 use <../vitamins/wire.scad>
@@ -108,7 +107,7 @@ module ssr_shroud(type, cable_d, name) {    //! Generate the STL file for a spec
 }
 
 module ssr_shroud_assembly(type, cable_d, name) //! The printed parts with inserts fitted
-assembly(str("ssr_shroud_", name)) {
+assembly(str("SSR_shroud_", name)) {
 
     translate_z(ssr_shroud_height(type))
         vflip()

printed/strap_handle.scad

@@ -22,7 +22,6 @@
 //! be fully customised by passing a list of properties.
 //
 include <../core.scad>
-include <../vitamins/screws.scad>
 use <../vitamins/insert.scad>
 
 strap = [18, 2, M3_pan_screw, 3, 25];

readme.md

@@ -17,39 +17,29 @@ See [usage](docs/usage.md) for requirements, installation instructions and a usa
 
 ## Table of Contents<a name="top"/>
 <table><tr>
-<th align="left"> Vitamins A-M </th><th align="left"> Vitamins N-Z </th><th align="left"> Printed </th><th align="left"> Utilities </th><th align="left"> Core Utilities </th></tr>
-<tr><td> <a href = "#Ball_bearings">Ball_bearings</a> </td><td> <a href = "#Nuts">Nuts</a> </td><td> <a href = "#Box">Box</a> </td><td> <a href = "#Annotation">Annotation</a> </td><td> <a href = "#Bom">Bom</a> </td></tr>
-<tr><td> <a href = "#Batteries">Batteries</a> </td><td> <a href = "#O_ring">O_ring</a> </td><td> <a href = "#Butt_box">Butt_box</a> </td><td> <a href = "#Bezier">Bezier</a> </td><td> <a href = "#Clip">Clip</a> </td></tr>
-<tr><td> <a href = "#Belts">Belts</a> </td><td> <a href = "#Opengrab">Opengrab</a> </td><td> <a href = "#Cable_grommets">Cable_grommets</a> </td><td> <a href = "#Dogbones">Dogbones</a> </td><td> <a href = "#Global">Global</a> </td></tr>
-<tr><td> <a href = "#Blowers">Blowers</a> </td><td> <a href = "#Pcb">Pcb</a> </td><td> <a href = "#Carriers">Carriers</a> </td><td> <a href = "#Fillet">Fillet</a> </td><td> <a href = "#Polyholes">Polyholes</a> </td></tr>
-<tr><td> <a href = "#Bulldogs">Bulldogs</a> </td><td> <a href = "#Pcbs">Pcbs</a> </td><td> <a href = "#Corner_block">Corner_block</a> </td><td> <a href = "#Hanging_hole">Hanging_hole</a> </td><td> <a href = "#Rounded_rectangle">Rounded_rectangle</a> </td></tr>
-<tr><td> <a href = "#Buttons">Buttons</a> </td><td> <a href = "#Pillars">Pillars</a> </td><td> <a href = "#Door_hinge">Door_hinge</a> </td><td> <a href = "#Layout">Layout</a> </td><td> <a href = "#Sphere">Sphere</a> </td></tr>
-<tr><td> <a href = "#Cable_strips">Cable_strips</a> </td><td> <a href = "#Pin_headers">Pin_headers</a> </td><td> <a href = "#Door_latch">Door_latch</a> </td><td> <a href = "#Maths">Maths</a> </td><td> <a href = "#Teardrops">Teardrops</a> </td></tr>
-<tr><td> <a href = "#Components">Components</a> </td><td> <a href = "#Psus">Psus</a> </td><td> <a href = "#Fan_guard">Fan_guard</a> </td><td> <a href = "#Offset">Offset</a> </td><td></td></tr>
-<tr><td> <a href = "#D_connectors">D_connectors</a> </td><td> <a href = "#Pulleys">Pulleys</a> </td><td> <a href = "#Fixing_block">Fixing_block</a> </td><td> <a href = "#Quadrant">Quadrant</a> </td><td></td></tr>
-<tr><td> <a href = "#Displays">Displays</a> </td><td> <a href = "#Rails">Rails</a> </td><td> <a href = "#Flat_hinge">Flat_hinge</a> </td><td> <a href = "#Round">Round</a> </td><td></td></tr>
-<tr><td> <a href = "#Extrusion_brackets">Extrusion_brackets</a> </td><td> <a href = "#Ring_terminals">Ring_terminals</a> </td><td> <a href = "#Foot">Foot</a> </td><td> <a href = "#Rounded_cylinder">Rounded_cylinder</a> </td><td></td></tr>
-<tr><td> <a href = "#Extrusions">Extrusions</a> </td><td> <a href = "#Rockers">Rockers</a> </td><td> <a href = "#Handle">Handle</a> </td><td> <a href = "#Rounded_polygon">Rounded_polygon</a> </td><td></td></tr>
-<tr><td> <a href = "#Fans">Fans</a> </td><td> <a href = "#Rod">Rod</a> </td><td> <a href = "#Pcb_mount">Pcb_mount</a> </td><td> <a href = "#Sector">Sector</a> </td><td></td></tr>
-<tr><td> <a href = "#Fuseholder">Fuseholder</a> </td><td> <a href = "#Screws">Screws</a> </td><td> <a href = "#Psu_shroud">Psu_shroud</a> </td><td> <a href = "#Sweep">Sweep</a> </td><td></td></tr>
-<tr><td> <a href = "#Geared_steppers">Geared_steppers</a> </td><td> <a href = "#Scs_bearing_blocks">Scs_bearing_blocks</a> </td><td> <a href = "#Ribbon_clamp">Ribbon_clamp</a> </td><td> <a href = "#Thread">Thread</a> </td><td></td></tr>
-<tr><td> <a href = "#Green_terminals">Green_terminals</a> </td><td> <a href = "#Sealing_strip">Sealing_strip</a> </td><td> <a href = "#Screw_knob">Screw_knob</a> </td><td> <a href = "#Tube">Tube</a> </td><td></td></tr>
-<tr><td> <a href = "#Hot_ends">Hot_ends</a> </td><td> <a href = "#Sheets">Sheets</a> </td><td> <a href = "#Socket_box">Socket_box</a> </td><td></td><td></td></tr>
-<tr><td> <a href = "#Hygrometer">Hygrometer</a> </td><td> <a href = "#Sk_brackets">Sk_brackets</a> </td><td> <a href = "#Ssr_shroud">Ssr_shroud</a> </td><td></td><td></td></tr>
-<tr><td> <a href = "#Iecs">Iecs</a> </td><td> <a href = "#Spades">Spades</a> </td><td> <a href = "#Strap_handle">Strap_handle</a> </td><td></td><td></td></tr>
-<tr><td> <a href = "#Inserts">Inserts</a> </td><td> <a href = "#Spools">Spools</a> </td><td></td><td></td><td></td></tr>
-<tr><td> <a href = "#Jack">Jack</a> </td><td> <a href = "#Springs">Springs</a> </td><td></td><td></td><td></td></tr>
-<tr><td> <a href = "#Kp_pillow_blocks">Kp_pillow_blocks</a> </td><td> <a href = "#Ssrs">Ssrs</a> </td><td></td><td></td><td></td></tr>
-<tr><td> <a href = "#Ldrs">Ldrs</a> </td><td> <a href = "#Stepper_motors">Stepper_motors</a> </td><td></td><td></td><td></td></tr>
-<tr><td> <a href = "#Leadnuts">Leadnuts</a> </td><td> <a href = "#Toggles">Toggles</a> </td><td></td><td></td><td></td></tr>
-<tr><td> <a href = "#Leds">Leds</a> </td><td> <a href = "#Transformers">Transformers</a> </td><td></td><td></td><td></td></tr>
-<tr><td> <a href = "#Light_strips">Light_strips</a> </td><td> <a href = "#Tubings">Tubings</a> </td><td></td><td></td><td></td></tr>
-<tr><td> <a href = "#Linear_bearings">Linear_bearings</a> </td><td> <a href = "#Variacs">Variacs</a> </td><td></td><td></td><td></td></tr>
-<tr><td> <a href = "#Mains_sockets">Mains_sockets</a> </td><td> <a href = "#Veroboard">Veroboard</a> </td><td></td><td></td><td></td></tr>
-<tr><td> <a href = "#Meter">Meter</a> </td><td> <a href = "#Washers">Washers</a> </td><td></td><td></td><td></td></tr>
-<tr><td> <a href = "#Microswitches">Microswitches</a> </td><td> <a href = "#Wire">Wire</a> </td><td></td><td></td><td></td></tr>
-<tr><td> <a href = "#Microview">Microview</a> </td><td> <a href = "#Zipties">Zipties</a> </td><td></td><td></td><td></td></tr>
-<tr><td> <a href = "#Modules">Modules</a> </td><td></td><td></td><td></td><td></td></tr>
+<th align="left"> Vitamins A-J </th><th align="left"> Vitamins K-Q </th><th align="left"> Vitamins R-Z </th><th align="left"> Printed </th><th align="left"> Utilities </th><th align="left"> Core Utilities </th></tr>
+<tr><td> <a href = "#Ball_bearings">Ball_bearings</a> </td><td> <a href = "#KP_pillow_blocks">KP_pillow_blocks</a> </td><td> <a href = "#Rails">Rails</a> </td><td> <a href = "#Box">Box</a> </td><td> <a href = "#Annotation">Annotation</a> </td><td> <a href = "#BOM">BOM</a> </td></tr>
+<tr><td> <a href = "#Batteries">Batteries</a> </td><td> <a href = "#LDRs">LDRs</a> </td><td> <a href = "#Ring_terminals">Ring_terminals</a> </td><td> <a href = "#Butt_box">Butt_box</a> </td><td> <a href = "#Bezier">Bezier</a> </td><td> <a href = "#Clip">Clip</a> </td></tr>
+<tr><td> <a href = "#Belts">Belts</a> </td><td> <a href = "#LEDs">LEDs</a> </td><td> <a href = "#Rockers">Rockers</a> </td><td> <a href = "#Cable_grommets">Cable_grommets</a> </td><td> <a href = "#Dogbones">Dogbones</a> </td><td> <a href = "#Global">Global</a> </td></tr>
+<tr><td> <a href = "#Blowers">Blowers</a> </td><td> <a href = "#Leadnuts">Leadnuts</a> </td><td> <a href = "#Rod">Rod</a> </td><td> <a href = "#Carriers">Carriers</a> </td><td> <a href = "#Fillet">Fillet</a> </td><td> <a href = "#Polyholes">Polyholes</a> </td></tr>
+<tr><td> <a href = "#Bulldogs">Bulldogs</a> </td><td> <a href = "#Light_strips">Light_strips</a> </td><td> <a href = "#SCS_bearing_blocks">SCS_bearing_blocks</a> </td><td> <a href = "#Corner_block">Corner_block</a> </td><td> <a href = "#Hanging_hole">Hanging_hole</a> </td><td> <a href = "#Rounded_rectangle">Rounded_rectangle</a> </td></tr>
+<tr><td> <a href = "#Buttons">Buttons</a> </td><td> <a href = "#Linear_bearings">Linear_bearings</a> </td><td> <a href = "#SK_brackets">SK_brackets</a> </td><td> <a href = "#Door_hinge">Door_hinge</a> </td><td> <a href = "#Layout">Layout</a> </td><td> <a href = "#Sphere">Sphere</a> </td></tr>
+<tr><td> <a href = "#Cable_strips">Cable_strips</a> </td><td> <a href = "#Mains_sockets">Mains_sockets</a> </td><td> <a href = "#SSRs">SSRs</a> </td><td> <a href = "#Door_latch">Door_latch</a> </td><td> <a href = "#Maths">Maths</a> </td><td> <a href = "#Teardrops">Teardrops</a> </td></tr>
+<tr><td> <a href = "#Components">Components</a> </td><td> <a href = "#Meter">Meter</a> </td><td> <a href = "#Screws">Screws</a> </td><td> <a href = "#Fan_guard">Fan_guard</a> </td><td> <a href = "#Offset">Offset</a> </td><td></td></tr>
+<tr><td> <a href = "#D_connectors">D_connectors</a> </td><td> <a href = "#Microswitches">Microswitches</a> </td><td> <a href = "#Sealing_strip">Sealing_strip</a> </td><td> <a href = "#Fixing_block">Fixing_block</a> </td><td> <a href = "#Quadrant">Quadrant</a> </td><td></td></tr>
+<tr><td> <a href = "#Displays">Displays</a> </td><td> <a href = "#Microview">Microview</a> </td><td> <a href = "#Sheets">Sheets</a> </td><td> <a href = "#Flat_hinge">Flat_hinge</a> </td><td> <a href = "#Round">Round</a> </td><td></td></tr>
+<tr><td> <a href = "#Extrusion_brackets">Extrusion_brackets</a> </td><td> <a href = "#Modules">Modules</a> </td><td> <a href = "#Spades">Spades</a> </td><td> <a href = "#Foot">Foot</a> </td><td> <a href = "#Rounded_cylinder">Rounded_cylinder</a> </td><td></td></tr>
+<tr><td> <a href = "#Extrusions">Extrusions</a> </td><td> <a href = "#Nuts">Nuts</a> </td><td> <a href = "#Spools">Spools</a> </td><td> <a href = "#Handle">Handle</a> </td><td> <a href = "#Rounded_polygon">Rounded_polygon</a> </td><td></td></tr>
+<tr><td> <a href = "#Fans">Fans</a> </td><td> <a href = "#O_ring">O_ring</a> </td><td> <a href = "#Springs">Springs</a> </td><td> <a href = "#PCB_mount">PCB_mount</a> </td><td> <a href = "#Sector">Sector</a> </td><td></td></tr>
+<tr><td> <a href = "#Fuseholder">Fuseholder</a> </td><td> <a href = "#Opengrab">Opengrab</a> </td><td> <a href = "#Stepper_motors">Stepper_motors</a> </td><td> <a href = "#PSU_shroud">PSU_shroud</a> </td><td> <a href = "#Sweep">Sweep</a> </td><td></td></tr>
+<tr><td> <a href = "#Geared_steppers">Geared_steppers</a> </td><td> <a href = "#PCB">PCB</a> </td><td> <a href = "#Toggles">Toggles</a> </td><td> <a href = "#Printed_box">Printed_box</a> </td><td> <a href = "#Thread">Thread</a> </td><td></td></tr>
+<tr><td> <a href = "#Green_terminals">Green_terminals</a> </td><td> <a href = "#PCBs">PCBs</a> </td><td> <a href = "#Transformers">Transformers</a> </td><td> <a href = "#Ribbon_clamp">Ribbon_clamp</a> </td><td> <a href = "#Tube">Tube</a> </td><td></td></tr>
+<tr><td> <a href = "#Hot_ends">Hot_ends</a> </td><td> <a href = "#PSUs">PSUs</a> </td><td> <a href = "#Tubings">Tubings</a> </td><td> <a href = "#SSR_shroud">SSR_shroud</a> </td><td></td><td></td></tr>
+<tr><td> <a href = "#Hygrometer">Hygrometer</a> </td><td> <a href = "#Pillars">Pillars</a> </td><td> <a href = "#Variacs">Variacs</a> </td><td> <a href = "#Screw_knob">Screw_knob</a> </td><td></td><td></td></tr>
+<tr><td> <a href = "#IECs">IECs</a> </td><td> <a href = "#Pin_headers">Pin_headers</a> </td><td> <a href = "#Veroboard">Veroboard</a> </td><td> <a href = "#Socket_box">Socket_box</a> </td><td></td><td></td></tr>
+<tr><td> <a href = "#Inserts">Inserts</a> </td><td> <a href = "#Pulleys">Pulleys</a> </td><td> <a href = "#Washers">Washers</a> </td><td> <a href = "#Strap_handle">Strap_handle</a> </td><td></td><td></td></tr>
+<tr><td> <a href = "#Jack">Jack</a> </td><td></td><td> <a href = "#Wire">Wire</a> </td><td></td><td></td><td></td></tr>
+<tr><td></td><td></td><td> <a href = "#Zipties">Zipties</a> </td><td></td><td></td><td></td></tr>
 </table>
 
 ---
@@ -669,21 +659,22 @@ Aluminium  extrusion.
 ### Modules
 | Module | Description |
 |:--- |:--- |
-| ```extrusion(type, length, cornerHole = false)``` | Draw the specified extrusion |
+| ```extrusion(type, length, center = true, cornerHole = false)``` | Draw the specified extrusion |
 
 ![extrusions](tests/png/extrusions.png)
 
 ### Vitamins
 | Qty | Module call | BOM entry |
 | ---:|:--- |:---|
+|   1 | ```extrusion(E1515, 80)``` |  Extrusion E1515 x 80mm |
 |   1 | ```extrusion(E2020, 80)``` |  Extrusion E2020 x 80mm |
 |   1 | ```extrusion(E2040, 80)``` |  Extrusion E2040 x 80mm |
 |   1 | ```extrusion(E2060, 80)``` |  Extrusion E2060 x 80mm |
 |   1 | ```extrusion(E2080, 80)``` |  Extrusion E2080 x 80mm |
-|   1 | ```extrusion(E3030, 80)``` |  Extrusion E3030 x 80mm |
-|   1 | ```extrusion(E3060, 80)``` |  Extrusion E3060 x 80mm |
-|   1 | ```extrusion(E4040, 80)``` |  Extrusion E4040 x 80mm |
-|   1 | ```extrusion(E4080, 80)``` |  Extrusion E4080 x 80mm |
+|   1 | ```extrusion(E3030, 80, cornerHole = true)``` |  Extrusion E3030 x 80mm |
+|   1 | ```extrusion(E3060, 80, cornerHole = true)``` |  Extrusion E3060 x 80mm |
+|   1 | ```extrusion(E4040, 80, cornerHole = true)``` |  Extrusion E4040 x 80mm |
+|   1 | ```extrusion(E4080, 80, cornerHole = true)``` |  Extrusion E4080 x 80mm |
 
 
 <a href="#top">Top</a>
@@ -876,7 +867,6 @@ Parametric green terminal blocks
 | Module | Description |
 |:--- |:--- |
 | ```green_terminal(type, ways, skip = [], colour = "lime")``` | Draw green terminal blocks, skip can be used to remove pins. |
-| ```terminal_254(ways, skip = [])``` | Draw 0.1" terminal block |
 
 ![green_terminals](tests/png/green_terminals.png)
 
@@ -986,8 +976,8 @@ Mini LCD Celsius Digital Thermometer Hygrometer Temperature Humidity Meter Gauge
 <a href="#top">Top</a>
 
 ---
-<a name="Iecs"></a>
-## Iecs
+<a name="IECs"></a>
+## IECs
 IEC mains inlets and outlet.
 
 
@@ -995,7 +985,7 @@ IEC mains inlets and outlet.
 
 [vitamins/iec.scad](vitamins/iec.scad) Implementation.
 
-[tests/iecs.scad](tests/iecs.scad) Code for this example.
+[tests/IECs.scad](tests/IECs.scad) Code for this example.
 
 ### Properties
 | Function | Description |
@@ -1142,8 +1132,8 @@ E.g. a "brown" socket for mains live needs to be displayed as "sienna" to look r
 <a href="#top">Top</a>
 
 ---
-<a name="Kp_pillow_blocks"></a>
-## Kp_pillow_blocks
+<a name="KP_pillow_blocks"></a>
+## KP_pillow_blocks
 KP pillow block bearings
 
 
@@ -1151,7 +1141,7 @@ KP pillow block bearings
 
 [vitamins/kp_pillow_block.scad](vitamins/kp_pillow_block.scad) Implementation.
 
-[tests/kp_pillow_blocks.scad](tests/kp_pillow_blocks.scad) Code for this example.
+[tests/KP_pillow_blocks.scad](tests/KP_pillow_blocks.scad) Code for this example.
 
 ### Properties
 | Function | Description |
@@ -1195,8 +1185,8 @@ KP pillow block bearings
 <a href="#top">Top</a>
 
 ---
-<a name="Ldrs"></a>
-## Ldrs
+<a name="LDRs"></a>
+## LDRs
 Light dependent resistors.
 
 Larger ones seem to have both a higher dark resistance and a lower bright light resistance.
@@ -1206,7 +1196,7 @@ Larger ones seem to have both a higher dark resistance and a lower bright light
 
 [vitamins/ldr.scad](vitamins/ldr.scad) Implementation.
 
-[tests/ldrs.scad](tests/ldrs.scad) Code for this example.
+[tests/LDRs.scad](tests/LDRs.scad) Code for this example.
 
 ### Properties
 | Function | Description |
@@ -1286,8 +1276,8 @@ Nuts for leadscrews.
 <a href="#top">Top</a>
 
 ---
-<a name="Leds"></a>
-## Leds
+<a name="LEDs"></a>
+## LEDs
 Standard domed through hole LEDs. Can specify colour and lead length.
 
 
@@ -1295,7 +1285,7 @@ Standard domed through hole LEDs. Can specify colour and lead length.
 
 [vitamins/led.scad](vitamins/led.scad) Implementation.
 
-[tests/leds.scad](tests/leds.scad) Code for this example.
+[tests/LEDs.scad](tests/LEDs.scad) Code for this example.
 
 ### Properties
 | Function | Description |
@@ -1817,14 +1807,14 @@ A permanent magnet that can be magnatized and de-magnatized electronically.
 <a href="#top">Top</a>
 
 ---
-<a name="Pcb"></a>
-## Pcb
+<a name="PCB"></a>
+## PCB
 PCBs and perfboard with optional components. The shape can be a rectangle with optionally rounded corners or a polygon for odd shapes like Arduino.
 
 
 [vitamins/pcb.scad](vitamins/pcb.scad) Implementation.
 
-[tests/pcb.scad](tests/pcb.scad) Code for this example.
+[tests/PCB.scad](tests/PCB.scad) Code for this example.
 
 ### Properties
 | Function | Description |
@@ -1899,8 +1889,8 @@ PCBs and perfboard with optional components. The shape can be a rectangle with o
 <a href="#top">Top</a>
 
 ---
-<a name="Pcbs"></a>
-## Pcbs
+<a name="PCBs"></a>
+## PCBs
 PCBs and perfboard with optional components. The shape can be a rectangle with optionally rounded corners or a polygon for odd shapes like Arduino.
 
 
@@ -1908,7 +1898,7 @@ PCBs and perfboard with optional components. The shape can be a rectangle with o
 
 [vitamins/pcb.scad](vitamins/pcb.scad) Implementation.
 
-[tests/pcbs.scad](tests/pcbs.scad) Code for this example.
+[tests/PCBs.scad](tests/PCBs.scad) Code for this example.
 
 ### Properties
 | Function | Description |
@@ -1992,7 +1982,7 @@ PCBs and perfboard with optional components. The shape can be a rectangle with o
 |   1 | ```molex_254(2)``` |  Molex KK header 2 way |
 |   1 | ```molex_254(3)``` |  Molex KK header 3 way |
 |  16 | ```nut(M2_nut, nyloc = true)``` |  Nut M2 x 1.6mm nyloc |
-|  32 | ```nut(M2p5_nut, nyloc = true)``` |  Nut M2.5 x 2.2mm nyloc |
+|  30 | ```nut(M2p5_nut, nyloc = true)``` |  Nut M2.5 x 2.2mm nyloc |
 |  12 | ```nut(M3_nut, nyloc = true)``` |  Nut M3 x 2.4mm nyloc |
 |  12 | ```nut(M4_nut, nyloc = true)``` |  Nut M4 x 3.2mm nyloc |
 |   1 | ```pcb(PI_IO)``` |  PI_IO V2 |
@@ -2007,21 +1997,19 @@ PCBs and perfboard with optional components. The shape can be a rectangle with o
 |   1 | ```pcb(RPI3)``` |  Raspberry Pi 3 |
 |   1 | ```pcb(RPI0)``` |  Raspberry Pi Zero |
 |  16 | ```screw(M2_cap_screw, 25)``` |  Screw M2 cap x 25mm |
-|   4 | ```screw(M2p5_cap_screw, 16)``` |  Screw M2.5 cap x 16mm |
-|   8 | ```screw(M2p5_cap_screw, 20)``` |  Screw M2.5 cap x 20mm |
-|   4 | ```screw(M2p5_cap_screw, 35)``` |  Screw M2.5 cap x 35mm |
-|   8 | ```screw(M2p5_pan_screw, 20)``` |  Screw M2.5 pan x 20mm |
-|   4 | ```screw(M2p5_pan_screw, 25)``` |  Screw M2.5 pan x 25mm |
+|   2 | ```screw(M2p5_cap_screw, 16)``` |  Screw M2.5 cap x 16mm |
+|  12 | ```screw(M2p5_cap_screw, 20)``` |  Screw M2.5 cap x 20mm |
+|   4 | ```screw(M2p5_pan_screw, 20)``` |  Screw M2.5 pan x 20mm |
+|   8 | ```screw(M2p5_pan_screw, 25)``` |  Screw M2.5 pan x 25mm |
 |   4 | ```screw(M2p5_pan_screw, 35)``` |  Screw M2.5 pan x 35mm |
 |   8 | ```screw(M3_cap_screw, 30)``` |  Screw M3 cap x 30mm |
 |   4 | ```screw(M3_cap_screw, 35)``` |  Screw M3 cap x 35mm |
-|   4 | ```screw(M4_cap_screw, 30)``` |  Screw M4 cap x 30mm |
-|   8 | ```screw(M4_cap_screw, 35)``` |  Screw M4 cap x 35mm |
+|  12 | ```screw(M4_cap_screw, 35)``` |  Screw M4 cap x 35mm |
 |   3 | ```terminal_35(2)``` |  Terminal block 2 way 3.5mm |
 |   2 | ```green_terminal(gt_2p54, 4)``` |  Terminal block 4 way 0.1" |
 |   1 |  |  USB A to Mini B lead |
 |  16 | ```washer(M2_washer)``` |  Washer  M2 x 5mm x 0.3mm |
-|  32 | ```washer(M2p5_washer)``` |  Washer  M2.5 x 5.9mm x 0.5mm |
+|  30 | ```washer(M2p5_washer)``` |  Washer  M2.5 x 5.9mm x 0.5mm |
 |  12 | ```washer(M3_washer)``` |  Washer  M3 x 7mm x 0.5mm |
 |  12 | ```washer(M4_washer)``` |  Washer  M4 x 9mm x 0.8mm |
 |   1 | ```pcb(ZC_A0591)``` |  ZC-A0591 ULN2003 driver PCB |
@@ -2029,24 +2017,24 @@ PCBs and perfboard with optional components. The shape can be a rectangle with o
 ### Printed
 | Qty | Filename |
 | ---:|:--- |
-|   4 | pcb_spacer20130.stl |
 |   4 | pcb_spacer20140.stl |
 |   4 | pcb_spacer20150.stl |
 |   4 | pcb_spacer20160.stl |
-|   4 | pcb_spacer25100_2.stl |
+|   4 | pcb_spacer20170.stl |
+|   4 | pcb_spacer25100.stl |
 |   4 | pcb_spacer25110_2.stl |
 |   4 | pcb_spacer25120_2.stl |
-|   4 | pcb_spacer25230.stl |
+|   4 | pcb_spacer25130_2.stl |
 |   4 | pcb_spacer25240.stl |
-|   4 | pcb_spacer2570.stl |
+|   2 | pcb_spacer2550.stl |
 |   4 | pcb_spacer2580.stl |
 |   4 | pcb_spacer2590.stl |
-|   4 | pcb_spacer30170.stl |
 |   4 | pcb_spacer30180.stl |
-|   4 | pcb_spacer30220.stl |
-|   4 | pcb_spacer40190.stl |
+|   4 | pcb_spacer30190.stl |
+|   4 | pcb_spacer30230.stl |
 |   4 | pcb_spacer40200.stl |
 |   4 | pcb_spacer40210.stl |
+|   4 | pcb_spacer40220.stl |
 
 
 <a href="#top">Top</a>
@@ -2148,8 +2136,8 @@ Pin headers and sockets, etc.
 <a href="#top">Top</a>
 
 ---
-<a name="Psus"></a>
-## Psus
+<a name="PSUs"></a>
+## PSUs
 Powersupplies. Can be a simple cube or can be defined by a list of six faces, each with thickness, holes, cutouts, etc.
 
 Face order is bottom, top, left, right, front, back.
@@ -2159,7 +2147,7 @@ Face order is bottom, top, left, right, front, back.
 
 [vitamins/psu.scad](vitamins/psu.scad) Implementation.
 
-[tests/psus.scad](tests/psus.scad) Code for this example.
+[tests/PSUs.scad](tests/PSUs.scad) Code for this example.
 
 ### Properties
 | Function | Description |
@@ -2173,6 +2161,7 @@ Face order is bottom, top, left, right, front, back.
 | ```psu_face_iec(type)``` | IEC connector x,y, rotation and type |
 | ```psu_face_switch(type)``` | Rocker switch x,y, rotation and type |
 | ```psu_face_thickness(type)``` | The thickness |
+| ```psu_face_vents(type)``` | Vents array position x,y, rotation, size and corner radius |
 | ```psu_faces(type)``` | List of face descriptions |
 | ```psu_height(type)``` | Height |
 | ```psu_left_bay(type)``` | Bay for terminals |
@@ -2601,13 +2590,16 @@ Machine screws and wood screws with various head styles.
 <a href="#top">Top</a>
 
 ---
-<a name="Scs_bearing_blocks"></a>
-## Scs_bearing_blocks
+<a name="SCS_bearing_blocks"></a>
+## SCS_bearing_blocks
+SCSnUU and SCSnLUU bearing blocks
+
+
 [vitamins/scs_bearing_blocks.scad](vitamins/scs_bearing_blocks.scad) Object definitions.
 
 [vitamins/scs_bearing_block.scad](vitamins/scs_bearing_block.scad) Implementation.
 
-[tests/scs_bearing_blocks.scad](tests/scs_bearing_blocks.scad) Code for this example.
+[tests/SCS_bearing_blocks.scad](tests/SCS_bearing_blocks.scad) Code for this example.
 
 ### Properties
 | Function | Description |
@@ -2748,8 +2740,8 @@ Note that modules that drill holes will return a 2D object if ```h``` is set to
 <a href="#top">Top</a>
 
 ---
-<a name="Sk_brackets"></a>
-## Sk_brackets
+<a name="SK_brackets"></a>
+## SK_brackets
 SK shaft support brackets
 
 
@@ -2757,7 +2749,7 @@ SK shaft support brackets
 
 [vitamins/sk_bracket.scad](vitamins/sk_bracket.scad) Implementation.
 
-[tests/sk_brackets.scad](tests/sk_brackets.scad) Code for this example.
+[tests/SK_brackets.scad](tests/SK_brackets.scad) Code for this example.
 
 ### Properties
 | Function | Description |
@@ -2931,8 +2923,8 @@ By default springs have their origin at the bottom but can be centered.
 <a href="#top">Top</a>
 
 ---
-<a name="Ssrs"></a>
-## Ssrs
+<a name="SSRs"></a>
+## SSRs
 Solid state relays.
 
 
@@ -2940,7 +2932,7 @@ Solid state relays.
 
 [vitamins/ssr.scad](vitamins/ssr.scad) Implementation.
 
-[tests/ssrs.scad](tests/ssrs.scad) Code for this example.
+[tests/SSRs.scad](tests/SSRs.scad) Code for this example.
 
 ### Properties
 | Function | Description |
@@ -3019,15 +3011,16 @@ NEMA stepper motor model.
 ### Vitamins
 | Qty | Module call | BOM entry |
 | ---:|:--- |:---|
-|  24 | ```screw(M3_pan_screw, 8)``` |  Screw M3 pan x  8mm |
+|   4 | ```ring_terminal(M3_ringterm)``` |  Ring terminal 3mm |
+|  15 | ```screw(M3_pan_screw, 8)``` |  Screw M3 pan x  8mm |
 |   1 | ```NEMA(NEMA14)``` |  Stepper motor NEMA14 x 36mm |
 |   1 | ```NEMA(NEMA16)``` |  Stepper motor NEMA16 x 19.2mm |
 |   1 | ```NEMA(NEMA17S)``` |  Stepper motor NEMA17 x 34mm |
 |   1 | ```NEMA(NEMA17M)``` |  Stepper motor NEMA17 x 40mm |
 |   1 | ```NEMA(NEMA17)``` |  Stepper motor NEMA17 x 47mm |
 |   1 | ```NEMA(NEMA23)``` |  Stepper motor NEMA22 x 51.2mm |
-|  24 | ```washer(M3_washer)``` |  Washer  M3 x 7mm x 0.5mm |
-|  24 | ```star_washer(M3_washer)``` |  Washer star M3 x 0.5mm |
+|  11 | ```washer(M3_washer)``` |  Washer  M3 x 7mm x 0.5mm |
+|  15 | ```star_washer(M3_washer)``` |  Washer star M3 x 0.5mm |
 
 
 <a href="#top">Top</a>
@@ -4248,15 +4241,15 @@ Printed handle that can be printed without needing support material due to its t
 <a href="#top">Top</a>
 
 ---
-<a name="Pcb_mount"></a>
-## Pcb_mount
+<a name="PCB_mount"></a>
+## PCB_mount
 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.
 
 
 [printed/pcb_mount.scad](printed/pcb_mount.scad) Implementation.
 
-[tests/pcb_mount.scad](tests/pcb_mount.scad) Code for this example.
+[tests/PCB_mount.scad](tests/PCB_mount.scad) Code for this example.
 
 ### Functions
 | Function | Description |
@@ -4296,15 +4289,96 @@ The stl must be given a parameterless wrapper in the project that uses it.
 <a href="#top">Top</a>
 
 ---
-<a name="Psu_shroud"></a>
-## Psu_shroud
+<a name="Printed_box"></a>
+## Printed_box
+A fully parametric 3D printed case that can be customised with cutouts and additions specified by children.
+
+The walls can be made wavy, which possibly reduces warping when printing and looks nice, however if holes need to be made
+in the sides you can't print a wavy bridge. Any holes need to be surrounded by a 45&deg; chamfer to make the bridges straight.
+See the mounting points for the feet in the first example.
+
+It can also have printed feet on the base with the screws doubling up to hold the base on.
+
+
+[printed/printed_box.scad](printed/printed_box.scad) Implementation.
+
+[tests/printed_box.scad](tests/printed_box.scad) Code for this example.
+
+### Properties
+| Function | Description |
+|:--- |:--- |
+| ```pbox_base(type)``` | Base thickness, can be zero for no base |
+| ```pbox_base_screw(type)``` | Screw type if no feet |
+| ```pbox_depth(type)``` | Internal depth |
+| ```pbox_foot(type)``` | Printed foot, can be false to suppress feet |
+| ```pbox_height(type)``` | Internal height |
+| ```pbox_name(type)``` | Name to allow more than one box in a project |
+| ```pbox_radius(type)``` | Internal corner radius |
+| ```pbox_ridges(type)``` | Ridge wavelength and amplitude |
+| ```pbox_top(type)``` | Top thickness |
+| ```pbox_wall(type)``` | Wall thickness |
+| ```pbox_width(type)``` | Internal width |
+
+### Functions
+| Function | Description |
+|:--- |:--- |
+| ```pbox_inclusion(type)``` | How far the ledge for the base extends inwards |
+| ```pbox_insert(type)``` | The insert for the base screws |
+| ```pbox_screw(type)``` | Foot screw if got feet else base_screw |
+| ```pbox_screw_inset(type)``` | How far the base screws are inset |
+| ```pbox_screw_length(type, panel_thickness = 0)``` | Length of the base screw |
+| ```pbox_total_height(type)``` | Total height including base overlap |
+| ```pbox_washer(type)``` | The washer for the base screws |
+
+### Modules
+| Module | Description |
+|:--- |:--- |
+| ```pbox(type)``` | Generate the STL for the main case |
+| ```pbox_base(type)``` | Generate the STL for the base |
+| ```pbox_base_screws(type, thickness = 0)``` | Place the screws and feet |
+| ```pbox_inserts(type)``` | Place the inserts for the base screws |
+
+![printed_box](tests/png/printed_box.png)
+
+### Vitamins
+| Qty | Module call | BOM entry |
+| ---:|:--- |:---|
+|   4 | ```insert(F1BM)``` |  Heatfit insert M2 |
+|   4 | ```insert(F1BM3)``` |  Heatfit insert M3 |
+|   4 | ```screw(M2_cap_screw, 6)``` |  Screw M2 cap x  6mm |
+|   3 | ```screw(M3_pan_screw, 6)``` |  Screw M3 pan x  6mm |
+|   4 | ```screw(M3_pan_screw, 10)``` |  Screw M3 pan x 10mm |
+|   4 | ```washer(M2_washer)``` |  Washer  M2 x 5mm x 0.3mm |
+|   7 | ```washer(M3_washer)``` |  Washer  M3 x 7mm x 0.5mm |
+
+### Printed
+| Qty | Filename |
+| ---:|:--- |
+|   1 | box1.stl |
+|   1 | box1_base.stl |
+|   7 | foot.stl |
+|   1 | smooth_box.stl |
+|   1 | smooth_box_base.stl |
+
+### Assemblies
+| Qty | Name |
+| ---:|:--- |
+|   1 | box1_assembly |
+|   1 | box2_assembly |
+
+
+<a href="#top">Top</a>
+
+---
+<a name="PSU_shroud"></a>
+## PSU_shroud
 A cover to go over the mains end of a PSU terminal strip to make it safe.
 The stl and assembly must be given a name and parameterless wrappers for the stl and assembly added to the project.
 
 
 [printed/psu_shroud.scad](printed/psu_shroud.scad) Implementation.
 
-[tests/psu_shroud.scad](tests/psu_shroud.scad) Code for this example.
+[tests/PSU_shroud.scad](tests/PSU_shroud.scad) Code for this example.
 
 ### Functions
 | Function | Description |
@@ -4332,23 +4406,25 @@ The stl and assembly must be given a name and parameterless wrappers for the stl
 ### Vitamins
 | Qty | Module call | BOM entry |
 | ---:|:--- |:---|
-|   4 | ```insert(F1BM3)``` |  Heatfit insert M3 |
-|   4 | ```screw(M3_cap_screw, 10)``` |  Screw M3 cap x 10mm |
-|   4 | ```washer(M3_washer)``` |  Washer  M3 x 7mm x 0.5mm |
-|   4 | ```star_washer(M3_washer)``` |  Washer star M3 x 0.5mm |
-|   2 | ```ziptie(small_ziptie, 3)``` |  Ziptie 2.5mm x 100mm min length |
+|   6 | ```insert(F1BM3)``` |  Heatfit insert M3 |
+|   6 | ```screw(M3_cap_screw, 10)``` |  Screw M3 cap x 10mm |
+|   6 | ```washer(M3_washer)``` |  Washer  M3 x 7mm x 0.5mm |
+|   6 | ```star_washer(M3_washer)``` |  Washer star M3 x 0.5mm |
+|   3 | ```ziptie(small_ziptie, 3)``` |  Ziptie 2.5mm x 100mm min length |
 
 ### Printed
 | Qty | Filename |
 | ---:|:--- |
 |   1 | psu_shroud_PD_150_12.stl |
 |   1 | psu_shroud_S_250_48.stl |
+|   1 | psu_shroud_S_300_12.stl |
 
 ### Assemblies
 | Qty | Name |
 | ---:|:--- |
-|   1 | psu_shroud_PD_150_12_assembly |
-|   1 | psu_shroud_S_250_48_assembly |
+|   1 | PSU_shroud_PD_150_12_assembly |
+|   1 | PSU_shroud_S_250_48_assembly |
+|   1 | PSU_shroud_S_300_12_assembly |
 
 
 <a href="#top">Top</a>
@@ -4496,15 +4572,15 @@ UK 13A socket and printed backbox with earth terminal for the panel it is mounte
 <a href="#top">Top</a>
 
 ---
-<a name="Ssr_shroud"></a>
-## Ssr_shroud
+<a name="SSR_shroud"></a>
+## SSR_shroud
 A cover to go over the mains end of an SSR to make it safe to be touched.
-The stl and assembly must be given a name and parameterless wrappers for the stl and assembly added to the project.
+The STL and assembly must be given a name and parameterless wrappers for the stl and assembly added to the project.
 
 
 [printed/ssr_shroud.scad](printed/ssr_shroud.scad) Implementation.
 
-[tests/ssr_shroud.scad](tests/ssr_shroud.scad) Code for this example.
+[tests/SSR_shroud.scad](tests/SSR_shroud.scad) Code for this example.
 
 ### Functions
 | Function | Description |
@@ -4544,8 +4620,8 @@ The stl and assembly must be given a name and parameterless wrappers for the stl
 ### Assemblies
 | Qty | Name |
 | ---:|:--- |
-|   1 | ssr_shroud_SSR10DA_assembly |
-|   1 | ssr_shroud_SSR25DA_assembly |
+|   1 | SSR_shroud_SSR10DA_assembly |
+|   1 | SSR_shroud_SSR25DA_assembly |
 
 
 <a href="#top">Top</a>
@@ -4969,7 +5045,7 @@ a cylinder. To get around this a colour can be passed to thread that is used to
 
 Making the ends requires a CGAL intersection, which make threads relatively slow. For this reason they are generally disabled when using the GUI but can
 be enabled by setting ```$show_threads``` to ```true```. When the tests are run, by default, threads are enabled only for things that feature them like screws.
-This behaviour can be changed by setting a ```SHOW_THREADS``` environment variable to ```false``` to disable all threads and ```true``` to enable all threads.
+This behaviour can be changed by setting a ```NOPSCADLIB_SHOW_THREADS``` environment variable to ```false``` to disable all threads and ```true``` to enable all threads.
 The same variable also affects the generation of assembly diagrams.
 
 Threads obey the $fn, $fa, $fs variables.
@@ -5019,8 +5095,8 @@ Simple tube or ring
 <a href="#top">Top</a>
 
 ---
-<a name="Bom"></a>
-## Bom
+<a name="BOM"></a>
+## BOM
 Bill Of Materials generation via echo and the ```bom.py``` script. Also handles exploded assembly views and posing. Assembly instructions can precede the module
 definition that makes the assembly.
 
@@ -5030,7 +5106,7 @@ heirachical BOMs are also generated for real projects.
 
 [utils/core/bom.scad](utils/core/bom.scad) Implementation.
 
-[tests/bom.scad](tests/bom.scad) Code for this example.
+[tests/BOM.scad](tests/BOM.scad) Code for this example.
 
 ### Functions
 | Function | Description |

scripts/bom.py

@@ -184,6 +184,9 @@ def parse_bom(file = "openscad.log", name = None):
                     main.add_part(s)
                     if stack:
                         main.assemblies[stack[-1]].add_part(s)
+        else:
+            if 'ERROR:' in line or 'WARNING:' in line:
+                print(line[:-1])
     return main
 
 def boms(target = None, assembly = None):

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

@@ -83,9 +83,9 @@ def make_parts(target, part_type, parts = None):
     #
     # Find all the scad files
     #
-    lib_dir = os.environ['OPENSCADPATH'] + '/NopSCADlib/printed'
+    lib_dirs = [path + '/' + lib + '/printed' for path in os.environ['OPENSCADPATH'].split(os.pathsep) for lib in sorted(os.listdir(path))]
     module_suffix = '_dxf' if part_type == 'svg' else '_' + part_type
-    for dir in [source_dir, source_dir + '/printed', lib_dir]:
+    for dir in [source_dir, source_dir + '/printed'] + lib_dirs:
         if os.path.isdir(dir):
             for filename in os.listdir(dir):
                 if filename[-5:] == ".scad":
@@ -102,13 +102,6 @@ def make_parts(target, part_type, parts = None):
                                     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
@@ -119,15 +112,21 @@ def make_parts(target, part_type, parts = None):
                                             changed = "No bounds"
                                         if changed:
                                             print(changed)
+                                            #
+                                            # 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);
                                             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
-
+                                            os.remove(part_maker_name)
                                         targets.remove(part)
-                                        os.remove(part_maker_name)
     #
     # Write new bounds file
     #

scripts/options.py

@@ -23,7 +23,7 @@ import json, os, deps
 
 def check_options(dir = '.'):
     global options, options_mtime
-    options = { "show_threads": str(os.getenv("SHOW_THREADS")) }
+    options = { "show_threads": str(os.getenv("NOPSCADLIB_SHOW_THREADS")) }
     options_fname = dir + '/options.json'
     try:
         with open(options_fname) as json_file:

scripts/readme.md

@@ -5,7 +5,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  |
-|:--|:--|
+|:---|:---|
 | ```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. |

scripts/render.py

@@ -59,7 +59,7 @@ def render(target, type):
         if mtime(part_file) > mtime(png_name):
             png_maker_name = "png.scad"
             with open(png_maker_name, "w") as f:
-                f.write('color("lime") import("%s");\n' % part_file)
+                f.write('color([0, 146/255, 0]) import("%s");\n' % part_file)
             cam = "--camera=0,0,0,70,0,315,500" if type == 'stl' else "--camera=0,0,0,0,0,0,500"
             render = "--preview" if type == 'stl' else "--render"
             tmp_name = 'tmp.png'

scripts/tests.py

@@ -109,13 +109,14 @@ def tests(tests):
     #
     # List of individual part files
     #
-    scads = [i for i in sorted(os.listdir(scad_dir)) if i[-5:] == ".scad"]
+    scads = [i for i in sorted(os.listdir(scad_dir), key = lambda s: s.lower()) if i[-5:] == ".scad"]
 
     for scad in scads:
         base_name = scad[:-5]
         if not tests or base_name in tests:
             print(base_name)
             cap_name = base_name[0].capitalize() + base_name[1:]
+            base_name = base_name.lower()
             scad_name = scad_dir + '/' + scad
             png_name = png_dir + '/' + base_name + '.png'
             bom_name = bom_dir + '/' + base_name + '.json'
@@ -140,11 +141,14 @@ def tests(tests):
                 print("Can't find implementation!")
                 continue
 
-            vsplit = "M"
+            vsplit = "AKR" + chr(ord('Z') + 1)
             vtype = locations[0][1]
-            types = [vtype + ' A-' + vsplit[0], vtype + ' ' + chr(ord(vsplit) + 1) + '-Z'] + [loc[1] for loc in locations[1 :]]
+            types = [vtype + ' ' + vsplit[i] + '-'  + chr(ord(vsplit[i + 1]) - 1) for i in range(len(vsplit) - 1)] + [loc[1] for loc in locations[1 :]]
             if type == vtype:
-                type = types[0] if cap_name[0] <= vsplit else types[1]
+                for i in range(1, len(vsplit)):
+                    if cap_name[0] < vsplit[i]:
+                         type = types[i - 1]
+                         break
 
             for t in types:
                 if not t in bodies:
@@ -188,10 +192,10 @@ def tests(tests):
 
             body += ["![%s](%s)\n" %(base_name, png_name)]
 
-            dname = deps_name(deps_dir, scad)
+            dname = deps_name(deps_dir, scad.lower())
             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 = times.check_have_time(changed, scad_name.lower())
             changed = options.have_changed(changed, oldest)
             if changed:
                 print(changed)

scripts/views.py

@@ -71,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):
@@ -88,6 +89,14 @@ def eop(print_mode, doc_file, last = False, first = False):
 def pad(s, before, after = 0):
     return '&nbsp;' * before + str(s) + '&nbsp;' * after
 
+def titalise(name):
+    cap_next = True
+    result = ''
+    for c in name.replace('_', ' '):
+        result = result + (c.upper() if cap_next else c);
+        cap_next = c == ' '
+    return result
+
 def views(target, do_assemblies = None):
     done_assemblies = []
     #
@@ -108,9 +117,10 @@ def views(target, do_assemblies = None):
     with open(bounds_fname) as json_file:
         bounds_map = json.load(json_file)
     #
-    # Find all the assemblies
+    # Find all the assemblies and remove any old views
     #
     assemblies = bom_to_assemblies(bom_dir, bounds_map)
+    lc_assemblies = [ass.lower() for ass in assemblies]
     for file in os.listdir(target_dir):
         if file.endswith('.png'):
             assembly = file[:-4].replace('_assembled', '_assembly')
@@ -123,8 +133,8 @@ def views(target, do_assemblies = None):
     # Find all the scad files
     #
     main_blurb = None
-    lib_dir = os.environ['OPENSCADPATH'] + '/NopSCADlib/printed'
-    for dir in [source_dir, source_dir + '/printed', lib_dir]:
+    lib_dirs = [path + '/' + lib + '/printed' for path in os.environ['OPENSCADPATH'].split(os.pathsep) for lib in sorted(os.listdir(path))]
+    for dir in [source_dir, source_dir + '/printed'] + lib_dirs:
         if os.path.isdir(dir):
             for filename in os.listdir(dir):
                 if filename.endswith('.scad'):
@@ -139,29 +149,24 @@ def views(target, do_assemblies = None):
                         if len(words) and words[0] == "module":
                             module = words[1].split('(')[0]
                             if is_assembly(module):
-                                if module in assemblies:
+                                lc_module = module.lower()
+                                if lc_module in lc_assemblies:
+                                    real_name = assemblies[lc_assemblies.index(lc_module)]
                                     #
                                     # Scrape the assembly instructions
                                     #
                                     for ass in flat_bom:
-                                        if ass["name"] == module:
+                                        if ass["name"] == real_name:
                                             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);
+                                    if not do_assemblies or real_name in do_assemblies:
                                         #
                                         # Run openscad on the created file
                                         #
                                         dname = deps_name(deps_dir, filename)
                                         for explode in [0, 1]:
-                                            png_name = target_dir + '/' + module + '.png'
+                                            png_name = target_dir + '/' + real_name + '.png'
                                             if not explode:
                                                 png_name = png_name.replace('_assembly', '_assembled')
                                             changed = check_deps(png_name, dname)
@@ -170,17 +175,24 @@ def views(target, do_assemblies = None):
                                             tmp_name = 'tmp.png'
                                             if changed:
                                                 print(changed)
+                                                #
+                                                # 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);
                                                 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)
+                                                os.remove(png_maker_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)
+                                    done_assemblies.append(real_name)
                                 else:
                                     if module == 'main_assembly':
                                         main_blurb = blurb.scrape_module_blurb(lines[:line_no])
@@ -215,7 +227,7 @@ def views(target, do_assemblies = None):
             print('1. [Parts list](#Parts_list)', file = doc_file)
             for ass in flat_bom:
                 name =  ass["name"]
-                cap_name = name.replace('_', ' ').title()
+                cap_name = titalise(name)
                 print('1. [%s](#%s)' % (cap_name, name), file = doc_file)
             print(file = doc_file)
             eop(print_mode, doc_file)
@@ -236,11 +248,11 @@ def views(target, do_assemblies = None):
                         else:
                             things[t][thing] = ass[t][thing]
             for ass in flat_bom:
-                name = ass["name"][:-9].replace('_', ' ').title().replace(' ','&nbsp;')
+                name = titalise(ass["name"][:-9]).replace(' ','&nbsp;')
                 print('| <span style="writing-mode: vertical-rl; text-orientation: mixed;">%s</span> ' % name, file = doc_file, end = '')
             print('| <span style="writing-mode: vertical-rl; text-orientation: mixed;">TOTALS</span> |  |', file = doc_file)
 
-            print(('|--:' * len(flat_bom) + '|--:|:--|'), file = doc_file)
+            print(('|---:' * len(flat_bom) + '|---:|:---|'), file = doc_file)
 
             for t in types:
                 if things[t]:
@@ -273,7 +285,7 @@ def views(target, do_assemblies = None):
             #
             for ass in flat_bom:
                 name = ass["name"]
-                cap_name = name.replace('_', ' ').title()
+                cap_name = titalise(name)
 
                 if ass["count"] > 1:
                     print('<a name="%s"></a>\n## %d x %s' % (name, ass["count"], cap_name), file = doc_file)
@@ -283,7 +295,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)
@@ -297,7 +309,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)
@@ -313,7 +325,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)
@@ -329,7 +341,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/BOM.scad

@@ -21,7 +21,6 @@
 //! BOM and assembly demonstration
 //
 include <../core.scad>
-include <../vitamins/screws.scad>
 include <../vitamins/sheets.scad>
 use <../vitamins/insert.scad>
 $explode = 1; // Normally set on the command line when generating assembly views with views.py

tests/IECs.scad

@@ -17,10 +17,10 @@
 // If not, see <https://www.gnu.org/licenses/>.
 //
 include <../core.scad>
-use <../utils/layout.scad>
-
 include <../vitamins/iecs.scad>
 
+use <../utils/layout.scad>
+
 module iecs()
     layout([for(i = iecs) iec_flange_h(i)], 10)
         rotate(90)

tests/KP_pillow_blocks.scad

@@ -17,10 +17,9 @@
 // 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>
+
+use <../utils/layout.scad>
 
 module kp_pillow_blocks() {
     screws = [M4_cap_screw, M4_cap_screw, M5_cap_screw, M5_cap_screw];

tests/LEDs.scad

@@ -16,7 +16,7 @@
 // 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 <../utils/core/core.scad>
 use <../utils/layout.scad>
 
 include <../vitamins/leds.scad>

tests/PCB.scad

@@ -17,11 +17,11 @@
 // If not, see <https://www.gnu.org/licenses/>.
 //
 include <../core.scad>
-
-use <../vitamins/pcb.scad>
 include <../vitamins/microswitches.scad>
 include <../vitamins/d_connectors.scad>
 
+use <../vitamins/pcb.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];
 

tests/PCB_mount.scad

@@ -16,7 +16,7 @@
 // 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 <../utils/core/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, [],

tests/PCBs.scad

@@ -17,11 +17,10 @@
 // If not, see <https://www.gnu.org/licenses/>.
 //
 include <../core.scad>
-use <../utils/layout.scad>
-
-include <../vitamins/d_connectors.scad>
 include <../vitamins/pcbs.scad>
 
+use <../utils/layout.scad>
+
 module pcbs()
     layout([for(p = pcbs) pcb_width(p)], 10)
         translate([0, pcb_length(pcbs[$i]) / 2])

tests/PSU_shroud.scad

@@ -17,10 +17,9 @@
 // If not, see <https://www.gnu.org/licenses/>.
 //
 include <../core.scad>
-use <../utils/layout.scad>
-
-include <../vitamins/screws.scad>
 include <../vitamins/psus.scad>
+
+use <../utils/layout.scad>
 use <../printed/psu_shroud.scad>
 
 thickness = 3;

tests/PSUs.scad

@@ -17,11 +17,10 @@
 // If not, see <https://www.gnu.org/licenses/>.
 //
 include <../core.scad>
-use <../utils/layout.scad>
-
-include <../vitamins/screws.scad>
 include <../vitamins/psus.scad>
 
+use <../utils/layout.scad>
+
 module psus()
     layout([for(p = psus) psu_width(p)], 10) let(p = psus[$i])
     rotate(atx_psu(p) ? 0 : 90) {

tests/SCS_bearing_blocks.scad

@@ -17,12 +17,12 @@
 // If not, see <https://www.gnu.org/licenses/>.
 //
 include <../core.scad>
-use <../utils/layout.scad>
-
 include <../vitamins/scs_bearing_blocks.scad>
 
+use <../utils/layout.scad>
+
 module scs_bearing_blocks()
-    layout([for(s = scs_bearing_blocks) 2 * scs_size(s)[0]]) {
+    layout([for(s = scs_bearing_blocks) scs_size(s).x], 10) {
         part_thickness = 5;
         scs_bearing_block_assembly(scs_bearing_blocks[$i], part_thickness);
 

tests/SK_brackets.scad

@@ -17,11 +17,11 @@
 // If not, see <https://www.gnu.org/licenses/>.
 //
 include <../core.scad>
-use <../utils/layout.scad>
-
 include <../vitamins/sk_brackets.scad>
 include <../vitamins/extrusions.scad>
 
+use <../utils/layout.scad>
+
 module sk_brackets() {
     screws = [M4_dome_screw, M4_cap_screw, M5_cap_screw, M5_cap_screw];
     nuts = [M4_hammer_nut, M4_sliding_t_nut, M5_sliding_t_nut, undef];
@@ -31,10 +31,9 @@ module sk_brackets() {
         sk_bracket_assembly(sk_brackets[$i], screw_type = screws[$i], nut_type = nuts[$i], max_screw_depth = depths[$i]);
         translate([0, -sk_hole_offset(sk_brackets[$i]) - extrusion_width($i < 2 ? E2020 : E3030) / 2, 0])
             rotate([0, 90, 0])
-                extrusion($i < 2 ? E2020 : E3030, 20);
+                extrusion($i < 2 ? E2020 : E3030, 20, false);
     }
 }
 
 if($preview)
-    let($show_threads = true)
-        sk_brackets();
+    sk_brackets();

tests/SSR_shroud.scad

@@ -17,10 +17,9 @@
 // If not, see <https://www.gnu.org/licenses/>.
 //
 include <../core.scad>
-use <../utils/layout.scad>
-
-include <../vitamins/screws.scad>
 include <../vitamins/ssrs.scad>
+
+use <../utils/layout.scad>
 use <../printed/ssr_shroud.scad>
 
 thickness = 3;

tests/SSRs.scad

@@ -17,11 +17,10 @@
 // If not, see <https://www.gnu.org/licenses/>.
 //
 include <../core.scad>
-use <../utils/layout.scad>
-
-include <../vitamins/screws.scad>
 include <../vitamins/ssrs.scad>
 
+use <../utils/layout.scad>
+
 module ssrs()
     layout([for(s = ssrs) ssr_width(s)], 15)
         rotate(90)

tests/annotation.scad

@@ -16,7 +16,7 @@
 // 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 <../utils/core/core.scad>
 use <../utils/annotation.scad>
 
 module annotations() {

tests/batteries.scad

@@ -16,10 +16,9 @@
 // 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 <../utils/core/core.scad>
 use <../utils/layout.scad>
 
-include <../vitamins/springs.scad>
 include <../vitamins/batteries.scad>
 
 module batteries()

tests/belts.scad

@@ -18,8 +18,6 @@
 //
 include <../core.scad>
 
-include <../vitamins/belts.scad>
-include <../vitamins/screws.scad>
 include <../vitamins/pulleys.scad>
 use <../vitamins/insert.scad>
 use <../utils/layout.scad>

tests/bezier.scad

@@ -16,7 +16,7 @@
 // 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 <../utils/core/core.scad>
 use <../utils/bezier.scad>
 use <../utils/sweep.scad>
 use <../utils/annotation.scad>

tests/blowers.scad

@@ -19,7 +19,6 @@
 include <../core.scad>
 use <../utils/layout.scad>
 
-include <../vitamins/screws.scad>
 include <../vitamins/blowers.scad>
 
 module blowers()

tests/box.scad

@@ -18,7 +18,6 @@
 //
 include <../core.scad>
 
-include <../vitamins/screws.scad>
 include <../vitamins/sheets.scad>
 use <../vitamins/insert.scad>
 

tests/bulldogs.scad

@@ -16,7 +16,7 @@
 // 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 <../utils/core/core.scad>
 use <../utils/layout.scad>
 
 include <../vitamins/bulldogs.scad>

tests/butt_box.scad

@@ -18,7 +18,6 @@
 //
 include <../core.scad>
 
-include <../vitamins/screws.scad>
 include <../vitamins/sheets.scad>
 use <../vitamins/insert.scad>
 

tests/buttons.scad

@@ -16,7 +16,7 @@
 // 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 <../utils/core/core.scad>
 use <../utils/layout.scad>
 
 include <../vitamins/buttons.scad>

tests/cable_grommets.scad

@@ -16,7 +16,7 @@
 // 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 <../utils/core/core.scad>
 
 use <../printed/cable_grommets.scad>
 

tests/cable_strips.scad

@@ -16,7 +16,7 @@
 // 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 <../utils/core/core.scad>
 
 use <../vitamins/cable_strip.scad>
 

tests/carriers.scad

@@ -16,7 +16,7 @@
 // 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 <../utils/core/core.scad>
 use <../printed/carriers.scad>
 
 module carriers()

tests/clip.scad

@@ -17,7 +17,7 @@
 // If not, see <https://www.gnu.org/licenses/>.
 //
 
-include <../core.scad>
+include <../utils/core/core.scad>
 
 module clips() {
     clip(xmin = 0, ymin = 0, zmin = 0, zmax = 40) sphere(50);

tests/components.scad

@@ -19,7 +19,6 @@
 include <../core.scad>
 use <../utils/layout.scad>
 
-include <../vitamins/screws.scad>
 include <../vitamins/components.scad>
 
 module resistors()

tests/corner_block.scad

@@ -19,8 +19,6 @@
 include <../core.scad>
 use <../printed/corner_block.scad>
 
-include <../vitamins/screws.scad>
-
 screws = [M2_cap_screw, M2p5_pan_screw, M3_dome_screw, M4_dome_screw];
 
 module do_corner_block(screw)

tests/d_connectors.scad

@@ -16,7 +16,7 @@
 // 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 <../utils/core/core.scad>
 use <../utils/layout.scad>
 
 include <../vitamins/d_connectors.scad>

tests/door_hinge.scad

@@ -16,7 +16,7 @@
 // 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 <../utils/core/core.scad>
 use <../printed/door_hinge.scad>
 
 include <../vitamins/sheets.scad>

tests/door_latch.scad

@@ -16,7 +16,7 @@
 // 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 <../utils/core/core.scad>
 use <../printed/door_latch.scad>
 
 module door_latches()

tests/extrusion_brackets.scad

@@ -16,14 +16,14 @@
 // 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 <../utils/core/core.scad>
 
 include <../vitamins/extrusion_brackets.scad>
 include <../vitamins/extrusions.scad>
 include <../vitamins/washers.scad>
 include <../vitamins/nuts.scad>
 
-module extrusion_brackets() {
+module extrusion_brackets(examples = false) {
     extrusion_inner_corner_bracket(E20_inner_corner_bracket);
 
     translate([30, 0])
@@ -34,27 +34,32 @@ module extrusion_brackets() {
 
     eWidth = extrusion_width(E2020);
 
-    translate([0, 60]) {
-        extrusion_inner_corner_bracket(E20_inner_corner_bracket);
-        translate([-eWidth / 2, 0, 0])
-            rotate([-90, 0, 0])
-                extrusion(E2020, 20);
-        translate([-eWidth, -eWidth / 2, 0])
-            rotate([0, 90, 0])
-                extrusion(E2020, 40);
-    }
+    if(examples) {
+        translate([20, 60, 10]) rotate([90, 0, 180]) {
+            extrusion_inner_corner_bracket(E20_inner_corner_bracket);
 
-    translate([60, 60]) {
-        extrusion_corner_bracket_assembly(E20_corner_bracket);
-        translate([-eWidth / 2, 0, 0])
-            rotate([-90, 0, 0])
-                extrusion(E2020, 30);
-        translate([-eWidth, -eWidth / 2, 0])
-            rotate([0, 90, 0])
-                extrusion(E2020, 50);
+            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)
-    let($show_threads = true)
-        extrusion_brackets();
+    extrusion_brackets(true);

tests/extrusions.scad

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

tests/fan_guard.scad

@@ -17,11 +17,11 @@
 // If not, see <https://www.gnu.org/licenses/>.
 //
 include <../core.scad>
-use <../utils/layout.scad>
-
 include <../printed/fan_guard.scad>
 include <../vitamins/fans.scad>
 
+use <../utils/layout.scad>
+
 module fan_guards()
     layout([for(f = fans) fan_width(f)], 10)
         color(pp1_colour) fan_guard(fans[$i], spokes = fan_width(fans[$i]) > 60 ? 8 : 4);

tests/fans.scad

@@ -17,11 +17,11 @@
 // If not, see <https://www.gnu.org/licenses/>.
 //
 include <../core.scad>
-use <../utils/layout.scad>
-
+include <../vitamins/fans.scad>
 include <../printed/fan_guard.scad>
 
-include <../vitamins/fans.scad>
+use <../utils/layout.scad>
+
 
 module fans()
     layout([for(f = fans) fan_width(f)], 10)

tests/fixing_block.scad

@@ -20,8 +20,6 @@ include <../core.scad>
 use <../printed/fixing_block.scad>
 use <../utils/layout.scad>
 
-include <../vitamins/screws.scad>
-
 screws = [M2_cap_screw, M2p5_pan_screw, M3_dome_screw, M4_dome_screw];
 
 module fixing_block_test(screw)