Printed corner blocks now have a short_insert option.

screw_insert() now takes a short flag.
screw_length() can now be passed an insert object.

.gitignore

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

CHANGELOG.md

@@ -3,6 +3,369 @@
 This changelog is generated by `changelog.py` using manually added semantic version tags to classify commits as breaking changes, additions or fixes.
 
 
+### [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.
+
+*   2022-02-24 [`c0d9067`](https://github.com/nophead/NopSCADlib/commit/c0d9067b740fc5ea4a41e696c88613a284685118 "show commit") [M.B.](# "Martin Budden") Fixed typos.
+
+*   2022-02-25 [`a30aff9`](https://github.com/nophead/NopSCADlib/commit/a30aff9613f51092bbad7052bfe1194a61557efc "show commit") [C.P.](# "Chris Palmer") Fixed missing brackets for sheets with chamfered corners.
+
+### [v20.1.0](https://github.com/nophead/NopSCADlib/releases/tag/v20.1.0 "show release") Additions [...](https://github.com/nophead/NopSCADlib/compare/v20.0.1...v20.1.0 "diff with v20.0.1")
+*   2022-02-23 [`f173284`](https://github.com/nophead/NopSCADlib/commit/f173284709acdbd32de21f0d27cb3ab10b42eb2a "show commit") [C.P.](# "Chris Palmer") Can now inhibit exploded lines for issue [#220](https://github.com/nophead/NopSCADlib/issues/220 "show issue").
+
+#### [v20.0.1](https://github.com/nophead/NopSCADlib/releases/tag/v20.0.1 "show release") Fixes [...](https://github.com/nophead/NopSCADlib/compare/v20.0.0...v20.0.1 "diff with v20.0.0")
+*   2022-02-23 [`0206b2e`](https://github.com/nophead/NopSCADlib/commit/0206b2e868119b3b5fdea6111839bf5055eae438 "show commit") [C.P.](# "Chris Palmer") Updated images.
+
+*   2022-02-03 [`1ac5a6f`](https://github.com/nophead/NopSCADlib/commit/1ac5a6f6cbe518646f19c4372a2393eb2e020a18 "show commit") [M.B.](# "Martin Budden") Made hard washers slightly lighter.
+This means they can be distinguished from bolts when viewed from directly
+above.
+
+## [v20.0.0](https://github.com/nophead/NopSCADlib/releases/tag/v20.0.0 "show release") Breaking Changes [...](https://github.com/nophead/NopSCADlib/compare/v19.21.0...v20.0.0 "diff with v19.21.0")
+*   2022-02-23 [`f8d17c6`](https://github.com/nophead/NopSCADlib/commit/f8d17c6f1615b9ff9b615ad2947c4b0119bf7597 "show commit") [C.P.](# "Chris Palmer") Updated readme.
+
+*   2022-02-22 [`662db2b`](https://github.com/nophead/NopSCADlib/commit/662db2bd4103dbeb4265c148d5f7e31c98d5dae2 "show commit") [M.B.](# "Martin Budden") Improved stepper motor naming convention.
+
+### [v19.21.0](https://github.com/nophead/NopSCADlib/releases/tag/v19.21.0 "show release") Additions [...](https://github.com/nophead/NopSCADlib/compare/v19.20.0...v19.21.0 "diff with v19.20.0")
+*   2022-02-23 [`42fccc1`](https://github.com/nophead/NopSCADlib/commit/42fccc1afbf28ef6a94f0480d1306e5bc2e48e46 "show commit") [C.P.](# "Chris Palmer") Added `bezier_join()`.
+Moved `path_length()` from `sweep.scad` to `maths.scad`.
+
+### [v19.20.0](https://github.com/nophead/NopSCADlib/releases/tag/v19.20.0 "show release") Additions [...](https://github.com/nophead/NopSCADlib/compare/v19.9.1...v19.20.0 "diff with v19.9.1")
+*   2022-02-15 [`0e2778e`](https://github.com/nophead/NopSCADlib/commit/0e2778e13de2e68fc21a7b4c706aada27a17842c "show commit") [C.P.](# "Chris Palmer") Cables can now have a list of wire colours.
+Added a constructor for cables.
+
+*   2022-02-15 [`50e23e5`](https://github.com/nophead/NopSCADlib/commit/50e23e5f818077e3661e25852dc959c34e6c8b4a "show commit") [C.P.](# "Chris Palmer") Added silkscreen text to PCBs.
+
+#### [v19.9.1](https://github.com/nophead/NopSCADlib/releases/tag/v19.9.1 "show release") Fixes [...](https://github.com/nophead/NopSCADlib/compare/v19.9.0...v19.9.1 "diff with v19.9.0")
+*   2022-02-15 [`59eeb2c`](https://github.com/nophead/NopSCADlib/commit/59eeb2c5d4c7cf9da1f219c2b01fabcf450085f3 "show commit") [C.P.](# "Chris Palmer") Trimmed the ribbon clamp tape.
+
+*   2022-02-15 [`7ea4dbe`](https://github.com/nophead/NopSCADlib/commit/7ea4dbe6cbbc23256d23f7aea87e8aac8d1000a9 "show commit") [C.P.](# "Chris Palmer") Fixed double application of `r2sides()` in `rounded_path()`.
+Added check for radius too big for corner in `rounded_path()`.
+Spiral paths can now have 0 twists.
+
+### [v19.9.0](https://github.com/nophead/NopSCADlib/releases/tag/v19.9.0 "show release") Additions [...](https://github.com/nophead/NopSCADlib/compare/v19.8.1...v19.9.0 "diff with v19.8.1")
+*   2022-02-11 [`95b6771`](https://github.com/nophead/NopSCADlib/commit/95b6771811fd48af46b5c2d426c42c04cd8e5af3 "show commit") [C.P.](# "Chris Palmer") Added printed cable clips.
+
+*   2022-02-11 [`ed46cbb`](https://github.com/nophead/NopSCADlib/commit/ed46cbb1470587d4fa3ee4e0e8e0513c82693b1b "show commit") [C.P.](# "Chris Palmer") Fixed `cable_bundle()` bugs and added test.
+Added `cable_bundle_positions()`.
+Can now mark cables as ribbon to force a flat layout.
+
+#### [v19.8.1](https://github.com/nophead/NopSCADlib/releases/tag/v19.8.1 "show release") Fixes [...](https://github.com/nophead/NopSCADlib/compare/v19.8.0...v19.8.1 "diff with v19.8.0")
+*   2022-02-09 [`2a2b7d8`](https://github.com/nophead/NopSCADlib/commit/2a2b7d8bd60f0ea8ad2c428593e7aea1dfa06e9c "show commit") [C.P.](# "Chris Palmer") Added a second example project.
+
+### [v19.8.0](https://github.com/nophead/NopSCADlib/releases/tag/v19.8.0 "show release") Additions [...](https://github.com/nophead/NopSCADlib/compare/v19.7.0...v19.8.0 "diff with v19.7.0")
+*   2022-02-09 [`055b4e7`](https://github.com/nophead/NopSCADlib/commit/055b4e7102ffcc39dc376330636efa79739a6555 "show commit") [C.P.](# "Chris Palmer") Added SOT23 and SOT223 SMD packages.
+`smd_capacitors` can now have a value.
+Wire links can now have zero length to create a vertical wire.
+
+*   2022-02-09 [`00d6efc`](https://github.com/nophead/NopSCADlib/commit/00d6efc3154bbd5597a3336bc8bdaf550e42f56a "show commit") [C.P.](# "Chris Palmer") Added veroboard constructor.
+Documented `solder_meniscus` and made it parametric.
+
+### [v19.7.0](https://github.com/nophead/NopSCADlib/releases/tag/v19.7.0 "show release") Additions [...](https://github.com/nophead/NopSCADlib/compare/v19.6.0...v19.7.0 "diff with v19.6.0")
+*   2022-02-08 [`1f55097`](https://github.com/nophead/NopSCADlib/commit/1f55097bdd3e4d0164a48dd7ebb3fc5370250ac4 "show commit") [C.P.](# "Chris Palmer") Support for twisted cables.
+Sweep now distbutes twists in proportion to segments lengths.
+Added  `spiral_paths(),` `segmented_path()` and `rounded_path_vertices()` functions.
+Added `show_path(path)` module.
+
+### [v19.6.0](https://github.com/nophead/NopSCADlib/releases/tag/v19.6.0 "show release") Additions [...](https://github.com/nophead/NopSCADlib/compare/v19.5.1...v19.6.0 "diff with v19.5.1")
+*   2022-02-06 [`225ea9b`](https://github.com/nophead/NopSCADlib/commit/225ea9b45160195bdf316e7ffdb383a63f898d3c "show commit") [C.P.](# "Chris Palmer") Added `rounded_path()` function to `sweep.scad`.
+
+#### [v19.5.1](https://github.com/nophead/NopSCADlib/releases/tag/v19.5.1 "show release") Fixes [...](https://github.com/nophead/NopSCADlib/compare/v19.5.0...v19.5.1 "diff with v19.5.0")
+*   2022-02-06 [`d341ce4`](https://github.com/nophead/NopSCADlib/commit/d341ce499e56972ff5267d3187387fe7df9d4130 "show commit") [C.P.](# "Chris Palmer") Added `render()` to `pocket_handle()`.
+
+*   2022-02-06 [`e7376e2`](https://github.com/nophead/NopSCADlib/commit/e7376e28c44355efa425b98aa0511ccdf0b63301 "show commit") [C.P.](# "Chris Palmer") Fixed corner block assembly names when overridden.
+
+*   2022-02-06 [`e238eaa`](https://github.com/nophead/NopSCADlib/commit/e238eaa473bac72136507d15c57f6156560d6cfe "show commit") [C.P.](# "Chris Palmer") Removed unused, undocumented function.
+
+### [v19.5.0](https://github.com/nophead/NopSCADlib/releases/tag/v19.5.0 "show release") Additions [...](https://github.com/nophead/NopSCADlib/compare/v19.4.1...v19.5.0 "diff with v19.4.1")
+*   2022-02-01 [`04e94a8`](https://github.com/nophead/NopSCADlib/commit/04e94a859aa0d21f840c992b487a901f096790a4 "show commit") [C.P.](# "Chris Palmer") Added `earth_rot` parameter to `NEMA_screws()`.
+
+#### [v19.4.1](https://github.com/nophead/NopSCADlib/releases/tag/v19.4.1 "show release") Fixes [...](https://github.com/nophead/NopSCADlib/compare/v19.4.0...v19.4.1 "diff with v19.4.0")
+*   2022-02-01 [`e696dc4`](https://github.com/nophead/NopSCADlib/commit/e696dc471845550eb94e1b648d8b109cc11a9bf1 "show commit") [C.P.](# "Chris Palmer") Fixed stupid bug in `euler()`.
+
+### [v19.4.0](https://github.com/nophead/NopSCADlib/releases/tag/v19.4.0 "show release") Additions [...](https://github.com/nophead/NopSCADlib/compare/v19.3.0...v19.4.0 "diff with v19.3.0")
+*   2022-01-29 [`f33a067`](https://github.com/nophead/NopSCADlib/commit/f33a0675f5b9f6a5ebe1c4b9755e894d1e2b7994 "show commit") [C.P.](# "Chris Palmer") Updated images and readme.
+
+*   2022-01-29 [`5223415`](https://github.com/nophead/NopSCADlib/commit/52234154294011d4cc312f9ff98716f484d20a41 "show commit") [C.P.](# "Chris Palmer") Ball bearing test now two rows.
+
+*   2022-01-28 [`f87f3f5`](https://github.com/nophead/NopSCADlib/commit/f87f3f51ee778ef7ca30319d1d6ff3f4013e8258 "show commit") [M.B.](# "Martin Budden") Added support for flanged bearings.
+Also added some new cartridge bearings.
+
+### [v19.3.0](https://github.com/nophead/NopSCADlib/releases/tag/v19.3.0 "show release") Additions [...](https://github.com/nophead/NopSCADlib/compare/v19.2.0...v19.3.0 "diff with v19.2.0")
+*   2022-01-29 [`1ee80f4`](https://github.com/nophead/NopSCADlib/commit/1ee80f4a908ff9939d06186f3b22f54f726fc4d2 "show commit") [C.P.](# "Chris Palmer") Ribbon clamps can now be made to hold multiple ribbons.
+
+*   2022-01-29 [`4340884`](https://github.com/nophead/NopSCADlib/commit/43408843af2c9b0924d4f5c29ff96644b5f48295 "show commit") [C.P.](# "Chris Palmer") `Butt_box` now has a `thin_blocks` property to make it use `2screw_blocks` instead of fixing blocks along the edges.
+
+*   2022-01-29 [`c4ccc30`](https://github.com/nophead/NopSCADlib/commit/c4ccc30b35f9b96c8b891efbe424a31bab7e1904 "show commit") [C.P.](# "Chris Palmer") Added `2screw_blocks,` a two screw version of corner blocks.
+
+*   2022-01-29 [`20db11f`](https://github.com/nophead/NopSCADlib/commit/20db11f81eb713b255c41e3be7e5b9c0373646de "show commit") [C.P.](# "Chris Palmer") Box top bezels can now be modified by adding a child that gets subtracted.
+
+*   2022-01-29 [`d82db46`](https://github.com/nophead/NopSCADlib/commit/d82db46ea11d99c92cd845a05cc6f9fc069f9497 "show commit") [C.P.](# "Chris Palmer") Added missing description for terminals.
+
+*   2022-01-26 [`ac58524`](https://github.com/nophead/NopSCADlib/commit/ac58524b8553d09356ca78e830c5ef47d1c1f05b "show commit") [C.P.](# "Chris Palmer") `Butt_box` `star_washers()` property renamed `bbox_star_washers()`.
+
+*   2022-01-26 [`ef06aa4`](https://github.com/nophead/NopSCADlib/commit/ef06aa43875aad40b016fb2939f256e074699bcf "show commit") [C.P.](# "Chris Palmer") `Butt_box` size and volume echo changed to show `Butt_box`.
+
+### [v19.2.0](https://github.com/nophead/NopSCADlib/releases/tag/v19.2.0 "show release") Additions [...](https://github.com/nophead/NopSCADlib/compare/v19.1.0...v19.2.0 "diff with v19.1.0")
+*   2022-01-25 [`d775a16`](https://github.com/nophead/NopSCADlib/commit/d775a16baa818e04d707e6759fe480bb88bf8b5f "show commit") [C.P.](# "Chris Palmer") Updated images and readme.
+
+*   2022-01-25 [`682b8ca`](https://github.com/nophead/NopSCADlib/commit/682b8caf4172d51de1ec191051da6eb432e1b35e "show commit") [C.P.](# "Chris Palmer") Removed CB- prefix from PSU descriptions.
+
+*   2022-01-25 [`c915dd8`](https://github.com/nophead/NopSCADlib/commit/c915dd8c5cc3dbc365ccc18a7a2fc00374fdafbe "show commit") [C.P.](# "Chris Palmer") Made `butt_box` example smaller to make room for more PSUs.
+
+*   2022-01-23 [`6805638`](https://github.com/nophead/NopSCADlib/commit/680563808aeb129e63de660df09c0c2d53775a65 "show commit") [M.B.](# "Martin Budden") Added ability to add PCB to PSU.
+Also added two slimline LED PSUs with PCBs and terminals at both ends.
+
+### [v19.1.0](https://github.com/nophead/NopSCADlib/releases/tag/v19.1.0 "show release") Additions [...](https://github.com/nophead/NopSCADlib/compare/v19.0.0...v19.1.0 "diff with v19.0.0")
+*   2022-01-25 [`127aab2`](https://github.com/nophead/NopSCADlib/commit/127aab2e7ab87ed801b9463d6437983646dacdb5 "show commit") [C.P.](# "Chris Palmer") Added test for terminals to get documentation.
+Updated images and readme.
+Note BigTreeTech Relay Module `v1.2` PCB added.
+
+*   2022-01-23 [`df3da13`](https://github.com/nophead/NopSCADlib/commit/df3da13d6b7c75f41aaf3e499815b51e39e06fea "show commit") [M.B.](# "Martin Budden") Added support for terminals on PCBs.
+
+## [v19.0.0](https://github.com/nophead/NopSCADlib/releases/tag/v19.0.0 "show release") Breaking Changes [...](https://github.com/nophead/NopSCADlib/compare/v18.4.0...v19.0.0 "diff with v18.4.0")
+*   2022-01-23 [`d4e8dd8`](https://github.com/nophead/NopSCADlib/commit/d4e8dd831187ea87ab8618f52541f3e53c0c17f8 "show commit") [C.P.](# "Chris Palmer") `Wire_hole_radius()` now rounded up to half mm diameters to match metric drills.
+`mouse_grommet` STL name is now based on the diameter instead of the radius.
+Added `mouse_grommet_length(r)` and documented `mouse_grommet_offset(r)`.
+
+### [v18.4.0](https://github.com/nophead/NopSCADlib/releases/tag/v18.4.0 "show release") Additions [...](https://github.com/nophead/NopSCADlib/compare/v18.3.2...v18.4.0 "diff with v18.3.2")
+*   2022-01-23 [`1928ec6`](https://github.com/nophead/NopSCADlib/commit/1928ec6fb162d44ffa2a8b37cdc5a064040e043c "show commit") [C.P.](# "Chris Palmer") Box can now be named to allow more than one in a project.
+`box_hole_inset(type)` documented.
+
+#### [v18.3.2](https://github.com/nophead/NopSCADlib/releases/tag/v18.3.2 "show release") Fixes [...](https://github.com/nophead/NopSCADlib/compare/v18.3.1...v18.3.2 "diff with v18.3.1")
+*   2022-01-23 [`f4b9ab9`](https://github.com/nophead/NopSCADlib/commit/f4b9ab961cea8364eaf6b75cd308b91978234ae8 "show commit") [C.P.](# "Chris Palmer") Fixed `blower_exit_offset()` for square blowers with 2 screws.
+
+#### [v18.3.1](https://github.com/nophead/NopSCADlib/releases/tag/v18.3.1 "show release") Fixes [...](https://github.com/nophead/NopSCADlib/compare/v18.3.0...v18.3.1 "diff with v18.3.0")
+*   2022-01-10 [`317b485`](https://github.com/nophead/NopSCADlib/commit/317b485ee1c17ef8f8004014a54f1c6706201932 "show commit") [C.P.](# "Chris Palmer") Updated the image.
+
+*   2022-01-11 [`ccf2b8e`](https://github.com/nophead/NopSCADlib/commit/ccf2b8e21b0b3a4d8ab72ea5cdecb0cdfb542e47 "show commit") [G.G.](# "Giampiero Gabbiani") Reverted PERF74x51
+
+*   2022-01-08 [`99f277d`](https://github.com/nophead/NopSCADlib/commit/99f277de8d71f289d1a7340995d25309369e145c "show commit") [G.G.](# "Giampiero Gabbiani") Fixed offset calculations
+
+*   2022-01-07 [`fe1ab5d`](https://github.com/nophead/NopSCADlib/commit/fe1ab5d59a5a4746a383111d1d2a558385f820f6 "show commit") [G.G.](# "Giampiero Gabbiani") Fixed grid origin offsets
+
+### [v18.3.0](https://github.com/nophead/NopSCADlib/releases/tag/v18.3.0 "show release") Additions [...](https://github.com/nophead/NopSCADlib/compare/v18.2.0...v18.3.0 "diff with v18.2.0")
+*   2022-01-10 [`49c2607`](https://github.com/nophead/NopSCADlib/commit/49c26079fea1be8eb4a69d7468fb12df4595ec4c "show commit") [C.P.](# "Chris Palmer") Added `M3x6_hex_pillar`.
+
+*   2022-01-10 [`b5ee63b`](https://github.com/nophead/NopSCADlib/commit/b5ee63bfc40b9ee698d44f435e58cfbc49ec259c "show commit") [C.P.](# "Chris Palmer") Added more documentation for microswitches.
+
+*   2022-01-10 [`a5bc80c`](https://github.com/nophead/NopSCADlib/commit/a5bc80c0e865335cde29db9203438fe4bc659f43 "show commit") [C.P.](# "Chris Palmer") Added `D_plug_d()` function.
+
+*   2022-01-10 [`bf8014f`](https://github.com/nophead/NopSCADlib/commit/bf8014fba0ed630898037712d2fdc432d7966d97 "show commit") [C.P.](# "Chris Palmer") Added `tubing_ir()` function.
+
+### [v18.2.0](https://github.com/nophead/NopSCADlib/releases/tag/v18.2.0 "show release") Additions [...](https://github.com/nophead/NopSCADlib/compare/v18.1.0...v18.2.0 "diff with v18.1.0")
+*   2021-12-14 [`608f0b2`](https://github.com/nophead/NopSCADlib/commit/608f0b2db052b0c79597be39de5e89b9989e9270 "show commit") [C.P.](# "Chris Palmer") Simplified teardrop top length calculation.
+
+*   2021-12-11 [`8682d0a`](https://github.com/nophead/NopSCADlib/commit/8682d0a4705ed2d85213d85702b5b9b039906f48 "show commit") [M.B.](# "Martin Budden") Allow configuration of teardrop angle.
+
+### [v18.1.0](https://github.com/nophead/NopSCADlib/releases/tag/v18.1.0 "show release") Additions [...](https://github.com/nophead/NopSCADlib/compare/v18.0.0...v18.1.0 "diff with v18.0.0")
+*   2021-12-14 [`abe1b1d`](https://github.com/nophead/NopSCADlib/commit/abe1b1db0157a86af14a68ec42bdaa3e079e73a3 "show commit") [C.P.](# "Chris Palmer") Updated readme.
+
+*   2021-12-14 [`71f935d`](https://github.com/nophead/NopSCADlib/commit/71f935de8e24673a10707cfe434a2faaf3de1c28 "show commit") [M.B.](# "Martin Budden") Corrected FOV handling.
+
+*   2021-08-09 [`4138ed4`](https://github.com/nophead/NopSCADlib/commit/4138ed438e1111bafbe3bee17021a922966c334b "show commit") [M.B.](# "Martin Budden") Added ability to display camera field of view.
+
+## [v18.0.0](https://github.com/nophead/NopSCADlib/releases/tag/v18.0.0 "show release") Breaking Changes [...](https://github.com/nophead/NopSCADlib/compare/v17.10.0...v18.0.0 "diff with v17.10.0")
+*   2021-12-12 [`970c538`](https://github.com/nophead/NopSCADlib/commit/970c5384960bb4c436cb789a1c5869c0a4adfaa5 "show commit") [C.P.](# "Chris Palmer") Updated images and readme.
+
+*   2021-12-12 [`cec790e`](https://github.com/nophead/NopSCADlib/commit/cec790ec09befd2631734cda88f3254043955638 "show commit") [M.B.](# "Martin Budden") Fixed y-carriage plain pulley and test.
+
+*   2021-11-27 [`e71db80`](https://github.com/nophead/NopSCADlib/commit/e71db80093e5131908dff4a6ecba02e5c213a7d8 "show commit") [M.B.](# "Martin Budden") Improvements to `core_xy`
+1. Better default parameters
+2. Changed `plain_idler_offset` to work in x and y, to facilitate larger idler pulleys
+
+### [v17.10.0](https://github.com/nophead/NopSCADlib/releases/tag/v17.10.0 "show release") Additions [...](https://github.com/nophead/NopSCADlib/compare/v17.9.0...v17.10.0 "diff with v17.9.0")
+*   2021-12-12 [`c31f58a`](https://github.com/nophead/NopSCADlib/commit/c31f58a4fdf5163dc56b98e89f1a98d08cdfded2 "show commit") [C.P.](# "Chris Palmer") Updated images and readme.
+
+*   2021-11-27 [`a280e1f`](https://github.com/nophead/NopSCADlib/commit/a280e1fcbd6fe068a186e5c9f609cff62b2974a4 "show commit") [M.B.](# "Martin Budden") Added GT2x9 belt.
+
+### [v17.9.0](https://github.com/nophead/NopSCADlib/releases/tag/v17.9.0 "show release") Additions [...](https://github.com/nophead/NopSCADlib/compare/v17.8.0...v17.9.0 "diff with v17.8.0")
+*   2021-12-11 [`a2dfaef`](https://github.com/nophead/NopSCADlib/commit/a2dfaef2b51ffec3f048f0af569b39e8a7dbbeaf "show commit") [C.P.](# "Chris Palmer") Updated readme.
+
+*   2021-11-16 [`9790bdd`](https://github.com/nophead/NopSCADlib/commit/9790bdda11573904bf87c655d1ab7b81736a45e0 "show commit") [M.B.](# "Martin Budden") Added function returning number of links in drag chain.
+
+### [v17.8.0](https://github.com/nophead/NopSCADlib/releases/tag/v17.8.0 "show release") Additions [...](https://github.com/nophead/NopSCADlib/compare/v17.7.2...v17.8.0 "diff with v17.7.2")
+*   2021-12-11 [`c4895f8`](https://github.com/nophead/NopSCADlib/commit/c4895f84c7cff48baa14040c2759da15d2a165be "show commit") [C.P.](# "Chris Palmer") Updated image and readme.
+
+*   2021-11-20 [`b1ad206`](https://github.com/nophead/NopSCADlib/commit/b1ad206ce4d29b61f3a9be15adde7f1a51c225b5 "show commit") [M.B.](# "Martin Budden") Rotated conical horihole.
+
+*   2021-11-20 [`da55f86`](https://github.com/nophead/NopSCADlib/commit/da55f86536746657a1e105858109f177d24c362e "show commit") [M.B.](# "Martin Budden") Added variant of drag chain without supports.
+Unsupported drag chain has conical pin and corresponding horihole and is printed with cutout facing upwards.
+
+ * Also made clearance a property of the drag chain so it can be altered for printing chain assemblies
+
+*   2021-12-11 [`43c78fd`](https://github.com/nophead/NopSCADlib/commit/43c78fd1a38de87a210a64c3587bc994731b41c6 "show commit") [C.P.](# "Chris Palmer") Annual image changes due to change of computer.
+
+#### [v17.7.2](https://github.com/nophead/NopSCADlib/releases/tag/v17.7.2 "show release") Fixes [...](https://github.com/nophead/NopSCADlib/compare/v17.7.1...v17.7.2 "diff with v17.7.1")
+*   2021-11-13 [`74e5698`](https://github.com/nophead/NopSCADlib/commit/74e569896bd9b4f98bcd7c84322cd358fee8941f "show commit") [C.P.](# "Chris Palmer") Updated images.
+
+*   2021-11-01 [`ed6f8cf`](https://github.com/nophead/NopSCADlib/commit/ed6f8cf5c0877f7e8ad9323cc4fd3a6983a11080 "show commit") [M.B.](# "Martin Budden") Added shading to base of screw sockets to increase visibility.
+
+#### [v17.7.1](https://github.com/nophead/NopSCADlib/releases/tag/v17.7.1 "show release") Fixes [...](https://github.com/nophead/NopSCADlib/compare/v17.7.0...v17.7.1 "diff with v17.7.0")
+*   2021-10-29 [`9464ad5`](https://github.com/nophead/NopSCADlib/commit/9464ad5dbf1c6befaa0059e7cc3f0988d5639173 "show commit") [C.P.](# "Chris Palmer") Fixed knob for pots with split shaft.
+Changed the order of `knob_for_pot()` parameters.
+
+### [v17.7.0](https://github.com/nophead/NopSCADlib/releases/tag/v17.7.0 "show release") Additions [...](https://github.com/nophead/NopSCADlib/compare/v17.6.0...v17.7.0 "diff with v17.6.0")
+*   2021-10-28 [`b424bea`](https://github.com/nophead/NopSCADlib/commit/b424bea622d5247fd1e2f1ddd51782aba55277e1 "show commit") [C.P.](# "Chris Palmer") Added printed knobs for pots.
+
+*   2021-10-28 [`c8d9bb7`](https://github.com/nophead/NopSCADlib/commit/c8d9bb7d094408f70cb91354895856cb915cfe00 "show commit") [C.P.](# "Chris Palmer") Potentiometers now create a BOM entry and have a value specified.
+
+### [v17.6.0](https://github.com/nophead/NopSCADlib/releases/tag/v17.6.0 "show release") Additions [...](https://github.com/nophead/NopSCADlib/compare/v17.5.0...v17.6.0 "diff with v17.5.0")
+*   2021-10-26 [`f5528c5`](https://github.com/nophead/NopSCADlib/commit/f5528c5a9a51abdd12443a677236ac8610206c20 "show commit") [C.P.](# "Chris Palmer") Single `7_segment` objects can now have multiple digits.
+This is deduced from the digit size compared to the overall size.
+The decimal point is now suppressed if there are not enough pins.
+Added 02531A and 02352A 3 digit displays.
+
+*   2021-10-26 [`09bce09`](https://github.com/nophead/NopSCADlib/commit/09bce09a85fee3f3ac684743467329c18f4ebb73 "show commit") [C.P.](# "Chris Palmer") Typo
+
+### [v17.5.0](https://github.com/nophead/NopSCADlib/releases/tag/v17.5.0 "show release") Additions [...](https://github.com/nophead/NopSCADlib/compare/v17.4.0...v17.5.0 "diff with v17.4.0")
+*   2021-10-24 [`bad33da`](https://github.com/nophead/NopSCADlib/commit/bad33da95eb3b20ccbb6e4906dccfe51e8f4372c "show commit") [C.P.](# "Chris Palmer") Updated images and readme.
+
+*   2021-10-21 [`427ef61`](https://github.com/nophead/NopSCADlib/commit/427ef610def6ef2744d565329069719e485a500e "show commit") [M.B.](# "Martin Budden") Allowed naming of magnets. Added radial encoder magnet.
+
+### [v17.4.0](https://github.com/nophead/NopSCADlib/releases/tag/v17.4.0 "show release") Additions [...](https://github.com/nophead/NopSCADlib/compare/v17.3.0...v17.4.0 "diff with v17.3.0")
+*   2021-10-24 [`f5d0bfb`](https://github.com/nophead/NopSCADlib/commit/f5d0bfb6c80111399f5fa2aeb8bab5bab9101285 "show commit") [C.P.](# "Chris Palmer") Fixed drill `center` parameter in `poly_drill()`.
+
+*   2021-10-24 [`b2117fa`](https://github.com/nophead/NopSCADlib/commit/b2117fa99a57341f9c93eed97c392c18173aa73c "show commit") [C.P.](# "Chris Palmer") `atx_psu_cutout(type)` now parametric and can be shown in the test.
+ATX300 PSU now has a correct cutout and more accurate grill holes.
+The four margins around grill holes can now be specified.
+
+*   2021-10-24 [`6687a4a`](https://github.com/nophead/NopSCADlib/commit/6687a4a7c62d526a5f376db903dcd74c4fb8a25c "show commit") [C.P.](# "Chris Palmer") Added `jack_4mm_flange_radius()`.
+
+*   2021-10-24 [`8524ddd`](https://github.com/nophead/NopSCADlib/commit/8524ddd34dd93d0bf5ddf538984809b8f0f8c986 "show commit") [C.P.](# "Chris Palmer") Foot now lowered by squeeze distance so the washer is visible.
+
+### [v17.3.0](https://github.com/nophead/NopSCADlib/releases/tag/v17.3.0 "show release") Additions [...](https://github.com/nophead/NopSCADlib/compare/v17.2.2...v17.3.0 "diff with v17.2.2")
+*   2021-10-20 [`21c0666`](https://github.com/nophead/NopSCADlib/commit/21c06667a3c5a0bc65440b990e28b8a2f93c7c32 "show commit") [C.P.](# "Chris Palmer") Added ATX300 PSU model.
+
+*   2021-10-20 [`d19fad3`](https://github.com/nophead/NopSCADlib/commit/d19fad3f9f7e6eba94b2005b4798b5914fff4b69 "show commit") [C.P.](# "Chris Palmer") PSU grills can now have different holes sizes, spacing, round or heaxagonal and avoid a list of rectangular regions.
+
+*   2021-10-20 [`172bfb1`](https://github.com/nophead/NopSCADlib/commit/172bfb16d8ec8ffee8b5185ef42867b37ab6bce1 "show commit") [C.P.](# "Chris Palmer") Added lugless pressfit IEC inlet.
+
+*   2021-10-09 [`491dbae`](https://github.com/nophead/NopSCADlib/commit/491dbae13b9ff2736324ff084c6a6f313b4a09fc "show commit") [C.P.](# "Chris Palmer") `screw_shorter_than()` will return 4 or 3 for short grub screws.
+
+#### [v17.2.2](https://github.com/nophead/NopSCADlib/releases/tag/v17.2.2 "show release") Fixes [...](https://github.com/nophead/NopSCADlib/compare/v17.2.1...v17.2.2 "diff with v17.2.1")
+*   2021-10-02 [`046c475`](https://github.com/nophead/NopSCADlib/commit/046c475e1833c09a925a5310d1ccc6e4b07e7f89 "show commit") [M.B.](# "Martin Budden") Set convexity to 8 for `linear_extrude` of extrusion.
+
+#### [v17.2.1](https://github.com/nophead/NopSCADlib/releases/tag/v17.2.1 "show release") Fixes [...](https://github.com/nophead/NopSCADlib/compare/v17.2.0...v17.2.1 "diff with v17.2.0")
+*   2021-10-06 [`5f72a12`](https://github.com/nophead/NopSCADlib/commit/5f72a1212514ee7f8a795b53b1d1d180329660df "show commit") [C.P.](# "Chris Palmer") Nuts shown on jacks and fuseholders only shown threaded when exploded.
+
+### [v17.2.0](https://github.com/nophead/NopSCADlib/releases/tag/v17.2.0 "show release") Additions [...](https://github.com/nophead/NopSCADlib/compare/v17.1.0...v17.2.0 "diff with v17.1.0")
+*   2021-10-06 [`82502eb`](https://github.com/nophead/NopSCADlib/commit/82502eb470127b28e4036821077cbdbd06c17e9e "show commit") [C.P.](# "Chris Palmer") Added `pot_nut()` module to draw potentiometer nuts and washers.
+
+### [v17.1.0](https://github.com/nophead/NopSCADlib/releases/tag/v17.1.0 "show release") Additions [...](https://github.com/nophead/NopSCADlib/compare/v17.0.1...v17.1.0 "diff with v17.0.1")
+*   2021-10-05 [`b541298`](https://github.com/nophead/NopSCADlib/commit/b541298eae361b80df3c6c5797f3940a37fc2a38 "show commit") [C.P.](# "Chris Palmer") Printed foot assembly can now omit the top washer when space is at a premium.
+Now correctly shows the screw in the squeezed position.
+
+*   2021-10-02 [`9884160`](https://github.com/nophead/NopSCADlib/commit/9884160ed5e8cd7d1f44c6fee950e3682714da9c "show commit") [C.P.](# "Chris Palmer") Updated the gallery
+
+#### [v17.0.1](https://github.com/nophead/NopSCADlib/releases/tag/v17.0.1 "show release") Fixes [...](https://github.com/nophead/NopSCADlib/compare/v17.0.0...v17.0.1 "diff with v17.0.0")
+*   2021-10-01 [`38c973b`](https://github.com/nophead/NopSCADlib/commit/38c973b316a853fcbef3ccb857d99404a772d9dd "show commit") [C.P.](# "Chris Palmer") FR4 veroboard made the correct colour.
+veroboard track cuts made slightly bigger.
+
+*   2021-10-01 [`042d809`](https://github.com/nophead/NopSCADlib/commit/042d809ed056ba55c32f1d850b81dcf559fe9134 "show commit") [C.P.](# "Chris Palmer") Resistor and thermistor wires made more round.
+
+*   2021-10-01 [`3864839`](https://github.com/nophead/NopSCADlib/commit/3864839e521eb64189cba8453ea8835d6ffadd75 "show commit") [C.P.](# "Chris Palmer") Fixed encoder breakout descripion typo.
+
+*   2021-10-01 [`2ba2c2c`](https://github.com/nophead/NopSCADlib/commit/2ba2c2c115d4ab6c2371c662a3e54d7c77aa7785 "show commit") [C.P.](# "Chris Palmer") Removed some unused dependencies.
+
+## [v17.0.0](https://github.com/nophead/NopSCADlib/releases/tag/v17.0.0 "show release") Breaking Changes [...](https://github.com/nophead/NopSCADlib/compare/v16.2.0...v17.0.0 "diff with v16.2.0")
+*   2021-09-28 [`a5c4bf0`](https://github.com/nophead/NopSCADlib/commit/a5c4bf05adbf53cb7eb113db1139b65eb616a2e0 "show commit") [M.B.](# "Martin Budden") Added hot end style string literals following discussion.
+
+*   2021-09-28 [`a65add6`](https://github.com/nophead/NopSCADlib/commit/a65add65acdfeb97a657e03b9398d5376f497e85 "show commit") [M.B.](# "Martin Budden") Removed hotend global enums.
+
 ### [v16.2.0](https://github.com/nophead/NopSCADlib/releases/tag/v16.2.0 "show release") Additions [...](https://github.com/nophead/NopSCADlib/compare/v16.1.0...v16.2.0 "diff with v16.1.0")
 *   2021-09-29 [`bab4c8e`](https://github.com/nophead/NopSCADlib/commit/bab4c8e8afcc9e96ada5ae8d7636f3f203c36a2c "show commit") [C.P.](# "Chris Palmer") `TO247_size()` now also returns lead height and the length of the wide bit.
 TO247 leads fixed at 3.
@@ -123,8 +486,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.
 

examples/EnviroPlus/bom/RPI_assembly.txt

@@ -0,0 +1,5 @@
+RPI_assembly:
+Vitamins:
+  1 Micro SD card
+  1 Raspberry Pi Zero
+  1 Pin header 20 x 2 right_angle

examples/EnviroPlus/bom/RPI_case_assembly.txt

@@ -0,0 +1,7 @@
+RPI_case_assembly:
+Vitamins:
+  2 Screw M2.5 pan x  6.4mm
+
+Assemblies:
+  1 RPI_assembly
+  1 enviro_case_assembly

examples/EnviroPlus/bom/back_assembly.txt

@@ -0,0 +1,8 @@
+back_assembly:
+Vitamins:
+  1 Fan 17mm x 8mm
+  1 PMS5003 particle detector
+
+Printed:
+  1 enviro_plus_case_base.stl
+  1 fan_duct.stl

examples/EnviroPlus/bom/bom.csv

@@ -0,0 +1,21 @@
+'Micro SD card',  1
+'Fan 17mm x 8mm',  1
+'Heatfit insert M2',  4
+'Nut M2.5 x 2.2mm nyloc',  4
+'Enviro+',  1
+'Raspberry Pi Zero',  1
+'Pin header 20 x 2 right_angle',  1
+'PMS5003 particle detector',  1
+'Screw M2 cap x  6mm',  4
+'Screw M2.5 pan x  6.4mm',  2
+'Screw M2.5 pan x  8mm',  4
+'Screw M3 pan x  6mm',  3
+'SMD capacitor 1206 10uF',  1
+'SMD resistor 0805 3K3 0.125W',  1
+'SOT223 package FZT851',  1
+'Veroboard 6 holes x 6strips',  1
+'Washer  M2 x 5mm x 0.3mm',  4
+'Washer  M2.5 x 5.9mm x 0.5mm',  4
+'Washer  M3 x 7mm x 0.5mm',  3
+'Wire link 0.8mm x 6.5mm',  3
+'Wire link 0.8mm x 0.4"',  1

examples/EnviroPlus/bom/bom.json

@@ -0,0 +1,194 @@
+[
+    {
+        "name": "back_assembly",
+        "big": null,
+        "ngb": false,
+        "zoomed": 0,
+        "count": 1,
+        "assemblies": {},
+        "vitamins": {
+            "pms5003(): PMS5003 particle detector": {
+                "count": 1
+            },
+            "fan(fan17x8): Fan 17mm x 8mm": {
+                "count": 1
+            }
+        },
+        "printed": {
+            "fan_duct.stl": {
+                "count": 1,
+                "colour": "darkorange"
+            },
+            "enviro_plus_case_base.stl": {
+                "count": 1,
+                "colour": "grey"
+            }
+        },
+        "routed": {}
+    },
+    {
+        "name": "RPI_assembly",
+        "big": null,
+        "ngb": false,
+        "zoomed": 0,
+        "count": 1,
+        "assemblies": {},
+        "vitamins": {
+            "pcb(RPI0): Raspberry Pi Zero": {
+                "count": 1
+            },
+            ": Micro SD card": {
+                "count": 1
+            },
+            "pin_header(2p54header, 20, 2, right_angle = true): Pin header 20 x 2 right_angle": {
+                "count": 1
+            }
+        },
+        "printed": {},
+        "routed": {}
+    },
+    {
+        "name": "fan_controller_assembly",
+        "big": null,
+        "ngb": false,
+        "zoomed": 0,
+        "count": 1,
+        "assemblies": {},
+        "vitamins": {
+            "veroboard(fan_vb): Veroboard 6 holes x 6strips": {
+                "count": 1
+            },
+            "wire_link(0.8, 10.16, tail = 2.5): Wire link 0.8mm x 0.4\"": {
+                "count": 1
+            },
+            "wire_link(0.8, 0, h = 4, tail = 2.5): Wire link 0.8mm x 6.5mm": {
+                "count": 3
+            },
+            "smd_resistor(RES0805, 3K3): SMD resistor 0805 3K3 0.125W": {
+                "count": 1
+            },
+            "smd_capacitor(CAP1206): SMD capacitor 1206 10uF": {
+                "count": 1
+            },
+            "smd_sot(SOT223): SOT223 package FZT851": {
+                "count": 1
+            }
+        },
+        "printed": {},
+        "routed": {}
+    },
+    {
+        "name": "enviro_assembly",
+        "big": null,
+        "ngb": false,
+        "zoomed": 0,
+        "count": 1,
+        "assemblies": {
+            "fan_controller_assembly": 1
+        },
+        "vitamins": {
+            "pcb(EnviroPlus): Enviro+": {
+                "count": 1
+            }
+        },
+        "printed": {},
+        "routed": {}
+    },
+    {
+        "name": "case_assembly",
+        "big": null,
+        "ngb": false,
+        "zoomed": 0,
+        "count": 1,
+        "assemblies": {},
+        "vitamins": {
+            "insert(F1BM2): Heatfit insert M2": {
+                "count": 4
+            },
+            "washer(M3_washer): Washer  M3 x 7mm x 0.5mm": {
+                "count": 3
+            },
+            "screw(M3_pan_screw, 6): Screw M3 pan x  6mm": {
+                "count": 3
+            }
+        },
+        "printed": {
+            "enviro_plus_case.stl": {
+                "count": 1,
+                "colour": "grey"
+            },
+            "bulkhead.stl": {
+                "count": 1,
+                "colour": "[0.862745, 0.0784314, 0.235294]"
+            },
+            "foot.stl": {
+                "count": 3,
+                "colour": "darkorange"
+            }
+        },
+        "routed": {}
+    },
+    {
+        "name": "enviro_case_assembly",
+        "big": null,
+        "ngb": false,
+        "zoomed": 0,
+        "count": 1,
+        "assemblies": {
+            "case_assembly": 1,
+            "enviro_assembly": 1
+        },
+        "vitamins": {
+            "screw(M2p5_pan_screw, 8): Screw M2.5 pan x  8mm": {
+                "count": 4
+            },
+            "washer(M2p5_washer): Washer  M2.5 x 5.9mm x 0.5mm": {
+                "count": 4
+            },
+            "nut(M2p5_nut, nyloc = true): Nut M2.5 x 2.2mm nyloc": {
+                "count": 4
+            }
+        },
+        "printed": {},
+        "routed": {}
+    },
+    {
+        "name": "RPI_case_assembly",
+        "big": null,
+        "ngb": false,
+        "zoomed": 0,
+        "count": 1,
+        "assemblies": {
+            "enviro_case_assembly": 1,
+            "RPI_assembly": 1
+        },
+        "vitamins": {
+            "screw(M2p5_pan_screw, 6.4): Screw M2.5 pan x  6.4mm": {
+                "count": 2
+            }
+        },
+        "printed": {},
+        "routed": {}
+    },
+    {
+        "name": "main_assembly",
+        "big": null,
+        "ngb": false,
+        "zoomed": 0,
+        "count": 1,
+        "assemblies": {
+            "RPI_case_assembly": 1,
+            "back_assembly": 1
+        },
+        "vitamins": {
+            "washer(M2_washer): Washer  M2 x 5mm x 0.3mm": {
+                "count": 4
+            },
+            "screw(M2_cap_screw, 6): Screw M2 cap x  6mm": {
+                "count": 4
+            }
+        },
+        "printed": {},
+        "routed": {}
+    }
+]

examples/EnviroPlus/bom/bom.txt

@@ -0,0 +1,53 @@
+Vitamins:
+                   F   
+                   a   
+                   n   
+                E      
+                n  c   
+                v  o   
+    R           i  n   
+    p           r  t   
+    i        E  o  r   
+             n     o   
+    c  B  C  v  c  l  M
+ R  a  a  a  i  a  l  a
+ p  s  c  s  r  s  e  i
+ i  e  k  e  o  e  r  n
+ 1|  |  |  |  |  |  |  |  1 Micro SD card
+  |  | 1|  |  |  |  |  |  1 Fan 17mm x 8mm
+  |  |  | 4|  |  |  |  |  4 Heatfit insert M2
+  |  |  |  |  | 4|  |  |  4 Nut M2.5 x 2.2mm nyloc
+  |  |  |  | 1|  |  |  |  1 Enviro+
+ 1|  |  |  |  |  |  |  |  1 Raspberry Pi Zero
+ 1|  |  |  |  |  |  |  |  1 Pin header 20 x 2 right_angle
+  |  | 1|  |  |  |  |  |  1 PMS5003 particle detector
+  |  |  |  |  |  |  | 4|  4 Screw M2 cap x  6mm
+  | 2|  |  |  |  |  |  |  2 Screw M2.5 pan x  6.4mm
+  |  |  |  |  | 4|  |  |  4 Screw M2.5 pan x  8mm
+  |  |  | 3|  |  |  |  |  3 Screw M3 pan x  6mm
+  |  |  |  |  |  | 1|  |  1 SMD capacitor 1206 10uF
+  |  |  |  |  |  | 1|  |  1 SMD resistor 0805 3K3 0.125W
+  |  |  |  |  |  | 1|  |  1 SOT223 package FZT851
+  |  |  |  |  |  | 1|  |  1 Veroboard 6 holes x 6strips
+  |  |  |  |  |  |  | 4|  4 Washer  M2 x 5mm x 0.3mm
+  |  |  |  |  | 4|  |  |  4 Washer  M2.5 x 5.9mm x 0.5mm
+  |  |  | 3|  |  |  |  |  3 Washer  M3 x 7mm x 0.5mm
+  |  |  |  |  |  | 3|  |  3 Wire link 0.8mm x 6.5mm
+  |  |  |  |  |  | 1|  |  1 Wire link 0.8mm x 0.4"
+
+Printed:
+  |  |  | 1|  |  |  |  |  1 bulkhead.stl
+  |  |  | 1|  |  |  |  |  1 enviro_plus_case.stl
+  |  | 1|  |  |  |  |  |  1 enviro_plus_case_base.stl
+  |  | 1|  |  |  |  |  |  1 fan_duct.stl
+  |  |  | 3|  |  |  |  |  3 foot.stl
+
+Assemblies:
+  1 RPI_assembly
+  1 RPI_case_assembly
+  1 back_assembly
+  1 case_assembly
+  1 enviro_assembly
+  1 enviro_case_assembly
+  1 fan_controller_assembly
+  1 main_assembly

examples/EnviroPlus/bom/case_assembly.txt

@@ -0,0 +1,10 @@
+case_assembly:
+Vitamins:
+  4 Heatfit insert M2
+  3 Screw M3 pan x  6mm
+  3 Washer  M3 x 7mm x 0.5mm
+
+Printed:
+  1 bulkhead.stl
+  1 enviro_plus_case.stl
+  3 foot.stl

examples/EnviroPlus/bom/enviro_assembly.txt

@@ -0,0 +1,6 @@
+enviro_assembly:
+Vitamins:
+  1 Enviro+
+
+Assemblies:
+  1 fan_controller_assembly

examples/EnviroPlus/bom/enviro_case_assembly.txt

@@ -0,0 +1,9 @@
+enviro_case_assembly:
+Vitamins:
+  4 Nut M2.5 x 2.2mm nyloc
+  4 Screw M2.5 pan x  8mm
+  4 Washer  M2.5 x 5.9mm x 0.5mm
+
+Assemblies:
+  1 case_assembly
+  1 enviro_assembly

examples/EnviroPlus/bom/fan_controller_assembly.txt

@@ -0,0 +1,8 @@
+fan_controller_assembly:
+Vitamins:
+  1 SMD capacitor 1206 10uF
+  1 SMD resistor 0805 3K3 0.125W
+  1 SOT223 package FZT851
+  1 Veroboard 6 holes x 6strips
+  3 Wire link 0.8mm x 6.5mm
+  1 Wire link 0.8mm x 0.4"

examples/EnviroPlus/bom/main_assembly.txt

@@ -0,0 +1,8 @@
+main_assembly:
+Vitamins:
+  4 Screw M2 cap x  6mm
+  4 Washer  M2 x 5mm x 0.3mm
+
+Assemblies:
+  1 RPI_case_assembly
+  1 back_assembly

examples/EnviroPlus/readme.md

@@ -0,0 +1,298 @@
+<a name="TOP"></a>
+# EnviroPlus
+Environmental monitor using Enviro+ sensor board and a Raspberry Pi Zero.
+
+![Main Assembly](assemblies/main_assembled.png)
+
+<span></span>
+
+---
+## Table of Contents
+1. [Parts list](#Parts_list)
+1. [Back Assembly](#back_assembly)
+1. [RPI Assembly](#RPI_assembly)
+1. [Fan Controller Assembly](#fan_controller_assembly)
+1. [Enviro Assembly](#enviro_assembly)
+1. [Case Assembly](#case_assembly)
+1. [Enviro Case Assembly](#enviro_case_assembly)
+1. [RPI Case Assembly](#RPI_case_assembly)
+1. [Main Assembly](#main_assembly)
+
+<span></span>
+[Top](#TOP)
+
+---
+<a name="Parts_list"></a>
+## Parts list
+| <span style="writing-mode: vertical-rl; text-orientation: mixed;">Back</span> | <span style="writing-mode: vertical-rl; text-orientation: mixed;">RPI</span> | <span style="writing-mode: vertical-rl; text-orientation: mixed;">Fan&nbsp;Controller</span> | <span style="writing-mode: vertical-rl; text-orientation: mixed;">Enviro</span> | <span style="writing-mode: vertical-rl; text-orientation: mixed;">Case</span> | <span style="writing-mode: vertical-rl; text-orientation: mixed;">Enviro&nbsp;Case</span> | <span style="writing-mode: vertical-rl; text-orientation: mixed;">RPI&nbsp;Case</span> | <span style="writing-mode: vertical-rl; text-orientation: mixed;">Main</span> | <span style="writing-mode: vertical-rl; text-orientation: mixed;">TOTALS</span> |  |
+|---:|---:|---:|---:|---:|---:|---:|---:|---:|:---|
+|  |  |  |  |  |  |  |  | | **Vitamins** |
+| &nbsp;&nbsp;.&nbsp; | &nbsp;&nbsp;.&nbsp; | &nbsp;&nbsp;.&nbsp; | &nbsp;&nbsp;1&nbsp; | &nbsp;&nbsp;.&nbsp; | &nbsp;&nbsp;.&nbsp; | &nbsp;&nbsp;.&nbsp; | &nbsp;&nbsp;.&nbsp; |  &nbsp;&nbsp;1&nbsp; | &nbsp;&nbsp; Enviro+ |
+| &nbsp;&nbsp;1&nbsp; | &nbsp;&nbsp;.&nbsp; | &nbsp;&nbsp;.&nbsp; | &nbsp;&nbsp;.&nbsp; | &nbsp;&nbsp;.&nbsp; | &nbsp;&nbsp;.&nbsp; | &nbsp;&nbsp;.&nbsp; | &nbsp;&nbsp;.&nbsp; |  &nbsp;&nbsp;1&nbsp; | &nbsp;&nbsp; Fan 17mm x 8mm |
+| &nbsp;&nbsp;.&nbsp; | &nbsp;&nbsp;.&nbsp; | &nbsp;&nbsp;.&nbsp; | &nbsp;&nbsp;.&nbsp; | &nbsp;&nbsp;4&nbsp; | &nbsp;&nbsp;.&nbsp; | &nbsp;&nbsp;.&nbsp; | &nbsp;&nbsp;.&nbsp; |  &nbsp;&nbsp;4&nbsp; | &nbsp;&nbsp; Heatfit insert M2 |
+| &nbsp;&nbsp;.&nbsp; | &nbsp;&nbsp;1&nbsp; | &nbsp;&nbsp;.&nbsp; | &nbsp;&nbsp;.&nbsp; | &nbsp;&nbsp;.&nbsp; | &nbsp;&nbsp;.&nbsp; | &nbsp;&nbsp;.&nbsp; | &nbsp;&nbsp;.&nbsp; |  &nbsp;&nbsp;1&nbsp; | &nbsp;&nbsp; Micro SD card |
+| &nbsp;&nbsp;.&nbsp; | &nbsp;&nbsp;.&nbsp; | &nbsp;&nbsp;.&nbsp; | &nbsp;&nbsp;.&nbsp; | &nbsp;&nbsp;.&nbsp; | &nbsp;&nbsp;4&nbsp; | &nbsp;&nbsp;.&nbsp; | &nbsp;&nbsp;.&nbsp; |  &nbsp;&nbsp;4&nbsp; | &nbsp;&nbsp; Nut M2.5 x 2.2mm nyloc |
+| &nbsp;&nbsp;1&nbsp; | &nbsp;&nbsp;.&nbsp; | &nbsp;&nbsp;.&nbsp; | &nbsp;&nbsp;.&nbsp; | &nbsp;&nbsp;.&nbsp; | &nbsp;&nbsp;.&nbsp; | &nbsp;&nbsp;.&nbsp; | &nbsp;&nbsp;.&nbsp; |  &nbsp;&nbsp;1&nbsp; | &nbsp;&nbsp; PMS5003 particle detector |
+| &nbsp;&nbsp;.&nbsp; | &nbsp;&nbsp;1&nbsp; | &nbsp;&nbsp;.&nbsp; | &nbsp;&nbsp;.&nbsp; | &nbsp;&nbsp;.&nbsp; | &nbsp;&nbsp;.&nbsp; | &nbsp;&nbsp;.&nbsp; | &nbsp;&nbsp;.&nbsp; |  &nbsp;&nbsp;1&nbsp; | &nbsp;&nbsp; Pin header 20 x 2 right_angle |
+| &nbsp;&nbsp;.&nbsp; | &nbsp;&nbsp;1&nbsp; | &nbsp;&nbsp;.&nbsp; | &nbsp;&nbsp;.&nbsp; | &nbsp;&nbsp;.&nbsp; | &nbsp;&nbsp;.&nbsp; | &nbsp;&nbsp;.&nbsp; | &nbsp;&nbsp;.&nbsp; |  &nbsp;&nbsp;1&nbsp; | &nbsp;&nbsp; Raspberry Pi Zero |
+| &nbsp;&nbsp;.&nbsp; | &nbsp;&nbsp;.&nbsp; | &nbsp;&nbsp;1&nbsp; | &nbsp;&nbsp;.&nbsp; | &nbsp;&nbsp;.&nbsp; | &nbsp;&nbsp;.&nbsp; | &nbsp;&nbsp;.&nbsp; | &nbsp;&nbsp;.&nbsp; |  &nbsp;&nbsp;1&nbsp; | &nbsp;&nbsp; SMD capacitor 1206 10uF |
+| &nbsp;&nbsp;.&nbsp; | &nbsp;&nbsp;.&nbsp; | &nbsp;&nbsp;1&nbsp; | &nbsp;&nbsp;.&nbsp; | &nbsp;&nbsp;.&nbsp; | &nbsp;&nbsp;.&nbsp; | &nbsp;&nbsp;.&nbsp; | &nbsp;&nbsp;.&nbsp; |  &nbsp;&nbsp;1&nbsp; | &nbsp;&nbsp; SMD resistor 0805 3K3 0.125W |
+| &nbsp;&nbsp;.&nbsp; | &nbsp;&nbsp;.&nbsp; | &nbsp;&nbsp;1&nbsp; | &nbsp;&nbsp;.&nbsp; | &nbsp;&nbsp;.&nbsp; | &nbsp;&nbsp;.&nbsp; | &nbsp;&nbsp;.&nbsp; | &nbsp;&nbsp;.&nbsp; |  &nbsp;&nbsp;1&nbsp; | &nbsp;&nbsp; SOT223 package FZT851 |
+| &nbsp;&nbsp;.&nbsp; | &nbsp;&nbsp;.&nbsp; | &nbsp;&nbsp;.&nbsp; | &nbsp;&nbsp;.&nbsp; | &nbsp;&nbsp;.&nbsp; | &nbsp;&nbsp;.&nbsp; | &nbsp;&nbsp;.&nbsp; | &nbsp;&nbsp;4&nbsp; |  &nbsp;&nbsp;4&nbsp; | &nbsp;&nbsp; Screw M2 cap x  6mm |
+| &nbsp;&nbsp;.&nbsp; | &nbsp;&nbsp;.&nbsp; | &nbsp;&nbsp;.&nbsp; | &nbsp;&nbsp;.&nbsp; | &nbsp;&nbsp;.&nbsp; | &nbsp;&nbsp;.&nbsp; | &nbsp;&nbsp;2&nbsp; | &nbsp;&nbsp;.&nbsp; |  &nbsp;&nbsp;2&nbsp; | &nbsp;&nbsp; Screw M2.5 pan x  6.4mm |
+| &nbsp;&nbsp;.&nbsp; | &nbsp;&nbsp;.&nbsp; | &nbsp;&nbsp;.&nbsp; | &nbsp;&nbsp;.&nbsp; | &nbsp;&nbsp;.&nbsp; | &nbsp;&nbsp;4&nbsp; | &nbsp;&nbsp;.&nbsp; | &nbsp;&nbsp;.&nbsp; |  &nbsp;&nbsp;4&nbsp; | &nbsp;&nbsp; Screw M2.5 pan x  8mm |
+| &nbsp;&nbsp;.&nbsp; | &nbsp;&nbsp;.&nbsp; | &nbsp;&nbsp;.&nbsp; | &nbsp;&nbsp;.&nbsp; | &nbsp;&nbsp;3&nbsp; | &nbsp;&nbsp;.&nbsp; | &nbsp;&nbsp;.&nbsp; | &nbsp;&nbsp;.&nbsp; |  &nbsp;&nbsp;3&nbsp; | &nbsp;&nbsp; Screw M3 pan x  6mm |
+| &nbsp;&nbsp;.&nbsp; | &nbsp;&nbsp;.&nbsp; | &nbsp;&nbsp;1&nbsp; | &nbsp;&nbsp;.&nbsp; | &nbsp;&nbsp;.&nbsp; | &nbsp;&nbsp;.&nbsp; | &nbsp;&nbsp;.&nbsp; | &nbsp;&nbsp;.&nbsp; |  &nbsp;&nbsp;1&nbsp; | &nbsp;&nbsp; Veroboard 6 holes x 6strips |
+| &nbsp;&nbsp;.&nbsp; | &nbsp;&nbsp;.&nbsp; | &nbsp;&nbsp;.&nbsp; | &nbsp;&nbsp;.&nbsp; | &nbsp;&nbsp;.&nbsp; | &nbsp;&nbsp;.&nbsp; | &nbsp;&nbsp;.&nbsp; | &nbsp;&nbsp;4&nbsp; |  &nbsp;&nbsp;4&nbsp; | &nbsp;&nbsp; Washer  M2 x 5mm x 0.3mm |
+| &nbsp;&nbsp;.&nbsp; | &nbsp;&nbsp;.&nbsp; | &nbsp;&nbsp;.&nbsp; | &nbsp;&nbsp;.&nbsp; | &nbsp;&nbsp;.&nbsp; | &nbsp;&nbsp;4&nbsp; | &nbsp;&nbsp;.&nbsp; | &nbsp;&nbsp;.&nbsp; |  &nbsp;&nbsp;4&nbsp; | &nbsp;&nbsp; Washer  M2.5 x 5.9mm x 0.5mm |
+| &nbsp;&nbsp;.&nbsp; | &nbsp;&nbsp;.&nbsp; | &nbsp;&nbsp;.&nbsp; | &nbsp;&nbsp;.&nbsp; | &nbsp;&nbsp;3&nbsp; | &nbsp;&nbsp;.&nbsp; | &nbsp;&nbsp;.&nbsp; | &nbsp;&nbsp;.&nbsp; |  &nbsp;&nbsp;3&nbsp; | &nbsp;&nbsp; Washer  M3 x 7mm x 0.5mm |
+| &nbsp;&nbsp;.&nbsp; | &nbsp;&nbsp;.&nbsp; | &nbsp;&nbsp;1&nbsp; | &nbsp;&nbsp;.&nbsp; | &nbsp;&nbsp;.&nbsp; | &nbsp;&nbsp;.&nbsp; | &nbsp;&nbsp;.&nbsp; | &nbsp;&nbsp;.&nbsp; |  &nbsp;&nbsp;1&nbsp; | &nbsp;&nbsp; Wire link 0.8mm x 0.4" |
+| &nbsp;&nbsp;.&nbsp; | &nbsp;&nbsp;.&nbsp; | &nbsp;&nbsp;3&nbsp; | &nbsp;&nbsp;.&nbsp; | &nbsp;&nbsp;.&nbsp; | &nbsp;&nbsp;.&nbsp; | &nbsp;&nbsp;.&nbsp; | &nbsp;&nbsp;.&nbsp; |  &nbsp;&nbsp;3&nbsp; | &nbsp;&nbsp; Wire link 0.8mm x 6.5mm |
+| &nbsp;&nbsp;2&nbsp; | &nbsp;&nbsp;3&nbsp; | &nbsp;&nbsp;8&nbsp; | &nbsp;&nbsp;1&nbsp; | &nbsp;&nbsp;10&nbsp; | &nbsp;&nbsp;12&nbsp; | &nbsp;&nbsp;2&nbsp; | &nbsp;&nbsp;8&nbsp; | &nbsp;&nbsp;46&nbsp; | &nbsp;&nbsp;Total vitamins count |
+|  |  |  |  |  |  |  |  | | **3D printed parts** |
+| &nbsp;&nbsp;.&nbsp; | &nbsp;&nbsp;.&nbsp; | &nbsp;&nbsp;.&nbsp; | &nbsp;&nbsp;.&nbsp; | &nbsp;&nbsp;1&nbsp; | &nbsp;&nbsp;.&nbsp; | &nbsp;&nbsp;.&nbsp; | &nbsp;&nbsp;.&nbsp; |  &nbsp;&nbsp;1&nbsp; | &nbsp;&nbsp;bulkhead.stl |
+| &nbsp;&nbsp;.&nbsp; | &nbsp;&nbsp;.&nbsp; | &nbsp;&nbsp;.&nbsp; | &nbsp;&nbsp;.&nbsp; | &nbsp;&nbsp;1&nbsp; | &nbsp;&nbsp;.&nbsp; | &nbsp;&nbsp;.&nbsp; | &nbsp;&nbsp;.&nbsp; |  &nbsp;&nbsp;1&nbsp; | &nbsp;&nbsp;enviro_plus_case.stl |
+| &nbsp;&nbsp;1&nbsp; | &nbsp;&nbsp;.&nbsp; | &nbsp;&nbsp;.&nbsp; | &nbsp;&nbsp;.&nbsp; | &nbsp;&nbsp;.&nbsp; | &nbsp;&nbsp;.&nbsp; | &nbsp;&nbsp;.&nbsp; | &nbsp;&nbsp;.&nbsp; |  &nbsp;&nbsp;1&nbsp; | &nbsp;&nbsp;enviro_plus_case_base.stl |
+| &nbsp;&nbsp;1&nbsp; | &nbsp;&nbsp;.&nbsp; | &nbsp;&nbsp;.&nbsp; | &nbsp;&nbsp;.&nbsp; | &nbsp;&nbsp;.&nbsp; | &nbsp;&nbsp;.&nbsp; | &nbsp;&nbsp;.&nbsp; | &nbsp;&nbsp;.&nbsp; |  &nbsp;&nbsp;1&nbsp; | &nbsp;&nbsp;fan_duct.stl |
+| &nbsp;&nbsp;.&nbsp; | &nbsp;&nbsp;.&nbsp; | &nbsp;&nbsp;.&nbsp; | &nbsp;&nbsp;.&nbsp; | &nbsp;&nbsp;3&nbsp; | &nbsp;&nbsp;.&nbsp; | &nbsp;&nbsp;.&nbsp; | &nbsp;&nbsp;.&nbsp; |  &nbsp;&nbsp;3&nbsp; | &nbsp;&nbsp;foot.stl |
+| &nbsp;&nbsp;2&nbsp; | &nbsp;&nbsp;.&nbsp; | &nbsp;&nbsp;.&nbsp; | &nbsp;&nbsp;.&nbsp; | &nbsp;&nbsp;5&nbsp; | &nbsp;&nbsp;.&nbsp; | &nbsp;&nbsp;.&nbsp; | &nbsp;&nbsp;.&nbsp; | &nbsp;&nbsp;7&nbsp; | &nbsp;&nbsp;Total 3D printed parts count |
+
+<span></span>
+[Top](#TOP)
+
+---
+<a name="back_assembly"></a>
+## Back Assembly
+### Vitamins
+|Qty|Description|
+|---:|:----------|
+|1| Fan 17mm x 8mm|
+|1| PMS5003 particle detector|
+
+
+### 3D Printed parts
+
+| 1 x enviro_plus_case_base.stl | 1 x fan_duct.stl |
+|---|---|
+| ![enviro_plus_case_base.stl](stls/enviro_plus_case_base.png) | ![fan_duct.stl](stls/fan_duct.png) 
+
+
+
+### Assembly instructions
+![back_assembly](assemblies/back_assembly.png)
+
+1. Print the fan duct in flexible TPE with low infill.
+1. Slide the pms5003 into the printed receptacle with the fan to the outside. Secure with tape if it is loose.
+1. Slide the fan into the fan duct.
+1. Slide the fan duct into the printed recepacle.
+
+![back_assembled](assemblies/back_assembled.png)
+
+<span></span>
+[Top](#TOP)
+
+---
+<a name="RPI_assembly"></a>
+## RPI Assembly
+### Vitamins
+|Qty|Description|
+|---:|:----------|
+|1| Micro SD card|
+|1| Pin header 20 x 2 right_angle|
+|1| Raspberry Pi Zero|
+
+
+### Assembly instructions
+![RPI_assembly](assemblies/RPI_assembly_tn.png)
+
+* Solder a right angle connector to the Raspberry Pi Zero.
+
+![RPI_assembled](assemblies/RPI_assembled_tn.png)
+
+<span></span>
+[Top](#TOP)
+
+---
+<a name="fan_controller_assembly"></a>
+## Fan Controller Assembly
+### Vitamins
+|Qty|Description|
+|---:|:----------|
+|1| SMD capacitor 1206 10uF|
+|1| SMD resistor 0805 3K3 0.125W|
+|1| SOT223 package FZT851|
+|1| Veroboard 6 holes x 6strips|
+|1| Wire link 0.8mm x 0.4"|
+|3| Wire link 0.8mm x 6.5mm|
+
+
+### Assembly instructions
+![fan_controller_assembly](assemblies/fan_controller_assembly_tn.png)
+
+The fan controller is a single transistor wired as a Miller integrator that effectively multiplies the capacitor value by the gain of the transistor.
+It converts the PWM signal on GPI4 to a stead DC voltage so that the fan doesn't whine, or stutter.
+
+![Schematic](docs/fan_controller.jpg)
+
+***
+* Make two track cuts as shown, one wide and the other narrow.
+
+![TrackCuts](docs/cuts.jpg)
+
+1. Add the SMT compeonents and then the wire links.
+1. Add more solder around the transistor to act as a heatsink.
+
+![SMT](docs/smt.jpg)
+
+
+![fan_controller_assembled](assemblies/fan_controller_assembled_tn.png)
+
+<span></span>
+[Top](#TOP)
+
+---
+<a name="enviro_assembly"></a>
+## Enviro Assembly
+### Vitamins
+|Qty|Description|
+|---:|:----------|
+|1| Enviro+|
+
+
+### Sub-assemblies
+
+| 1 x fan_controller_assembly |
+|---|
+| ![fan_controller_assembled](assemblies/fan_controller_assembled_tn.png) 
+
+
+
+### Assembly instructions
+![enviro_assembly](assemblies/enviro_assembly_tn.png)
+
+* Solder the fan_controller to the Enviro+ expansion connector at the 5V, GND and #4 pins.
+
+![enviro_assembled](assemblies/enviro_assembled_tn.png)
+
+<span></span>
+[Top](#TOP)
+
+---
+<a name="case_assembly"></a>
+## Case Assembly
+### Vitamins
+|Qty|Description|
+|---:|:----------|
+|4| Heatfit insert M2|
+|3| Screw M3 pan x  6mm|
+|3| Washer  M3 x 7mm x 0.5mm|
+
+
+### 3D Printed parts
+
+| 1 x bulkhead.stl | 1 x enviro_plus_case.stl | 3 x foot.stl |
+|---|---|---|
+| ![bulkhead.stl](stls/bulkhead.png) | ![enviro_plus_case.stl](stls/enviro_plus_case.png) | ![foot.stl](stls/foot.png) 
+
+
+
+### Assembly instructions
+![case_assembly](assemblies/case_assembly.png)
+
+1. Solvent weld or glue the bulkhead into the recess in the bottom of the case.
+1. Fit the heatfit inserts with a soldering iron with a conical bit heated to about 200&deg;C.
+1. Tap the three holes for the feet with an M3 tap.
+1. Screw on the three feet with M3 x 6mm pan screws and washers.
+
+![case_assembled](assemblies/case_assembled.png)
+
+<span></span>
+[Top](#TOP)
+
+---
+<a name="enviro_case_assembly"></a>
+## Enviro Case Assembly
+### Vitamins
+|Qty|Description|
+|---:|:----------|
+|4| Nut M2.5 x 2.2mm nyloc|
+|4| Screw M2.5 pan x  8mm|
+|4| Washer  M2.5 x 5.9mm x 0.5mm|
+
+
+### Sub-assemblies
+
+| 1 x case_assembly | 1 x enviro_assembly |
+|---|---|
+| ![case_assembled](assemblies/case_assembled_tn.png) | ![enviro_assembled](assemblies/enviro_assembled_tn.png) 
+
+
+
+### Assembly instructions
+![enviro_case_assembly](assemblies/enviro_case_assembly.png)
+
+* Screw the Enviro+ PCB to the front of the case using M2.5 x 8mm pan screws with washer and nuts on the inside.
+
+![enviro_case_assembled](assemblies/enviro_case_assembled.png)
+
+<span></span>
+[Top](#TOP)
+
+---
+<a name="RPI_case_assembly"></a>
+## RPI Case Assembly
+### Vitamins
+|Qty|Description|
+|---:|:----------|
+|2| Screw M2.5 pan x  6.4mm|
+
+
+### Sub-assemblies
+
+| 1 x RPI_assembly | 1 x enviro_case_assembly |
+|---|---|
+| ![RPI_assembled](assemblies/RPI_assembled_tn.png) | ![enviro_case_assembled](assemblies/enviro_case_assembled_tn.png) 
+
+
+
+### Assembly instructions
+![RPI_case_assembly](assemblies/RPI_case_assembly.png)
+
+* Plug the RPi into the Enviro+ socket and secure with two screws self tapped into the bosses in the case.
+
+![RPI_case_assembled](assemblies/RPI_case_assembled.png)
+
+<span></span>
+[Top](#TOP)
+
+---
+<a name="main_assembly"></a>
+## Main Assembly
+### Vitamins
+|Qty|Description|
+|---:|:----------|
+|4| Screw M2 cap x  6mm|
+|4| Washer  M2 x 5mm x 0.3mm|
+
+
+### Sub-assemblies
+
+| 1 x RPI_case_assembly | 1 x back_assembly |
+|---|---|
+| ![RPI_case_assembled](assemblies/RPI_case_assembled_tn.png) | ![back_assembled](assemblies/back_assembled_tn.png) 
+
+
+
+### Assembly instructions
+![main_assembly](assemblies/main_assembly.png)
+
+* Solder the fan wires to the veroboard assembly
+
+![FanWires](docs/fan_connection.jpg)
+
+* Slide the back assembly into the case and secure with four M2 x 6mm cap screws and washers.
+
+![main_assembled](assemblies/main_assembled.png)
+
+<span></span>
+[Top](#TOP)

examples/EnviroPlus/scad/fan_controller.scad

@@ -0,0 +1,45 @@
+//
+//! Environmental monitor using Enviro+ sensor board and a Raspberry Pi Zero.
+//
+// GNU GPL v2
+// nop.head@gmail.com
+// hydraraptor.blogspot.com
+//
+// Top level model
+//
+
+include <NopSCADlib/core.scad>
+use <NopSCADlib/vitamins/veroboard.scad>
+include <NopSCADlib/vitamins/smds.scad>
+
+fan_vb = vero("fan_vb", "fan_controller", 6, 6, breaks = [[2, 1], [2 + eps, 5]],
+    components = [
+        [5, 3,    90, "link", inch(0.4), undef, undef, 2.5],
+        [0, 5,     0, "link", 0, 4, undef, 2.5],
+        [0, 1,     0, "link", 0, 4, undef, 2.5],
+        [0, 0,     0, "link", 0, 4, undef, 2.5],
+        [2, 5,     0, "-smd_res", RES0805, "3K3"],
+        [4, 4.7,  90, "-smd_cap", CAP1206, 1.2, "10uF"],
+        [2, 2.5, 180, "-smd_sot", SOT223, "FZT851"],
+    ],
+    joints = [[5, 1], [5, 5], [0, [0, 1, 5]]]
+ );
+
+//! The fan controller is a single transistor wired as a Miller integrator that effectively multiplies the capacitor value by the gain of the transistor.
+//! It converts the PWM signal on GPI4 to a stead DC voltage so that the fan doesn't whine, or stutter.
+//!
+//! ![Schematic](docs/fan_controller.jpg)
+//!
+//! ***
+//! * Make two track cuts as shown, one wide and the other narrow.
+//!
+//! ![TrackCuts](docs/cuts.jpg)
+//!
+//! 1. Add the SMT compeonents and then the wire links.
+//! 1. Add more solder around the transistor to act as a heatsink.
+//!
+//! ![SMT](docs/smt.jpg)
+//!
+module fan_controller_assembly() rotate(90) vflip(!exploded()) veroboard_assembly(fan_vb, -vero_thickness(fan_vb) - 1.4, 0);
+
+fan_controller_assembly();

examples/EnviroPlus/scad/main.scad

@@ -0,0 +1,518 @@
+//
+//! Environmental monitor using Enviro+ sensor board and a Raspberry Pi Zero.
+//
+// GNU GPL v2
+// nop.head@gmail.com
+// hydraraptor.blogspot.com
+//
+// Top level model
+//
+$explode = 0; // [0, 1]
+assembly = "main"; // [main, back, RPI, case, enviro_case, RPI_case]
+
+/* [Hidden] */
+
+show_box = true;
+show_enviroplus = true;
+$pp1_colour = "grey";
+$extrusion_width = 0.5;
+
+include <NopSCADlib/core.scad>
+include <NopSCADlib/vitamins/pin_headers.scad>
+include <NopSCADlib/vitamins/pcbs.scad>
+include <NopSCADlib/vitamins/fans.scad>
+
+use <NopSCADlib/vitamins/insert.scad>
+use <NopSCADlib/vitamins/veroboard.scad>
+use <NopSCADlib/utils/round.scad>
+use <NopSCADlib/printed/foot.scad>
+use <NopSCADlib/printed/printed_box.scad>
+use <fan_controller.scad>
+
+rpi = RPI0;
+pcb = EnviroPlus;
+fan = fan17x8;
+foot = Foot(d = 13, h = 5, t = 2, r = 1, screw = M3_pan_screw);
+module foot_stl() foot(foot);
+
+rpi_offset = [0, -pcb_width(pcb) / 2 + 0.5, pcb_width(rpi) / 2 + 8.6];
+rpi_holes = [0, 1];
+wall = 2;
+top_thickness = 2;
+base_thickness = 2;
+case_inner_rad = 8;
+
+width = pcb_length(pcb) + 9 + 10;
+pcb_x = -(width - pcb_length(pcb) - 9) / 2;
+depth = pcb_width(pcb) + 9;
+height = pcb_width(rpi) / 2 + rpi_offset.z + 9;
+bulkhead_outset = 2;
+bulkhead_inset = 0.5;
+bulkhead_t = 2;
+clearance = 0.1;
+pcb_screw = alternate_screw(hs_pan, pcb_screw(pcb));
+
+box = pbox(name = "enviro_plus_case", wall = wall, top_t = top_thickness, base_t = base_thickness, screw = M2_cap_screw, radius = case_inner_rad, ridges = [8, 1],
+    size = [width,  depth, height]);
+
+pms5003 = [50, 38, 21];
+pms5003_wall = 1;
+pms5003_pos = [width / 2 - pms5003.x / 2 - pms5003_wall - pbox_screw_inset(box) - insert_boss_radius(screw_insert(pbox_screw(box)), wall) - 0.5,
+               depth / 2 - pms5003.z / 2 - wall - 1,
+               height + top_thickness - pms5003.y / 2];
+
+
+fan_duct_t = 1.7;
+foam_t = 0;
+fan_pos = [pms5003_pos.x - pms5003.x / 2 - pms5003_wall - fan_width(fan) / 2 - fan_duct_t, 1 + foam_t, 12 + top_thickness + fan_depth(fan) / 2];
+fan_socket = 8;
+
+module fan_shape() {
+    w = fan_width(fan);
+    p = fan_hole_pitch(fan);
+    r = w / 2 - p;
+
+    rounded_square([w, w], r);
+}
+
+module fan_duct_stl() {
+    module frame(z, offset, y = -fan_pos.y)
+        translate([0, y, z])
+            linear_extrude(height = eps)
+                offset(offset)
+                    fan_shape();
+
+    z = height + top_thickness - fan_pos.z + fan_depth(fan) / 2 - fan_socket;
+
+    translate([0, -fan_pos.y, z])
+        linear_extrude(height = fan_socket)
+            difference() {
+                fan_shape();
+
+                round(1)
+                    offset(-fan_duct_t)
+                        fan_shape();
+            }
+
+    stl("fan_duct") union() {
+        difference() {
+            hull() {
+                frame(z, 0);
+
+                frame(fan_depth(fan), fan_duct_t + foam_t, 0);
+            }
+            hull() {
+                frame(z, -fan_duct_t);
+
+                frame(fan_depth(fan), foam_t -extrusion_width / 2, 0);
+            }
+        }
+
+        linear_extrude(height = fan_depth(fan))
+            difference() {
+                offset(fan_duct_t + foam_t)
+                    fan_shape();
+
+                offset(foam_t)
+                    fan_shape();
+            }
+    }
+}
+
+module pms5003() {
+    vitamin("pms5003(): PMS5003 particle detector");
+
+    w = pms5003.x;
+    d = pms5003.y;
+    h = pms5003.z;
+    t = 0.1;
+    color("silver")
+        difference() {
+            linear_extrude(height = h, center = true)
+                difference() {
+                    square([w, d], center = true);
+
+                    for(x = [-1, 1], y = [-1, 1])
+                        translate([x * w / 2, y * d / 2])
+                            square(2, center = true);
+                }
+            cube([w + 2 * eps, d + 2 * eps, t * 2], center = true);
+         }
+
+    color("black")
+        rounded_rectangle([w - 2 * t, d - 2 * t, h - 2 * t], r = 1, center = true);
+}
+
+module pcb_shape(offset)
+    rounded_square([pcb_length(pcb) + 2 * offset, pcb_width(pcb) + 2 * offset], pcb_radius(pcb) + offset);
+
+module gap() {
+    gap = pcb_component_position(pcb, "-chip");
+
+    translate([gap.x, -gap.y])
+        square([17.5, 20], center = true);
+}
+
+module rpi_holes()
+    for(i = rpi_holes) {
+        hole = pcb_coord(rpi, pcb_holes(rpi)[i]);
+        translate([hole.x, rpi_offset.y, -hole.y + rpi_offset.z + top_thickness])
+            rotate([90, 0, 0])
+                children();
+    }
+
+module feet_positions() {
+    clearance = 2;
+    foot_r = foot_diameter(foot) / 2;
+    x_inset = case_inner_rad + foot_r - pbox_ridges(box).y;
+    z_inset = foot_r + clearance;
+    h = height + base_thickness;
+
+    for(p = [[-1, -1], [1, -1], [0, 1]])
+        translate([p.x * (width / 2 - x_inset), depth / 2 + wall + pbox_ridges(box).y, top_thickness + h / 2 + p.y * (h / 2 - z_inset)])
+            rotate([90, 0, 0])
+                children();
+}
+
+module slots(h = 10, expand = 0) {
+    for(comp = [["uSD", 2, 11, 0.7], ["flat_flex", 1, 12, 0.5]]) {
+        p = pcb_component_position(rpi, comp[0]);
+        translate([sign(p.x) * (width / 2 + wall / 2 + pbox_ridges(box).y / 2), rpi_offset.y + pcb_thickness(rpi) + comp[3], top_thickness + rpi_offset.z - p.y])
+            rotate([90, 0, 90])
+                hull() {
+                    vertical_tearslot(r = comp[1] + expand, l = comp[2], h = h);
+
+                    if(expand)
+                         vertical_tearslot(r = comp[1] + expand + h / 2, l = comp[2], h = eps);
+                }
+     }
+}
+
+module box_internal_additions() {
+    translate([pcb_x, 0]) {
+        linear_extrude(height = top_thickness + bulkhead_t)
+            difference() {
+                pcb_shape(bulkhead_outset + wall + pbox_ridges(box).y + eps);
+
+                gap();
+
+                pcb_shape(bulkhead_outset + clearance);
+            }
+
+        rpi_holes()
+            hull() {
+                wall = 1.8;
+                r =  screw_radius(pcb_screw) + wall;
+                z = depth / 2 + rpi_offset.y + pbox_ridges(box).y + eps;
+                offset = max(r, z);
+                cylinder(r =r, h = z);
+
+                translate([0, -offset - r, z])
+                    cube(eps);
+            }
+    }
+    d = washer_diameter(screw_washer(foot_screw(foot))) + 1;
+    h = pbox_ridges(box).y;
+    feet_positions()
+        translate_z(wall - eps)
+            cylinder(d2 = d, d1 = d + 2 * h, h = h);
+
+    slots(wall + pbox_ridges(box).y + eps, 1);
+}
+
+module box_external_additions() {
+    amp = pbox_ridges(box).y + eps;
+    d = foot_diameter(foot) + 1;
+    feet_positions()
+        cylinder(d1 = d, d2 = d + 2 * amp, h = amp);
+
+    slots(wall + pbox_ridges(box).y + eps, 1);
+}
+
+
+module box_holes() {
+    translate([pcb_x, 0]) {
+        linear_extrude(height = top_thickness + eps)
+            pcb_shape(clearance);
+
+        rpi_holes()
+            teardrop_plus(r = screw_pilot_hole(pcb_screw), h = 7 - 1.6, center = false);
+    }
+    feet_positions()
+        teardrop(r = screw_pilot_hole(foot_screw(foot)), h = 10, center = true);
+
+    grills = 7;
+    bar = 1.6;
+    x = pcb_x + pcb_length(pcb) / 2 + 2 * wall +  pbox_ridges(box).y + 2 * eps;
+    w = width / 2 - x;
+    d = depth - case_inner_rad;
+    pitch = d / (grills - 1);
+    for(i = [0 : grills -1])
+        let(w = i == 0 || i == grills -1 ? w - 1 : w)
+            translate([x + w / 2, -d / 2 + i * pitch])
+                rounded_rectangle([w, pitch - bar, 10], 1);
+
+    slots();
+}
+
+module bulkhead_stl() {
+    holes = pcb_holes(pcb);
+    pitch = max([for(h = holes) pcb_coord(pcb, h).x]) - min([for(h = holes)  pcb_coord(pcb, h).x]);
+    boss_r = (pitch - 51.4) / 2;
+
+    stl("bulkhead")
+        linear_extrude(height = bulkhead_t)
+            difference() {
+                pcb_shape(bulkhead_outset);
+
+                gap();
+
+                difference() {
+                    pcb_shape(-bulkhead_inset);
+
+                    pcb_screw_positions(pcb)
+                        rotate($i * 90)
+                            hull() {
+                                circle(boss_r);
+
+                                translate([boss_r - eps, -boss_r])
+                                    square([eps, boss_r]);
+
+                                translate([-boss_r, boss_r - eps])
+                                    square([boss_r, eps]);
+
+                                translate([-boss_r, -boss_r])
+                                    square(eps);
+                            }
+                }
+
+                pcb_screw_positions(pcb)
+                    poly_circle(screw_clearance_radius(pcb_screw));
+            }
+}
+
+module enviro_plus_case_stl() {
+     pbox(box) {
+        box_internal_additions();
+        box_holes();
+        box_external_additions();
+     }
+}
+
+module base_additions() {
+    w = pms5003.x + clearance;
+    d = pms5003.z + clearance;
+    wall = pms5003_wall;
+
+    translate([pms5003_pos.x, -pms5003_pos.y])
+        linear_extrude(height = base_thickness + pms5003.y)
+            difference() {
+                square([w + 2 * wall, d + 2 * wall], center = true);
+                square([w, d], center = true);
+            }
+
+    translate([fan_pos.x, 0])
+        linear_extrude(height = top_thickness + fan_socket)
+            difference() {
+                offset(wall)
+                    fan_shape();
+
+                fan_shape();
+            }
+}
+
+module base_holes() {
+    for(i = [0 : 1]) {
+        p = pcb_component_position(rpi, "usb_uA", i);
+        translate([p.x + pcb_x, -rpi_offset.y - pcb_thickness(rpi) - 1.3])
+            rounded_rectangle([11,7, 100], 0.5, true);
+    }
+
+    translate([pms5003_pos.x, -pms5003_pos.y])
+        rounded_rectangle([pms5003.x - 2 ,pms5003.z - 2, 100], 2, true);
+
+    translate([fan_pos.x, 0])
+        linear_extrude(height = 2 * base_thickness + eps, center = true)
+            round(1)
+                offset(-fan_duct_t)
+                    fan_shape();
+}
+
+module enviro_plus_case_base_stl()
+    pbox_base(box) {
+        base_additions();
+        base_holes();
+    }
+
+//! * Solder a right angle connector to the Raspberry Pi Zero.
+module RPI_assembly()
+assembly("RPI") {
+    pcb(rpi);
+
+    pcb_grid(rpi, 9.5, 0.5, -0.6)
+        rotate(180)
+            explode(20)
+                pin_header(2p54header, 20, 2, right_angle = true);
+}
+
+//! 1. Solvent weld or glue the bulkhead into the recess in the bottom of the case.
+//! 1. Fit the heatfit inserts with a soldering iron with a conical bit heated to about 200&deg;C.
+//! 1. Tap the three holes for the feet with an M3 tap.
+//! 1. Screw on the three feet with M3 x 6mm pan screws and washers.
+module case_assembly() pose([ 29.60, 0.00, 158.00 ], exploded = true) pose([ 198.00, 0.00, 352.80 ], exploded = false)
+assembly("case") {
+    if(show_box)
+        stl_colour(pp1_colour) render() enviro_plus_case_stl();
+    else
+        render() difference() {
+            enviro_plus_case_stl();
+
+            translate_z(height / 2)
+                cube([100, 100, height - 20], center = true);
+        }
+
+    pbox_inserts(box);
+
+    translate([pcb_x, 0, top_thickness])
+        explode(20)
+            stl_colour(pp2_colour) render() bulkhead_stl();
+
+    feet_positions() {
+        foot_assembly(0, foot);
+
+        vflip()
+            explode(20, explode_children = true)
+                translate_z(foot_thickness(foot))
+                    screw_and_washer(foot_screw(foot), 6);
+    }
+
+}
+
+//! * Solder the fan_controller to the Enviro+ expansion connector at the 5V, GND and #4 pins.
+module enviro_assembly() hflip(exploded())
+assembly("enviro") {
+    if(show_enviroplus)
+        pcb(pcb);
+
+    pcb_grid(pcb, 5.5, 2.5, -pcb_thickness(pcb)) {
+        hflip()
+            explode(15)
+                fan_controller_assembly();
+    }
+    if(!exploded())
+        for(x = [8, 7, 3])
+            pcb_grid(pcb, x, 0, 0.05)
+                solder_meniscus(pcb, 0.39, 1);
+}
+
+//! * Screw the Enviro+ PCB to the front of the case using M2.5 x 8mm pan screws with washer and nuts on the inside.
+module enviro_case_assembly() pose([ 231.40, 0.00, 1.20 ])
+assembly("enviro_case") {
+    case_assembly();
+
+    translate([pcb_x, 0, top_thickness])
+        vflip() explode(20, explode_children = true) {
+            t = pcb_thickness(pcb);
+            nut = screw_nut(pcb_screw);
+            washer = screw_washer(pcb_screw);
+
+            no_explode() enviro_assembly();
+
+            pcb_screw_positions(pcb) {
+                translate_z(t)
+                    screw(pcb_screw, screw_longer_than(t + bulkhead_t + nut_thickness(nut, true) + washer_thickness(washer)));
+
+                translate_z(-bulkhead_t)
+                    vflip()
+                        explode(20, explode_children = true)
+                            nut_and_washer(nut, true);
+            }
+        }
+}
+
+//! * Plug the RPi into the Enviro+ socket and secure with two screws self tapped into the bosses in the case.
+module RPI_case_assembly() pose([ 20.50, 0.00, 153.30 ])
+assembly("RPI_case") {
+    enviro_case_assembly();
+
+    translate([pcb_x, 0]) {
+        translate_z(top_thickness) {
+
+            translate(rpi_offset)
+                rotate([-90, 0, 0])
+                    RPI_assembly();
+        }
+        rpi_holes()
+            vflip()
+                translate_z(pcb_thickness(rpi))
+                    screw(pcb_screw, 6.4);
+    }
+}
+
+//! 1. Print the fan duct in flexible TPE with low infill.
+//! 1. Slide the pms5003 into the printed receptacle with the fan to the outside. Secure with tape if it is loose.
+//! 1. Slide the fan into the fan duct.
+//! 1. Slide the fan duct into the printed recepacle.
+module back_assembly() pose([ 228.60, 0.00, 24.30 ])
+assembly("back") {
+    translate(pms5003_pos)
+        explode(-50)
+            rotate([90, 0, 0])
+                pms5003();
+
+    explode(-20, explode_children = true)
+        translate(fan_pos) {
+            explode(-20)
+                fan(fan);
+
+            translate_z(-fan_depth(fan) / 2)
+                stl_colour(pp4_colour)
+                    render()
+                        fan_duct_stl();
+        }
+
+    translate_z(height + top_thickness + base_thickness + eps) vflip()
+        stl_colour(show_box ? pp1_colour : pp2_colour) render() enviro_plus_case_base_stl();
+}
+
+//! * Solder the fan wires to the veroboard assembly
+//!
+//! ![FanWires](docs/fan_connection.jpg)
+//!
+//! * Slide the back assembly into the case and secure with four M2 x 6mm cap screws and washers.
+module main_assembly() pose([170, 335, 0], exploded = false) pose([ 42.20, 0.00, 159.60 ], exploded = true)
+assembly("main") {
+    RPI_case_assembly();
+
+    explode(20, explode_children = true) {
+        pbox_base_screws(box);
+
+        back_assembly();
+    }
+}
+
+if($preview) {
+    if(assembly == "main")
+        main_assembly();
+    else if(assembly == "case")
+        case_assembly();
+    else if(assembly == "back")
+        back_assembly();
+    else if(assembly == "RPI")
+        RPI_assembly();
+    else if(assembly == "RPI_case")
+        RPI_case_assembly();
+    else if(assembly == "enviro_case")
+        enviro_case_assembly();
+}
+else {
+    gap = 5;
+
+    enviro_plus_case_stl();
+
+    translate([0, -depth - gap])
+        enviro_plus_case_base_stl();
+
+    translate([0, -2 * (depth + gap)])
+        bulkhead_stl();
+}

gallery/readme.md

@@ -25,6 +25,11 @@ WiFi controllable PSU
 
 ![](IOT_50V_PSU.png)
 
+## IOT LOAD
+WiFi controllable programmable load
+
+![](IOT_LOAD.png)
+
 ## Lab ATX PSU
 Bench power supply built around an ATX PSU.
 
@@ -65,6 +70,16 @@ Mains isolated and variable supply with metering.
 
 
 
+## PSU Cover
+A base and shroud to make PSU safe to sit on a desk
+
+![](PSU_cover.png)
+
+## PotBox
+Potentiometer box with course and fine controls and three 4mm binding posts
+
+![](PotBox.png)
+
 ## SunBot
 A solar tracker to keep a solar panel pointing at the sun.
 

global_defs.scad

@@ -29,12 +29,14 @@ 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
 show_rays       = is_undef($show_rays)       ? false  : $show_rays;       // show camera sight lines and light direction
 show_threads    = is_undef($show_threads)    ? false  : $show_threads;    // show screw threads
 show_plugs      = is_undef($show_plugs)      ? false  : $show_plugs;      // plugs on headers
+teardrop_angle  = is_undef($teardrop_angle)  ? 45     : $teardrop_angle;  // teardrop angle
 pp1_colour      = is_undef($pp1_colour)      ? rr_green     : $pp1_colour;// printed part colour 1, RepRap logo colour
 pp2_colour      = is_undef($pp2_colour)      ? crimson      : $pp2_colour;// printed part colour 2
 pp3_colour      = is_undef($pp3_colour)      ? "SteelBlue"  : $pp3_colour;// printed part colour 3
@@ -50,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;

libtest.scad

@@ -51,6 +51,7 @@ use <tests/blowers.scad>
 use <tests/box_sections.scad>
 use <tests/bulldogs.scad>
 use <tests/buttons.scad>
+use <tests/cable_clip.scad>
 use <tests/cable_strips.scad>
 use <tests/cameras.scad>
 use <tests/camera_housing.scad>
@@ -123,6 +124,7 @@ use <tests/fixing_block.scad>
 use <tests/flat_hinge.scad>
 use <tests/foot.scad>
 use <tests/handle.scad>
+use <tests/knob.scad>
 use <tests/PCB_mount.scad>
 use <tests/pocket_handle.scad>
 use <tests/printed_box.scad>
@@ -153,19 +155,46 @@ translate([x5 + 50, cable_grommets_y])
 translate([x5 + 95, cable_grommets_y])
     press_fits();
 
-translate([x5, cable_grommets_y + 60])
+fixing_blocks_y = cable_grommets_y + 60;
+translate([x5, fixing_blocks_y])
     fixing_blocks();
 
-translate([x5, cable_grommets_y + 90])
+corner_blocks_y = fixing_blocks_y + 30;
+translate([x5, corner_blocks_y])
     corner_blocks();
 
-translate([x5, cable_grommets_y + 150])
-    feet();
-
-translate([x5 + 70, cable_grommets_y + 150])
+screw_knobs_y = corner_blocks_y + 70;
+translate([x5, screw_knobs_y])
     screw_knobs();
 
-translate([x5, cable_grommets_y + 470]) {
+knobs_y = screw_knobs_y + 40;
+translate([640, knobs_y])
+    printed_pulley_test();
+
+translate([x5, knobs_y])
+    knobs();
+
+clips_y = knobs_y + 50;
+translate([x5, clips_y])
+    cable_clips();
+
+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();
+
+pocket_y = handle_y + 70;
+translate([x5 + 65, pocket_y])
+    pocket_handles();
+
+hinge_y = pocket_y + 100;
+translate([x5, hinge_y]) {
     door_hinges()
         door_latches();
 
@@ -173,29 +202,18 @@ translate([x5, cable_grommets_y + 470]) {
         flat_hinges();
 }
 
-translate([x5, cable_grommets_y + 370])
-    no_explode() socket_boxes();
-
-translate([x5 + 60, cable_grommets_y + 200])
-    strap_handles();
-
-translate([640, cable_grommets_y + 200])
-    printed_pulley_test();
-
-translate([x5, cable_grommets_y + 250])
-    handle();
-
-translate([950, 600])
-    box_test();
-
-translate([900, 750])
-    pocket_handles();
-
-translate([900, 850])
+pbox_y = hinge_y + 70;
+translate([900, pbox_y])
     printed_boxes();
 
-translate([850, 1330 + 85])
-    bbox_test();
+box_y = pbox_y + 150;
+translate([950, box_y])
+    box_test();
+
+
+translate([950, 1400])
+    rotate(-90)
+        bbox_test();
 
 inserts_y = 0;
 nuts_y = inserts_y + 20;
@@ -422,6 +440,9 @@ translate([x2, extrusions_y])
 translate([400, transformers_y])
     transformers();
 
+translate([x4 + 50, transformers_y])
+    no_explode() socket_boxes();
+
 
 belts_y = 0;
 rails_y = belts_y + 200;

printed/box.scad

@@ -30,10 +30,16 @@
 //! ![](docs/box.png)
 //!
 //! Normally the side sheets are the same type but they can be overridden individually as long as the substitute has the same thickness.
+//!
+//! A box can have an optional name to allow more than one in the same project.
+//!
+//! The top bezel can have an optional child, which is subtracted to allow modification.
 //
-include <../core.scad>
+include <../utils/core/core.scad>
 use <../vitamins/sheet.scad>
 use <../vitamins/insert.scad>
+use <../vitamins/screw.scad>
+use <../vitamins/washer.scad>
 use <../utils/quadrant.scad>
 use <../utils/round.scad>
 
@@ -48,12 +54,13 @@ function box_sheets(type)      = type[3]; //! Sheet type used for the sides
 function box_top_sheet(type)   = type[4]; //! Sheet type for the top
 function box_base_sheet(type)  = type[5]; //! Sheet type for the bottom
 function box_feet(type)        = type[6]; //! True to enable feet on the bottom bezel
-function box_width(type)       = type[7]; //! Internal width
-function box_depth(type)       = type[8]; //! Internal depth
-function box_height(type)      = type[9]; //! Internal height
+function box_name(type)        = type[7]; //! Name for projects with more than one box
+function box_width(type)       = type[8]; //! Internal width
+function box_depth(type)       = type[9]; //! Internal depth
+function box_height(type)      = type[10];//! Internal height
 
-function box(screw, wall, sheets, top_sheet, base_sheet, size, feet = false, shelf_screw = M3_dome_screw) = //! Construct a property list for a box.
- concat([screw, shelf_screw, wall, sheets, top_sheet, base_sheet, feet], size);
+function box(screw, wall, sheets, top_sheet, base_sheet, size, feet = false, shelf_screw = undef, name = "box") = //! Construct a property list for a box.
+ concat([screw, is_undef(shelf_screw) ? screw : shelf_screw, wall, sheets, top_sheet, base_sheet, feet, name], size);
 
 function box_bezel_clearance(type) = bezel_clearance;
 
@@ -64,7 +71,7 @@ function box_washer(type) = screw_washer(box_screw(type));
 function box_insert(type) = screw_insert(box_screw(type));
 function box_shelf_insert(type) = screw_insert(box_shelf_screw(type));
 
-function box_hole_inset(type) = washer_radius(box_washer(type)) + 1;
+function box_hole_inset(type) = washer_radius(box_washer(type)) + 1; //! Screw inset from the corner of the internal dimensions
 function box_insert_r(type) = insert_hole_radius(box_insert(type));
 function box_insert_l(type) = insert_length(box_insert(type));
 function box_boss_r(type) = ceil(corrected_radius(box_insert_r(type)) + box_wall(type));
@@ -79,7 +86,6 @@ function box_screw_length(type, top) =
     let(s = top ? box_top_sheet(type) : box_base_sheet(type))
         screw_length(box_screw(type), sheet_thickness(s) + box_corner_gap(type) + box_profile_overlap(type) - 1, washers = 2, insert = true, longer = true);
 
-function box_wall_clearance(type) = box_sheet_slot(type) / 2 - sheet_thickness(box_sheets(type)) / 2;
 function box_margin(type) = box_profile_overlap(type) + box_corner_gap(type); //! How much the bezel intrudes on the specified height
 function box_intrusion(type) = box_hole_inset(type) + box_boss_r(type); //! Corner profile intrusion
 function sheet_reduction(type) = 2 * box_corner_gap(type) + sheet_end_clearance;
@@ -89,6 +95,8 @@ function box_bezel_height(type, bottom) = //! Bezel height for top or bottom
     let(t1 = sheet_thickness(box_base_sheet(type)), t2 = sheet_thickness(box_top_sheet(type)))
         box_corner_rad(type) + box_profile_overlap(type) + (bottom ? max(t1, t2) : t2) - sheet_thickness(box_sheets(type));
 
+function box_bc_name(type, suffix) = let(name = box_name(type)) name == "box" ? suffix : str(name, "_", suffix); // Backwards compatible name
+
 grill_hole = 5;
 grill_gap = 1.9;
 
@@ -141,7 +149,7 @@ module box_corner_profile_2D(type) { //! The 2D shape of the corner profile.
 module box_corner_profile(type) { //! Generates the corner profile STL for 3D printing.
     length = box_height(type) - 2 * box_margin(type);
 
-    stl("box_corner_profile")
+    stl(str(box_name(type), "_corner_profile"))
         difference() {
             linear_extrude(length, center = true, convexity = 5)
                 box_corner_profile_2D(type);
@@ -190,7 +198,7 @@ module box_corner_profile_section(type, section, sections) { //! Generates inter
 }
 
 module box_corner_profile_sections(type, section, sections) { //! Generate four copies of a corner profile section
-    stl("box_corner_profile");
+    stl(str(box_name(type), "_corner_profile"));
     offset = box_boss_r(type) + 1;
     for(i = [0 : 3])
         rotate(i * 90)
@@ -220,7 +228,7 @@ module box_bezel(type, bottom) { //! Generates top and bottom bezel STLs
     height = box_bezel_height(type, bottom);
     foot_extension = foot_height - height;
 
-    stl(bottom ? "bottom_bezel" : "top_bezel")
+    stl(box_bc_name(type, bottom ? "bottom_bezel" : "top_bezel"))
         difference() {
             w = box_width(type);
             d = box_depth(type);
@@ -280,6 +288,12 @@ module box_bezel(type, bottom) { //! Generates top and bottom bezel STLs
                         box_screw_hole_positions(type)
                             poly_circle(screw_clearance_radius(box_screw(type)));
                     }
+            //
+            // Optional child to subtract
+            //
+            if($children && !bottom)
+                translate_z(-box_profile_overlap(type))
+                    children();
          }
 }
 
@@ -353,7 +367,6 @@ module box_bezel_section(type, bottom, rows, cols, x, y) { //! Generates interlo
 
                 translate([0, bw2 / 2, dh2 / 2])
                     cube([eps, bw2 - 2 * dowel_wall + 2 * extrusion_width, dh2], center = true);
-
             }
         }
     }
@@ -369,7 +382,9 @@ module box_bezel_section(type, bottom, rows, cols, x, y) { //! Generates interlo
             union() {
                 clip(xmin = 0, xmax = w, ymin = 0, ymax = h)
                     translate([tw / 2 - x * w, th / 2 - y * h, profile_overlap])
-                        box_bezel(type, bottom);
+                        box_bezel(type, bottom)
+                            if($children && !bottom)
+                                children();
 
                 if(x < cols - 1 && y == 0)
                     translate([w, 0])
@@ -438,7 +453,7 @@ module box_screw_hole_positions(type) {
 }
 
 module box_base_blank(type) { //! Generates a 2D template for the base sheet
-    dxf("box_base");
+    dxf(str(box_name(type), "_base"));
 
     difference() {
         sheet_2D(box_base_sheet(type), box_width(type), box_depth(type), box_sheet_r(type));
@@ -449,7 +464,7 @@ module box_base_blank(type) { //! Generates a 2D template for the base sheet
 }
 
 module box_top_blank(type) {  //! Generates a 2D template for the top sheet
-    dxf("box_top");
+    dxf(str(box_name(type), "_top"));
 
     difference() {
         sheet_2D(box_top_sheet(type), box_width(type), box_depth(type), box_sheet_r(type));
@@ -464,7 +479,7 @@ function subst_sheet(type, sheet) =
         sheet ? assert(sheet_thickness(sheet) == sheet_thickness(s)) sheet : s;
 
 module box_shelf_blank(type, sheet = false) { //! Generates a 2D template for a shelf sheet
-    dxf("box_shelf");
+    dxf(str(box_name(type), "_shelf"));
 
     difference() {
         sheet_2D(subst_sheet(type, sheet), box_width(type) - bezel_clearance, box_depth(type) - bezel_clearance, 1);
@@ -512,7 +527,7 @@ module box_shelf_bracket(type, screw_positions, wall = undef) { //! Generates a
                         square([lip, eps]);
                 }
 
-    stl("shelf_bracket")
+    stl(box_bc_name(type, "shelf_bracket"))
         difference() {
             union() {
                 linear_extrude(w)
@@ -565,25 +580,25 @@ module box_shelf_bracket_section(type, rows, cols, x, y) { //! Generates section
 }
 
 module box_left_blank(type, sheet = false) { //! Generates a 2D template for the left sheet, `sheet` can be set to override the type
-    dxf("box_left");
+    dxf(str(box_name(type), "_left"));
 
     sheet_2D(subst_sheet(type, sheet), box_depth(type) - sheet_reduction(type), box_height(type) - sheet_reduction(type), 1);
 }
 
 module box_right_blank(type, sheet = false) { //! Generates a 2D template for the right sheet, `sheet` can be set to override the type
-    dxf("box_right");
+    dxf(str(box_name(type), "_right"));
 
     sheet_2D(subst_sheet(type, sheet), box_depth(type) - sheet_reduction(type), box_height(type) - sheet_reduction(type), 1);
 }
 
 module box_front_blank(type, sheet = false) { //! Generates a 2D template for the front sheet, `sheet` can be set to override the type
-    dxf("box_front");
+    dxf(str(box_name(type), "_front"));
 
     sheet_2D(subst_sheet(type, sheet), box_width(type) - sheet_reduction(type), box_height(type) - sheet_reduction(type), 1);
 }
 
 module box_back_blank(type, sheet = false) { //! Generates a 2D template for the back sheet, `sheet` can be set to override the type
-    dxf("box_back");
+    dxf(str(box_name(type), "_back"));
 
     sheet_2D(subst_sheet(type, sheet), box_width(type) - sheet_reduction(type), box_height(type) - sheet_reduction(type), 1);
 }

printed/box_assembly.scad

@@ -23,7 +23,7 @@
 // parameters to make the assembly views. E.g. module box_assembly() _box_assembly(box);
 //
 module _box_assembly(type, top = true, base = true, left = true, right = true, back = true, front = true, bezels = true, corners = 4)
-assembly("box") {
+assembly(box_name(type)) {
     echo("Box:", box_width(type), box_depth(type), box_height(type));
 
     t = sheet_thickness(box_sheets(type));
@@ -50,7 +50,9 @@ assembly("box") {
         translate_z(z * (box_height(type) / 2 - box_corner_gap(type) + 50 * exploded()))
             rotate([z * 90 - 90, 0, 0])
                 if(bezels && (z > 0 ? top : base))
-                    stl_colour(pp1_colour) render() box_bezel(type, z < 0);
+                    stl_colour(pp1_colour) render() box_bezel(type, z < 0)
+                        if(z > 0 && $children)
+                            children();
 
         translate_z(z * (box_height(type) / 2 + sheet_thickness + 50 * exploded()))
             box_screw_hole_positions(type)

printed/butt_box.scad

@@ -31,7 +31,8 @@
 //!  * An optional list of fixing blocks to be omitted can be given.
 //!  * Star washers can be omitted by setting the 11th parameter to false.
 //!
-//! Uses [fixing blocks](#fixing_block) and [corner blocks](#corner_block).
+//! Uses [fixing blocks](#fixing_block) and [corner blocks](#corner_block) by default. Setting `thin_blocks` uses 2screw_blocks instead of
+//! fixing_blocks along the sides.
 //
 
 use <fixing_block.scad>
@@ -46,12 +47,13 @@ function bbox_span(type)       = type[4]; //! Maximum span between fixing blocks
 function bbox_width(type)      = type[5]; //! Internal width
 function bbox_depth(type)      = type[6]; //! Internal depth
 function bbox_height(type)     = type[7]; //! Internal height
-function bbox_name(type)       = type[8] ? type[8] : "bbox"; //! Optional name if there is more than one box in a project
-function bbox_skip_blocks(type)= type[9] ? type[9] : [];  //! List of fixing blocks to skip, used to allow a hinged panel for example
-function star_washers(type)    = type[10] ? type[10] : is_undef(type[10]); //! Set to false to remove star washers.
+function bbox_name(type)       = type[8]; //! Optional name if there is more than one box in a project
+function bbox_skip_blocks(type)= type[9]; //! List of fixing blocks to skip, used to allow a hinged panel for example
+function bbox_star_washers(type)= type[10];//! Set to false to remove star washers.
+function bbox_thin_blocks(type) = type[11];//! Set for 2 screw blocks instead of three hole fixing blocks.
 
-function bbox(screw, sheets, base_sheet, top_sheet, span, size, name = "bbox", skip_blocks = [], star_washers = true) = //! Construct the property list for a butt_box
- [ screw, sheets, base_sheet, top_sheet, span, size.x, size.y, size.z, name, skip_blocks, star_washers ];
+function bbox(screw, sheets, base_sheet, top_sheet, span, size, name = "bbox", skip_blocks = [], star_washers = true, thin_blocks = false) = //! Construct the property list for a butt_box
+ [ screw, sheets, base_sheet, top_sheet, span, size.x, size.y, size.z, name, skip_blocks, star_washers, thin_blocks ];
 
 function bbox_volume(type) = bbox_width(type) * bbox_depth(type) * bbox_height(type) / 1000000; //! Internal volume in litres
 function bbox_area(type) = let(w =  bbox_width(type), d = bbox_depth(type), h = bbox_height(type)) //! Internal surface area in m^2
@@ -108,7 +110,10 @@ function fixing_block_positions(type) = let(
                 rotate([y > 0 ? 180 : 0, x * y * 90, 0]),
     ];
 
-function side_holes(type) = [for(p = fixing_block_positions(type), q = fixing_block_holes(bbox_screw(type))) p * q];
+function side_holes(type) = let(
+    screw = bbox_screw(type),
+    holes = bbox_thin_blocks(type) ? 2screw_block_holes(screw) : fixing_block_holes(screw))
+        [for(p = fixing_block_positions(type), q = holes) p * q];
 
 module bbox_drill_holes(type, t)
     position_children(concat(corner_holes(type), side_holes(type)), t)
@@ -226,11 +231,13 @@ module _bbox_assembly(type, top = true, base = true, left = true, right = true,
     width = bbox_width(type);
     depth = bbox_depth(type);
     height = bbox_height(type);
-    echo("Box:", width, depth, height, volume = bbox_volume(type), area = bbox_area(type));
+    echo("Butt_box:", width, depth, height, volume = bbox_volume(type), area = bbox_area(type));
 
     t = sheet_thickness(bbox_sheets(type));
     bt = sheet_thickness(bbox_base_sheet(type));
     tt = sheet_thickness(bbox_top_sheet(type));
+    star_washers = bbox_star_washers(type);
+    thin_blocks = bbox_thin_blocks(type);
 
     function is_missing_screw(p) = p.y > depth / 2 - 1 ? !back : false;
 
@@ -240,13 +247,16 @@ module _bbox_assembly(type, top = true, base = true, left = true, right = true,
             let(q = transform([0, 0, 0], p), thickness = q.z > 0 ? tt : bt)
                 multmatrix(p)
                     fastened_corner_block_assembly(is_missing_screw(q) && ((q.z > 0) != (q.x > 0)) ? 0 : t, bbox_screw(type), thickness,
-                                                   is_missing_screw(q) && ((q.z > 0) == (q.x > 0)) ? 0 : t, star_washers = star_washers(type));
+                                                   is_missing_screw(q) && ((q.z > 0) == (q.x > 0)) ? 0 : t, star_washers = star_washers);
 
         h = height / 2 - 1;
         for(p = fixing_block_positions(type))
             let(q = transform([0, 0, 0], p), thickness = q.z > h ? tt : q.z < -h ? bt : t)
                 multmatrix(p)
-                    fastened_fixing_block_assembly(is_missing_screw(q) ? 0 : t, bbox_screw(type), thickness2 = thickness, star_washers = star_washers(type));
+                    if(thin_blocks)
+                        fastened_2screw_block_assembly(is_missing_screw(q) ? 0 : t, bbox_screw(type), thickness_below = thickness, star_washers = star_washers);
+                    else
+                        fastened_fixing_block_assembly(is_missing_screw(q) ? 0 : t, bbox_screw(type), thickness2 = thickness, star_washers = star_washers);
 
         for(x = [-1, 1])
             translate([x * (width / 2 + t / 2 + eps + 25 * exploded()), 0])

printed/cable_clip.scad

@@ -0,0 +1,117 @@
+//
+// NopSCADlib Copyright Chris Palmer 2022
+// nop.head@gmail.com
+// hydraraptor.blogspot.com
+//
+// This file is part of NopSCADlib.
+//
+// NopSCADlib is free software: you can redistribute it and/or modify it under the terms of the
+// GNU General Public License as published by the Free Software Foundation, either version 3 of
+// the License, or (at your option) any later version.
+//
+// NopSCADlib is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+// without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+// See the GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License along with NopSCADlib.
+// If not, see <https://www.gnu.org/licenses/>.
+//
+
+//
+//! Cable clips to order. Can be for one or two cables of different sizes.
+//
+include <../core.scad>
+use <../vitamins/wire.scad>
+use <../utils/fillet.scad>
+
+wall = 2;
+
+function cable_clip_width(screw) = max(wall + 2 * screw_clearance_radius(screw) + wall, washer_diameter(screw_washer(screw))); //! Width given the `screw`.
+function cable_clip_height(cable) = cable_height(cable) + wall; //! Height given the `cable`.
+function cable_clip_extent(screw, cable) = screw_clearance_radius(screw) + wall + cable_width(cable) + wall; //! How far it extends from the screw.
+function cable_clip_offset(screw, cable) = screw_clearance_radius(screw) + wall + cable_width(cable) / 2; //! The offset of the cable from the screw
+
+module single_cable_clip(screw, cable, h = 0) {
+    screw_dia = 2 * screw_clearance_radius(screw);
+    height = cable_clip_width(screw);
+    depth = h ? h : cable_height(cable) + wall;
+    w = cable_width(cable);
+    width = wall + w + wall + screw_dia + wall;
+    hole_x = wall + w + wall + screw_dia / 2;
+    rad = min(wall + cable_wire_size(cable) / 2, depth / 2);
+    r = extrusion_width - eps;
+    translate([-hole_x, 0]) difference() {
+        linear_extrude(height)
+            difference() {
+                hull() {
+                    rounded_square([width, 1], r, center = false);
+
+                    translate([width - 1, 0])
+                        rounded_square([1, depth], r, center = false);
+
+                    translate([rad, depth - rad])
+                        circle(r = rad);
+                }
+
+                translate([wall + cable_width(cable) / 2, 0]) {
+                    hull() {
+                        for(p = cable_bundle_positions(cable))
+                            translate(p)
+                                circle(d = cable_wire_size(cable));
+
+                        square([w, eps], center = true);
+                    }
+                    for(side = [-1, 1])
+                        translate([side * w / 2, 0])
+                            hflip(side < 0)
+                                fillet(r = r, h = 0);
+                }
+            }
+
+        translate([hole_x, depth / 2, height / 2])
+            rotate([90,0,0])
+                teardrop_plus(h = depth + 1, r = screw_dia / 2, center = true);
+    }
+}
+
+
+module double_cable_clip(screw, cable1, cable2) {
+    h = max(cable_clip_height(cable1), cable_clip_height(cable2));
+    union() {
+        single_cable_clip(screw, cable1, h);
+
+        mirror([1,0,0]) single_cable_clip(screw, cable2, h);
+    }
+}
+
+module cable_clip(screw, cable1, cable2 = 0) { //! Create the STL for a single cable or two cable clip
+    function clip_str(screw) = str("cable_clip_", screw_radius(screw) * 20);
+    function cable_str(cable) = str("_", cable_wires(cable), "_", round(cable_wire_size(cable) * 10));
+
+    if(cable2) {
+        stl(str(clip_str(screw), cable_str(cable1), cable_str(cable2)));
+
+        double_cable_clip(screw, cable1, cable2);
+    }
+    else {
+        stl(str(clip_str(screw), cable_str(cable1)));
+
+        single_cable_clip(screw, cable1);
+    }
+}
+
+
+module cable_clip_assembly(screw, thickness, cable1, cable2 = 0) { //! Cable clip with the fasteners
+    height = max(cable_clip_height(cable1), cable2 ? cable_clip_height(cable2) : 0);
+
+    stl_colour(pp1_colour) render()
+        translate([0, cable_clip_width(screw) / 2]) rotate([90, 0, 0])
+            cable_clip(screw, cable1, cable2);
+
+    translate_z(height)
+        screw_and_washer(screw, screw_length(screw, height + thickness, 2, nyloc = true));
+
+    translate_z(-thickness)
+        vflip()
+            nut_and_washer(screw_nut(screw), true);
+}

printed/cable_grommets.scad

@@ -158,14 +158,14 @@ module mouse_grommet_hole(r, h = 50, z = undef, expand = wall + clearance) //! M
                 square([2 * R, eps]);
         }
 
-function mouse_grommet_offset(r) = r + wall;
+function mouse_grommet_offset(r) = r + wall; //! Offset of the wire from the ground
+function mouse_grommet_length(r) = 2 * r + 2 * wall + 2 * overlap; //! Length of grommet given r
 
 module mouse_grommet(r, thickness) { //! Make the STL for a mouse grommet
 
     width = 2 * (wall + clearance) + thickness;
-    length = 2 * r + 2 * wall + 2 * overlap;
 
-    stl(str("mouse_grommet_", r * 10, "_", thickness))
+    stl(str("mouse_grommet_", r * 20, "_", thickness))
         rotate([90, 0, 0])
             union() {
                 for(side = [-1, 1])
@@ -193,10 +193,10 @@ module mouse_grommet_assembly(r, thickness)
             mouse_grommet(r, thickness);
 
 module ribbon_grommet_20_3_stl() ribbon_grommet(20, 3);
-module mouse_grommet_15_3_stl() mouse_grommet(1.5, 3);
-module mouse_grommet_20_3_stl() mouse_grommet(2, 3);
-module mouse_grommet_25_3_stl() mouse_grommet(2.5, 3);
-module mouse_grommet_30_3_stl() mouse_grommet(3, 3);
+module mouse_grommet_30_3_stl() mouse_grommet(1.5, 3);
+module mouse_grommet_40_3_stl() mouse_grommet(2, 3);
+module mouse_grommet_50_3_stl() mouse_grommet(2.5, 3);
+module mouse_grommet_60_3_stl() mouse_grommet(3, 3);
 
 module round_grommet_bottom_30_stl() round_grommet_bottom(3);
 module round_grommet_bottom_40_stl() round_grommet_bottom(4);

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

@@ -29,6 +29,9 @@
 //! This allows the block and one set of fasteners to be on one assembly and the other fasteners on the mating assemblies.
 //!
 //! Star washers can be omitted by setting `star_washers` to false.
+//!
+//! A 2screw_block is a thinner version with two screws and two mating surfaces. It can be used as an alternative to fixing blocks when
+//! high lateral rigidity is not required.
 //
 include <../core.scad>
 use <../vitamins/insert.scad>
@@ -41,46 +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) = //! Block width, depth and height
-    corner_block_hole_offset(screw) + insert_outer_d(screw_insert(screw)) / 2 + wall;
+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_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_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_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])
@@ -106,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(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);
 }
@@ -161,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&deg;C.
@@ -192,3 +203,198 @@ module corner_block_M30_assembly() corner_block_assembly(M3_cap_screw);
 //! 1. Lay the blocks on each of their other two flat sides and repeat.
 //
 module corner_block_M40_assembly() corner_block_assembly(M4_cap_screw);
+
+//
+//! 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&deg;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);
+
+//
+//! 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&deg;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);
+
+//
+//! 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&deg;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&deg;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, 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, 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, short_insert = false) { //! Generate the STL for a printed 2screw block
+    r = 1;
+    cb_width = 2screw_block_width(screw, short_insert);
+    cb_height = corner_block_width(screw, short_insert);
+    cb_depth = cb_height;
+    insert = screw_insert(screw, short_insert);
+    corner_rad = insert_outer_d(insert) / 2 + wall;
+    offset = corner_block_hole_offset(screw, short_insert);
+
+    stl(name ? name : str("2screw_block", "_M", screw_radius(screw) * 20, short_insert ? "_s" : ""))
+        difference() {
+            hull()  {
+                translate([-cb_width / 2 + r, r])
+                    cylinder(r = r, h = 1);
+
+                translate([cb_width / 2 - r, r])
+                    cylinder(r = r, h = 1);
+
+                translate([0, offset, offset])
+                    sphere(corner_rad);
+
+                translate([0, offset])
+                    cylinder(r = corner_rad, h = 1);
+
+                translate([0, r, offset])
+                    rotate([-90, 0, 180])
+                        rounded_cylinder(r = corner_rad, h = r, r2 = r);
+            }
+            2screw_block_v_hole(screw, short_insert)
+                insert_hole(insert, overshoot);
+
+            2screw_block_h_hole(screw, short_insert)
+                insert_hole(insert, overshoot, true);
+
+            children();
+        }
+}
+
+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, short_insert) children();
+
+    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, short_insert = false) { //! Printed block with fasteners
+    thickness2 = !is_undef(thickness_below) ? thickness_below : thickness;
+    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, short_insert) children();
+
+    if(thickness)
+        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, short_insert)
+            translate_z(thickness2)
+                screw_and_washer(screw, screw_length2, star_washers);
+}
+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&deg;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_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&deg;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&deg;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_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&deg;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&deg;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_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&deg;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&deg;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_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&deg;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/drag_chain.scad

@@ -35,18 +35,17 @@ include <../core.scad>
 use <../utils/horiholes.scad>
 use <../utils/maths.scad>
 
-clearance = 0.1;
-
 function drag_chain_name(type)        = type[0]; //! The name to allow more than one in a project
 function drag_chain_size(type)        = type[1]; //! The internal size and link length
 function drag_chain_travel(type)      = type[2]; //! X travel
 function drag_chain_wall(type)        = type[3]; //! Side wall thickness
 function drag_chain_bwall(type)       = type[4]; //! Bottom wall
 function drag_chain_twall(type)       = type[5]; //! Top wall
-function drag_chain_screw(type)       = type[6]; //! Mounting screw for the ends
-function drag_chain_screw_lists(type) = type[7]; //! Two lists of four bools to say which screws positions are used
+function drag_chain_clearance(type)   = type[6]; //! Clearance around joints
+function drag_chain_supports(type)    = type[7]; //! Whether to print version of chain with or without supports
+function drag_chain_screw(type)       = type[8]; //! Mounting screw for the ends
+function drag_chain_screw_lists(type) = type[9]; //! Two lists of four bools to say which screws positions are used
 
-function drag_chain_clearance() = clearance; //! Clearance around joints.
 
 function drag_chain_radius(type) = //! The bend radius at the pivot centres
     let(s = drag_chain_size(type))
@@ -56,12 +55,15 @@ function drag_chain_z(type) = //! Outside dimension of a 180 bend
     let(os = drag_chain_outer_size(type), s = drag_chain_size(type))
         2 * drag_chain_radius(type) + os.z;
 
-function drag_chain(name, size, travel, wall = 1.6, bwall = 1.5, twall = 1.5, screw = M2_cap_screw, screw_lists = [[1,0,0,1],[1,0,0,1]]) = //! Constructor
-    [name, size, travel, wall, bwall, twall, screw, screw_lists];
+function drag_chain(name, size, travel, wall = 1.6, bwall = 1.5, twall = 1.5, clearance = 0.1, supports = true, screw = M2_cap_screw, screw_lists = [[1,0,0,1],[1,0,0,1]]) = //! Constructor
+    [name, size, travel, wall, bwall, twall, clearance, supports, screw, screw_lists];
 
 function drag_chain_outer_size(type) = //! Link outer dimensions
     let(s = drag_chain_size(type), z = s.z + drag_chain_bwall(type) + drag_chain_twall(type))
-        [s.x + z, s.y + 4 * drag_chain_wall(type) + 2 * clearance, z];
+        [s.x + z, s.y + 4 * drag_chain_wall(type) + 2 * drag_chain_clearance(type), z];
+
+function drag_chain_links(type) = //! Number of links in chain
+    ceil(drag_chain_travel(type) / drag_chain_size(type).x) + 4;
 
 function screw_lug_radius(screw) = //! Radius of a screw lug
     corrected_radius(screw_clearance_radius(screw)) + 3.1 * extrusion_width;
@@ -85,6 +87,7 @@ module drag_chain_screw_positions(type, end) { //! Place children at the screw p
     r = screw_lug_radius(drag_chain_screw(type));
     s = drag_chain_size(type);
     os = drag_chain_outer_size(type);
+    clearance = drag_chain_clearance(type);
     R = os.z / 2;
     x0 = end ? R + norm([drag_chain_cam_x(type), R - drag_chain_twall(type)]) + clearance + r : r;
     x1 = end ? os.x - r : os.x - 2 * R - clearance - r;
@@ -99,7 +102,7 @@ function drag_chain_cam_x(type) = // how far the cam sticks out
     let(s = drag_chain_size(type),
         r =  drag_chain_outer_size(type).z / 2,
         wall =  drag_chain_wall(type),
-        cam_r = s.x - 2 * clearance - wall - r,  // inner_x_normal - clearance - r
+        cam_r = s.x - 2 * drag_chain_clearance(type) - wall - r,  // inner_x_normal - clearance - r
         twall = drag_chain_twall(type)
     )   min(sqrt(max(sqr(cam_r) - sqr(r - twall), 0)), r);
 
@@ -111,8 +114,15 @@ module drag_chain_link(type, start = false, end = false, check_kids = true) { //
     bwall = drag_chain_bwall(type);
     twall = drag_chain_twall(type);
     os = drag_chain_outer_size(type);
+    clearance = drag_chain_clearance(type);
+    supports = drag_chain_supports(type);
     r = os.z / 2;
-    pin_r = r / 2;
+    // initial estimates of pin_r and pin_h
+    pin_r0 = r / 2 - 0.2;
+    pin_h0 = min(wall + clearance, 2 * pin_r0 - 1);
+     // for conical pin: ensure minimum radius of top of pin and pin does not overlap cutout
+    pin_r = supports ? r / 2 : min(r / 2 - 0.2, (os.z - 2 * twall - 3 * pin_h0 / 4 - 0.2) / 2);
+    pin_h = min(wall + clearance, 2 * pin_r - 1);
 
     socket_x = r;
     pin_x = socket_x + s.x;
@@ -123,44 +133,51 @@ module drag_chain_link(type, start = false, end = false, check_kids = true) { //
     inner_x = start ? 0 : outer_normal_x - wall; // s.x - clearance - wall
 
     roof_x_normal = 2 * r - twall;
-    roof_x = start ? 0 : roof_x_normal;
-
-    floor_x = start ? 0 : 2 * r;
     cam_x = drag_chain_cam_x(type);
     assert(r + norm([drag_chain_cam_x(type), r - drag_chain_twall(type)]) + clearance <= inner_x || start, "Link must be longer");
 
+    vflip(!supports)
     difference() {
         union() {
             for(side = [-1, 1])
                 rotate([90, 0, 0]) {
                     // Outer cheeks
                     translate_z(side * (os.y / 2 - wall / 2))
-                        linear_extrude(wall, center = true)
-                            difference() {
+                        difference() {
+                            linear_extrude(wall, center = true)
                                 hull() {
                                     if(start)
                                         square([eps, os.z]);
                                     else
                                         translate([socket_x, r])
-                                            rotate(180)
+                                            rotate(supports ? 180 : 0)
                                                 teardrop(r = r, h = 0);
 
                                     translate([outer_end_x - eps, 0])
                                         square([eps, os.z]);
                                 }
                                 if(!start)
-                                    translate([socket_x, r])
-                                        horihole(pin_r, r);
+                                    if(supports)
+                                        translate([socket_x, r, 0])
+                                            horihole(pin_r, r, wall + 2*eps);
+                                    else
+                                        translate([socket_x, r, -side * (wall / 2 + clearance)])
+                                            rotate(180)
+                                                hull() {
+                                                    horihole(r = pin_r + pin_h / 2, z = r, h = eps);
+                                                    translate_z(side * pin_h)
+                                                        horihole(r = pin_r - pin_h / 2, z = r, h = eps);
+                                                }
                             }
                     // Inner cheeks
-                    translate_z(side * (s.y / 2 + wall / 2))
+                    translate_z(side * (s.y / 2 + wall / 2)) {
                         linear_extrude(wall, center = true)
                             difference() {
                                 union() {
                                     hull() {
                                         if(!end) {
                                             translate([pin_x, r])
-                                                rotate(180)
+                                                rotate(supports ? 180 : 0)
                                                     teardrop(r = r, h = 0);
 
                                             translate([pin_x, twall])
@@ -186,31 +203,39 @@ module drag_chain_link(type, start = false, end = false, check_kids = true) { //
                                                     square(os.z);
                                     }
                             }
-                    // Pin
-                    if(!end)
-                        translate([pin_x, r, side * (s.y / 2 + wall + clearance)])
-                            horicylinder(r = pin_r, z = r, h = 2 * wall);
+                        // Pin
+                        if(!end)
+                            if(supports)
+                                translate([pin_x, r, side * (wall / 2 + clearance)])
+                                    horicylinder(r = pin_r, z = r, h = 2 * wall + eps);
+                            else
+                                translate([pin_x, r, side * wall / 2])
+                                    vflip(side == -1)
+                                        cylinder(r1 = pin_r + pin_h / 2, r2 = pin_r - pin_h / 2, h = pin_h + eps);
+                    }
 
                     // Cheek joint
                     translate([inner_x, 0, side * (s.y / 2 + wall) - 0.5])
                         cube([outer_end_x - inner_x, os.z, 1]);
                 }
 
-            // Roof, actually the floor when printed
+            // Roof, actually the floor when printed with supports
+            roof_x = start ? 0 : roof_x_normal;
             roof_end = end ? s.x + 2 * r : s.x + r - twall - clearance;
-            translate([roof_x, -s.y / 2 - 0.5])
-                cube([roof_end - roof_x , s.y + 1, twall]);
+            translate([roof_x, -s.y / 2 - wall, 0]) {
+                cube([roof_end - roof_x, s.y + 2 * wall, twall]);
+                translate([0, -wall, 0])
+                    cube([s.x - roof_x - clearance, s.y + 4 * wall, twall]);
+            }
 
-            translate([roof_x, -os.y / 2 + 0.5])
-                cube([s.x - clearance - roof_x, os.y - 1, twall]);
-
-            // Floor, actually the roof when printed
+            // Floor, actually the roof when printed with supports
+            floor_x = start ? 0 : 2 * r;
             floor_end = end ? s.x + 2 * r : s.x + r;
-            translate([floor_x, -s.y / 2 - wall, os.z - bwall])
+            translate([floor_x, -s.y / 2 - wall, os.z - bwall]) {
                 cube([floor_end - floor_x, s.y + 2 * wall, bwall]);
-
-            translate([floor_x, -os.y / 2 + 0.5,  os.z - bwall])
-                cube([s.x - floor_x - clearance, os.y -1, bwall]);
+                translate([0, -wall, 0])
+                    cube([s.x - floor_x - clearance, s.y + 4 * wall, bwall]);
+            }
 
             if(start || end) {
                 drag_chain_screw_positions(type, end)
@@ -223,16 +248,16 @@ module drag_chain_link(type, start = false, end = false, check_kids = true) { //
                 }
                 children();
             }
-        }
+        } // end union
+
         if(start || end)
             translate_z(-eps)
                 drag_chain_screw_positions(type, end)
                     rotate($a)
                         poly_cylinder(r = screw_clearance_radius(drag_chain_screw(type)), h = os.z + 2 * eps, center = false);
+    } // end difference
 
-    }
-
-    if(show_supports() && !end) {
+    if(supports && show_supports() && !end) {
         for(side = [-1, 1]) {
             w = 2.1 * extrusion_width;
             translate([s.x + r + cam_x - w / 2, side * (s.y / 2 + wall / 2), twall / 2])
@@ -255,16 +280,15 @@ module _drag_chain_assembly(type, pos = 0, render = false) {
     s = drag_chain_size(type);
     x = (1 + exploded()) * s.x;
     r = drag_chain_radius(type) * x / s.x;
-    travel = drag_chain_travel(type);
-    links = ceil(travel / s.x);
-    actual_travel = links * s.x;
+    links = drag_chain_links(type);
+    actual_travel = (links - 4) * s.x;
     z = drag_chain_outer_size(type).z;
 
     zb = z / 2;                                     // z of bottom track
     c = [actual_travel / 2 + pos / 2, 0, r + zb];   // centre of bend
 
     points = [                                      // Calculate list of hinge points
-        for(i = 0, p = [0, 0, z / 2 + 2 * r]; i < links + 5;
+        for(i = 0, p = [0, 0, z / 2 + 2 * r]; i < links + 1;
             i = i + 1,
             dx = p.z > c.z ? x : -x,
             p = max(p.x + dx, p.x) <= c.x ? p + [dx, 0, 0]      // Straight sections
@@ -277,11 +301,12 @@ module _drag_chain_assembly(type, pos = 0, render = false) {
 
     module link(n)                                  // Position and colour link with origin at the hinge hole
         translate([-z / 2, 0, -z / 2]) {
-            stl_colour(n < 0 || n == npoints - 1 ? pp3_colour : n % 2 ? pp1_colour : pp2_colour)
-                render_if(render)
-                    drag_chain_link(type, start = n == -1, end = n == npoints - 1, check_kids = false)
-                        let($fasteners = 0)
-                            children();
+            vflip(!drag_chain_supports(type))
+                stl_colour(n < 0 || n == npoints - 1 ? pp3_colour : n % 2 ? pp1_colour : pp2_colour)
+                    render_if(render)
+                        drag_chain_link(type, start = n == -1, end = n == npoints - 1, check_kids = false)
+                            let($fasteners = 0)
+                                children();
 
             let($fasteners = 1) children();
         }

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

@@ -67,18 +67,19 @@ module foot(type = foot) { //! Generate STL
         }
 }
 
-module foot_assembly(t = 0, type = foot, flip = false) { //! Assembly with fasteners in place for specified sheet thickness
+module foot_assembly(t = 0, type = foot, flip = false, no_washer = false) { //! Assembly with fasteners in place for specified sheet thickness
     screw = foot_screw(type);
     nut = screw_nut(screw);
     squeeze = 0.5;
-    screw_length = screw_length(screw, foot_thickness(type) + t - squeeze, 2, nyloc = true);
+    screw_length = screw_length(screw, foot_thickness(type) + t - squeeze, no_washer ? 1 : 2, nyloc = true);
 
     vflip() explode(15, true) {
-        stl_colour(pp4_colour) foot(type);
+        translate_z(-squeeze)
+            stl_colour(pp4_colour) foot(type);
 
         if(t)
             explode(15, true)
-                translate_z(foot_thickness(type))
+                translate_z(foot_thickness(type) - squeeze)
                     if(flip)
                         nut_and_washer(nut, true);
                     else
@@ -87,9 +88,15 @@ module foot_assembly(t = 0, type = foot, flip = false) { //! Assembly with faste
     if(t)
         translate_z(t)
             if(flip)
-                screw_and_washer(screw, screw_length);
+                if(no_washer)
+                    screw(screw, screw_length);
+                else
+                    screw_and_washer(screw, screw_length);
             else
-                nut_and_washer(nut, true);
+                if(no_washer)
+                    nut(nut, true);
+                else
+                    nut_and_washer(nut, true);
 }
 
 module insert_foot(type = insert_foot) { //! Generate STL for foot with insert

printed/knob.scad

@@ -0,0 +1,171 @@
+//
+// NopSCADlib Copyright Chris Palmer 221
+// nop.head@gmail.com
+// hydraraptor.blogspot.com
+//
+// This file is part of NopSCADlib.
+//
+// NopSCADlib is free software: you can redistribute it and/or modify it under the terms of the
+// GNU General Public License as published by the Free Software Foundation, either version 3 of
+// the License, or (at your option) any later version.
+//
+// NopSCADlib is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+// without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+// See the GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License along with NopSCADlib.
+// If not, see <https://www.gnu.org/licenses/>.
+//
+
+//
+//! Parametric knobs for potentiometers and encoders.
+//!
+//! A knob can be constructed by specifying all the parameters or the potentiometer can be specified to customise it for its shaft with a recess to clear the nut, washer and thread.
+//! An optional skirt and / or a pointer can be specified.
+//!
+//! The STL includes a support membrane that needs to be cut out and a thread needs to be tapped for the grub screw.
+//
+
+include <../core.scad>
+use <../utils/hanging_hole.scad>
+use <../utils/rounded_polygon.scad>
+use <../vitamins/potentiometer.scad>
+
+clearance = 0.2;
+
+function knob_name(type)     = type[0]; //! Name for the stl maker
+function knob_top_d(type)    = type[1]; //! Diameter at the top
+function knob_bot_d(type)    = type[2]; //! Diameter at the bottom
+function knob_height(type)   = type[3]; //! Height
+function knob_corner_r(type) = type[4]; //! Rounded top corner
+function knob_shaft_d(type)  = type[5]; //! Shaft diameter
+function knob_shaft_len(type)= type[6]; //! Shaft length
+function knob_flat_d(type)   = type[7]; //! The shaft diameter at the flat
+function knob_flat_h(type)   = type[8]; //! The length of the flat
+function knob_screw(type)    = type[9]; //! The grub screw type
+function knob_skirt(type)    = type[10]; //! Skirt diameter and thickness
+function knob_recess(type)   = type[11]; //! Recess diameter and thickness to clear nut and thread, diameter, nut height, thread height
+function knob_pointer(type)  = type[12]; //! Pointer outside radius, [point width, back width] and height height
+
+function knob(name = "knob", top_d = 12, bot_d = 15, height = 18, shaft_length, skirt = [20, 2], pointer = false, corner_r = 2, screw = M3_grub_screw, shaft_d, flat_d, flat_h, recess) = //! Constructor
+[
+    name, top_d, bot_d, height, corner_r, shaft_d, shaft_length, flat_d, flat_h, screw, skirt, recess, pointer
+];
+
+function knob_for_pot(pot, thickness, z = 1, washer = true, top_d = 12, bot_d = 15, height = 0, shaft_length = undef, skirt = [20, 2], pointer = false, corner_r = 2, screw = M3_grub_screw) =  //! Construct a knob to fit specified pot
+    let(s = pot_shaft(pot),
+        washer = washer && pot_washer(pot) ? pot_washer(pot) : [0, 0],
+        nut = pot_nut(pot) ? pot_nut(pot) : [pot_thread_d(pot) * cos(30), pot_thread_h(pot) - thickness],
+        shaft_length = is_undef(shaft_length) ? s.z : min(shaft_length, s.z),
+        h = round_to_layer(shaft_length + pot_thread_h(pot) - thickness - z),
+        height = max(height, h + 1),
+        recess = [(z > washer.y ? nut.x / cos(30) : washer.x) + 0.4, round_to_layer(nut.y + washer.y - z + layer_height), round_to_layer(pot_thread_h(pot) - z - thickness + 2 * layer_height)],
+        flat_d = s.y + 0.06,
+        flat_h = min(s[3], shaft_length)
+    )
+    knob(name = str(pot[0], "_knob"),
+         top_d = top_d,
+         bot_d = bot_d,
+         height = height,
+         corner_r = corner_r,
+         screw = screw,
+         skirt = skirt,
+         pointer = pointer,
+         shaft_d = s.x,
+         shaft_length = h,
+         flat_d = flat_d,
+         flat_h = flat_h,
+         recess = recess);
+
+function knob_screw_z(type) = knob_shaft_len(type) - knob_flat_h(type) / 2;
+
+module knob(type, supports = true) { //! Generate the STL for a knob
+    r_top = knob_top_d(type) / 2;
+    r_bot = knob_bot_d(type) / 2;
+    h = knob_height(type);
+    r = knob_corner_r(type);
+    screw = knob_screw(type);
+    sr = knob_shaft_d(type) / 2 + (screw ? clearance : 0);
+    top_wall = h - knob_shaft_len(type);
+    fr = knob_flat_d(type) - sr + 2 * clearance;
+    fh = knob_flat_h(type);
+    skirt = knob_skirt(type);
+    recess = knob_recess(type);
+    pointer = knob_pointer(type);
+
+    stl(knob_name(type))
+    {
+        difference() {
+            union() {
+                rotate_extrude() {
+                    rounded_polygon([
+                        [0, h, 0],
+                        [r_top - r, h - r, r],
+                        [r_bot, 0, 0],
+                        [0, 0, 0],
+                    ]);
+
+                    if(skirt)
+                        square([skirt.x / 2, skirt.y]);
+                }
+                if(pointer)
+                    linear_extrude(pointer.z)
+                        rotate(-90)
+                            hull() {
+                                translate([pointer.x, 0])
+                                    square([eps, pointer.y[0]], center = true);
+
+                                translate([r_bot, 0])
+                                    square([eps, pointer.y[1]], center = true);
+                            }
+            }
+            shaft_z = recess ? recess.z + (supports ? layer_height : -eps) : -eps;
+            translate_z(shaft_z) {
+                h = h - top_wall - shaft_z;
+                linear_extrude(h)
+                    difference() {
+                        poly_circle(sr);
+
+                        if(fr > 0)
+                            translate([-sr, fr])
+                                square([2 * sr, sr]);
+                    }
+
+                if(h > fh)
+                    poly_cylinder(sr, round_to_layer(h - fh), center = false);
+            }
+
+            if(recess)
+                translate_z(-eps)
+                    hull() {
+                        poly_cylinder(r = recess.x / 2, h = recess.y + eps, center = false);
+
+                        linear_extrude(recess.z + eps)
+                            offset(min(-(recess.z - recess.y), 0))
+                                poly_circle(recess.x / 2);
+                    }
+
+            if(screw)
+                translate_z(knob_screw_z(type))
+                    rotate([90, 0, 180])
+                        teardrop_plus(r = screw_pilot_hole(screw), h = max(r_top, r_bot) + eps, center = false);
+        }
+    }
+}
+
+//! Knob with grub screw in place
+module knob_assembly(type) explode(40, explode_children = true) { //! Assembly with the grub screw in place
+    sr = knob_shaft_d(type) / 2;
+    fr = knob_flat_d(type) < sr ? knob_flat_d(type) - sr : sr;
+    r_top = knob_top_d(type) / 2;
+    r_bot = knob_bot_d(type) / 2;
+    screw_length = screw_shorter_than(min(r_top, r_bot) - fr);
+    screw = knob_screw(type);
+
+    stl_colour(pp1_colour) render() knob(type, supports = false);
+
+    if(screw)
+        translate([0, (fr + screw_length), knob_screw_z(type)])
+            rotate([90, 0, 180])
+                screw(screw, screw_length);
+}

printed/pocket_handle.scad

@@ -137,7 +137,7 @@ module pocket_handle_assembly(type) { //! Assembly with fasteners in place
 
     translate_z(f.z + t / 2) hflip() {
         stl_colour(pp1_colour)
-            pocket_handle(type);
+            render() pocket_handle(type);
 
         pocket_handle_hole_positions(type) {
             translate_z(f.z + t)

printed/press_fit.scad

@@ -22,7 +22,7 @@
 //!
 //! Add solvent or glue to make a permanent fixture.
 //
-include <../core.scad>
+include <../utils/core/core.scad>
 
 interference = 0.0;
 

printed/printed_box.scad

@@ -26,12 +26,14 @@
 //!
 //! It can also have printed feet on the base with the screws doubling up to hold the base on.
 //
-include <../core.scad>
+include <../utils/core/core.scad>
+use <../vitamins/screw.scad>
+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
@@ -39,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
@@ -61,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/printed_pulleys.scad

@@ -21,8 +21,8 @@
 //! Creative Commons - Attribution - Share Alike license (see <https://creativecommons.org/licenses/by-sa/3.0/>)
 //
 
-include <../core.scad>
-include <../vitamins/pulleys.scad>
+include <../utils/core/core.scad>
+use <../vitamins/pulley.scad>
 
 printed_pulley_GT2_profile = [[0.747183,-0.5],[0.747183,0],[0.647876,0.037218],[0.598311,0.130528],[0.578556,0.238423],[0.547158,0.343077],[0.504649,0.443762],[0.451556,0.53975],[0.358229,0.636924],[0.2484,0.707276],[0.127259,0.750044],[0,0.76447],[-0.127259,0.750044],[-0.2484,0.707276],[-0.358229,0.636924],[-0.451556,0.53975],[-0.504797,0.443762],[-0.547291,0.343077],[-0.578605,0.238423],[-0.598311,0.130528],[-0.648009,0.037218],[-0.747183,0],[-0.747183,-0.5]];
 

printed/psu_shroud.scad

@@ -27,6 +27,7 @@ use <../vitamins/insert.scad>
 use <../vitamins/wire.scad>
 use <../vitamins/psu.scad>
 use <../utils/round.scad>
+use <../vitamins/terminal.scad>
 
 wall = 1.8;
 top = 1.5;

printed/ribbon_clamp.scad

@@ -18,7 +18,10 @@
 //
 
 //
-//! Clamp for ribbon cable and polypropylene strip.
+//! Clamp for ribbon cable and polypropylene strip or one or more ribbon cables.
+//!
+//! * When `ways` is a scalar number the slot is sized for one ribbon cable and a PP strip.
+//! * When `ways` is a two element vector the second element indicates the number of cables and the slot is size for just the cables.
 //
 include <../core.scad>
 use <../vitamins/insert.scad>
@@ -34,7 +37,8 @@ function ribbon_clamp_hole_pitch(ways, screw = screw) =
 
 function ribbon_clamp_width(screw = screw) = 2 * (insert_hole_radius(screw_insert(screw)) + wall); //! Width
 function ribbon_clamp_length(ways, screw = screw) = ribbon_clamp_hole_pitch(ways, screw) + ribbon_clamp_width(screw); //! Length given ways
-function ribbon_clamp_height(screw = screw) = ribbon_clamp_screw_depth(screw) + 1; //! Height
+function ribbon_clamp_height(screw = screw, ways = undef) = ribbon_clamp_screw_depth(screw) + 1 +  //! Height
+        (!is_undef(ways) && is_list(ways) ?  (ways[1] - 1) * inch(0.05) : 0);
 
 module ribbon_clamp_hole_positions(ways, screw = screw, side = undef) //! Place children at hole positions
     for(x = is_undef(side) ? [-1, 1] : side)
@@ -45,16 +49,20 @@ module ribbon_clamp_holes(ways, h = 20, screw = screw) //! Drill screw holes
     ribbon_clamp_hole_positions(ways, screw)
         drill(screw_clearance_radius(screw), h);
 
+function str_ways(ways) = is_list(ways) ? str(ways[0], "_", ways[1]) : str(ways);
+function str_screw_d(screw_d) = screw_d != 3 ? str("_", screw_d) : "";
+
 module ribbon_clamp(ways, screw = screw) { //! Generate STL for given number of ways
     screw_d = screw_radius(screw) * 2;
 
     pitch = ribbon_clamp_hole_pitch(ways, screw);
     d = ribbon_clamp_width(screw);
-    h = ribbon_clamp_height(screw);
-    t = round_to_layer(ribbon_clamp_slot_depth() + wall);
+    h = ribbon_clamp_height(screw, ways);
+    slot_d = is_list(ways) ? ways[1] * inch(0.05) : ribbon_clamp_slot_depth();
+    t = round_to_layer(slot_d + wall);
     insert = screw_insert(screw);
 
-    stl(str("ribbon_clamp_", ways, screw_d != 3 ? str("_", screw_d) : ""))
+    stl(str("ribbon_clamp_", str_ways(ways), str_screw_d(screw_d)))
         difference() {
             union() {
                 hull() {
@@ -72,7 +80,7 @@ module ribbon_clamp(ways, screw = screw) { //! Generate STL for given number of
             }
 
             translate_z(h)
-                cube([ribbon_clamp_slot(ways), d + 1, ribbon_clamp_slot_depth() * 2], center = true);
+                cube([ribbon_clamp_slot(ways), d + 1, slot_d * 2], center = true);
 
             ribbon_clamp_hole_positions(ways, screw)
                 translate_z(h)
@@ -83,8 +91,8 @@ module ribbon_clamp(ways, screw = screw) { //! Generate STL for given number of
 
 module ribbon_clamp_assembly(ways, screw = screw)  //! Printed part with inserts in place
 pose([55, 180, 25])
-assembly(let(screw_d = screw_radius(screw) * 2)str("ribbon_clamp_", ways, screw_d != 3 ? str("_", screw_d) : ""), ngb = true) {
-    h = ribbon_clamp_height(screw);
+assembly(let(screw_d = screw_radius(screw) * 2)str("ribbon_clamp_", str_ways(ways), str_screw_d(screw_d)), ngb = true) {
+    h = ribbon_clamp_height(screw, ways);
     insert = screw_insert(screw);
 
     stl_colour(pp1_colour) render()
@@ -97,7 +105,7 @@ assembly(let(screw_d = screw_radius(screw) * 2)str("ribbon_clamp_", ways, screw_
 
 module ribbon_clamp_fastened_assembly(ways, thickness, screw = screw) { //! Clamp with fasteners in place
     tape_l = floor(ribbon_clamp_slot(ways));
-    tape_width = 25;
+    tape_width = ribbon_clamp_width(screw) + 2;
     tape_thickness = 0.5;
 
     vitamin(str(": Tape self amalgamating silicone ",tape_l," x 25mm"));

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

scripts/changelog.py

@@ -82,6 +82,7 @@ def codify(word, url):
 
 
 def fixup_comment(comment, url):
+    comment = comment.replace('cnc_bit+_r', 'cnc_bit_r')
     """ markup code words and fix new paragraphs """
     result = ''
     word = ''
@@ -156,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 changelog.*', 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)
@@ -422,7 +422,7 @@ def views(target, do_assemblies = None):
     times.add_time(html_name, t)
     times.print_times(pngs + [html_name])
     #
-    # Make the printme.html by replacing empty spans that invisbly mark the page breaks by page break divs.
+    # Make the printme.html by replacing empty spans that invisibly mark the page breaks by page break divs.
     #
     with open(html_name, 'rt') as src:
         lines = src.readlines()

tests/7_segments.scad

@@ -16,14 +16,16 @@
 // You should have received a copy of the GNU General Public License along with NopSCADlib.
 // If not, see <https://www.gnu.org/licenses/>.
 //
-include <../core.scad>
+include <../utils/core/core.scad>
 use <../utils/layout.scad>
 
 include <../vitamins/7_segments.scad>
 
+function digits(s) = 7_segment_digits(s) < 2 ? 2 : 1;
+
 module 7_segments()
-    layout([for(s = 7_segments) 7_segment_size(s).x * 2], 5) let(s = 7_segments[$i])
-        7_segment_digits(s, 2);
+    layout([for(s = 7_segments) 7_segment_size(s).x * digits(s)], 3) let(s = 7_segments[$i])
+        7_segment_digits(s, digits(s));
 
 if($preview)
     7_segments();

tests/BOM.scad

@@ -32,7 +32,7 @@ height = 10;
 insert = screw_insert(screw);
 
 module widget(thickness) {
-    vitamin(str("widget(", thickness, "): Rivit like thing for ", thickness, "mm sheets"));
+    vitamin(str("widget(", thickness, "): Rivet like thing for ", thickness, "mm sheets"));
     t = 1;
     color("silver") {
         cylinder(d = 3, h = thickness + 2 * eps, center = true);
@@ -85,7 +85,7 @@ assembly("widget_top") {
 module widget_assembly()
 assembly("widget") {
 
-    widget_base_assembly();                 // Note this is not exloded because it is sub-assembly
+    widget_base_assembly();                 // Note this is not exploded because it is sub-assembly
 
     translate_z(height) {
         translate_z(sheet_thickness(sheet))