Added comment to indicate the .py suffix may be needed on linux and OSX.

Include terminal.scad in lib.scad to allow use of terminal_block().

.gitignore

@@ -11,3 +11,4 @@ options.json
 times.txt
 *_diff.png
 *.echo
+cmd_times.txt

CHANGELOG.md

@@ -3,6 +3,126 @@
 This changelog is generated by `changelog.py` using manually added semantic version tags to classify commits as breaking changes, additions or fixes.
 
 
+### [v20.14.0](https://github.com/nophead/NopSCADlib/releases/tag/v20.14.0 "show release") Additions [...](https://github.com/nophead/NopSCADlib/compare/v20.13.0...v20.14.0 "diff with v20.13.0")
+*   2022-09-29 [`f1737d2`](https://github.com/nophead/NopSCADlib/commit/f1737d257b54957772ab6faea102f8ddb829119b "show commit") [C.](# "Chris") Updated images and readme.
+
+*   2022-09-27 [`ce258d6`](https://github.com/nophead/NopSCADlib/commit/ce258d6d4f1de5fbdda76a78b0ad2cbf1b41a3f9 "show commit") [J.R.](# "Jeroen Roos") Leadnuts: add nuthousing
+
+### [v20.13.0](https://github.com/nophead/NopSCADlib/releases/tag/v20.13.0 "show release") Additions [...](https://github.com/nophead/NopSCADlib/compare/v20.12.0...v20.13.0 "diff with v20.12.0")
+*   2022-09-27 [`ec85cc5`](https://github.com/nophead/NopSCADlib/commit/ec85cc5d4c76baedae670a5652194bd1799a7094 "show commit") [C.](# "Chris") Updated images and readme.
+
+*   2022-09-24 [`fb66954`](https://github.com/nophead/NopSCADlib/commit/fb6695471f935057a0949e55f70a39911ac81f4c "show commit") [J.R.](# "Jeroen Roos") Shaft coupling: Add flexible SC `/` 6x8 flexible SC
+
+ * Added the possibility for shaft couplings to be flexible and added a 6x8
+example of such a coupling.
+
+### [v20.12.0](https://github.com/nophead/NopSCADlib/releases/tag/v20.12.0 "show release") Additions [...](https://github.com/nophead/NopSCADlib/compare/v20.11.0...v20.12.0 "diff with v20.11.0")
+*   2022-09-27 [`c9ac393`](https://github.com/nophead/NopSCADlib/commit/c9ac393c0c7b025b3e6ad9e1030d1b13f8b879c3 "show commit") [C.](# "Chris") Printed corner blocks now have a `short_insert` option.
+
+*   2022-09-27 [`208334a`](https://github.com/nophead/NopSCADlib/commit/208334a585ed0605bf7dbaab1050c060aa15edb7 "show commit") [C.](# "Chris") Printed box now has a short insert option.
+
+*   2022-09-27 [`3a17b89`](https://github.com/nophead/NopSCADlib/commit/3a17b89d5ceb69834b23ff6bc46523f2dfb15f99 "show commit") [C.](# "Chris") Added short inserts and M5 inserts.
+`screw_insert()` now takes a short flag.
+`screw_length()` can now be passed an insert object.
+
+*   2022-09-25 [`0f36c02`](https://github.com/nophead/NopSCADlib/commit/0f36c02b5e34b0b45d258ff8e6ed4536f0601d92 "show commit") [C.](# "Chris") Added `layer_height0` global variable and updated `round_to_layer()` to handle it.
+
+ * Moved functions from `global_defs.scad` to `global.scad` so they get documented.
+
+### [v20.11.0](https://github.com/nophead/NopSCADlib/releases/tag/v20.11.0 "show release") Additions [...](https://github.com/nophead/NopSCADlib/compare/v20.10.3...v20.11.0 "diff with v20.10.3")
+*   2022-08-30 [`c1e4625`](https://github.com/nophead/NopSCADlib/commit/c1e4625382646faf6a00e78ac01e495a88169b35 "show commit") [C.](# "Chris") Replaced generic chips with SOIC8.
+Updated images and readme.
+
+*   2022-08-29 [`6059c5f`](https://github.com/nophead/NopSCADlib/commit/6059c5f5569a9fc2ba08e448bbf90328fb985ed3 "show commit") [C.](# "ChemicalXandco") add L9110S 2-Channel motor driver module
+
+#### [v20.10.3](https://github.com/nophead/NopSCADlib/releases/tag/v20.10.3 "show release") Fixes [...](https://github.com/nophead/NopSCADlib/compare/v20.10.2...v20.10.3 "diff with v20.10.2")
+*   2022-08-03 [`4ceb6bd`](https://github.com/nophead/NopSCADlib/commit/4ceb6bd8639cd39ac39798b3eccd178526a56c13 "show commit") [C.](# "Chris") Fixed a gap in printed hinges.
+
+#### [v20.10.2](https://github.com/nophead/NopSCADlib/releases/tag/v20.10.2 "show release") Fixes [...](https://github.com/nophead/NopSCADlib/compare/v20.10.1...v20.10.2 "diff with v20.10.1")
+*   2022-07-16 [`664d04a`](https://github.com/nophead/NopSCADlib/commit/664d04ad93c28c2614d5991e2b8dfa78964f6a99 "show commit") [C.](# "Chris") Now logs the time taken to run non OpenSCAD commands in `cmd_times.txt`
+
+#### [v20.10.1](https://github.com/nophead/NopSCADlib/releases/tag/v20.10.1 "show release") Fixes [...](https://github.com/nophead/NopSCADlib/compare/v20.10.0...v20.10.1 "diff with v20.10.0")
+*   2022-06-30 [`f44d9ae`](https://github.com/nophead/NopSCADlib/commit/f44d9ae424f407baa4f8b5187819b43b30800257 "show commit") [M.B.](# "Martin Budden") Made includes relative in `bldc_motors`.
+
+*   2022-07-15 [`1238dba`](https://github.com/nophead/NopSCADlib/commit/1238dba90ac5c48ba01abb9e7926a064353489de "show commit") [C.](# "Chris") Updated readme.
+
+*   2022-06-22 [`aec7211`](https://github.com/nophead/NopSCADlib/commit/aec72118fac218ca033264fa7b28db2bff7db10a "show commit") [M.B.](# "Martin Budden") Fixed typos.
+
+### [v20.10.0](https://github.com/nophead/NopSCADlib/releases/tag/v20.10.0 "show release") Additions [...](https://github.com/nophead/NopSCADlib/compare/v20.9.0...v20.10.0 "diff with v20.9.0")
+*   2022-07-04 [`b58a59d`](https://github.com/nophead/NopSCADlib/commit/b58a59dab70bb414dd90dc5a9055d6bf3b4f6144 "show commit") [C.](# "Chris") Updated images and readme.
+
+*   2022-07-04 [`6b6ffb2`](https://github.com/nophead/NopSCADlib/commit/6b6ffb2b74cc89ffecbcad7c304c3c4f047a8805 "show commit") [C.](# "Chris") Added SOICs to tests.
+
+*   2022-07-04 [`1e30ad2`](https://github.com/nophead/NopSCADlib/commit/1e30ad24e802dc6e075fd73185551202101d4793 "show commit") [C.](# "Chris") Added `smd_soic` to  `pcb_component()`.
+
+*   2022-07-04 [`dc715ff`](https://github.com/nophead/NopSCADlib/commit/dc715ff2b70ae98615ee43750f3bb7613b481f7b "show commit") [C.](# "Chris") Tweaked SOIC text size.
+
+*   2022-07-04 [`c57c202`](https://github.com/nophead/NopSCADlib/commit/c57c202e31c70351f38ef6299c60b0deb54bd296 "show commit") [M.](# "MS3FGX") Adjust lead sizing
+
+*   2022-07-02 [`26bfe96`](https://github.com/nophead/NopSCADlib/commit/26bfe96614741206c8da6d126edfa9eb5326cb8f "show commit") [M.](# "MS3FGX") Add SOIC SMD Package
+
+### [v20.9.0](https://github.com/nophead/NopSCADlib/releases/tag/v20.9.0 "show release") Additions [...](https://github.com/nophead/NopSCADlib/compare/v20.8.0...v20.9.0 "diff with v20.8.0")
+*   2022-07-02 [`2cc3c6e`](https://github.com/nophead/NopSCADlib/commit/2cc3c6ec7c9d8ee285d49111559d40fb2a3112e1 "show commit") [C.](# "Chris") Updated images and readme.
+
+*   2022-07-02 [`633843d`](https://github.com/nophead/NopSCADlib/commit/633843d45eacd42619581a4619752700e1cd687b "show commit") [C.](# "Chris") Added LED1206 example to PCB test.
+
+*   2022-07-02 [`1a472c8`](https://github.com/nophead/NopSCADlib/commit/1a472c8ed549e230f7df93989f3e1db729b4b281 "show commit") [M.](# "MS3FGX") Add 1206 SMD LED
+
+### [v20.8.0](https://github.com/nophead/NopSCADlib/releases/tag/v20.8.0 "show release") Additions [...](https://github.com/nophead/NopSCADlib/compare/v20.7.0...v20.8.0 "diff with v20.7.0")
+*   2022-06-23 [`ecd534b`](https://github.com/nophead/NopSCADlib/commit/ecd534b5773928b9987023bd4370f661cc750fbd "show commit") [C.P.](# "Chris Palmer") Added `NEMA_connection_pos()`.
+Changed motor wire colours and tweaked wire position and size,
+
+### [v20.7.0](https://github.com/nophead/NopSCADlib/releases/tag/v20.7.0 "show release") Additions [...](https://github.com/nophead/NopSCADlib/compare/v20.6.1...v20.7.0 "diff with v20.6.1")
+*   2022-06-21 [`28c36a4`](https://github.com/nophead/NopSCADlib/commit/28c36a4e966cceccbbdc330cf9a6fdeaa0283889 "show commit") [C.P.](# "Chris Palmer") `rounded_polygon()` now copes with the degenerate case when tangents intersect to form a sharp corner with no arc.
+Added an `offset()` function with some limitations.
+
+#### [v20.6.1](https://github.com/nophead/NopSCADlib/releases/tag/v20.6.1 "show release") Fixes [...](https://github.com/nophead/NopSCADlib/compare/v20.6.0...v20.6.1 "diff with v20.6.0")
+*   2022-06-21 [`6a9af0a`](https://github.com/nophead/NopSCADlib/commit/6a9af0af8aef68978b8be248810d07c85150341b "show commit") [C.P.](# "Chris Palmer") Updates images
+
+*   2022-06-21 [`a6a0808`](https://github.com/nophead/NopSCADlib/commit/a6a08088d986dbcbc4d01c06e0475176ec8bc76f "show commit") [M.B.](# "Martin Budden") Fixed dimensions of E1515 extrusion.
+
+*   2022-06-21 [`bcf9fb3`](https://github.com/nophead/NopSCADlib/commit/bcf9fb38dfabaf93508a380b85b12e3b23f28cf8 "show commit") [M.B.](# "Martin Budden") Fixed typos.
+
+*   2022-06-21 [`06443a5`](https://github.com/nophead/NopSCADlib/commit/06443a558b407292a1e73f60c24cc90ec618d511 "show commit") [M.B.](# "Martin Budden") Standardised setting of imgsize in scripts.
+
+### [v20.6.0](https://github.com/nophead/NopSCADlib/releases/tag/v20.6.0 "show release") Additions [...](https://github.com/nophead/NopSCADlib/compare/v20.5.1...v20.6.0 "diff with v20.5.1")
+*   2022-06-14 [`18f3d43`](https://github.com/nophead/NopSCADlib/commit/18f3d43780d7e083fc3b21290db2049fb4364a46 "show commit") [C.P.](# "Chris Palmer") Added convexity parameter to `clip()`.
+
+#### [v20.5.1](https://github.com/nophead/NopSCADlib/releases/tag/v20.5.1 "show release") Fixes [...](https://github.com/nophead/NopSCADlib/compare/v20.5.0...v20.5.1 "diff with v20.5.0")
+*   2022-06-14 [`eda88cc`](https://github.com/nophead/NopSCADlib/commit/eda88cc8d75eb4c0cb59b368b4e2ad3db2115834 "show commit") [C.P.](# "Chris Palmer") Fixed `vero()` constructor documentation.
+Fixed missing space in veroboard vitamin description.
+
+*   2022-06-14 [`630268d`](https://github.com/nophead/NopSCADlib/commit/630268d71a0b478c28b6bde2a7c3ff9074c7a8fb "show commit") [C.P.](# "Chris Palmer") Changed `screw_knob()` facets to be suitable for 3D printing.
+Fixed `knob_height()` so it can take a screw as a type.
+
+### [v20.5.0](https://github.com/nophead/NopSCADlib/releases/tag/v20.5.0 "show release") Additions [...](https://github.com/nophead/NopSCADlib/compare/v20.4.0...v20.5.0 "diff with v20.4.0")
+*   2022-05-31 [`cc5654d`](https://github.com/nophead/NopSCADlib/commit/cc5654d7d756287f5311e35104003f38a4a94475 "show commit") [C.](# "Chris") Added `usb_miniA()`.
+
+### [v20.4.0](https://github.com/nophead/NopSCADlib/releases/tag/v20.4.0 "show release") Additions [...](https://github.com/nophead/NopSCADlib/compare/v20.3.1...v20.4.0 "diff with v20.3.1")
+*   2022-04-01 [`d46913c`](https://github.com/nophead/NopSCADlib/commit/d46913ce4f64656889fd29dccc0709d84d4d9c49 "show commit") [C.P.](# "Chris Palmer") Printed `screw_knob()` is now fully customisable by passing a parameter
+list, constructed by `screw_knob(),` in place of the screw.
+
+ * Screws can still be passed for backwards compatibility.
+
+#### [v20.3.1](https://github.com/nophead/NopSCADlib/releases/tag/v20.3.1 "show release") Fixes [...](https://github.com/nophead/NopSCADlib/compare/v20.3.0...v20.3.1 "diff with v20.3.0")
+*   2022-04-01 [`b9f676a`](https://github.com/nophead/NopSCADlib/commit/b9f676a75369d666540f79abe0392e209e20d0f0 "show commit") [C.P.](# "Chris Palmer") Documented `insert_hole_length()`.
+
+### [v20.3.0](https://github.com/nophead/NopSCADlib/releases/tag/v20.3.0 "show release") Additions [...](https://github.com/nophead/NopSCADlib/compare/v20.2.0...v20.3.0 "diff with v20.2.0")
+*   2022-03-17 [`ddc4150`](https://github.com/nophead/NopSCADlib/commit/ddc4150ed73c8300bc3ef4326a91cd4ec54ed9e3 "show commit") [C.P.](# "Chris Palmer") Updated images and readme.
+
+*   2022-03-16 [`7e126c9`](https://github.com/nophead/NopSCADlib/commit/7e126c94cadd120d686eaad8459723e0c1dfc0b2 "show commit") [M.](# "Mozza") Add A23 cell
+
+### [v20.2.0](https://github.com/nophead/NopSCADlib/releases/tag/v20.2.0 "show release") Additions [...](https://github.com/nophead/NopSCADlib/compare/v20.1.2...v20.2.0 "diff with v20.1.2")
+*   2022-03-17 [`744ebc2`](https://github.com/nophead/NopSCADlib/commit/744ebc293594e2d049220bba7325f3a22f40a71a "show commit") [C.P.](# "Chris Palmer") Added functions for generating twisted cable paths and calculating its radius.
+Top row of cable bundles reversed to match a twisted cable.
+
+#### [v20.1.2](https://github.com/nophead/NopSCADlib/releases/tag/v20.1.2 "show release") Fixes [...](https://github.com/nophead/NopSCADlib/compare/v20.1.1...v20.1.2 "diff with v20.1.1")
+*   2022-03-17 [`99a5570`](https://github.com/nophead/NopSCADlib/commit/99a5570e248be32747bead61e17feaa3bde13f9b "show commit") [C.P.](# "Chris Palmer") Fixed ziptie bug for small wires and corners made sharper.
+
+*   2022-03-17 [`b70911d`](https://github.com/nophead/NopSCADlib/commit/b70911dc132727f24798e92be06a87ab37f2917e "show commit") [C.P.](# "Chris Palmer") Image odd pixel changes due to move to summer computer.
+
+*   2022-03-01 [`2d20fb1`](https://github.com/nophead/NopSCADlib/commit/2d20fb130a260b1f7358ea9fbb9fca2b5a18a65b "show commit") [C.P.](# "Chris Palmer") Removed dead code in `spiral_paths()`.
+
 #### [v20.1.1](https://github.com/nophead/NopSCADlib/releases/tag/v20.1.1 "show release") Fixes [...](https://github.com/nophead/NopSCADlib/compare/v20.1.0...v20.1.1 "diff with v20.1.0")
 *   2022-02-25 [`943deed`](https://github.com/nophead/NopSCADlib/commit/943deededfe2b258f23ca64001ae7c010ed626bc "show commit") [C.P.](# "Chris Palmer") Updated the readme.
 
@@ -392,8 +512,6 @@ Fixed `M6_cs_cap_screw` and `M4_grub_screw` socket sizes.
 #### [v15.21.1](https://github.com/nophead/NopSCADlib/releases/tag/v15.21.1 "show release") Fixes [...](https://github.com/nophead/NopSCADlib/compare/v15.21.0...v15.21.1 "diff with v15.21.0")
 *   2021-08-09 [`be53547`](https://github.com/nophead/NopSCADlib/commit/be53547728834d8e786ad4cb5637c768320a3105 "show commit") [M.B.](# "Martin Budden") Fixed display of BLDC prop shaft when thread length `=` 0.
 
-*   2021-07-04 [`ba7d7d3`](https://github.com/nophead/NopSCADlib/commit/ba7d7d32adf554d163143c0ae1707565340bb35b "show commit") [C.P.](# "Chris Palmer") Updated chnagelog.
-
 ### [v15.21.0](https://github.com/nophead/NopSCADlib/releases/tag/v15.21.0 "show release") Additions [...](https://github.com/nophead/NopSCADlib/compare/v15.20.0...v15.21.0 "diff with v15.20.0")
 *   2021-07-01 [`df35e14`](https://github.com/nophead/NopSCADlib/commit/df35e14fc71794c3826d6c99ce3cab93a4cfa5fe "show commit") [M.B.](# "Martin Budden") Improved handling of pcb plating colour.
 

docs/usage.md

@@ -28,6 +28,8 @@ by downloading https://github.com/nophead/NopSCADlib/archive/master.zip and unzi
 
 The `NopSCADlib/scripts` directory needs to be added to the executable search path, `PATH` on Windows and `path` on Linux and Mac.
 
+Note that on Linux and OSX the full file name including the `.py` will be needed.
+
 The installation can be tested by opening `NopSCADlib/libtest.scad` in the OpenSCAD GUI. It should render all the objects in the library in about 1 minute.
 
 Running `tests` from the command line will run all the tests in the `tests` directory and build the `readme.md` catalog for GitHub and render it to `readme.html`

global_defs.scad

@@ -29,6 +29,7 @@ rr_green = [0, 146/255, 0];                                               // Rep
 crimson  = [220/255, 20/255, 60/255];
 
 layer_height    = is_undef($layer_height)    ? 0.25   : $layer_height;    // layer height when printing
+layer_height0   = is_undef($layer_height0)   ? layer_height : $layer_height0; // height of first layer if different
 extrusion_width = is_undef($extrusion_width) ? 0.5    : $extrusion_width; // filament width when printing
 nozzle          = is_undef($nozzle)          ? 0.45   : $nozzle;          // 3D printer nozzle
 cnc_bit_r       = is_undef($cnc_bit_r)       ? 1.2    : $cnc_bit_r;       // minimum tool radius when milling 2D objects
@@ -51,10 +52,7 @@ eps = 1/128;     // small fudge factor to stop CSG barfing on coincident faces.
 $fa = 6;
 $fs = extrusion_width / 2;
 
-function round_to_layer(z) = ceil(z / layer_height) * layer_height;         //! Round up to a multiple of layer_height.
-
 // Some additional named colours
-function grey(n) = [0.01, 0.01, 0.01] * n;                                  //! Generate a shade of grey to pass to color().
 silver           = [0.75, 0.75, 0.75];
 gold             = [255, 215,   0] / 255;
 brass            = [255, 220, 100] / 255;

lib.scad

@@ -63,6 +63,7 @@ include <vitamins/spools.scad>
 include <vitamins/ssrs.scad>
 include <vitamins/stepper_motors.scad>
 include <vitamins/swiss_clips.scad>
+include <vitamins/terminal.scad>
 include <vitamins/toggles.scad>
 include <vitamins/transformers.scad>
 include <vitamins/tubings.scad>

libtest.scad

@@ -163,14 +163,11 @@ corner_blocks_y = fixing_blocks_y + 30;
 translate([x5, corner_blocks_y])
     corner_blocks();
 
-feet_y = corner_blocks_y + 70;
-translate([x5, feet_y])
-    feet();
-
-translate([x5 + 70, feet_y])
+screw_knobs_y = corner_blocks_y + 70;
+translate([x5, screw_knobs_y])
     screw_knobs();
 
-knobs_y = feet_y + 40;
+knobs_y = screw_knobs_y + 40;
 translate([640, knobs_y])
     printed_pulley_test();
 
@@ -185,6 +182,9 @@ strap_y = clips_y + 50;
 translate([x5 + 60, strap_y])
     strap_handles();
 
+translate([x6, strap_y])
+   feet();
+
 handle_y = strap_y + 50;
 translate([x5, handle_y])
     handle();
@@ -279,6 +279,9 @@ translate([x0, pulleys_y])
 translate([x0, leadnuts_y])
     leadnuts();
 
+translate([x0 + 120, leadnuts_y])
+    leadnuthousings();
+
 translate([x0, linear_bearings_y]) {
     linear_bearings();
     rods();

printed/camera_housing.scad

@@ -23,7 +23,6 @@
 include <../core.scad>
 include <../vitamins/cameras.scad>
 use <../vitamins/pcb.scad>
-use <../vitamins/insert.scad>
 
 wall = 1.75;
 min_wall = 2 * extrusion_width;

printed/corner_block.scad

@@ -44,47 +44,49 @@ overshoot = 2;      // how far screw can overshoot the insert
 
 function corner_block_screw() = def_screw; //! Default screw type
 
-function corner_block_hole_offset(screw = def_screw) = //! Hole offset from the edge
-    let(insert = screw_insert(screw))
+function corner_block_hole_offset(screw = def_screw, short_insert = false) = //! Hole offset from the edge
+    let(insert = screw_insert(screw, short_insert))
         insert_length(insert) + max(overshoot + screw_clearance_radius(screw), insert_hole_radius(insert)) + 1;
 
+function corner_block_width(screw = def_screw, short_insert = false) = //! Block width, depth and height
+    corner_block_hole_offset(screw, short_insert) + insert_outer_d(screw_insert(screw, short_insert)) / 2 + wall;
 
-function corner_block_width(screw = def_screw) = //! Block width, depth and height
-    corner_block_hole_offset(screw) + insert_outer_d(screw_insert(screw)) / 2 + wall;
+function corner_block_v_hole(screw = def_screw, short_insert = false) = //! Transform to bottom hole
+    let(offset = corner_block_hole_offset(screw, short_insert))
+        translate([offset, offset]) * rotate([180, 0, 0]);
 
-function corner_block_v_hole(screw = def_screw) = let(offset = corner_block_hole_offset(screw)) translate([offset, offset]) * rotate([180, 0, 0]); //! Transform to bottom hole
-
-function corner_block_h_holes(screw = def_screw) = //! List of transforms to side holes
-    let(offset = corner_block_hole_offset(screw))
+function corner_block_h_holes(screw = def_screw, short_insert = false) = //! List of transforms to side holes
+    let(offset = corner_block_hole_offset(screw, short_insert))
         [translate([offset, 0,      offset])                * rotate([90, 0,   0]),
          translate([0,      offset, offset - layer_height]) * rotate([90, 0, -90])];
 
-function corner_block_holes(screw) = concat([corner_block_v_hole(screw)], corner_block_h_holes(screw)); //! List of transforms to all holes
+function corner_block_holes(screw, short_insert = false) =  //! List of transforms to all holes
+    concat([corner_block_v_hole(screw, short_insert)], corner_block_h_holes(screw, short_insert));
 
-module corner_block_v_hole(screw = def_screw) //! Place children at the bottom screw hole
-    multmatrix(corner_block_v_hole(screw))
+module corner_block_v_hole(screw = def_screw, short_insert = false) //! Place children at the bottom screw hole
+    multmatrix(corner_block_v_hole(screw, short_insert))
         children();
 
-module corner_block_h_holes(screw = def_screw, index = undef) //! Place children at the side screw holes
-    for(p = !is_undef(index) ? [corner_block_h_holes(screw)[index]] : corner_block_h_holes(screw))
+module corner_block_h_holes(screw = def_screw, index = undef, short_insert = false) //! Place children at the side screw holes
+    for(p = !is_undef(index) ? [corner_block_h_holes(screw, short_insert)[index]] : corner_block_h_holes(screw, short_insert))
         multmatrix(p)
             children();
 
-module corner_block_holes(screw = def_screw) //! Place children at all the holes
-    for(p = corner_block_holes(screw))
+module corner_block_holes(screw = def_screw, short_insert = false) //! Place children at all the holes
+    for(p = corner_block_holes(screw, short_insert))
         multmatrix(p)
             children();
 
-module corner_block(screw = def_screw, name = false) { //! Generate the STL for a printed corner block
+module corner_block(screw = def_screw, name = false, short_insert = false) { //! Generate the STL for a printed corner block
     r = 1;
-    cb_width = corner_block_width(screw);
+    cb_width = corner_block_width(screw, short_insert);
     cb_height = cb_width;
     cb_depth = cb_width;
-    insert = screw_insert(screw);
+    insert = screw_insert(screw, short_insert);
     corner_rad = insert_outer_d(insert) / 2 + wall;
-    offset = corner_block_hole_offset(screw);
+    offset = corner_block_hole_offset(screw, short_insert);
 
-    stl(name ? name : str("corner_block", "_M", screw_radius(screw) * 20))
+    stl(name ? name : str("corner_block", "_M", screw_radius(screw) * 20, short_insert ? "_s": ""))
         difference() {
             hull()  {
                 translate([r, r])
@@ -110,53 +112,54 @@ module corner_block(screw = def_screw, name = false) { //! Generate the STL for
                     rotate([0, 90, 180])
                         rounded_cylinder(r = corner_rad, h = r, r2 = r);
             }
-            corner_block_v_hole(screw)
+            corner_block_v_hole(screw, short_insert)
                 insert_hole(insert, overshoot);
 
-            corner_block_h_holes(screw)
+            corner_block_h_holes(screw, short_insert = short_insert)
                 insert_hole(insert, overshoot, true);
 
             children();
         }
 }
 
-module corner_block_assembly(screw = def_screw, name = false) //! The printed block with inserts
-assembly(name ? name : str("corner_block_M", 20 * screw_radius(screw)), ngb = true) {
-    insert = screw_insert(screw);
+module corner_block_assembly(screw = def_screw, name = false, short_insert = false) //! The printed block with inserts
+assembly(name ? name : str("corner_block_M", 20 * screw_radius(screw), short_insert ? "_s": ""), ngb = true) {
+    insert = screw_insert(screw, short_insert);
 
     stl_colour(name ? pp2_colour : pp1_colour)
-        render() corner_block(screw, name) children();
+        render() corner_block(screw, name, short_insert) children();
 
-    corner_block_h_holes(screw)
+    corner_block_h_holes(screw, short_insert = short_insert)
         insert(insert);
 
-    corner_block_v_hole(screw)
+    corner_block_v_hole(screw, short_insert)
         insert(insert);
 }
 
-module fastened_corner_block_assembly(thickness, screw = def_screw, thickness_below = undef, thickness_side2 = undef, name = false, show_block = true, star_washers = true) { //! Printed block with all fasteners
+module fastened_corner_block_assembly(thickness, screw = def_screw, thickness_below = undef, thickness_side2 = undef, name = false, show_block = true, star_washers = true, short_insert = false) { //! Printed block with all fasteners
     thickness2 = !is_undef(thickness_below) ? thickness_below : thickness;
     thickness3 = !is_undef(thickness_side2) ? thickness_side2 : thickness;
-    function screw_len(t) = screw_length(screw, t + overshoot, star_washers ? 2 : 1, true);
+    insert = screw_insert(screw, short_insert);
+    function screw_len(t) = screw_length(screw, t + overshoot, star_washers ? 2 : 1, insert);
     screw_length = screw_len(thickness);
     screw_length2 = screw_len(thickness2);
     screw_length3 = screw_len(thickness3);
 
     if(show_block)
-        corner_block_assembly(screw, name) children();
+        corner_block_assembly(screw, name, short_insert) children();
 
     if(thickness)
-        corner_block_h_holes(screw, 0)
+        corner_block_h_holes(screw, 0, short_insert)
             translate_z(thickness)
                 screw_and_washer(screw, screw_length, star_washers);
 
     if(thickness3)
-        corner_block_h_holes(screw, 1)
+        corner_block_h_holes(screw, 1, short_insert)
             translate_z(thickness3)
                 screw_and_washer(screw, screw_length3, star_washers);
 
     if(thickness2)
-        corner_block_v_hole(screw)
+        corner_block_v_hole(screw, short_insert)
             translate_z(thickness2)
                 screw_and_washer(screw, screw_length2, star_washers);
 }
@@ -165,6 +168,10 @@ module corner_block_M20_stl() corner_block(M2_cap_screw);
 module corner_block_M25_stl() corner_block(M2p5_cap_screw);
 module corner_block_M30_stl() corner_block(M3_cap_screw);
 module corner_block_M40_stl() corner_block(M4_cap_screw);
+module corner_block_M20_s_stl() corner_block(M2_cap_screw, short_insert = true);
+module corner_block_M25_s_stl() corner_block(M2p5_cap_screw, short_insert = true);
+module corner_block_M30_s_stl() corner_block(M3_cap_screw, short_insert = true);
+module corner_block_M40_s_stl() corner_block(M4_cap_screw, short_insert = true);
 //
 //! 1. Lay the blocks out and place an M2 insert in each upward facing hole.
 //! 1. Push them home with a soldering iron with a conical bit heated to 200°C.
@@ -197,36 +204,69 @@ module corner_block_M30_assembly() corner_block_assembly(M3_cap_screw);
 //
 module corner_block_M40_assembly() corner_block_assembly(M4_cap_screw);
 
-function 2screw_block_width(screw = def_screw) = //! 2 screw block width is narrower, height and depth are as corner_block
-    insert_outer_d(screw_insert(screw)) + 2 * wall;
+//
+//! 1. Lay the blocks out and place an M2 insert in each upward facing hole.
+//! 1. Push them home with a soldering iron with a conical bit heated to 200°C.
+//! When removing the iron it helps to twist it a little anti-clockwise to release it from the thread.
+//! 1. Lay the blocks on each of their other two flat sides and repeat.
+//
+module corner_block_M20_s_assembly() corner_block_assembly(M2_cap_screw, short_insert = true);
 
-function 2screw_block_v_hole(screw = def_screw) = translate([0, corner_block_hole_offset(screw)]) * rotate([180, 0, 0]); //! Transform to bottom hole
-function 2screw_block_h_hole(screw = def_screw) = translate([0, 0, corner_block_hole_offset(screw)]) * rotate([90, 0, 0]); //! Transform to front hole
-function 2screw_block_holes(screw) = concat([2screw_block_v_hole(screw)], [2screw_block_h_hole(screw)]); //! List of transforms to both holes
+//
+//! 1. Lay the blocks out and place an M2.5 insert in each upward facing hole.
+//! 1. Push them home with a soldering iron with a conical bit heated to 200°C.
+//! When removing the iron it helps to twist it a little anti-clockwise to release it from the thread.
+//! 1. Lay the blocks on each of their other two flat sides and repeat.
+//
+module corner_block_M25_s_assembly() corner_block_assembly(M2p5_cap_screw, short_insert = true);
 
-module 2screw_block_v_hole(screw = def_screw) //! Place children at the bottom screw hole
-    multmatrix(2screw_block_v_hole(screw))
+//
+//! 1. Lay the blocks out and place an M3 insert in each upward facing hole.
+//! 1. Push them home with a soldering iron with a conical bit heated to 200°C.
+//! When removing the iron it helps to twist it a little anti-clockwise to release it from the thread.
+//! 1. Lay the blocks on each of their other two flat sides and repeat.
+//
+module corner_block_M30_s_assembly() corner_block_assembly(M3_cap_screw, short_insert = true);
+
+//
+//! 1. Lay the blocks out and place an M4 insert in each upward facing hole.
+//! 1. Push them home with a soldering iron with a conical bit heated to 200°C.
+//! When removing the iron it helps to twist it a little anti-clockwise to release it from the thread.
+//! 1. Lay the blocks on each of their other two flat sides and repeat.
+//
+module corner_block_M40_s_assembly() corner_block_assembly(M4_cap_screw, short_insert = true);
+
+
+function 2screw_block_width(screw = def_screw, short_insert = false) = //! 2 screw block width is narrower, height and depth are as corner_block
+    insert_outer_d(screw_insert(screw, short_insert)) + 2 * wall;
+
+function 2screw_block_v_hole(screw = def_screw, short_insert = false) = translate([0, corner_block_hole_offset(screw, short_insert)]) * rotate([180, 0, 0]); //! Transform to bottom hole
+function 2screw_block_h_hole(screw = def_screw, short_insert = false) = translate([0, 0, corner_block_hole_offset(screw, short_insert)]) * rotate([90, 0, 0]); //! Transform to front hole
+function 2screw_block_holes(screw, short_insert = false) = concat([2screw_block_v_hole(screw, short_insert)], [2screw_block_h_hole(screw, short_insert)]); //! List of transforms to both holes
+
+module 2screw_block_v_hole(screw = def_screw, short_insert = false) //! Place children at the bottom screw hole
+    multmatrix(2screw_block_v_hole(screw, short_insert))
         children();
 
-module 2screw_block_h_hole(screw = def_screw) //! Place children at the front screw hole
-    multmatrix(2screw_block_h_hole(screw))
+module 2screw_block_h_hole(screw = def_screw, short_insert = false) //! Place children at the front screw hole
+    multmatrix(2screw_block_h_hole(screw, short_insert))
         children();
 
-module 2screw_block_holes(screw = def_screw) //! Place children at both screw holes
-    for(p = 2screw_block_holes(screw))
+module 2screw_block_holes(screw = def_screw, short_insert = false) //! Place children at both screw holes
+    for(p = 2screw_block_holes(screw, short_insert))
         multmatrix(p)
             children();
 
-module 2screw_block(screw = def_screw, name = false) { //! Generate the STL for a printed 2screw block
+module 2screw_block(screw = def_screw, name = false, short_insert = false) { //! Generate the STL for a printed 2screw block
     r = 1;
-    cb_width = 2screw_block_width(screw);
-    cb_height = corner_block_width(screw);
+    cb_width = 2screw_block_width(screw, short_insert);
+    cb_height = corner_block_width(screw, short_insert);
     cb_depth = cb_height;
-    insert = screw_insert(screw);
+    insert = screw_insert(screw, short_insert);
     corner_rad = insert_outer_d(insert) / 2 + wall;
-    offset = corner_block_hole_offset(screw);
+    offset = corner_block_hole_offset(screw, short_insert);
 
-    stl(name ? name : str("2screw_block", "_M", screw_radius(screw) * 20))
+    stl(name ? name : str("2screw_block", "_M", screw_radius(screw) * 20, short_insert ? "_s" : ""))
         difference() {
             hull()  {
                 translate([-cb_width / 2 + r, r])
@@ -245,43 +285,44 @@ module 2screw_block(screw = def_screw, name = false) { //! Generate the STL for
                     rotate([-90, 0, 180])
                         rounded_cylinder(r = corner_rad, h = r, r2 = r);
             }
-            2screw_block_v_hole(screw)
+            2screw_block_v_hole(screw, short_insert)
                 insert_hole(insert, overshoot);
 
-            2screw_block_h_hole(screw)
+            2screw_block_h_hole(screw, short_insert)
                 insert_hole(insert, overshoot, true);
 
             children();
         }
 }
 
-module 2screw_block_assembly(screw = def_screw, name = false) //! The printed block with inserts
-assembly(name ? name : str("2screw_block_M", 20 * screw_radius(screw)), ngb = true) {
-    insert = screw_insert(screw);
+module 2screw_block_assembly(screw = def_screw, name = false, short_insert = false) //! The printed block with inserts
+assembly(name ? name : str("2screw_block_M", 20 * screw_radius(screw), short_insert ? "_s" :""), ngb = true) {
+    insert = screw_insert(screw, short_insert);
 
     stl_colour(name ? pp2_colour : pp1_colour)
-        render() 2screw_block(screw, name) children();
+        render() 2screw_block(screw, name, short_insert) children();
 
-    2screw_block_holes(screw)
+    2screw_block_holes(screw, short_insert)
         insert(insert);
 }
 
-module fastened_2screw_block_assembly(thickness, screw = def_screw, thickness_below = undef, name = false, show_block = true, star_washers = true) { //! Printed block with fasteners
+module fastened_2screw_block_assembly(thickness, screw = def_screw, thickness_below = undef, name = false, show_block = true, star_washers = true, short_insert = false) { //! Printed block with fasteners
     thickness2 = !is_undef(thickness_below) ? thickness_below : thickness;
-    function screw_len(t) = screw_length(screw, t + overshoot, star_washers ? 2 : 1, true);
+    insert = screw_insert(screw, short_insert);
+    function screw_len(t) = screw_length(screw, t + overshoot, star_washers ? 2 : 1, insert);
     screw_length = screw_len(thickness);
     screw_length2 = screw_len(thickness2);
 
     if(show_block)
-        2screw_block_assembly(screw, name) children();
+        2screw_block_assembly(screw, name, short_insert) children();
 
     if(thickness)
-        2screw_block_h_hole(screw)
+        2screw_block_h_hole(screw, short_insert)
             translate_z(thickness)
                 screw_and_washer(screw, screw_length, star_washers);
 
     if(thickness2)
-        2screw_block_v_hole(screw)
+        2screw_block_v_hole(screw, short_insert)
             translate_z(thickness2)
                 screw_and_washer(screw, screw_length2, star_washers);
 }
@@ -289,6 +330,11 @@ module 2screw_block_M20_stl() 2screw_block(M2_cap_screw);
 module 2screw_block_M25_stl() 2screw_block(M2p5_cap_screw);
 module 2screw_block_M30_stl() 2screw_block(M3_cap_screw);
 module 2screw_block_M40_stl() 2screw_block(M4_cap_screw);
+
+module 2screw_block_M20_s_stl() 2screw_block(M2_cap_screw, short_insert = true);
+module 2screw_block_M25_s_stl() 2screw_block(M2p5_cap_screw, short_insert = true);
+module 2screw_block_M30_s_stl() 2screw_block(M3_cap_screw, short_insert = true);
+module 2screw_block_M40_s_stl() 2screw_block(M4_cap_screw, short_insert = true);
 //
 //! 1. Lay the blocks out and place an M2 insert in the forward facing hole.
 //! 1. Push them home with a soldering iron with a conical bit heated to 200°C.
@@ -297,6 +343,14 @@ module 2screw_block_M40_stl() 2screw_block(M4_cap_screw);
 //
 module 2screw_block_M20_assembly() 2screw_block_assembly(M2_cap_screw);
 
+//
+//! 1. Lay the blocks out and place an M2 insert in the forward facing hole.
+//! 1. Push them home with a soldering iron with a conical bit heated to 200°C.
+//! When removing the iron it helps to twist it a little anti-clockwise to release it from the thread.
+//! 1. Lay the blocks on each of their other flat side and repeat.
+//
+module 2screw_block_M20_s_assembly() 2screw_block_assembly(M2_cap_screw, short_insert = true);
+
 //
 //! 1. Lay the blocks out and place an M2.5 insert in the forward facing hole.
 //! 1. Push them home with a soldering iron with a conical bit heated to 200°C.
@@ -305,6 +359,14 @@ module 2screw_block_M20_assembly() 2screw_block_assembly(M2_cap_screw);
 //
 module 2screw_block_M25_assembly() 2screw_block_assembly(M2p5_cap_screw);
 
+//
+//! 1. Lay the blocks out and place an M2.5 insert in the forward facing hole.
+//! 1. Push them home with a soldering iron with a conical bit heated to 200°C.
+//! When removing the iron it helps to twist it a little anti-clockwise to release it from the thread.
+//! 1. Lay the blocks on each of their other flat side and repeat.
+//
+module 2screw_block_M25_s_assembly() 2screw_block_assembly(M2p5_cap_screw, short_insert = true);
+
 //
 //! 1. Lay the blocks out and place an M3 insert in the forward facing hole.
 //! 1. Push them home with a soldering iron with a conical bit heated to 200°C.
@@ -313,6 +375,14 @@ module 2screw_block_M25_assembly() 2screw_block_assembly(M2p5_cap_screw);
 //
 module 2screw_block_M30_assembly() 2screw_block_assembly(M3_cap_screw);
 
+//
+//! 1. Lay the blocks out and place an M3 insert in the forward facing hole.
+//! 1. Push them home with a soldering iron with a conical bit heated to 200°C.
+//! When removing the iron it helps to twist it a little anti-clockwise to release it from the thread.
+//! 1. Lay the blocks on each of their other flat side and repeat.
+//
+module 2screw_block_M30_s_assembly() 2screw_block_assembly(M3_cap_screw, short_insert = true);
+
 //
 //! 1. Lay the blocks out and place an M4 insert in the forward facing hole.
 //! 1. Push them home with a soldering iron with a conical bit heated to 200°C.
@@ -320,3 +390,11 @@ module 2screw_block_M30_assembly() 2screw_block_assembly(M3_cap_screw);
 //! 1. Lay the blocks on each of their other flat side and repeat.
 //
 module 2screw_block_M40_assembly() 2screw_block_assembly(M4_cap_screw);
+
+//
+//! 1. Lay the blocks out and place an M4 insert in the forward facing hole.
+//! 1. Push them home with a soldering iron with a conical bit heated to 200°C.
+//! When removing the iron it helps to twist it a little anti-clockwise to release it from the thread.
+//! 1. Lay the blocks on each of their other flat side and repeat.
+//
+module 2screw_block_M40_s_assembly() 2screw_block_assembly(M4_cap_screw, short_insert = true);

printed/flat_hinge.scad

@@ -111,8 +111,8 @@ module hinge_male(type, female = false) {       //! The half with the stationary
                                         rotate(180)
                                             teardrop(r = kr, h = 0);
 
-                                        translate([-kr - 1, -kr])
-                                            square(1);
+                                        translate([-kr - inset - eps, -kr])
+                                            square([eps, t]);
                                     }
                                     teardrop_plus(r = pr + (female ? gap : 0), h = 0);
                                 }

printed/printed_box.scad

@@ -32,8 +32,8 @@ use <../vitamins/washer.scad>
 use <../vitamins/insert.scad>
 use <foot.scad>
 
-function pbox(name, wall, top_t, base_t, radius, size, foot = false, screw = false, ridges = [0, 0]) //! Construct a printed box property list
-    = concat([name, wall, top_t, base_t, foot, screw, radius, ridges], size);
+function pbox(name, wall, top_t, base_t, radius, size, foot = false, screw = false, short_insert = false, ridges = [0, 0]) //! Construct a printed box property list
+    = concat([name, wall, top_t, base_t, foot, screw, short_insert, radius, ridges], size);
 
 function pbox_name(type)       = type[0]; //! Name to allow more than one box in a project
 function pbox_wall(type)       = type[1]; //! Wall thickness
@@ -41,11 +41,12 @@ 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
+function pbox_short_insert(type)=type[6]; //! Use short inserts
+function pbox_radius(type)     = type[7]; //! Internal corner radius
+function pbox_ridges(type)     = type[8]; //! Ridge wavelength and amplitude
+function pbox_width(type)      = type[9]; //! Internal width
+function pbox_depth(type)      = type[10]; //! Internal depth
+function pbox_height(type)     = type[11]; //! Internal height
 
 base_outset = 1;    // How much the base overlaps the inner dimensions
 base_overlap = 2;   // The width of ledge the base sits on
@@ -63,12 +64,12 @@ function pbox_total_height(type) =  //! Total height including base overlap
 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_insert(type) = screw_insert(pbox_screw(type), short = pbox_short_insert(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 = pbox_screw(type))
-        screw_length(screw, pbox_base(type) + (foot ? foot_thickness(foot) : panel_thickness), 1, true);
+        screw_length(screw, pbox_base(type) + (foot ? foot_thickness(foot) : panel_thickness), 1,  pbox_insert(type));
 
 function pbox_mid_offset(type) = pbox_ridges(type).y + pbox_wall(type) / 2; // Offset to wall midpoint
 

printed/screw_knob.scad

@@ -19,53 +19,102 @@
 
 //
 //! Knob with embedded hex head screw.
+//!
+//! Most aspects can be customised, e.g. the flange thickness and radius. It can also be solid or just a wall and be wavey edged or fluted.
 //
 include <../core.scad>
 use <../utils/hanging_hole.scad>
 
-knob_wall = 2;
+function screw_knob_screw(type)    = type[0]; //! The hex screw
+function screw_knob_wall(type)     = type[1]; //! Wall thickness
+function screw_knob_stem_h(type)   = type[2]; //! The stem height below the flange
+function screw_knob_flange_t(type) = type[3]; //! The thickness of the flange
+function screw_knob_flange_r(type) = type[4]; //! The flange outside radius
+function screw_knob_solid(type)    = type[5]; //! Is the flange solid or just a wall
+function screw_knob_waves(type)    = type[6]; //! Number of waves around the flange edge
+function screw_knob_wave_amp(type) = type[7]; //! Wave amplitude
+function screw_knob_fluted(type)   = type[8]; //! Fluted instead of sine wave
+
+function screw_knob(screw, wall = 2, stem_h = 6, flange_t = 4, flange_r = 9, solid = true, waves = 5, wave_amp = 2, fluted = false) = //! Constructor
+    [screw, wall, stem_h, flange_t, flange_r, solid, waves, wave_amp, fluted];
+
 function knob_nut_trap_depth(screw) = round_to_layer(screw_head_height(screw));
-knob_stem_h = 6;
-knob_thickness = 4;
-knob_r = 8;
-knob_wave = 1;
-knob_waves = 5;
-knob_height = knob_stem_h + knob_thickness;
-function knob_height() = knob_height;
+function knob_height(type) = //! Total height of the knob
+    let(type = !is_list(type[0]) ? screw_knob(type) : type)
+        screw_knob_stem_h(type) + screw_knob_flange_t(type);
 
-module screw_knob(screw) { //! Generate the STL for a knob to fit the specified hex screw
-    knob_stem_r = nut_trap_radius(screw_nut(screw)) + knob_wall;
+module screw_knob(type) { //! Generate the STL for a knob to fit the specified hex screw
+    type = !is_list(type[0]) ? screw_knob(type) : type;         // Allow just the screw to be specified for backwards compatibility
+    screw = screw_knob_screw(type);
+    wall = screw_knob_wall(type);
+    trap_r = nut_trap_radius(screw_nut(screw));
+    stem_r = trap_r + wall;
+    amp = screw_knob_wave_amp(type);
+    flange_r = max(screw_knob_flange_r(type), stem_r + amp);
+    flange_t = screw_knob_flange_t(type);
+    knob_h = knob_height(type);
+    waves = screw_knob_waves(type);
 
-    function wave(a) = knob_r + sin(a * knob_waves) * knob_wave;
+    function wave(a) = flange_r - amp / 2 + sin(a * waves) * amp / 2;
+    fn = r2sides(flange_r);
+    points = [for(i = [0 : fn - 1], a = i * 360 / fn) wave(a) * [sin(a), cos(a)]];
+    solid = screw_knob_solid(type);
+
+    module shape()
+        if(screw_knob_fluted(type))
+            difference() {
+                circle4n(flange_r);
+
+                c = flange_r * sin(90 / waves);            // Flute half chord
+                d = flange_r - flange_r * cos(90 / waves); // Distance from chord to perimeter
+                b = amp - d;                               // Distance from chord to flute bottom
+                flute_r = (b^2 + c^2) / b / 2;
+                for(i = [0 : waves - 1])
+                    rotate(360 * i / waves)
+                        translate([0, flange_r - amp + flute_r])
+                            circle4n(flute_r);
+            }
+        else
+            polygon(points);
 
     stl(str("screw_knob_M", screw_radius(screw) * 20))
         union() {
             render() difference() {
-                cylinder(r = knob_stem_r, h = knob_thickness + knob_stem_h);
+                cylinder(r = stem_r, h = knob_h);
 
                 hanging_hole(knob_nut_trap_depth(screw), screw_clearance_radius(screw))
                     rotate(45)
-                        circle(r = nut_trap_radius(screw_nut(screw)), $fn = 6);
+                        circle(r = trap_r, $fn = 6);
             }
-            linear_extrude(knob_thickness, convexity = 3)
-                difference() {
-                    polygon(points = [for(a = [0 : 359]) [wave(a) * sin(a), wave(a) * cos(a)]]);
+            for(i = [0 : 1])
+                linear_extrude(i ? flange_t : round_to_layer(wall), convexity = 3)
+                    difference() {
+                        shape();
 
-                    circle(knob_stem_r - eps);
-                }
+                        if(i && ! solid)
+                            offset(-wall)
+                                shape();
+
+                        circle(stem_r - eps);
+                    }
         }
 }
 
 //! Place the screw through the printed part
-module screw_knob_assembly(screw, length) //! Assembly with the screw in place
-assembly(str("screw_knob_M", 20 * screw_radius(screw), "_", length), ngb = true) {
-    translate_z(knob_height)
-        vflip()
-            stl_colour(pp1_colour) screw_knob(screw);
+module screw_knob_assembly(type, length) { //! Assembly with the screw in place
+    type = !is_list(type[0]) ? screw_knob(type) : type;
+    screw = screw_knob_screw(type);
+    knob_h = knob_height(type);
 
-    translate_z(knob_height - knob_nut_trap_depth(screw))
-        rotate(-45)
-            screw(screw, length);
+    assembly(str("screw_knob_M", 20 * screw_radius(screw), "_", length), ngb = true) {
+        translate_z(knob_h)
+            vflip()
+                stl_colour(pp1_colour) screw_knob(type);
+
+        translate_z(knob_h - knob_nut_trap_depth(screw))
+            rotate(-45)
+                screw(screw, length);
+    }
 }
 
 module screw_knob_M30_stl() screw_knob(M3_hex_screw);

readme.md

@@ -234,8 +234,9 @@ exposing enough information to make a battery box.
 ### Vitamins
 | Qty | Module call | BOM entry |
 | ---:|:--- |:---|
-|   6 | `battery_contact(bcontact, false)` |  Battery negative contact |
-|   6 | `battery_contact(bcontact, true)` |  Battery positive contact |
+|   7 | `battery_contact(bcontact, false)` |  Battery negative contact |
+|   7 | `battery_contact(bcontact, true)` |  Battery positive contact |
+|   1 | `battery(A23CELL)` |  Cell A23 12v |
 |   1 | `battery(AACELL)` |  Cell AA |
 |   1 | `battery(AAACELL)` |  Cell AAA |
 |   1 | `battery(CCELL)` |  Cell C |
@@ -370,7 +371,7 @@ Individual teeth are not drawn, instead they are represented by a lighter colour
 |   1 | `belt(T2p5x6, [ ... ])` |  Belt T2.5 x 6mm x 130mm |
 |   1 | `belt(T5x10, [ ... ])` |  Belt T5 x 10mm x 130mm |
 |   1 | `belt(T5x6, [ ... ])` |  Belt T5 x 6mm x 130mm |
-|   2 | `insert(F1BM3)` |  Heatfit insert M3 |
+|   2 | `insert(F1BM3)` |  Heatfit insert M3 x 5.8mm |
 |   2 | `pulley(GT2x16_toothed_idler)` |  Pulley GT2 idler 16 teeth |
 |   4 | `pulley(GT2x20_toothed_idler)` |  Pulley GT2 idler 20 teeth |
 |   6 | `pulley(GT2x16_plain_idler)` |  Pulley GT2 idler smooth 9.63mm |
@@ -1511,6 +1512,7 @@ Heatfit threaded inserts. Can be pushed into thermoplastics using a soldering ir
 | Function | Description |
 |:--- |:--- |
 | `insert_boss_radius(type, wall)` | Compute the outer radius of an insert boss |
+| `insert_hole_length(type)` | Length of the insert rounded to layer height |
 | `insert_nose_length(type, d)` | The length before the second ring. |
 
 ### Modules
@@ -1526,10 +1528,14 @@ Heatfit threaded inserts. Can be pushed into thermoplastics using a soldering ir
 ### Vitamins
 | Qty | Module call | BOM entry |
 | ---:|:--- |:---|
-|   1 | `insert(F1BM2)` |  Heatfit insert M2 |
-|   1 | `insert(F1BM2p5)` |  Heatfit insert M2.5 |
-|   1 | `insert(F1BM3)` |  Heatfit insert M3 |
-|   1 | `insert(F1BM4)` |  Heatfit insert M4 |
+|   2 | `insert(F1BM2)` |  Heatfit insert M2 x 4mm |
+|   1 | `insert(CNCKM2p5)` |  Heatfit insert M2.5 x 4mm |
+|   1 | `insert(F1BM2p5)` |  Heatfit insert M2.5 x 5.8mm |
+|   1 | `insert(CNCKM3)` |  Heatfit insert M3 x 3mm |
+|   1 | `insert(F1BM3)` |  Heatfit insert M3 x 5.8mm |
+|   1 | `insert(CNCKM4)` |  Heatfit insert M4 x 4mm |
+|   1 | `insert(F1BM4)` |  Heatfit insert M4 x 8.2mm |
+|   2 | `insert(CNCKM5)` |  Heatfit insert M5 x 5.8mm |
 
 
 <a href="#top">Top</a>
@@ -1644,6 +1650,16 @@ Nuts for leadscrews.
 | `leadnut_od(type)` | Outer diameter of the shank |
 | `leadnut_pitch(type)` | Screw pitch |
 | `leadnut_screw(type)` | The type of the fixing screws |
+| `leadnuthousing_height(type)` | Height of housing |
+| `leadnuthousing_hole_pos(type)` | Offset from center for nut hole |
+| `leadnuthousing_length(type)` | Length of housing |
+| `leadnuthousing_mount_screw(type)` | Mounting screw |
+| `leadnuthousing_mount_screw_len(type)` | Mounting screw length |
+| `leadnuthousing_nut(type)` | Nut type this is suitable for |
+| `leadnuthousing_nut_screw_length(type)` | Length of mounting screw for nut |
+| `leadnuthousing_screw_dist_l(type)` | Distance between mounting holes length |
+| `leadnuthousing_screw_dist_w(type)` | Distance between mounting holes width |
+| `leadnuthousing_width(type)` | Width of housing |
 
 ### Functions
 | Function | Description |
@@ -1655,15 +1671,21 @@ Nuts for leadscrews.
 |:--- |:--- |
 | `leadnut(type)` | Draw specified leadnut |
 | `leadnut_screw_positions(type)` | Position children at the screw holes |
+| `leadnuthousing(type)` | Nut housing, to connect a lead nut to another object |
+| `leadnuthousing_nut_position(type)` | The position of the nut may be off-center, use this to get the position |
+| `leadnuthousing_nut_screw_positions(type)` | get screw positions to mount the nut to the nut housing |
+| `leadnuthousing_screw_positions(type)` | Get screw positions to mount the leadnut housing |
 
 ![leadnuts](tests/png/leadnuts.png)
 
 ### Vitamins
 | Qty | Module call | BOM entry |
 | ---:|:--- |:---|
-|   1 | `leadnut(LSN8x2)` |  Leadscrew nut 8 x 2 |
+|   1 | `nuthousing(LNHT8x2)` |  Lead Screw Nut Housing T8 |
+|   2 | `leadnut(LSN8x2)` |  Leadscrew nut 8 x 2 |
 |   1 | `leadnut(LSN8x8)` |  Leadscrew nut 8 x 8 RobotDigg |
 |   1 | `leadnut(SFU1610)` |  Leadscrew nut for SFU1610 |
+|   4 | `screw(M3_cap_screw, 15)` |  Screw M3 cap x 15mm |
 
 
 <a href="#top">Top</a>
@@ -2401,6 +2423,7 @@ PCBs and perfboard with optional components. The shape can be a rectangle with o
 | `usb_Ax2(cutout = false)` | Draw USB type A dual socket |
 | `usb_B(cutout = false)` | Draw USB B connector |
 | `usb_C(cutout = false)` | Draw USB C connector |
+| `usb_miniA(cutout = false)` | Draw USB mini A connector |
 | `usb_uA(cutout = false)` | Draw USB micro A connector |
 | `vero_pin(cropped = false)` | Draw a vero pin |
 
@@ -2437,12 +2460,16 @@ PCBs and perfboard with optional components. The shape can be a rectangle with o
 |   1 | `ax_res(res1_8, 1e+6, tol = 1)` |  Resistor 1e+6 Ohms 1% 0.125W |
 |   1 | `smd_led(LED0603, orange)` |  SMD LED 0603 orange |
 |   1 | `smd_led(LED0805, red)` |  SMD LED 0805 red |
+|   1 | `smd_led(LED1206, blue)` |  SMD LED 1306 blue |
 |   1 | `smd_capacitor(CAP0603)` |  SMD capacitor 0603 |
 |   1 | `smd_capacitor(CAP0805)` |  SMD capacitor 0805 |
 |   1 | `smd_capacitor(CAP1206)` |  SMD capacitor 1206 |
 |   1 | `smd_resistor(RES0603, 1K)` |  SMD resistor 0603 1K 0.1W |
 |   1 | `smd_resistor(RES0805, 1K)` |  SMD resistor 0805 1K 0.125W |
 |   1 | `smd_resistor(RES1206, 1K)` |  SMD resistor 1206 1K 0.25W |
+|   1 | `smd_soic(SOIC16)` |  SOIC16 package ICL323 |
+|   1 | `smd_soic(SOIC18)` |  SOIC18 package PIC18F88 |
+|   1 | `smd_soic(SOIC8)` |  SOIC8 package M34063 |
 |   1 | `smd_sot(SOT223)` |  SOT223 package LM117 |
 |   1 | `smd_sot(SOT23)` |  SOT23 package 2N7000 |
 |   1 | `square_button(button_4p5mm)` |  Square button 4.5mm |
@@ -2551,6 +2578,7 @@ PCBs and perfboard with optional components. The shape can be a rectangle with o
 | `usb_Ax2(cutout = false)` | Draw USB type A dual socket |
 | `usb_B(cutout = false)` | Draw USB B connector |
 | `usb_C(cutout = false)` | Draw USB C connector |
+| `usb_miniA(cutout = false)` | Draw USB mini A connector |
 | `usb_uA(cutout = false)` | Draw USB micro A connector |
 | `vero_pin(cropped = false)` | Draw a vero pin |
 
@@ -2577,6 +2605,7 @@ PCBs and perfboard with optional components. The shape can be a rectangle with o
 |   1 | `pcb(ExtruderPCB)` |  Extruder connection PCB - not shown |
 |   1 | `pcb(KY_040)` |  KY-040 rotart encoder breakout |
 |   1 | `pcb(Keyes5p1)` |  Keyes5.1 Arduino Uno expansion board - not shown |
+|   1 | `pcb(L9110S)` |  L9110S 2-Channel motor driver module |
 |   1 | `pcb(LIPO_fuel_gauge)` |  LIPO fuel gauge |
 |   1 | `pcb(MP1584EN)` |  MP1584EN 3A buck converter |
 |   1 | `pcb(MT3608)` |  MT3608 boost converter module |
@@ -2587,7 +2616,7 @@ PCBs and perfboard with optional components. The shape can be a rectangle with o
 |   1 | `molex_254(3)` |  Molex KK header 3 way - not shown |
 |  20 | `nut(M2_nut, nyloc = true)` |  Nut M2 x 1.6mm nyloc |
 |  30 | `nut(M2p5_nut, nyloc = true)` |  Nut M2.5 x 2.2mm nyloc |
-|  32 | `nut(M3_nut, nyloc = true)` |  Nut M3 x 2.4mm nyloc |
+|  36 | `nut(M3_nut, nyloc = true)` |  Nut M3 x 2.4mm nyloc |
 |   8 | `nut(M4_nut, nyloc = true)` |  Nut M4 x 3.2mm nyloc |
 |   1 | `pcb(PI_IO)` |  PI_IO V2 - not shown |
 |   1 | `pcb(PSU12V1A)` |  PSU 12V 1A - not shown |
@@ -2610,10 +2639,12 @@ PCBs and perfboard with optional components. The shape can be a rectangle with o
 |   8 | `screw(M2p5_cap_screw, 30)` |  Screw M2.5 cap x 30mm |
 |   4 | `screw(M2p5_pan_screw, 20)` |  Screw M2.5 pan x 20mm |
 |   8 | `screw(M2p5_pan_screw, 25)` |  Screw M2.5 pan x 25mm |
-|  10 | `screw(M3_cap_screw, 16)` |  Screw M3 cap x 16mm |
-|  13 | `screw(M3_cap_screw, 30)` |  Screw M3 cap x 30mm |
-|   9 | `screw(M3_cap_screw, 35)` |  Screw M3 cap x 35mm |
-|   8 | `screw(M4_cap_screw, 35)` |  Screw M4 cap x 35mm |
+|   8 | `screw(M3_cap_screw, 16)` |  Screw M3 cap x 16mm |
+|   6 | `screw(M3_cap_screw, 20)` |  Screw M3 cap x 20mm |
+|   8 | `screw(M3_cap_screw, 30)` |  Screw M3 cap x 30mm |
+|  14 | `screw(M3_cap_screw, 35)` |  Screw M3 cap x 35mm |
+|   4 | `screw(M4_cap_screw, 35)` |  Screw M4 cap x 35mm |
+|   4 | `screw(M4_cap_screw, 40)` |  Screw M4 cap x 40mm |
 |   1 | `pcb(XIAO)` |  Seeeduino XIAO |
 |   1 | `pcb(TP4056)` |  TP4056 Li-lon Battery charger module |
 |   3 | `terminal_35(2)` |  Terminal block 2 way 3.5mm - not shown |
@@ -2622,34 +2653,37 @@ PCBs and perfboard with optional components. The shape can be a rectangle with o
 |   1 | `pcb(WD2002SJ)` |  WD2002SJ Buck Boost DC-DC converter |
 |  20 | `washer(M2_washer)` |  Washer  M2 x 5mm x 0.3mm |
 |  30 | `washer(M2p5_washer)` |  Washer  M2.5 x 5.9mm x 0.5mm |
-|  32 | `washer(M3_washer)` |  Washer  M3 x 7mm x 0.5mm |
+|  36 | `washer(M3_washer)` |  Washer  M3 x 7mm x 0.5mm |
 |   8 | `washer(M4_washer)` |  Washer  M4 x 9mm x 0.8mm |
 |   1 | `pcb(ZC_A0591)` |  ZC-A0591 ULN2003 driver PCB |
 
 ### Printed
 | Qty | Filename |
 | ---:|:--- |
-|   8 | pcb_spacer20100.stl |
+|   4 | pcb_spacer20100.stl |
+|   4 | pcb_spacer20110.stl |
 |   4 | pcb_spacer2070.stl |
 |   4 | pcb_spacer2080.stl |
 |   4 | pcb_spacer2090.stl |
-|   4 | pcb_spacer25120.stl |
 |   4 | pcb_spacer25130.stl |
-|   4 | pcb_spacer25140_2.stl |
+|   4 | pcb_spacer25140.stl |
 |   4 | pcb_spacer25150_2.stl |
-|   4 | pcb_spacer25170.stl |
+|   4 | pcb_spacer25160_2.stl |
 |   4 | pcb_spacer25180.stl |
+|   4 | pcb_spacer25190.stl |
 |   2 | pcb_spacer2550.stl |
-|   4 | pcb_spacer2580.stl |
-|   4 | pcb_spacer30160.stl |
-|   4 | pcb_spacer30190.stl |
-|   5 | pcb_spacer30200.stl |
+|   4 | pcb_spacer2590.stl |
+|   4 | pcb_spacer30170.stl |
+|   4 | pcb_spacer30200.stl |
 |   5 | pcb_spacer30210.stl |
-|   4 | pcb_spacer30220.stl |
+|   5 | pcb_spacer30220.stl |
+|   4 | pcb_spacer30230.stl |
 |   4 | pcb_spacer3050.stl |
-|   6 | pcb_spacer3060.stl |
-|   4 | pcb_spacer40230.stl |
+|   4 | pcb_spacer3060.stl |
+|   2 | pcb_spacer3070.stl |
+|   4 | pcb_spacer3080.stl |
 |   4 | pcb_spacer40240.stl |
+|   4 | pcb_spacer40250.stl |
 
 
 <a href="#top">Top</a>
@@ -3299,6 +3333,7 @@ For an explanation of `screw_polysink()` see <https://hydraraptor.blogspot.com/2
 |:--- |:--- |
 | `screw_boss_diameter(type)` | Boss big enough for nut trap and washer |
 | `screw_head_depth(type, d = 0)` | How far a counter sink head will go into a straight hole diameter d |
+| `screw_insert(screw, short = false, i = 0)` | Find insert to fit specified screw, defaults to longest but can specify the shortest |
 | `screw_length(screw, thickness, washers, insert = false, nyloc = false, nut = false, longer = false)` | Returns the length of the longest or shortest screw that will got through `thickness` and `washers` and possibly an `insert`, `nut` or `nyloc` |
 | `screw_longer_than(x)` | Returns the length of the shortest screw length longer or equal to x |
 | `screw_nut_radius(type)` | Radius of matching nut |
@@ -3462,6 +3497,7 @@ Shaft couplings
 | `sc_diameter(type)` | Coupling outer diameter |
 | `sc_diameter1(type)` | Diameter of smaller shaft |
 | `sc_diameter2(type)` | Diameter of larger shaft |
+| `sc_flexible(type)` | Flexible coupling |
 | `sc_length(type)` | Coupling length |
 
 ### Modules
@@ -3475,6 +3511,7 @@ Shaft couplings
 | Qty | Module call | BOM entry |
 | ---:|:--- |:---|
 |   1 | `shaft_coupling(SC_5x8_rigid)` |  Shaft coupling SC_5x8_rigid |
+|   1 | `shaft_coupling(SC_6x8_flex)` |  Shaft coupling SC_6x8_flex |
 
 
 <a href="#top">Top</a>
@@ -3639,6 +3676,12 @@ Surface mount components for PCBs.
 | `smd_res_end_cap(type)` | End cap width |
 | `smd_res_power(type)` | Power rating in Watts |
 | `smd_res_size(type)` | Body length, width and height |
+| `smd_soic_lead_pitch(type)` | Lead pitch |
+| `smd_soic_lead_size(type)` | Lead width, foot depth, lead thickness |
+| `smd_soic_lead_span(type)` | Total span of leads |
+| `smd_soic_lead_z(type)` | Top of lead frame from top |
+| `smd_soic_size(type)` | Body length, width and height |
+| `smd_soic_z(type)` | Height above PCB surface |
 | `smd_sot_lead_pitch(type)` | Lead pitch |
 | `smd_sot_lead_size(type)` | Lead width, foot depth, lead thickness |
 | `smd_sot_lead_span(type)` | Total span of leads |
@@ -3660,6 +3703,7 @@ Surface mount components for PCBs.
 | `smd_capacitor(type, height, value = undef)` | Draw an SMD capacitor with specified height |
 | `smd_led(type, colour, cutout)` | Draw an SMD LED with specified `colour` |
 | `smd_resistor(type, value)` | Draw an SMD resistor with specified value |
+| `smd_soic(type, value)` | Draw an SMD SOIC |
 | `smd_sot(type, value)` | Draw an SMD transistor |
 
 ![smds](tests/png/smds.png)
@@ -3669,12 +3713,16 @@ Surface mount components for PCBs.
 | ---:|:--- |:---|
 |   1 | `smd_led(LED0603, green)` |  SMD LED 0603 green |
 |   1 | `smd_led(LED0805, blue)` |  SMD LED 0805 blue |
+|   1 | `smd_led(LED1206, red)` |  SMD LED 1306 red |
 |   1 | `smd_capacitor(CAP0603)` |  SMD capacitor 0603 |
 |   1 | `smd_capacitor(CAP0805)` |  SMD capacitor 0805 |
 |   1 | `smd_capacitor(CAP1206)` |  SMD capacitor 1206 |
 |   1 | `smd_resistor(RES0603, 1R0)` |  SMD resistor 0603 1R0 0.1W |
 |   1 | `smd_resistor(RES0805, 10M)` |  SMD resistor 0805 10M 0.125W |
 |   1 | `smd_resistor(RES1206, 100K)` |  SMD resistor 1206 100K 0.25W |
+|   1 | `smd_soic(SOIC16)` |  SOIC16 package SOIC16 |
+|   1 | `smd_soic(SOIC18)` |  SOIC18 package SOIC18 |
+|   1 | `smd_soic(SOIC8)` |  SOIC8 package SOIC8 |
 |   1 | `smd_sot(SOT223)` |  SOT223 package FZT851 |
 |   1 | `smd_sot(SOT23)` |  SOT23 package 2N7000 |
 
@@ -3883,6 +3931,7 @@ NEMA stepper motor model.
 | Function | Description |
 |:--- |:--- |
 | `NEMA_big_hole(type)` | Clearance hole for the big boss |
+| `NEMA_connection_pos(type, jst_connector = false)` | Position of the wires or the connector |
 | `NEMA_holes(type)` | Screw positions for for loop |
 
 ### Modules
@@ -4242,7 +4291,7 @@ Veroboard with mounting holes, track breaks, removed tracks, solder points and c
 ### Functions
 | Function | Description |
 |:--- |:--- |
-| `vero(name, assembly, holes, strips, pitch = inch(0.1)` | Constructor |
+| `vero(name, assembly, holes, strips, pitch = 2.54, fr4 = false, screw = M3_cap_screw, mounting_holes = [], breaks = [], no_tracks = [], components = [], joints = [])` | Constructor |
 | `vero_length(type)` | Length of the board |
 | `vero_size(type)` | Board size |
 | `vero_thickness(type)` | Thickness of the substrate |
@@ -4270,7 +4319,7 @@ Veroboard with mounting holes, track breaks, removed tracks, solder points and c
 |   4 | `nut(M3_nut, nyloc = true)` |  Nut M3 x 2.4mm nyloc |
 |   4 | `screw(M3_dome_screw, 25)` |  Screw M3 dome x 25mm |
 |   2 | `green_terminal(gt_2p54, 10)` |  Terminal block 10 way 0.1" |
-|   2 | `veroboard(z_vb)` |  Veroboard 5 holes x 22strips |
+|   2 | `veroboard(z_vb)` |  Veroboard 5 holes x 22 strips |
 |   8 | `washer(M3_washer)` |  Washer  M3 x 7mm x 0.5mm |
 
 ### Printed
@@ -4553,7 +4602,7 @@ The top bezel can have an optional child, which is subtracted to allow modificat
 ### Vitamins
 | Qty | Module call | BOM entry |
 | ---:|:--- |:---|
-|   8 | `insert(F1BM3)` |  Heatfit insert M3 |
+|   8 | `insert(F1BM3)` |  Heatfit insert M3 x 5.8mm |
 |   4 | `screw(M3_dome_screw, 16)` |  Screw M3 dome x 16mm |
 |   4 | `screw(M3_dome_screw, 20)` |  Screw M3 dome x 20mm |
 |   2 | `sheet(DiBond, 143, 63, 1)` |  Sheet DiBond 143mm x 63mm x 3mm |
@@ -4657,7 +4706,7 @@ fixing_blocks along the sides.
 ### Vitamins
 | Qty | Module call | BOM entry |
 | ---:|:--- |:---|
-|  60 | `insert(F1BM3)` |  Heatfit insert M3 |
+|  60 | `insert(F1BM3)` |  Heatfit insert M3 x 5.8mm |
 |  44 | `screw(M3_dome_screw, 10)` |  Screw M3 dome x 10mm |
 |   4 | `screw(M3_dome_screw, 12)` |  Screw M3 dome x 12mm |
 |  12 | `screw(M3_dome_screw, 16)` |  Screw M3 dome x 16mm |
@@ -4903,42 +4952,42 @@ high lateral rigidity is not required.
 ### Functions
 | Function | Description |
 |:--- |:--- |
-| `2screw_block_h_hole(screw = def_screw)` | Transform to front hole |
-| `2screw_block_holes(screw)` | List of transforms to both holes |
-| `2screw_block_v_hole(screw = def_screw)` | Transform to bottom hole |
-| `2screw_block_width(screw = def_screw)` | 2 screw block width is narrower, height and depth are as corner_block |
-| `corner_block_h_holes(screw = def_screw)` | List of transforms to side holes |
-| `corner_block_hole_offset(screw = def_screw)` | Hole offset from the edge |
-| `corner_block_holes(screw)` | List of transforms to all holes |
+| `2screw_block_h_hole(screw = def_screw, short_insert = false)` | Transform to front hole |
+| `2screw_block_holes(screw, short_insert = false)` | List of transforms to both holes |
+| `2screw_block_v_hole(screw = def_screw, short_insert = false)` | Transform to bottom hole |
+| `2screw_block_width(screw = def_screw, short_insert = false)` | 2 screw block width is narrower, height and depth are as corner_block |
+| `corner_block_h_holes(screw = def_screw, short_insert = false)` | List of transforms to side holes |
+| `corner_block_hole_offset(screw = def_screw, short_insert = false)` | Hole offset from the edge |
+| `corner_block_holes(screw, short_insert = false)` | List of transforms to all holes |
 | `corner_block_screw()` | Default screw type |
-| `corner_block_v_hole(screw = def_screw)` | Transform to bottom hole |
-| `corner_block_width(screw = def_screw)` | Block width, depth and height |
+| `corner_block_v_hole(screw = def_screw, short_insert = false)` | Transform to bottom hole |
+| `corner_block_width(screw = def_screw, short_insert = false)` | Block width, depth and height |
 
 ### Modules
 | Module | Description |
 |:--- |:--- |
-| `2screw_block(screw = def_screw, name = false)` | Generate the STL for a printed 2screw block |
-| `2screw_block_assembly(screw = def_screw, name = false)` | The printed block with inserts |
-| `2screw_block_h_hole(screw = def_screw)` | Place children at the front screw hole |
-| `2screw_block_holes(screw = def_screw)` | Place children at both screw holes |
-| `2screw_block_v_hole(screw = def_screw)` | Place children at the bottom screw hole |
-| `corner_block(screw = def_screw, name = false)` | Generate the STL for a printed corner block |
-| `corner_block_assembly(screw = def_screw, name = false)` | The printed block with inserts |
-| `corner_block_h_holes(screw = def_screw, index = undef)` | Place children at the side screw holes |
-| `corner_block_holes(screw = def_screw)` | Place children at all the holes |
-| `corner_block_v_hole(screw = def_screw)` | Place children at the bottom screw hole |
-| `fastened_2screw_block_assembly(thickness, screw = def_screw, thickness_below = undef, name = false, show_block = true, star_washers = true)` | Printed block with fasteners |
-| `fastened_corner_block_assembly(thickness, screw = def_screw, thickness_below = undef, thickness_side2 = undef, name = false, show_block = true, star_washers = true)` | Printed block with all fasteners |
+| `2screw_block(screw = def_screw, name = false, short_insert = false)` | Generate the STL for a printed 2screw block |
+| `2screw_block_assembly(screw = def_screw, name = false, short_insert = false)` | The printed block with inserts |
+| `2screw_block_h_hole(screw = def_screw, short_insert = false)` | Place children at the front screw hole |
+| `2screw_block_holes(screw = def_screw, short_insert = false)` | Place children at both screw holes |
+| `2screw_block_v_hole(screw = def_screw, short_insert = false)` | Place children at the bottom screw hole |
+| `corner_block(screw = def_screw, name = false, short_insert = false)` | Generate the STL for a printed corner block |
+| `corner_block_assembly(screw = def_screw, name = false, short_insert = false)` | The printed block with inserts |
+| `corner_block_h_holes(screw = def_screw, index = undef, short_insert = false)` | Place children at the side screw holes |
+| `corner_block_holes(screw = def_screw, short_insert = false)` | Place children at all the holes |
+| `corner_block_v_hole(screw = def_screw, short_insert = false)` | Place children at the bottom screw hole |
+| `fastened_2screw_block_assembly(thickness, screw = def_screw, thickness_below = undef, name = false, show_block = true, star_washers = true, short_insert = false)` | Printed block with fasteners |
+| `fastened_corner_block_assembly(thickness, screw = def_screw, thickness_below = undef, thickness_side2 = undef, name = false, show_block = true, star_washers = true, short_insert = false)` | Printed block with all fasteners |
 
 ![corner_block](tests/png/corner_block.png)
 
 ### Vitamins
 | Qty | Module call | BOM entry |
 | ---:|:--- |:---|
-|   5 | `insert(F1BM2)` |  Heatfit insert M2 |
-|   5 | `insert(F1BM2p5)` |  Heatfit insert M2.5 |
-|   5 | `insert(F1BM3)` |  Heatfit insert M3 |
-|   5 | `insert(F1BM4)` |  Heatfit insert M4 |
+|   5 | `insert(F1BM2)` |  Heatfit insert M2 x 4mm |
+|   5 | `insert(F1BM2p5)` |  Heatfit insert M2.5 x 5.8mm |
+|   5 | `insert(F1BM3)` |  Heatfit insert M3 x 5.8mm |
+|   5 | `insert(F1BM4)` |  Heatfit insert M4 x 8.2mm |
 |   5 | `screw(M2_cap_screw, 8)` |  Screw M2 cap x  8mm |
 |   5 | `screw(M2p5_pan_screw, 10)` |  Screw M2.5 pan x 10mm |
 |   5 | `screw(M3_dome_screw, 10)` |  Screw M3 dome x 10mm |
@@ -5227,10 +5276,10 @@ Star washers can be omitted by setting `star_washers` to false.
 ### Vitamins
 | Qty | Module call | BOM entry |
 | ---:|:--- |:---|
-|   3 | `insert(F1BM2)` |  Heatfit insert M2 |
-|   3 | `insert(F1BM2p5)` |  Heatfit insert M2.5 |
-|   3 | `insert(F1BM3)` |  Heatfit insert M3 |
-|   3 | `insert(F1BM4)` |  Heatfit insert M4 |
+|   3 | `insert(F1BM2)` |  Heatfit insert M2 x 4mm |
+|   3 | `insert(F1BM2p5)` |  Heatfit insert M2.5 x 5.8mm |
+|   3 | `insert(F1BM3)` |  Heatfit insert M3 x 5.8mm |
+|   3 | `insert(F1BM4)` |  Heatfit insert M4 x 8.2mm |
 |   3 | `screw(M2_cap_screw, 8)` |  Screw M2 cap x  8mm |
 |   3 | `screw(M2p5_pan_screw, 10)` |  Screw M2.5 pan x 10mm |
 |   3 | `screw(M3_dome_screw, 10)` |  Screw M3 dome x 10mm |
@@ -5377,7 +5426,7 @@ inserts don't grip well in rubber.
 ### Vitamins
 | Qty | Module call | BOM entry |
 | ---:|:--- |:---|
-|   1 | `insert(F1BM3)` |  Heatfit insert M3 |
+|   1 | `insert(F1BM3)` |  Heatfit insert M3 x 5.8mm |
 |   1 | `nut(M4_nut, nyloc = true)` |  Nut M4 x 3.2mm nyloc |
 |   1 | `screw(M3_cap_screw, 8)` |  Screw M3 cap x  8mm |
 |   1 | `screw(M4_cap_screw, 16)` |  Screw M4 cap x 16mm |
@@ -5430,7 +5479,7 @@ Printed handle that can be printed without needing support material due to its t
 ### Vitamins
 | Qty | Module call | BOM entry |
 | ---:|:--- |:---|
-|   2 | `insert(F1BM4)` |  Heatfit insert M4 |
+|   2 | `insert(F1BM4)` |  Heatfit insert M4 x 8.2mm |
 |   2 | `screw(M4_cap_screw, 16)` |  Screw M4 cap x 16mm |
 |   2 | `washer(M4_washer)` |  Washer  M4 x 9mm x 0.8mm |
 |   2 | `star_washer(M4_washer)` |  Washer star M4 x 0.8mm |
@@ -5662,6 +5711,7 @@ It can also have printed feet on the base with the screws doubling up to hold th
 | `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_short_insert(type)` | Use short inserts |
 | `pbox_top(type)` | Top thickness |
 | `pbox_wall(type)` | Wall thickness |
 | `pbox_width(type)` | Internal width |
@@ -5669,7 +5719,7 @@ It can also have printed feet on the base with the screws doubling up to hold th
 ### Functions
 | Function | Description |
 |:--- |:--- |
-| `pbox(name, wall, top_t, base_t, radius, size, foot = false, screw = false, ridges = [0, 0])` | Construct a printed box property list |
+| `pbox(name, wall, top_t, base_t, radius, size, foot = false, screw = false, short_insert = false, ridges = [0, 0])` | Construct a printed box property list |
 | `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 |
@@ -5693,8 +5743,8 @@ It can also have printed feet on the base with the screws doubling up to hold th
 ### Vitamins
 | Qty | Module call | BOM entry |
 | ---:|:--- |:---|
-|   4 | `insert(F1BM2)` |  Heatfit insert M2 |
-|   4 | `insert(F1BM3)` |  Heatfit insert M3 |
+|   4 | `insert(F1BM2)` |  Heatfit insert M2 x 4mm |
+|   4 | `insert(F1BM3)` |  Heatfit insert M3 x 5.8mm |
 |   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 |
@@ -5823,7 +5873,7 @@ The stl and assembly must be given a name and parameterless wrappers for the stl
 ### Vitamins
 | Qty | Module call | BOM entry |
 | ---:|:--- |:---|
-|   6 | `insert(F1BM3)` |  Heatfit insert M3 |
+|   6 | `insert(F1BM3)` |  Heatfit insert M3 x 5.8mm |
 |   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 |
@@ -5879,8 +5929,8 @@ Clamp for ribbon cable and polypropylene strip or one or more ribbon cables.
 ### Vitamins
 | Qty | Module call | BOM entry |
 | ---:|:--- |:---|
-|   2 | `insert(F1BM2)` |  Heatfit insert M2 |
-|   2 | `insert(F1BM3)` |  Heatfit insert M3 |
+|   2 | `insert(F1BM2)` |  Heatfit insert M2 x 4mm |
+|   2 | `insert(F1BM3)` |  Heatfit insert M3 x 5.8mm |
 |   1 |  |  Ribbon cable 20 way 100mm |
 |   1 |  |  Ribbon cable 8 way 100mm |
 |   2 | `screw(M2_dome_screw, 8)` |  Screw M2 dome x  8mm |
@@ -5912,15 +5962,36 @@ Clamp for ribbon cable and polypropylene strip or one or more ribbon cables.
 ## Screw_knob
 Knob with embedded hex head screw.
 
+Most aspects can be customised, e.g. the flange thickness and radius. It can also be solid or just a wall and be wavey edged or fluted.
+
 [printed/screw_knob.scad](printed/screw_knob.scad) Implementation.
 
 [tests/screw_knob.scad](tests/screw_knob.scad) Code for this example.
 
+### Properties
+| Function | Description |
+|:--- |:--- |
+| `screw_knob_flange_r(type)` | The flange outside radius |
+| `screw_knob_flange_t(type)` | The thickness of the flange |
+| `screw_knob_fluted(type)` | Fluted instead of sine wave |
+| `screw_knob_screw(type)` | The hex screw |
+| `screw_knob_solid(type)` | Is the flange solid or just a wall |
+| `screw_knob_stem_h(type)` | The stem height below the flange |
+| `screw_knob_wall(type)` | Wall thickness |
+| `screw_knob_wave_amp(type)` | Wave amplitude |
+| `screw_knob_waves(type)` | Number of waves around the flange edge |
+
+### Functions
+| Function | Description |
+|:--- |:--- |
+| `knob_height(type)` | Total height of the knob |
+| `screw_knob(screw, wall = 2, stem_h = 6, flange_t = 4, flange_r = 9, solid = true, waves = 5, wave_amp = 2, fluted = false)` | Constructor |
+
 ### Modules
 | Module | Description |
 |:--- |:--- |
-| `screw_knob(screw)` | Generate the STL for a knob to fit the specified hex screw |
-| `screw_knob_assembly(screw, length)` | Assembly with the screw in place |
+| `screw_knob(type)` | Generate the STL for a knob to fit the specified hex screw |
+| `screw_knob_assembly(type, length)` | Assembly with the screw in place |
 
 ![screw_knob](tests/png/screw_knob.png)
 
@@ -5929,18 +6000,24 @@ Knob with embedded hex head screw.
 | ---:|:--- |:---|
 |   1 | `screw(M3_hex_screw, 16)` |  Screw M3 hex x 16mm |
 |   1 | `screw(M4_hex_screw, 16)` |  Screw M4 hex x 16mm |
+|   1 | `screw(M5_hex_screw, 16)` |  Screw M5 hex x 16mm |
+|   1 | `screw(M6_hex_screw, 16)` |  Screw M6 hex x 16mm |
 
 ### Printed
 | Qty | Filename |
 | ---:|:--- |
 |   1 | screw_knob_M30.stl |
 |   1 | screw_knob_M40.stl |
+|   1 | screw_knob_M50.stl |
+|   1 | screw_knob_M60.stl |
 
 ### Assemblies
 | Qty | Name |
 | ---:|:--- |
 |   1 | screw_knob_M30_16_assembly |
 |   1 | screw_knob_M40_16_assembly |
+|   1 | screw_knob_M50_16_assembly |
+|   1 | screw_knob_M60_16_assembly |
 
 
 <a href="#top">Top</a>
@@ -5971,7 +6048,7 @@ UK 13A socket and printed backbox with earth terminal for the panel it is mounte
 ### Vitamins
 | Qty | Module call | BOM entry |
 | ---:|:--- |:---|
-|   4 | `insert(F1BM3)` |  Heatfit insert M3 |
+|   4 | `insert(F1BM3)` |  Heatfit insert M3 x 5.8mm |
 |   1 | `mains_socket(Contactum)` |  Mains socket 13A |
 |   1 | `mains_socket(MKLOGIC)` |  Mains socket 13A, switched |
 |   2 | `nut(M3_nut, nyloc = true)` |  Nut M3 x 2.4mm nyloc |
@@ -6028,7 +6105,7 @@ 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 | `insert(F1BM3)` |  Heatfit insert M3 x 5.8mm |
 |   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 |
@@ -6090,7 +6167,7 @@ be fully customised by passing a list of properties.
 ### Vitamins
 | Qty | Module call | BOM entry |
 | ---:|:--- |:---|
-|   2 | `insert(F1BM3)` |  Heatfit insert M3 |
+|   2 | `insert(F1BM3)` |  Heatfit insert M3 x 5.8mm |
 |   2 | `screw(M3_pan_screw, 8)` |  Screw M3 pan x  8mm |
 |   2 | `washer(M3_penny_washer)` |  Washer penny  M3 x 12mm x 0.8mm |
 |   2 | `star_washer(M3_washer)` |  Washer star M3 x 0.5mm |
@@ -6577,6 +6654,8 @@ Because the tangents need to be calculated to find the length these can be calcu
 | Function | Description |
 |:--- |:--- |
 | `circle_tangent(p1, p2)` | Compute the clockwise tangent between two circles represented as [x,y,r] |
+| `line_intersection(l0, l1)` | Return the point where two 2D lines intersect or undef if they don't. |
+| `offset(points, offset)` | Offset a 2D polygon, breaks for concave shapes and negative offsets if the offset is more than half the smallest feature size. |
 | `rounded_polygon(points, _tangents = undef)` | Return the rounded polygon from the point list, can pass the tangent list to save it being calculated |
 | `rounded_polygon_arcs(points, tangents)` | Compute the arcs at the points, for each point [angle, rotate_angle, length] |
 | `rounded_polygon_length(points, tangents)` | Calculate the length given the point list and the list of tangents computed by `rounded_polygon_tangents` |
@@ -6665,7 +6744,7 @@ Each vertex, apart from the first and the last, has an associated radius and the
 | `rounded_path_vertices(path)` | Show the unrounded version of a rounded_path for debug |
 | `segmented_path(path, min_segment)` | Add points to a path to enforce a minimum segment length |
 | `skin_faces(points, npoints, facets, loop, offset = 0)` | Create the mesh for the swept volume without end caps |
-| `spiral_paths(path, n, r, twists, start_angle)` | Create a new paths which sprial around the given path. Use for making twisted cables |
+| `spiral_paths(path, n, r, twists, start_angle)` | Create a new paths which spiral around the given path. Use for making twisted cables |
 | `sweep(path, profile, loop = false, twist = 0)` | Generate the point list and face list of the swept volume |
 
 ### Modules
@@ -6810,7 +6889,7 @@ The `pose()` module allows assembly views in the readme to be posed differently
 ### Vitamins
 | Qty | Module call | BOM entry |
 | ---:|:--- |:---|
-|   1 | `insert(F1BM3)` |  Heatfit insert M3 |
+|   1 | `insert(F1BM3)` |  Heatfit insert M3 x 5.8mm |
 |   1 | `widget(3)` |  Rivet like thing for 3mm sheets |
 |   1 | `screw(M3_cap_screw, 8)` |  Screw M3 cap x  8mm |
 |   1 | `sheet(PMMA3, 20, 20, 1)` |  Sheet acrylic 20mm x 20mm x 3mm |
@@ -6852,7 +6931,7 @@ Original version by Doug Moen on the OpenSCAD forum
 | Module | Description |
 |:--- |:--- |
 | `box(xmin, ymin, zmin, xmax, ymax, zmax)` | Construct a box given its bounds |
-| `clip(xmin = -inf, ymin = -inf, zmin = -inf, xmax = inf, ymax = inf, zmax = inf)` | Clip child to specified boundaries |
+| `clip(xmin = -inf, ymin = -inf, zmin = -inf, xmax = inf, ymax = inf, zmax = inf, convexity = 1)` | Clip child to specified boundaries |
 
 ![clip](tests/png/clip.png)
 
@@ -6863,6 +6942,7 @@ Original version by Doug Moen on the OpenSCAD forum
 <a name="Global"></a>
 ## Global
 Global constants, functions and modules. This file is used directly or indirectly in every scad file.
+See [global_defs.scad](../../global_defs.scad) for a list of global constants.
 
 [utils/core/global.scad](utils/core/global.scad) Implementation.
 
@@ -6875,6 +6955,7 @@ Global constants, functions and modules. This file is used directly or indirectl
 | `cm(x)` | cm to mm conversion |
 | `echoit(x)` | Echo expression and return it, useful for debugging |
 | `foot(x)` | Foot to mm conversion |
+| `grey(n)` | Generate a shade of grey to pass to color(). |
 | `in(list, x)` | Returns true if `x` is an element in the `list` |
 | `inch(x)` | Inch to mm conversion (For fractional inches, 'inch(1 + 7/8)' will work as expected.) |
 | `limit(x, min, max)` | Force x in range min <= x <= max |
@@ -6883,6 +6964,7 @@ Global constants, functions and modules. This file is used directly or indirectl
 | `no_point(str)` | Replace decimal point in string with 'p' |
 | `r2sides(r)` | Replicates the OpenSCAD logic to calculate the number of sides from the radius |
 | `r2sides4n(r)` | Round up the number of sides to a multiple of 4 to ensure points land on all axes |
+| `round_to_layer(z)` | Round up to a layer boundary using `layer_height0` for the first layer and `layer_height` for subsequent layers. |
 | `slice(list, start = 0, end = undef)` | Slice a list or string with Python type semantics |
 | `sqr(x)` | Returns the square of `x` |
 | `yard(x)` | Yard to mm conversion |

scripts/changelog.py

@@ -157,11 +157,11 @@ if __name__ == '__main__':
                         break
                     j += 1
 
-                # Print verson info
+                # Print version info
                 print('%s [%s](%s "show release") %s %s' % ('#' * (level + 1), ver, url + '/releases/tag/' + ver, type, diff), file = file)
 
             # Print commits excluding merges
 
-            if not c.comment.startswith('Merge branch') and not c.comment.startswith('Merge pull') and not re.match(r'U..ated chang.*log.*', c.comment):
+            if not c.comment.startswith('Merge branch') and not c.comment.startswith('Merge pull') and not re.match(r'U..ated ch.*log.*', c.comment):
                 print('* %s [`%s`](%s "show commit") %s %s\n' % (c.date, c.hash[:7], url + '/commit/' + c.hash, initials(c.author), fixup_comment(c.comment, url)), file = file)
     do_cmd(('codespell -w -L od ' + filename).split())

scripts/render.py

@@ -26,7 +26,7 @@ from set_config import *
 from exports import bom_to_parts
 import os
 import openscad
-from tests import do_cmd, update_image, colour_scheme, background
+from tests import do_cmd, update_image, colour_scheme, background, image_size
 from deps import mtime
 from colorama import init
 import json
@@ -95,7 +95,7 @@ def render(target, type):
             render = "--preview" if type == 'stl' or colour != pp1 else "--render"
             tmp_name = tmp_dir + '/' + part[:-4] + '.png'
             dummy_deps_name = tmp_dir + '/tmp.deps' # work around for OpenSCAD issue #3879
-            openscad.run("-o", tmp_name, png_maker_name, colour_scheme, "--projection=p", "--imgsize=4096,4096", cam, render, "--autocenter", "--viewall", "-d", dummy_deps_name)
+            openscad.run("-o", tmp_name, png_maker_name, colour_scheme, "--projection=p", image_size, cam, render, "--autocenter", "--viewall", "-d", dummy_deps_name)
             do_cmd(("magick "+ tmp_name + " -trim -resize 280x280 -background %s -gravity Center -extent 280x280 -bordercolor %s -border 10 %s"
                     % (background, background, tmp_name)).split())
             update_image(tmp_name, png_name)

scripts/set_config.py

@@ -57,13 +57,13 @@ def set_config(target, usage = None):
         sys.exit(1)
 
     if not targets:
-        print("Not a muli-configuration project (no config_<target>.scad files found)")
+        print("Not a multi-configuration project (no config_<target>.scad files found)")
         if usage:
             usage()
         sys.exit(1)
 
     if not target in targets:
-        print(target + " is not a configuration, avaliable configurations are: " + valid_targets_string())
+        print(target + " is not a configuration, available configurations are: " + valid_targets_string())
         if usage:
             usage()
         sys.exit(1)

scripts/tests.py

@@ -36,8 +36,7 @@ from blurb import *
 from colorama import Fore
 from tmpdir import *
 
-w = 4096
-h = w
+image_size = "--imgsize=4096,4096"
 threshold = 20  # Image comparison allowed number of different pixels
 fuzz = 5       # Image comparison allowed percentage error in pixel value
 
@@ -48,7 +47,12 @@ def do_cmd(cmd, output = sys.stdout):
     for arg in cmd:
         print(arg, end = " ")
     print()
-    return subprocess.call(cmd, stdout = output, stderr = output)
+    t = time.time()
+    rv = subprocess.call(cmd, stdout = output, stderr = output)
+    elapsed = time.time() - t
+    with open("cmd_times.txt", 'at') as f:
+        print(cmd[0], cmd[-1], elapsed, file = f)
+    return rv
 
 def compare_images(a, b, c):
     if not os.path.isfile(b):
@@ -119,7 +123,7 @@ def tests(tests):
         libtest = True
         lib_blurb = scrape_blurb(scad_name)
         if not os.path.isfile(png_name):
-            openscad.run(scad_name, "-o", png_name, colour_scheme, "--projection=p", "--imgsize=%d,%d" % (w, h), "--camera=0,0,0,50,0,340,500", "--autocenter", "--viewall");
+            openscad.run(scad_name, "-o", png_name, colour_scheme, "--projection=p", image_size, "--camera=0,0,0,50,0,340,500", "--autocenter", "--viewall");
             do_cmd(["magick", png_name, "-trim", "-resize", "1280", "-bordercolor", background, "-border", "10", png_name])
     else:
         #
@@ -240,7 +244,7 @@ def tests(tests):
                 print(changed)
                 t = time.time()
                 tmp_name = tmp_dir + '/tmp.png'
-                openscad.run_list([scad_name, "-o", tmp_name] + options.list() + ["-D$bom=2", colour_scheme, "--projection=p", "--imgsize=%d,%d" % (w, h), "--camera=0,0,0,70,0,315,500", "--autocenter", "--viewall", "-d", dname]);
+                openscad.run_list([scad_name, "-o", tmp_name] + options.list() + ["-D$bom=2", colour_scheme, "--projection=p", image_size, "--camera=0,0,0,70,0,315,500", "--autocenter", "--viewall", "-d", dname]);
                 times.add_time(scad_name, t)
                 do_cmd(["magick", tmp_name, "-trim", "-resize", "1000x600", "-bordercolor", background, "-border", "10", tmp_name])
                 update_image(tmp_name, png_name)

scripts/views.py

@@ -25,7 +25,7 @@
 from __future__ import print_function
 from set_config import *
 import openscad
-from tests import do_cmd, update_image, colour_scheme, background
+from tests import do_cmd, update_image, colour_scheme, background, image_size
 import time
 import times
 import options
@@ -223,7 +223,7 @@ def views(target, do_assemblies = None):
                                                 target_def = ['-D$target="%s"' % target] if target else []
                                                 cwd_def = ['-D$cwd="%s"' % os.getcwd().replace('\\', '/')]
                                                 view_def = ['--viewall', '--autocenter'] if not (zoomed & (1 << explode)) else ['--camera=0,0,0,55,0,25,140']
-                                                openscad.run_list(["-o", tmp_name, png_maker_name] + options.list() + target_def + cwd_def + view_def + ["-D$pose=1", "-D$explode=%d" % explode, colour_scheme, "--projection=p", "--imgsize=4096,4096", "-d", dname]);
+                                                openscad.run_list(["-o", tmp_name, png_maker_name] + options.list() + target_def + cwd_def + view_def + ["-D$pose=1", "-D$explode=%d" % explode, colour_scheme, "--projection=p", image_size, "-d", dname]);
                                                 times.add_time(png_name, t)
                                                 do_cmd(["magick", tmp_name, "-trim", "-resize", "1004x1004", "-bordercolor", background, "-border", "10", tmp_name])
                                                 update_image(tmp_name, png_name)

tests/PCB.scad

@@ -61,6 +61,7 @@ test_pcb = ["test_pcb", "Test PCB",
     [
         [ 20, -5,  180, "trimpot10"],
         [ 20, -15,  90, "trimpot10", true],
+        [  7,  2,   90, "smd_led", LED1206, "blue"],
         [ 10,  2,   90, "smd_led", LED0805, "red"],
         [ 13,  2,   90, "smd_led", LED0603, "orange"],
         [ 16,  2,   90, "smd_res", RES1206, "1K"],
@@ -85,16 +86,18 @@ test_pcb = ["test_pcb", "Test PCB",
         [  8, 105, 180, "usb_Ax2"],
         [  7,  85, 180, "molex_usb_Ax1"],
         [ 8.5,125, 180, "molex_usb_Ax2"],
-        [  3, 140, 180, "usb_uA"],
-        [  8, 155, 180, "usb_B"],
+        [  3, 138, 180, "usb_uA"],
+        [ 4.6,148, 180, "usb_miniA"],
+        [ 3.7,158, 180, "usb_C"],
+        [  8, 170, 180, "usb_B"],
+        [  6, 184, 180, "uSD", [12, 11.5, 1.4]],
+        [  8, 196, 180, "jack"],
+        [  6, 206, 180, "barrel_jack"],
+        [  5, 220, 180, "hdmi"],
+        [  3, 235, 180, "mini_hdmi"],
+        [ 38, 190, -90, "text", 25, 4, "Silkscreen", "Liberation Sans:style=Bold"],
         [ 25, 200,   0, "buzzer", 4.5, 8.5],
         [ 25, 218,   0, "buzzer"],
-        [ 38, 190, -90, "text", 25, 4, "Silkscreen", "Liberation Sans:style=Bold"],
-        [  8, 190, 180, "jack"],
-        [  6, 200, 180, "barrel_jack"],
-        [  5, 218, 180, "hdmi"],
-        [  3, 235, 180, "mini_hdmi"],
-        [  6, 175, 180, "uSD", [12, 11.5, 1.4]],
 
         [ 65,   9,   0, "link", inch(0.4)],
         [ 65,  12,   0, "ax_res", res1_8, 1000],
@@ -112,7 +115,6 @@ test_pcb = ["test_pcb", "Test PCB",
         [ 60,   3,   0, "flex"],
         [ 50,  15, -90, "flat_flex"],
         [ 40,  15, -90, "flat_flex", true],
-        [ 60,  35,   0, "D_plug", DCONN9],
 
         [ 50,  50,   0, "molex_hdr", 2],
         [ 50,  60,   0, "jst_xh", 2],
@@ -137,8 +139,11 @@ test_pcb = ["test_pcb", "Test PCB",
         [ 55, 170,   0, "button_4p5mm"],
         [ 50, 185,   0, "microswitch", small_microswitch],
         [ 52, 200,   0, "pcb", 11, TMC2130 ],
-        [ 80, 200,   0, "pdip", 24, "27C32", true, inch(0.6) ],
-        [ 80, 170,   0, "pdip", 8, "NE555" ],
+        [ 80, 210,   0, "pdip", 24, "27C32", true, inch(0.6) ],
+        [ 80, 180,   0, "pdip", 8, "NE555" ],
+        [ 80, 166, -90, "smd_soic", SOIC18, "PIC18F88"],
+        [ 71, 166, -90, "smd_soic", SOIC16, "ICL323"],
+        [ 64, 166, -90, "smd_soic", SOIC8, "M34063"],
         [ 80, 150,   0, "chip", 10, 5, 1, grey(20)],
 
         [ 52, 206,   0, "2p54socket", 8, 1 ],
@@ -146,7 +151,8 @@ test_pcb = ["test_pcb", "Test PCB",
         [ 50, 220,   0, "standoff",  5, 4.5, 12.5, 2.54],
         [ 50, 240,   0, "potentiometer"],
         [ 75, 240,   0, "potentiometer", KY_040_encoder, 8],
-        [ 30,  85,   -90, "7seg", WT5011BSR, 2],
+        [ 30,  85, -90, "7seg", WT5011BSR, 2],
+        [ 30, 55, -90, "D_plug", DCONN9],
     ],
     // accessories
     []

tests/SMDs.scad

@@ -38,6 +38,12 @@ module smds() {
         layout([for(s = smd_sots) smd_sot_size(s).x], 1)
             let(s = smd_sots[$i])
                 smd_sot(s, ["2N7000", "FZT851"][$i]);
+
+    translate([0, 20])
+        layout([for(s = smd_soics) smd_soic_size(s).x], 1)
+            let(s = smd_soics[$i])
+                smd_soic(s, s[0]);
+
 }
 
 if($preview)

tests/inserts.scad

@@ -24,9 +24,15 @@ include <../vitamins/inserts.scad>
 module inserts() {
 
     for(i = [0: len(inserts) -1])
-        translate([10 * i, 0])
+        translate([10 * i, 5])
             insert(inserts[i]);
 
+    for(i = [0: len(short_inserts) -1])
+        translate([10 * i, -5])
+            insert(short_inserts[i]);
+
+
+
     stl_colour(pp1_colour)
         translate([len(inserts) * 10, 0]) {
             insert_lug(inserts[0], 2, 1);

tests/leadnuts.scad

@@ -25,6 +25,26 @@ module leadnuts()
     layout([for(n = leadnuts) leadnut_flange_dia(n)], 5)
         leadnut(leadnuts[$i]);
 
+module leadnuthousings()
+    layout([for(n = leadnuthousings) leadnuthousing_width(n)], 5) {
+        rotate([0,0,270]) {
+            leadnuthousing(leadnuthousings[$i]);
+            explode(15)
+                leadnuthousing_nut_position(leadnuthousings[$i])
+                    leadnut(leadnuthousing_nut(leadnuthousings[$i]));
+            explode(17 + leadnuthousing_nut_screw_length(leadnuthousings[$i]))
+                translate_z(leadnuthousing_height(leadnuthousings[$i])/2)
+                    leadnuthousing_nut_screw_positions(leadnuthousings[$i])
+                        screw(leadnut_screw(
+                            leadnuthousing_nut(leadnuthousings[$i])),
+                            leadnuthousing_nut_screw_length(leadnuthousings[$i])
+                        );
+        }
+    }
+
 if($preview)
-    let($show_threads = true)
+    let($show_threads = true) {
         leadnuts();
+        translate([0,50,0])
+            leadnuthousings();
+    }

tests/screw_knob.scad

@@ -17,20 +17,26 @@
 // If not, see <https://www.gnu.org/licenses/>.
 //
 include <../core.scad>
+use <../utils/layout.scad>
 
 use <../printed/screw_knob.scad>
 
-screws = [M3_hex_screw, M4_hex_screw];
+knobs = [
+    M3_hex_screw,
+    M4_hex_screw,
+    screw_knob(M5_hex_screw, flange_r = 12, flange_t = 6, stem_h = 2, waves = 6),
+    screw_knob(M6_hex_screw, flange_r = 15, flange_t = 6, solid = false, stem_h = 2, waves = 6, wall = 1.6, fluted = true),
+];
 
-module do_screw_knob(screw)
+module do_screw_knob(knob) {
     if($preview)
-        screw_knob_assembly(screw, 16);
+        screw_knob_assembly(knob, 16);
     else
-        screw_knob(screw);
+        screw_knob(knob);
+}
 
 module screw_knobs()
-    for(i = [0 : len(screws) - 1])
-        translate([i * 30, 0])
-            do_screw_knob(screws[i]);
+    layout([for(k = knobs) 2 * screw_knob_flange_r(k)], 10)
+        do_screw_knob(knobs[$i]);
 
 screw_knobs();

tests/stepper_motors.scad

@@ -16,18 +16,28 @@
 // You should have received a copy of the GNU General Public License along with NopSCADlib.
 // If not, see <https://www.gnu.org/licenses/>.
 //
+show_connection_pos = false;
+
+/* [Hidden] */
 include <../core.scad>
 include <../vitamins/stepper_motors.scad>
 
 use <../utils/layout.scad>
 
+has_connector = [NEMA17_27, NEMA17_40, NEMA17_40L280, NEMA8_30, NEMA8_30BH];
+
 module stepper_motors()
     layout([for(s = stepper_motors) NEMA_width(s)], 5, no_offset = false) let(m = stepper_motors[$i]) {
-        rotate(180)
-            NEMA(m, 0, in([NEMA17_27, NEMA17_40, NEMA17_40L280, NEMA8_30, NEMA8_30BH], m));
+        rotate(180) {
+            NEMA(m, 0, in(has_connector, m) ? true : show_connection_pos ? undef : false);
 
-        translate_z(4)
-            NEMA_screws(m, M3_pan_screw, n = $i - 2, earth = $i > 6 ? undef : $i - 3);
+            if(show_connection_pos)
+                translate(NEMA_connection_pos(m, in(has_connector, m)))
+                    sphere();
+
+            translate_z(4)
+                NEMA_screws(m, M3_pan_screw, n = $i - 2, earth = $i > 6 ? undef : $i - 3);
+        }
     }
 
 if($preview)

utils/core/clip.scad

@@ -41,8 +41,8 @@ module box(xmin, ymin, zmin, xmax, ymax, zmax) //! Construct a box given its bou
          [0,2,3,1]]  // left
     );
 
-module clip(xmin = -inf, ymin = -inf, zmin = -inf, xmax = inf, ymax = inf, zmax = inf) //! Clip child to specified boundaries
-    render() intersection() {
+module clip(xmin = -inf, ymin = -inf, zmin = -inf, xmax = inf, ymax = inf, zmax = inf, convexity = 1) //! Clip child to specified boundaries
+    render(convexity = convexity) intersection() {
         children();
 
         box(xmin, ymin, zmin, xmax, ymax, zmax);

utils/core/global.scad

@@ -19,6 +19,7 @@
 
 //
 //! Global constants, functions and modules. This file is used directly or indirectly in every scad file.
+//! See [global_defs.scad](../../global_defs.scad) for a list of global constants.
 //
 include <../../global_defs.scad>
 
@@ -38,6 +39,13 @@ function r2sides(r) = $fn ? $fn : ceil(max(min(360/ $fa, r * 2 * PI / $fs), 5));
 function r2sides4n(r) = floor((r2sides(r) + 3) / 4) * 4;                            //! Round up the number of sides to a multiple of 4 to ensure points land on all axes
 function limit(x, min, max) = max(min(x, max), min);                                //! Force x in range min <= x <= max
 
+function round_to_layer(z) =  //! Round up to a layer boundary using `layer_height0` for the first layer and `layer_height` for subsequent layers.
+    z <= 0 ? 0 :
+    z <= layer_height0 ? layer_height0 :
+    ceil((z -layer_height0) / layer_height) * layer_height + layer_height0;
+
+function grey(n) = [0.01, 0.01, 0.01] * n;                                          //! Generate a shade of grey to pass to color().
+
 module translate_z(z)                                                               //! Shortcut for Z only translations
     translate([0, 0, z]) children();
 

utils/rounded_polygon.scad

@@ -33,7 +33,7 @@ function circle_tangent(p1, p2) = //! Compute the clockwise tangent between two
         dx = p2.x - p1.x,
         dy = p2.y - p1.y,
         d = sqrt(dx * dx + dy * dy),
-        theta = atan2(dy, dx) + acos((r1 - r2) / d),
+        theta = assert(d, str("points conicident ", p1)) atan2(dy, dx) + acos((r1 - r2) / d),
         v = [cos(theta), sin(theta)]
     )[ p1 + r1 * v, p2 + r2 * v ];
 
@@ -72,24 +72,52 @@ function rounded_polygon_length(points, tangents) = //! Calculate the length giv
         arcs = rounded_polygon_arcs(points, tangents)
     ) sumv( map( concat(tangents, arcs), function(e) e[2] ) );
 
+function line_intersection(l0, l1) = //! Return the point where two 2D lines intersect or undef if they don't.
+    assert(Len(l0) == 2 && Len(l1) == 2, "Two 2D vectors expected")
+    let(
+        p0 = l0[0], p1 = l0[1], p2 = l1[0], p3 = l1[1],
+        v1 = p1 - p0,
+        v2 = p3 - p2,
+        v3 = p0 - p2,
+        det = v1.x * v2.y - v2.x * v1.y,
+        s = det ? (-v1.y * v3.x + v1.x * v3.y) / det : inf,
+        t = det ? ( v2.x * v3.y - v2.y * v3.x) / det : inf
+    ) s >= 0 && s <= 1 && t >= 0 && t <= 1 ? p0 + t * v1 : undef;
+
 function rounded_polygon(points, _tangents = undef) = //! Return the rounded polygon from the point list, can pass the tangent list to save it being calculated
     let(
         len = len(points),
         tangents = _tangents ? _tangents : rounded_polygon_tangents(points),
         arcs = rounded_polygon_arcs(points, tangents)
-    ) [for(i = [0 : len - 1], last = (i - 1 + len) % len, R = points[i][2]) each [
-        vec2(tangents[last][1]),                        // End of last tangent
-        if(R)                                               // If rounded
-            let(r = abs(R),                                     // Get radius
-                n = r2sides4n(r),                               // Decide number of vertices
-                step = 360 / n,                                 // Angular step
-                arc = arcs[i],                                  // Get corner arc details
-                start = ceil(arc[1] / step + eps),              // Starting index
-                end = floor((arc[0] + arc[1]) / step - eps),    // Ending index
-                c = vec2(points[i])                             // Centre of arc
-            ) for(j = R > 0 ? [end : -1 : start] : [start : 1 : end], a = j * step) c + r * [cos(a), sin(a)], // Points on the arc
-        vec2(tangents[i][0])]                           // Start of next tangent
+    ) [for(i = [0 : len - 1], last = (i - 1 + len) % len)
+        let(
+            t0 = vec2(tangents[last]),
+            t1 = vec2(tangents[i]),
+            p = line_intersection(t0, t1),                              // Do the tangents cross?
+            R = points[i][2]
+        )
+        if(!is_undef(p))                                                // Tangents intersect, so just add the intersection point
+            p
+        else
+            each [                                                      // Else link the two tangent ends with an arc
+                t0[1],                                                  // End of last tangent
+                if(R)                                                   // If rounded
+                    let(r = abs(R),                                     // Get radius
+                        n = r2sides4n(r),                               // Decide number of vertices
+                        step = 360 / n,                                 // Angular step
+                        arc = arcs[i],                                  // Get corner arc details
+                        start = ceil(arc[1] / step + eps),              // Starting index
+                        end = floor((arc[0] + arc[1]) / step - eps),    // Ending index
+                        c = vec2(points[i])                             // Centre of arc
+                    ) for(j = R > 0 ? [end : -1 : start] : [start : 1 : end], a = j * step)
+                        c + r * [cos(a), sin(a)],                       // Points on the arc
+                if(R)
+                    t1[0],                                              // Start of next tangent
+            ]
        ];
 
+function offset(points, offset) =                                       //! Offset a 2D polygon, breaks for concave shapes and negative offsets if the offset is more than half the smallest feature size.
+    rounded_polygon([for(p = points) [p.x, p.y, offset]]);
+
 module rounded_polygon(points, _tangents = undef) //! Draw the rounded polygon from the point list, can pass the tangent list to save it being calculated
     polygon(rounded_polygon(points, _tangents), convexity = len(points));

utils/sweep.scad

@@ -127,8 +127,8 @@ function sweep_transforms(path, loop = false, twist = 0) =
                          i = i + 1,
                          rot = i < len ? rotate_from_to(tangents[i - 1], tangents[i]) * rot : undef) rot],
 
-        missmatch = loop ? calculate_twist(rotations[0], rotations[last]) : 0,
-        rotation = missmatch + twist
+        mismatch = loop ? calculate_twist(rotations[0], rotations[last]) : 0,
+        rotation = mismatch + twist
     )
     [for(i = [0 : last])
         let(za = rotation * lengths[i] / length)
@@ -239,7 +239,7 @@ function segmented_path(path, min_segment) = [  //! Add points to a path to enfo
             path[len(path) - 1]
 ];
 
-function spiral_paths(path, n, r, twists, start_angle) = let( //! Create a new paths which sprial around the given path. Use for making twisted cables
+function spiral_paths(path, n, r, twists, start_angle) = let( //! Create a new paths which spiral around the given path. Use for making twisted cables
         segment = twists ? path_length(path) / twists / r2sides(2 * r) : inf,
         transforms = sweep_transforms(segmented_path(path, segment), twist = 360 * twists)
     ) [for(i = [0 : n - 1]) let(initial = [r, 0, 0, 1] * rotate(start_angle + i * 360 / n)) [for(t = transforms) initial * t]];

vitamins/batteries.scad

@@ -44,7 +44,8 @@ AACELL    = ["AACELL",    "Cell AA",                                  50.5, 14.5
 AAACELL   = ["AAACELL",   "Cell AAA",                                 44.5, 10.5,  8, 3.8, 0.8, "grey",           [],                      0, bcontact];
 CCELL     = ["CCELL",     "Cell C",                                   50,   26.2, 20, 7.5, 1.5, "brown",          [],                      0, bcontact];
 DCELL     = ["DCELL",     "Cell D",                                   61.5, 34.2, 22, 8.2, 2.4, "brown",          [],                      0, bcontact];
+A23CELL   = ["A23CELL",   "Cell A23 12v",                             28.5, 10.3, 5.2,5.2, 1.0, "silver",         [],                      0, bcontact];
 
-batteries = [AAACELL, AACELL, CCELL, DCELL, LUMINTOP, S25R18650];
+batteries = [AAACELL, AACELL, CCELL, DCELL, LUMINTOP, S25R18650, A23CELL];
 
 use <battery.scad>

vitamins/bldc_motor.scad

@@ -20,11 +20,11 @@
 //
 //!  Brushless DC electric motor
 //
-include <NopSCADlib/core.scad>
+include <../utils/core/core.scad>
 
-use <NopSCADlib/vitamins/rod.scad>
-use <NopSCADlib/utils/thread.scad>
-use <NopSCADlib/utils/tube.scad>
+use <rod.scad>
+use <../utils/thread.scad>
+use <../utils/tube.scad>
 
 
 function BLDC_diameter(type)                    = type[1]; //! Diameter of motor

vitamins/extrusions.scad

@@ -20,7 +20,7 @@
 // Extrusion
 //
 //                  W   H     d1     d2  sq    cw   cwi   t    st   f    recess
-E1515  = [ "E1515", 15, 15,  -2.5,    0, 5.7,  3.4,  5.7, 1.1, 1.1, 0.5, false ];
+E1515  = [ "E1515", 15, 15,  -3.3,    0, 5.5,  6.2,  9.5, 1.0, 0.9, 0.5, false ];
 E2020  = [ "E2020", 20, 20,  -4.2,   -3,   8,    6, 12.0,   2,   2, 1,   false ];
 E2020t = [ "E2020t",20, 20,  -5.0,   -3, 7.8,  6.2, 11.0, 1.8, 1.5, 1.5, [7.2, 0.5] ];
 E2040  = [ "E2040", 20, 40,  -4.2,   -3,   8,    6, 12.0,   2,   2, 1,   false ];

vitamins/insert.scad

@@ -33,7 +33,7 @@ function insert_ring1_h(type)        = type[6];     //! Height of the top and mi
 function insert_ring2_d(type)        = type[7];     //! Diameter of the middle ring
 function insert_ring3_d(type)        = type[8];     //! Diameter of the bottom ring
 
-function insert_hole_length(type) = round_to_layer(insert_length(type));
+function insert_hole_length(type) = round_to_layer(insert_length(type)); //! Length of the insert rounded to layer height
 
 function insert_nose_length(type, d) = let( //! The length before the second ring.
         length = insert_length(type),
@@ -53,7 +53,7 @@ module insert(type) { //! Draw specified insert
     ring2_h = ring1_h + chamfer1;
     gap = (length - ring1_h - ring2_h - chamfer2) / 3;
 
-    vitamin(str("insert(", type[0], "): Heatfit insert M", insert_screw_diameter(type)));
+    vitamin(str("insert(", type[0], "): Heatfit insert M", insert_screw_diameter(type), " x ", length, "mm"));
     $fn = 64;
     thread_d = insert_screw_diameter(type);
     explode(20, offset = [0, 0, -5]) translate_z(eps) vflip() {

vitamins/inserts.scad

@@ -34,6 +34,13 @@ F1BM2p5 = [ "F1BM2p5", 5.8, 4.6, 4.0, 2.5, 3.65, 1.6, 4.4, 3.9 ];
 F1BM3   = [ "F1BM3",   5.8, 4.6, 4.0, 3,   3.65, 1.6, 4.4, 3.9 ];
 F1BM4   = [ "F1BM4",   8.2, 6.3, 5.6, 4,   5.15, 2.3, 6.0, 5.55 ];
 
-inserts = [ F1BM2, F1BM2p5, F1BM3, F1BM4 ];
+CNCKM2p5 =[ "CNCKM2p5",4.0, 4.6, 4.0, 2.5, 3.65, 1.0, 4.4, 3.9 ];
+CNCKM3 =  [ "CNCKM3",  3.0, 4.6, 4.0, 3,   3.65, 0.7, 4.4, 3.9 ];
+CNCKM4 =  [ "CNCKM4",  4.0, 6.3, 5.6, 4,   5.15, 1.0, 6.0, 5.55];
+CNCKM5 =  [ "CNCKM5",  5.8, 7.1, 6.4, 5,   6.0,  1.6, 6.8, 6.33];
+
+
+inserts =       [ F1BM2, F1BM2p5,  F1BM3,  F1BM4,  CNCKM5 ];
+short_inserts = [ F1BM2, CNCKM2p5, CNCKM3, CNCKM4, CNCKM5 ];
 
 use <insert.scad>

vitamins/leadnut.scad

@@ -23,6 +23,7 @@
 include <../utils/core/core.scad>
 use <../utils/tube.scad>
 use <../utils/thread.scad>
+use <../vitamins/screw.scad>
 
 function leadnut_bore(type)          = type[2];     //! Thread size
 function leadnut_od(type)            = type[3];     //! Outer diameter of the shank
@@ -41,6 +42,17 @@ function leadnut_colour(type)        = type[15];    //! The colour
 
 function leadnut_shank(type)         = leadnut_height(type) - leadnut_flange_t(type) - leadnut_flange_offset(type); //! The length of the shank below the flange
 
+function leadnuthousing_length(type)            = type[2];  //! Length of housing
+function leadnuthousing_width(type)             = type[3];  //! Width of housing
+function leadnuthousing_height(type)            = type[4];  //! Height of housing
+function leadnuthousing_hole_pos(type)          = type[5];  //! Offset from center for nut hole
+function leadnuthousing_screw_dist_l(type)      = type[6];  //! Distance between mounting holes length
+function leadnuthousing_screw_dist_w(type)      = type[7];  //! Distance between mounting holes width
+function leadnuthousing_mount_screw(type)       = type[8];  //! Mounting screw
+function leadnuthousing_mount_screw_len(type)   = type[9];  //! Mounting screw length
+function leadnuthousing_nut(type)               = type[10]; //! Nut type this is suitable for
+function leadnuthousing_nut_screw_length(type)  = type[11]; //! Length of mounting screw for nut
+
 module leadnut_screw_positions(type) { //! Position children at the screw holes
     holes = leadnut_holes(type);
     flat = leadnut_flat(type);
@@ -87,3 +99,58 @@ module leadnut(type) { //! Draw specified leadnut
                     }
         }
 }
+
+module leadnuthousing_screw_positions(type) { //! Get screw positions to mount the leadnut housing
+    for(p = [[-1,-1], [1,-1], [1,1], [-1,1]])
+        translate([p.x * leadnuthousing_screw_dist_l(type)/2, p.y * leadnuthousing_screw_dist_w(type)/2, 0])
+            children();
+}
+module leadnuthousing_nut_position(type) { //! The position of the nut may be off-center, use this to get the position
+    translate([leadnuthousing_hole_pos(type),0, leadnuthousing_height(type)/2])
+        children();
+}
+
+module leadnuthousing_nut_screw_positions(type) { //! get screw positions to mount the nut to the nut housing
+    translate([leadnuthousing_hole_pos(type),0, 0])
+        leadnut_screw_positions(leadnuthousing_nut(type))
+            children();
+}
+
+module leadnuthousing(type) { //! Nut housing, to connect a lead nut to another object
+    vitamin(str("nuthousing(", type[0], "): ", type[1]));
+
+    leadnut = leadnuthousing_nut(type);
+    screw = leadnut_screw(leadnut);
+    d = screw_radius(screw) * 2;
+    p = metric_coarse_pitch(d);
+    sl = leadnuthousing_nut_screw_length(type);
+    ms = leadnuthousing_mount_screw(type);
+    msl = leadnuthousing_mount_screw_len(type);
+    md = screw_radius (ms) * 2;
+    mp = metric_coarse_pitch(md);
+
+    color("silver")
+        difference() {
+            cube([leadnuthousing_length(type), leadnuthousing_width(type), leadnuthousing_height(type)], center = true);
+            translate([leadnuthousing_hole_pos(type),0,0]) {
+                cylinder(d=leadnut_od(leadnut), h=leadnuthousing_length(type)+2, center=true);
+                translate_z(leadnut_flange_offset(leadnut))
+                    leadnut_screw_positions(leadnut)
+                cylinder(r=screw_radius(leadnut_screw(leadnut)), h=sl+1);
+            }
+
+            rotate([0,90,0])
+                leadnuthousing_screw_positions(type)
+                    cylinder(r=screw_radius(ms), h=msl+1);
+
+        }
+    if(show_threads) {
+        translate([leadnuthousing_hole_pos(type),0,leadnuthousing_height(type)/2 - sl/2 - leadnut_flange_t(leadnut)])
+            leadnut_screw_positions(leadnut)
+                female_metric_thread(d, p, sl, center = true, colour = silver);
+        rotate([0,90,0])
+            translate_z(msl/2)
+                leadnuthousing_screw_positions(type)
+                    female_metric_thread(md, mp, msl, center = true, colour = silver);
+    }
+}

vitamins/leadnuts.scad

@@ -29,5 +29,9 @@ LSN8x8  = ["LSN8x8",  "Leadscrew nut 8 x 8 RobotDigg", 8, 12.75,19, 25.4, 4.1, 0
 SFU1610 = ["SFU1610", "Leadscrew nut for SFU1610",    16, 28, 42.5, 48,    10, 0,   6, 6,   38/2,    M6_cap_screw, 5, 10, 40, "#DFDAC5"];
 
 leadnuts = [LSN8x2, LSN8x8, SFU1610];
+//                                                  L   W   H   Hole    Mounting screws (top)             Nut      Nut mount screw
+//                                                              Pos     Dist L Dist W Type             L            Length
+LNHT8x2 = [ "LNHT8x2", "Lead Screw Nut Housing T8", 30, 34, 30, -1,     20,    24,    M4_cs_cap_screw, 15, LSN8x2,  15 ];
+leadnuthousings = [LNHT8x2];
 
 use <leadnut.scad>

vitamins/nuts.scad

@@ -28,14 +28,14 @@ M5_nut_depth = 4;
 M6_nut_depth = 5;
 M8_nut_depth = 6.5;
 
-//                                      s    r    t    n     w              t                  t
-//                                      c    a    h    y     a              r                  h
-//                                      r    d    i    l     s              a                  r
-//                                      e    i    c    o     h              p                  e
-//                                      w    u    k    c     e                                 d
-//                                           s    n          r              d
-//                                                e    t                    e                  p
-//                                                s    h                    p                  i
+//                                      s    d    t    n     w              t                  t
+//                                      c    i    h    y     a              r                  h
+//                                      r    a    i    l     s              a                  r
+//                                      e    m    c    o     h              p                  e
+//                                      w    e    k    c     e                                 d
+//                                           t    n          r              d
+//                                           e    e    t                    e                  p
+//                                           r    s    h                    p                  i
 //                                                s    k                    t                  t
 //                                                                          h                  c
 //                                                                                             h

vitamins/pcb.scad

@@ -485,6 +485,50 @@ module usb_uA(cutout = false) { //! Draw USB micro A connector
         }
 }
 
+module usb_miniA(cutout = false) { //! Draw USB mini A connector
+    l = 9.2;
+    iw1 = 7.0;
+    iw2 = 6.0;
+    ih1 = 1.05;
+    ih2 = 1.0;
+    h = 4.0;
+    t = 0.4;
+
+    module D() {
+        hull() {
+            translate([-iw1 / 2, h - t - ih1])
+                square([iw1, ih1]);
+
+            translate([-iw2 / 2, t + ih2])
+                square([iw2, eps]);
+
+        }
+        translate([-iw2 / 2, t])
+            square([iw2, ih2]);
+    }
+
+    if(cutout)
+        rotate([90, 0, 90])
+            linear_extrude(100)
+                offset(2 * panel_clearance)
+                    D();
+    else
+        color("silver") rotate([90, 0, 90]) {
+            linear_extrude(l, center = true)
+                difference() {
+                    offset(t)
+                        D();
+
+                    D();
+                }
+
+            translate_z(-l / 2)
+                linear_extrude(1)
+                    offset(t)
+                        D();
+        }
+}
+
 module usb_C(cutout = false) { //! Draw USB C connector
     l = 7.35;
     w = 8.94;
@@ -1046,6 +1090,7 @@ module pcb_component(comp, cutouts = false, angle = undef) { //! Draw pcb compon
         if(show(comp, "usb_A"))         usb_Ax1(cutouts);
         if(show(comp, "usb_Ax2"))       usb_Ax2(cutouts);
         if(show(comp, "usb_uA"))        usb_uA(cutouts);
+        if(show(comp, "usb_miniA"))     usb_miniA(cutouts);
         if(show(comp, "usb_B"))         usb_B(cutouts);
         if(show(comp, "usb_C"))         usb_C(cutouts);
         if(show(comp, "jack"))          jack(cutouts);
@@ -1089,6 +1134,7 @@ module pcb_component(comp, cutouts = false, angle = undef) { //! Draw pcb compon
             if(show(comp, "smd_res"))       smd_resistor(comp[4], comp[5]);
             if(show(comp, "smd_cap"))       smd_capacitor(comp[4], comp[5], param(6, undef));
             if(show(comp, "smd_sot"))       smd_sot(comp[4], comp[5]);
+            if(show(comp, "smd_soic"))      smd_soic(comp[4], comp[5]);
             if(show(comp, "vero_pin"))      vero_pin(param(4, false));
             if(show(comp, "terminal"))      terminal_block(comp[5], comp[4]);
             if(show(comp, "text"))          color("white") linear_extrude(eps) resize([comp[4], comp[5]]) text(comp[6], font = param(7, "Liberation Mono"), valign = "center", halign = "center");

vitamins/pcbs.scad

@@ -885,7 +885,7 @@ ArduinoNano = let(l = 43.18, w = 17.78, pitch = inch(0.6), pins = 15, poffset =
       [l / 2 + poffset, w / 2 - pitch / 2,  0, "-2p54joiner", pins, 1],
       [l / 2 + poffset, w / 2 + pitch / 2,  0, "-2p54joiner", pins, 1],
       [l / 2 + poffset + inch(0.75), w / 2, 0, "2p54header",  2,    3, false, undef, false, false],
-      [1.75, w / 2, 180, "usb_uA" ],
+      [3.1, w / 2, 180, "usb_miniA" ],
       [l / 2 - inch(0.25), w / 2, 45, "chip", 7, 7, 1.3],
       [l / 2 + poffset + inch(0.15), w / 2,    0, "chip", 3.5, 6,   1.8, silver ], // mock button
       [l / 2 + poffset + inch(0.15), w / 2,    0, "chip", 1.3, 2.6, 2.6, grey(90) ], // mock button
@@ -908,9 +908,19 @@ KY_040 = ["KY_040", "KY-040 rotart encoder breakout",
     ],
     []];
 
+L9110S = ["L9110S", "L9110S 2-Channel motor driver module", 29.2, 23, 1.6, 0, 3, 0, "#2140BE", false, [[10.7, 2.3], [10.7, -2.3], [-5.3, 2.3], [-5.3, -2.3] ],
+    [
+        [ -1.3,  11.5,      0, "2p54header", 1, 6],
+        [  16, 9.5      ,   0, "smd_led", LED0805, "red"],
+        for(i = [-1, 1]) [ 4, 5.5*i, 180, "gterm508", 2],
+        for(i = [-1, 1]) [ 17.38, 3*i, 90, "smd_soic", SOIC8, "" ]
+    ],
+    []];
+
+
 tiny_pcbs = [XIAO, MP1584EN, TP4056, ESP_01, LIPO_fuel_gauge];
 
-pcbs = [RAMPSEndstop, KY_040, MT3608, ZC_A0591, ArduinoNano, RPI_Pico, ESP32_DOIT_V1, RPI0, EnviroPlus, ArduinoUno3, ArduinoLeonardo, WD2002SJ, RPI3, RPI4, BTT_RELAY_V1_2, BTT_SKR_MINI_E3_V2_0, BTT_SKR_E3_TURBO, BTT_SKR_V1_4_TURBO, DuetE, Duex5];
+pcbs = [RAMPSEndstop, MT3608, KY_040, L9110S, ZC_A0591, ArduinoNano, RPI_Pico, ESP32_DOIT_V1, RPI0, EnviroPlus, ArduinoUno3, ArduinoLeonardo, WD2002SJ, RPI3, RPI4, BTT_RELAY_V1_2, BTT_SKR_MINI_E3_V2_0, BTT_SKR_E3_TURBO, BTT_SKR_V1_4_TURBO, DuetE, Duex5];
 
 pcbs_not_shown = [Melzi, Duex2, PSU12V1A, Keyes5p1, PI_IO, ExtruderPCB];
 

vitamins/screw.scad

@@ -68,7 +68,7 @@ function screw_shorter_than(x) = x >= 20 ? floor(x / 5) * 5 : //! Returns the le
 
 function screw_length(screw, thickness, washers, insert = false, nyloc = false, nut = false, longer = false) = //! Returns the length of the longest or shortest screw that will got through `thickness` and `washers` and possibly an `insert`, `nut` or `nyloc`
     let(washer = washers ? washers * washer_thickness(screw_washer(screw)) : 0,
-        insert = insert ? insert_length(screw_insert(screw)) : 0,
+        insert = insert ? insert_length(is_list(insert) ? insert : screw_insert(screw)) : 0,
         nut = nut || nyloc ? nut_thickness(screw_nut(screw), nyloc)  : 0,
         total = thickness + washer + insert + nut
        )
@@ -76,10 +76,11 @@ function screw_length(screw, thickness, washers, insert = false, nyloc = false,
 
 function screw_smaller_than(d) = d >= 2.5 && d < 3 ? 2.5 : floor(d); // Largest diameter screw less than or equal to specified diameter
 
-function screw_insert(screw, i = 0) = let(d = screw_radius(screw) * 2)
-     i >= len(inserts) ? undef
-                       : insert_screw_diameter(inserts[i]) == d ? inserts[i]
-                                                                : screw_insert(screw, i + 1);
+function screw_insert(screw, short = false, i = 0) =  //! Find insert to fit specified screw, defaults to longest but can specify the shortest
+    let(d = screw_radius(screw) * 2, list = short ? short_inserts : inserts)
+        i >= len(list) ? undef
+                       : insert_screw_diameter(list[i]) == d ? list[i]
+                                                             : screw_insert(screw, short, i + 1);
 
 module screw(type, length, hob_point = 0, nylon = false) { //! Draw specified screw, optionally hobbed or nylon
     description = str("Screw ", nylon ? "Nylon " : "", type[1], length < 10 ? " x  " : " x ", length, "mm", hob_point ? str(", hobbed at ", hob_point) : "");

vitamins/shaft_coupling.scad

@@ -26,6 +26,7 @@ function sc_length(type)       = type[1]; //! Coupling length
 function sc_diameter(type)     = type[2]; //! Coupling outer diameter
 function sc_diameter1(type)    = type[3]; //! Diameter of smaller shaft
 function sc_diameter2(type)    = type[4]; //! Diameter of larger shaft
+function sc_flexible(type)     = type[5]; //! Flexible coupling
 
 module shaft_coupling(type, colour = "silver") { //! Draw the shaft coupling
     vitamin(str("shaft_coupling(", type[0], "): Shaft coupling ", type[0]));
@@ -34,6 +35,7 @@ module shaft_coupling(type, colour = "silver") { //! Draw the shaft coupling
     radius = sc_diameter(type) / 2;
     r1 = sc_diameter1(type) / 2;
     r2 = sc_diameter2(type) / 2;
+    flexible = is_undef(sc_flexible(type)) ? false : sc_flexible(type);
 
     grub_length = 3;
     module grub_screw_positions() {
@@ -54,6 +56,11 @@ module shaft_coupling(type, colour = "silver") { //! Draw the shaft coupling
 
                 tube(radius, r2, length / 2, false);
             }
+            if (flexible) {
+                linear_extrude(length/3, center=true, convexity = 20, twist = -5 * 360)
+                    translate([r1,0,0])
+                       square(radius-r1,1); 
+            }
             grub_screw_positions()
                 rotate([180, 0, 0])
                     cylinder(r = screw_radius(M3_grub_screw), h = 5);

vitamins/shaft_couplings.scad

@@ -21,9 +21,9 @@
 //! Shaft couplings
 //
 
-//                                   L   D        d1   d2
-SC_5x8_rigid  = [ "SC_5x8_rigid",    25, 12.5,    5,   8 ];
-
-shaft_couplings = [SC_5x8_rigid];
+//                                   L   D        d1   d2 flex?
+SC_5x8_rigid  = [ "SC_5x8_rigid",    25, 12.5,    5,   8, false ];
+SC_6x8_flex   = [ "SC_6x8_flex",     25, 19,      6,   8, true ];
+shaft_couplings = [SC_5x8_rigid, SC_6x8_flex];
 
 use <shaft_coupling.scad>

vitamins/smd.scad

@@ -178,3 +178,53 @@ module smd_sot(type, value) { //! Draw an SMD transistor
                     text(value, halign = "center", valign = "center");
 
 }
+
+function smd_soic_size(type)       = type[1];    //! Body length, width and height
+function smd_soic_z(type)          = type[2];    //! Height above PCB surface
+function smd_soic_lead_z(type)     = type[3];    //! Top of lead frame from top
+function smd_soic_lead_pitch(type) = type[4];    //! Lead pitch
+function smd_soic_lead_span(type)  = type[5];    //! Total span of leads
+function smd_soic_lead_size(type)  = type[6];    //! Lead width, foot depth, lead thickness
+
+module smd_soic(type, value) { //! Draw an SMD SOIC
+    vitamin(str("smd_soic(", type[0], "): ", type[0], " package ", value));
+
+    size = smd_soic_size(type);
+    z0 = smd_soic_z(type);
+    z2 = z0 + size.z;
+    z1 = z2 - smd_soic_lead_z(type);
+    slant = 5;                              //! 5 degree body draft angle
+    pitch = smd_soic_lead_pitch(type);
+    span = (smd_soic_lead_span(type) / 2);
+    leads = floor(size.x / pitch) + 1;
+    ls = smd_soic_lead_size(type);
+
+    r = ls.z;
+    gullwing = rounded_path([[0, 0, ls.z / 2], [0, ls.y - ls.z, ls.z / 2], r, [0, ls.y -ls.z + z1 - ls.z, z1 - ls.z / 2], r, [0, span / 2, z1 - ls.z / 2]], $fn = 32);
+
+    color(grey(20))
+        hull()
+            for(z = [z0, z1, z2], inset = abs(z - z1) * tan(slant))
+                translate_z(z)
+                    cube([size.x - 2 * inset, size.y - 2 * inset, eps], center = true);
+
+    color(silver) {
+        for(i = [0 : leads - 1]) {
+            translate([i * pitch - size.x / 2 + (size.x - (leads - 1) * pitch) / 2, -span])
+                sweep(gullwing, rectangle_points(ls.x, ls.z));
+
+        rotate(180)
+            translate([0, -span / 2])
+                translate([i * pitch - size.x / 2 + (size.x - (leads - 1) * pitch) / 2, -span / 2])
+                    sweep(gullwing, rectangle_points(ls.x, ls.z));
+        }
+
+    }
+
+    color("white")
+        translate_z(z0 + size.z)
+            linear_extrude(eps)
+                resize([size.x * 0.9, size.y / 2])
+                    text(value, halign = "center", valign = "center");
+
+}

vitamins/smds.scad

@@ -23,8 +23,9 @@
 
 LED0603 = ["LED0603", [1.6, 0.8,  0.18], [1.0, 0.8,  0.42]];
 LED0805 = ["LED0805", [2.0, 1.25, 0.46], [1.4, 1.25, 0.54]];
+LED1206 = ["LED1206", [3.2, 1.6, 0.5], [2.0, 1.6, .6]];
 
-smd_leds = [LED0603, LED0805];
+smd_leds = [LED0603, LED0805, LED1206];
 
 RES0603 = ["RES0603", [1.6, 0.8, 0.45], 0.3, 1/10];
 RES0805 = ["RES0805", [2.0, 1.2, 0.45], 0.4, 1/8];
@@ -43,4 +44,10 @@ SOT223 = ["SOT223", [6.5, 3.5, 1.6], 0.05, 0.89, 2.3, 7.0, [0.7, 0.95, 0.25], 3]
 
 smd_sots = [SOT23, SOT223];
 
+SOIC8  = ["SOIC8",  [4.90, 3.90, 1.25], 0.10, 0.66, 1.27, 6.00, [0.31, .50, 0.20]];
+SOIC16 = ["SOIC16", [9.90, 3.90, 1.25], 0.10, 0.66, 1.27, 6.00, [0.31, .50, 0.20]];
+SOIC18 = ["SOIC18", [11.40, 7.50, 2.00], 0.10, 1.20, 1.27, 10.30, [0.31, .50, 0.20]];
+
+smd_soics = [SOIC8, SOIC16, SOIC18];
+
 use <smd.scad>

vitamins/stepper_motor.scad

@@ -51,6 +51,18 @@ stepper_body_colour = grey(20);
 stepper_cap_colour  = grey(50);
 stepper_machined_colour = grey(90);
 
+function NEMA_connection_pos(type, jst_connector = false) = let( //! Position of the wires or the connector
+        side = NEMA_width(type),
+        length = NEMA_length(type),
+        cap = NEMA_cap_heights(type)[1],
+        hdr = NEMA_end_connector(type) ? jst_zh_header : jst_ph_header,
+        socket_size = hdr_box_size(hdr),
+        end_conn_inset = socket_size.y - 2
+    )
+    jst_connector ? NEMA_end_connector(type) ? [0, side / 2 + hdr_y_offset(hdr) + socket_size.y / 2 - end_conn_inset, -length]
+                                             : [0, side / 2 + socket_size.z,  hdr_y_offset(hdr) - socket_size.y / 2 - length + cap]
+                  : [0, side / 2, -length + cap / 2];
+
 module NEMA_outline(type) //! 2D outline
     intersection() {
         side = NEMA_width(type);
@@ -185,14 +197,14 @@ module NEMA(type, shaft_angle = 0, jst_connector = false) { //! Draw specified N
                 not_on_bom()
                     leadscrew(shaft_rad * 2, shaft.x + length + shaft2, shaft.y, shaft.z, center = false);
 
-    if(!jst_connector)
+    if(jst_connector == false)
         translate([0, side / 2, -length + cap / 2])
             rotate([90, 0, 0])
                 for(i = [0 : 3])
                     rotate(225 + i * 90)
-                        color(["red", "blue","green","black"][i])
-                            translate([1, 0, 0])
-                                cylinder(r = 1.5 / 2, h = 12, center = true);
+                        color(["red", "green", "black", "blue"][i])
+                            translate([1.48 / sqrt(2), 0, 0])
+                                cylinder(d = 1.48, h = 12, center = true);
 }
 
 module NEMA_screw_positions(type, n = 4) { //! Positions children at the screw holes

vitamins/veroboard.scad

@@ -41,7 +41,7 @@ function vero_track_width(type)    = vero_pitch(type) * 0.8; //! The width of th
 function vero_length(type) = vero_holes(type) * vero_pitch(type); //! Length of the board
 function vero_width(type) = vero_strips(type) * vero_pitch(type); //! Width of the board
 
-function vero(name, assembly, holes, strips, pitch = inch(0.1), fr4 = false, screw = M3_cap_screw, mounting_holes = [], breaks = [], no_tracks = [], components = [], joints = []) = //! Constructor
+function vero(name, assembly, holes, strips, pitch = 2.54, fr4 = false, screw = M3_cap_screw, mounting_holes = [], breaks = [], no_tracks = [], components = [], joints = []) = //! Constructor
     [ name, assembly, holes, strips, pitch, fr4, screw, mounting_holes, breaks, no_tracks, components, joints ];
 
 function vero_size(type) = [vero_length(type), vero_width(type), vero_thickness(type)]; //! Board size
@@ -89,7 +89,7 @@ module veroboard(type) { //! Draw specified veroboard with missing tracks and tr
     tc = vero_fr4(type) ? "silver" : copper;
     no_track = vero_no_track(type);
 
-    vitamin(str("veroboard(", type[0], "): Veroboard ", holes, " holes x ", strips, "strips"));
+    vitamin(str("veroboard(", type[0], "): Veroboard ", holes, " holes x ", strips, " strips"));
 
     color(colour) linear_extrude(vero_thickness(type))
         difference() {