Fixed typo in resistor comment.

veroboard_assembly() now doesn't include the fasteners.

.gitignore

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

CHANGELOG.md

@@ -3,6 +3,322 @@
 This changelog is generated by `changelog.py` using manually added semantic version tags to classify commits as breaking changes, additions or fixes.
 
 
+### [v21.1.0](https://github.com/nophead/NopSCADlib/releases/tag/v21.1.0 "show release") Additions [...](https://github.com/nophead/NopSCADlib/compare/v21.0.1...v21.1.0 "diff with v21.0.1")
+*   2023-03-11 [`18cd33c`](https://github.com/nophead/NopSCADlib/commit/18cd33c66388d4d4e7be664c0f883cff0854524b "show commit") [C.](# "Chris") Fixed typos, corrected vitamin call, added boilerplate, updated images and readme.
+
+*   2023-03-11 [`ebfb330`](https://github.com/nophead/NopSCADlib/commit/ebfb330ac69f4e90de84ecffea94ce067d041031 "show commit") [D.K.](# "Dirkjan Krijnders") Added comments and make holes a `linear_extrude` result
+
+*   2023-03-08 [`c5fab08`](https://github.com/nophead/NopSCADlib/commit/c5fab08a454383b295be2b151fd715ee79b85db3 "show commit") [D.K.](# "Dirkjan Krijnders") Added `photo_interrupter` to the test
+
+*   2023-03-08 [`fecc937`](https://github.com/nophead/NopSCADlib/commit/fecc93746ab80ad1fc74f0fe3465de92ffee7b36 "show commit") [D.K.](# "Dirkjan Krijnders") Added vitamins for photo interrupters
+
+#### [v21.0.1](https://github.com/nophead/NopSCADlib/releases/tag/v21.0.1 "show release") Fixes [...](https://github.com/nophead/NopSCADlib/compare/v21.0.0...v21.0.1 "diff with v21.0.0")
+*   2023-03-11 [`07da7d8`](https://github.com/nophead/NopSCADlib/commit/07da7d8dc7d3fb769e57a6b9ca86465357007b6c "show commit") [C.](# "Chris") Removed `Python2.7` from `usage.md` as no longer works.
+
+*   2023-03-10 [`5a3bbf9`](https://github.com/nophead/NopSCADlib/commit/5a3bbf967dc967eca4726af517382e7eb875dde1 "show commit") [C.](# "Chris") Fixed broken cover image.
+
+## [v21.0.0](https://github.com/nophead/NopSCADlib/releases/tag/v21.0.0 "show release") Breaking Changes [...](https://github.com/nophead/NopSCADlib/compare/v20.24.0...v21.0.0 "diff with v20.24.0")
+*   2023-03-10 [`9d4d5ab`](https://github.com/nophead/NopSCADlib/commit/9d4d5aba17974e7b5911e723d48d7b9403a4bcb4 "show commit") [C.](# "Chris") `veroboard_assembly()` renamed `veroboard_fastened_assembly()`.
+`veroboard_assembly()` now doesn't include the fasteners.
+
+### [v20.24.0](https://github.com/nophead/NopSCADlib/releases/tag/v20.24.0 "show release") Additions [...](https://github.com/nophead/NopSCADlib/compare/v20.23.0...v20.24.0 "diff with v20.23.0")
+*   2023-03-10 [`d939401`](https://github.com/nophead/NopSCADlib/commit/d939401183d12af3452e17aa5b020dab50f8edb0 "show commit") [C.](# "Chris") Added `vero_grid_pos()` function.
+
+*   2023-03-10 [`584542f`](https://github.com/nophead/NopSCADlib/commit/584542f87a27efe06ff3ba597dbaff1f3c32c4fd "show commit") [C.](# "Chris") Added fastons.
+
+*   2023-03-10 [`62372a0`](https://github.com/nophead/NopSCADlib/commit/62372a049b9ac7a0fecebfd3618df91ff6ffa87a "show commit") [C.](# "Chris") The `wire()` module can now draw wires if a path is specified.
+
+*   2023-03-10 [`14698e5`](https://github.com/nophead/NopSCADlib/commit/14698e5203e1e860230ddb3729816730e221f49c "show commit") [C.](# "Chris") Added PTFE heatshrink sleeving.
+
+*   2023-03-10 [`14f6bb5`](https://github.com/nophead/NopSCADlib/commit/14f6bb533a3dcc1d36b2b764906cdca7d8d24484 "show commit") [C.](# "Chris") Added `sleeving_length` to `al_clad_resistor_assembly()`.
+
+*   2023-03-10 [`01e9aae`](https://github.com/nophead/NopSCADlib/commit/01e9aae698f57bac6046d1a04aaa11b0c88006b5 "show commit") [C.](# "Chris") Added `TO220_size()` and `TO220_lead_pos(i,` l).
+
+*   2023-02-04 [`27f9b24`](https://github.com/nophead/NopSCADlib/commit/27f9b242f250c0083344a05527055bb2fbb56f91 "show commit") [C.P.](# "Chris Palmer") Added crystal, transistors, diode and LEDs to Arduino Uno.
+
+*   2023-02-03 [`f07fda7`](https://github.com/nophead/NopSCADlib/commit/f07fda70cdfc743cd2462636fcc1eb13a092f9e4 "show commit") [C.P.](# "Chris Palmer") Wire links can now be sleeved.
+
+*   2023-02-01 [`abf1f1a`](https://github.com/nophead/NopSCADlib/commit/abf1f1ab3f3eddc2f274df649e8481a4117901eb "show commit") [C.P.](# "Chris Palmer") PCB blocks can now have rounded edges for more realistic cans.
+
+*   2023-02-01 [`df06d1f`](https://github.com/nophead/NopSCADlib/commit/df06d1f57fff64cd6da20684f8371da204f69a82 "show commit") [C.P.](# "Chris Palmer") Updated changelog.
+
+### [v20.23.0](https://github.com/nophead/NopSCADlib/releases/tag/v20.23.0 "show release") Additions [...](https://github.com/nophead/NopSCADlib/compare/v20.22.0...v20.23.0 "diff with v20.22.0")
+*   2023-02-01 [`470d6d6`](https://github.com/nophead/NopSCADlib/commit/470d6d6216b1cef8ce6cafd4b14300edb62eac4a "show commit") [C.P.](# "Chris Palmer") Started radial components with crystals.
+
+*   2023-02-01 [`0e5e15a`](https://github.com/nophead/NopSCADlib/commit/0e5e15a747fed6b4ef434c9796bef6cb9e658c0e "show commit") [C.P.](# "Chris Palmer") Added SOIC14 package.
+
+*   2023-02-01 [`3f84912`](https://github.com/nophead/NopSCADlib/commit/3f84912e555cd4f7e97e7cac3091260fe969df4c "show commit") [C.P.](# "Chris Palmer") Added `rounded_top_rectangle()`.
+
+### [v20.22.0](https://github.com/nophead/NopSCADlib/releases/tag/v20.22.0 "show release") Additions [...](https://github.com/nophead/NopSCADlib/compare/v20.21.0...v20.22.0 "diff with v20.21.0")
+*   2023-01-29 [`01eeafb`](https://github.com/nophead/NopSCADlib/commit/01eeafb2552a4fcc735e85e8d0e7c0855c18be8c "show commit") [C.P.](# "Chris Palmer") Updated images and readme.
+
+*   2023-01-29 [`dd876c8`](https://github.com/nophead/NopSCADlib/commit/dd876c8fc9f2658332c1c3200a6a67e1b78a8f64 "show commit") [C.P.](# "Chris Palmer") Added vertical USB connector to PCB test.
+
+*   2023-01-29 [`ff40a27`](https://github.com/nophead/NopSCADlib/commit/ff40a276e1a37836ab011689e849da76ce19d4a7 "show commit") [C.P.](# "Chris Palmer") Fixed display position in tests.
+
+*   2023-01-29 [`463c620`](https://github.com/nophead/NopSCADlib/commit/463c620cc3053428ecf7ca6360477992b9538978 "show commit") [C.P.](# "Chris Palmer") Made a new row of PCBs in the test.
+
+*   2023-01-29 [`7b1a916`](https://github.com/nophead/NopSCADlib/commit/7b1a9160434f5b000c83f03d39305f73b0bbf646 "show commit") [C.P.](# "Chris Palmer") Fixed vAx1 dimensions, removed flange and repositioned the tongue.
+
+*   2023-01-28 [`de05134`](https://github.com/nophead/NopSCADlib/commit/de051343d01e57b5e0c43a5f8de69eb508bd86ca "show commit") [E.F.](# "Elliot Foster") WiP of an Orange Pi Zero 2 PCB
+
+### [v20.21.0](https://github.com/nophead/NopSCADlib/releases/tag/v20.21.0 "show release") Additions [...](https://github.com/nophead/NopSCADlib/compare/v20.20.1...v20.21.0 "diff with v20.20.1")
+*   2023-01-28 [`34719c3`](https://github.com/nophead/NopSCADlib/commit/34719c33607f8720701eb59719af337cb4a1b777 "show commit") [C.P.](# "Chris Palmer") Box shelves now have screws in the corners to hold them down.
+
+*   2023-01-28 [`024439d`](https://github.com/nophead/NopSCADlib/commit/024439d4c2d0f302027d130584cedadb6d9d14a9 "show commit") [C.P.](# "Chris Palmer") Can now specify short inserts to be used for `butt_boxes`.
+
+#### [v20.20.1](https://github.com/nophead/NopSCADlib/releases/tag/v20.20.1 "show release") Fixes [...](https://github.com/nophead/NopSCADlib/compare/v20.20.0...v20.20.1 "diff with v20.20.0")
+*   2023-01-28 [`005c112`](https://github.com/nophead/NopSCADlib/commit/005c112ba9fc210f88fa82cf638108dbe0b20f26 "show commit") [C.P.](# "Chris Palmer") Added values to the SMD capacitors on the example PCB.
+
+*   2023-01-28 [`dfbcbf8`](https://github.com/nophead/NopSCADlib/commit/dfbcbf84ab57a2c70aaf5b1fa26668278b6993d3 "show commit") [C.P.](# "Chris Palmer") Changed OpenGrab link as `nicadrone.com` has gone.
+
+### [v20.20.0](https://github.com/nophead/NopSCADlib/releases/tag/v20.20.0 "show release") Additions [...](https://github.com/nophead/NopSCADlib/compare/v20.19.1...v20.20.0 "diff with v20.19.1")
+*   2023-01-24 [`e7e9313`](https://github.com/nophead/NopSCADlib/commit/e7e9313e71fb2b30aca142ceded2dc5615695071 "show commit") [C.P.](# "Chris Palmer") Updated images and readme.
+
+*   2023-01-23 [`dab06ce`](https://github.com/nophead/NopSCADlib/commit/dab06ce4ca771787aa625d1370b4f2b779580315 "show commit") [E.F.](# "Elliot Foster") Add Raspberry Pi 3 A+ to pcbs
+
+#### [v20.19.1](https://github.com/nophead/NopSCADlib/releases/tag/v20.19.1 "show release") Fixes [...](https://github.com/nophead/NopSCADlib/compare/v20.19.0...v20.19.1 "diff with v20.19.0")
+*   2023-01-24 [`494002a`](https://github.com/nophead/NopSCADlib/commit/494002aebeda560e65ca4f8cb3794707487a3c2a "show commit") [C.P.](# "Chris Palmer") Added test to MP1584EN PCB.
+
+*   2023-01-24 [`77e948f`](https://github.com/nophead/NopSCADlib/commit/77e948f43c911442211bcbf6d1b1520184d2c70b "show commit") [C.P.](# "Chris Palmer") Added can bus connectors to OpenGrab model.
+Tweaked some PCB component positions.
+
+*   2023-01-24 [`543cdb4`](https://github.com/nophead/NopSCADlib/commit/543cdb4e01d38308a06d4368ebabadb85c696567 "show commit") [C.P.](# "Chris Palmer") Increased the clearance of holes made for pin header.
+
+### [v20.19.0](https://github.com/nophead/NopSCADlib/releases/tag/v20.19.0 "show release") Additions [...](https://github.com/nophead/NopSCADlib/compare/v20.18.1...v20.19.0 "diff with v20.18.1")
+*   2023-01-12 [`ebd50ba`](https://github.com/nophead/NopSCADlib/commit/ebd50bae535283b94b310ee74c9b98b2e3b7f8be "show commit") [C.P.](# "Chris Palmer") Added SMD diodes, inductors and potentiometers.
+Complete set of components added to MP1584EN buck regulator.
+
+#### [v20.18.1](https://github.com/nophead/NopSCADlib/releases/tag/v20.18.1 "show release") Fixes [...](https://github.com/nophead/NopSCADlib/compare/v20.18.0...v20.18.1 "diff with v20.18.0")
+*   2023-01-07 [`ec3e752`](https://github.com/nophead/NopSCADlib/commit/ec3e752fc5b5586ef5ac838c709ab4b704dac817 "show commit") [C.](# "Chris") Added missing documentation for `hinge_female()` module.
+
+### [v20.18.0](https://github.com/nophead/NopSCADlib/releases/tag/v20.18.0 "show release") Additions [...](https://github.com/nophead/NopSCADlib/compare/v20.17.0...v20.18.0 "diff with v20.17.0")
+*   2023-01-07 [`8587d52`](https://github.com/nophead/NopSCADlib/commit/8587d52d1b87dc9932c7e458798d4a6f3722a371 "show commit") [C.](# "Chris") Added `screw_keyhole()` module.
+
+### [v20.17.0](https://github.com/nophead/NopSCADlib/releases/tag/v20.17.0 "show release") Additions [...](https://github.com/nophead/NopSCADlib/compare/v20.16.0...v20.17.0 "diff with v20.16.0")
+*   2023-01-07 [`cec8c3a`](https://github.com/nophead/NopSCADlib/commit/cec8c3a107b81f8badb4e2077a318cc36fcdd481 "show commit") [C.](# "Chris") Added printed LED bezels.
+
+### [v20.16.0](https://github.com/nophead/NopSCADlib/releases/tag/v20.16.0 "show release") Additions [...](https://github.com/nophead/NopSCADlib/compare/v20.15.2...v20.16.0 "diff with v20.15.2")
+*   2023-01-07 [`848dcb8`](https://github.com/nophead/NopSCADlib/commit/848dcb86b9f1d9a164366208da76faea6d6050f1 "show commit") [C.](# "Chris") Added 8mm LED.
+
+#### [v20.15.2](https://github.com/nophead/NopSCADlib/releases/tag/v20.15.2 "show release") Fixes [...](https://github.com/nophead/NopSCADlib/compare/v20.15.1...v20.15.2 "diff with v20.15.1")
+*   2023-01-07 [`a31f6f1`](https://github.com/nophead/NopSCADlib/commit/a31f6f100ce18168594b02a25d5229536f02a65c "show commit") [C.](# "Chris") Revised LED dimensions.
+
+*   2023-01-07 [`b3dd635`](https://github.com/nophead/NopSCADlib/commit/b3dd635889f7ed4f779ee9408ff81ac64cb1f7ec "show commit") [C.](# "Chris") Fixed duplicated `dxf()` calls in printed box and `butt_box`.
+Client code now calls `dxf()` so that the generated files can be used to speed up assembly views.
+
+#### [v20.15.1](https://github.com/nophead/NopSCADlib/releases/tag/v20.15.1 "show release") Fixes [...](https://github.com/nophead/NopSCADlib/compare/v20.15.0...v20.15.1 "diff with v20.15.0")
+*   2022-12-06 [`e256801`](https://github.com/nophead/NopSCADlib/commit/e256801206189eafcf020cc7fdb50fff4314c397 "show commit") [C.P.](# "Chris Palmer") Added comment to indicate the `.py` suffix may be needed on linux and OSX.
+
+### [v20.15.0](https://github.com/nophead/NopSCADlib/releases/tag/v20.15.0 "show release") Additions [...](https://github.com/nophead/NopSCADlib/compare/v20.14.1...v20.15.0 "diff with v20.14.1")
+*   2022-12-05 [`9dc8062`](https://github.com/nophead/NopSCADlib/commit/9dc8062befa72c6650b17d34428bfe39e709fdc2 "show commit") [M.W.](# "Marek Wodzinski") Include `terminal.scad` in `lib.scad` to allow use of `terminal_block()`.
+
+#### [v20.14.1](https://github.com/nophead/NopSCADlib/releases/tag/v20.14.1 "show release") Fixes [...](https://github.com/nophead/NopSCADlib/compare/v20.14.0...v20.14.1 "diff with v20.14.0")
+*   2022-10-20 [`f2313a3`](https://github.com/nophead/NopSCADlib/commit/f2313a3f0ccbb130a7bd974b9a02f5ef6841f39e "show commit") [D.](# "drf5n") update `nuts.scad` table comment
+
+ * Change comment about nut sizes from radius to diameter.
+
+*   2022-09-29 [`d95e1e6`](https://github.com/nophead/NopSCADlib/commit/d95e1e64edba4ef51852a1e72d00497154c80c88 "show commit") [C.](# "Chris") Udated changelog.
+
+### [v20.14.0](https://github.com/nophead/NopSCADlib/releases/tag/v20.14.0 "show release") Additions [...](https://github.com/nophead/NopSCADlib/compare/v20.13.0...v20.14.0 "diff with v20.13.0")
+*   2022-09-29 [`f1737d2`](https://github.com/nophead/NopSCADlib/commit/f1737d257b54957772ab6faea102f8ddb829119b "show commit") [C.](# "Chris") Updated images and readme.
+
+*   2022-09-27 [`ce258d6`](https://github.com/nophead/NopSCADlib/commit/ce258d6d4f1de5fbdda76a78b0ad2cbf1b41a3f9 "show commit") [J.R.](# "Jeroen Roos") Leadnuts: add nuthousing
+
+### [v20.13.0](https://github.com/nophead/NopSCADlib/releases/tag/v20.13.0 "show release") Additions [...](https://github.com/nophead/NopSCADlib/compare/v20.12.0...v20.13.0 "diff with v20.12.0")
+*   2022-09-27 [`ec85cc5`](https://github.com/nophead/NopSCADlib/commit/ec85cc5d4c76baedae670a5652194bd1799a7094 "show commit") [C.](# "Chris") Updated images and readme.
+
+*   2022-09-24 [`fb66954`](https://github.com/nophead/NopSCADlib/commit/fb6695471f935057a0949e55f70a39911ac81f4c "show commit") [J.R.](# "Jeroen Roos") Shaft coupling: Add flexible SC `/` 6x8 flexible SC
+
+ * Added the possibility for shaft couplings to be flexible and added a 6x8
+example of such a coupling.
+
+### [v20.12.0](https://github.com/nophead/NopSCADlib/releases/tag/v20.12.0 "show release") Additions [...](https://github.com/nophead/NopSCADlib/compare/v20.11.0...v20.12.0 "diff with v20.11.0")
+*   2022-09-27 [`c9ac393`](https://github.com/nophead/NopSCADlib/commit/c9ac393c0c7b025b3e6ad9e1030d1b13f8b879c3 "show commit") [C.](# "Chris") Printed corner blocks now have a `short_insert` option.
+
+*   2022-09-27 [`208334a`](https://github.com/nophead/NopSCADlib/commit/208334a585ed0605bf7dbaab1050c060aa15edb7 "show commit") [C.](# "Chris") Printed box now has a short insert option.
+
+*   2022-09-27 [`3a17b89`](https://github.com/nophead/NopSCADlib/commit/3a17b89d5ceb69834b23ff6bc46523f2dfb15f99 "show commit") [C.](# "Chris") Added short inserts and M5 inserts.
+`screw_insert()` now takes a short flag.
+`screw_length()` can now be passed an insert object.
+
+*   2022-09-25 [`0f36c02`](https://github.com/nophead/NopSCADlib/commit/0f36c02b5e34b0b45d258ff8e6ed4536f0601d92 "show commit") [C.](# "Chris") Added `layer_height0` global variable and updated `round_to_layer()` to handle it.
+
+ * Moved functions from `global_defs.scad` to `global.scad` so they get documented.
+
+### [v20.11.0](https://github.com/nophead/NopSCADlib/releases/tag/v20.11.0 "show release") Additions [...](https://github.com/nophead/NopSCADlib/compare/v20.10.3...v20.11.0 "diff with v20.10.3")
+*   2022-08-30 [`c1e4625`](https://github.com/nophead/NopSCADlib/commit/c1e4625382646faf6a00e78ac01e495a88169b35 "show commit") [C.](# "Chris") Replaced generic chips with SOIC8.
+Updated images and readme.
+
+*   2022-08-29 [`6059c5f`](https://github.com/nophead/NopSCADlib/commit/6059c5f5569a9fc2ba08e448bbf90328fb985ed3 "show commit") [C.](# "ChemicalXandco") add L9110S 2-Channel motor driver module
+
+#### [v20.10.3](https://github.com/nophead/NopSCADlib/releases/tag/v20.10.3 "show release") Fixes [...](https://github.com/nophead/NopSCADlib/compare/v20.10.2...v20.10.3 "diff with v20.10.2")
+*   2022-08-03 [`4ceb6bd`](https://github.com/nophead/NopSCADlib/commit/4ceb6bd8639cd39ac39798b3eccd178526a56c13 "show commit") [C.](# "Chris") Fixed a gap in printed hinges.
+
+#### [v20.10.2](https://github.com/nophead/NopSCADlib/releases/tag/v20.10.2 "show release") Fixes [...](https://github.com/nophead/NopSCADlib/compare/v20.10.1...v20.10.2 "diff with v20.10.1")
+*   2022-07-16 [`664d04a`](https://github.com/nophead/NopSCADlib/commit/664d04ad93c28c2614d5991e2b8dfa78964f6a99 "show commit") [C.](# "Chris") Now logs the time taken to run non OpenSCAD commands in `cmd_times.txt`
+
+#### [v20.10.1](https://github.com/nophead/NopSCADlib/releases/tag/v20.10.1 "show release") Fixes [...](https://github.com/nophead/NopSCADlib/compare/v20.10.0...v20.10.1 "diff with v20.10.0")
+*   2022-06-30 [`f44d9ae`](https://github.com/nophead/NopSCADlib/commit/f44d9ae424f407baa4f8b5187819b43b30800257 "show commit") [M.B.](# "Martin Budden") Made includes relative in `bldc_motors`.
+
+*   2022-07-15 [`1238dba`](https://github.com/nophead/NopSCADlib/commit/1238dba90ac5c48ba01abb9e7926a064353489de "show commit") [C.](# "Chris") Updated readme.
+
+*   2022-06-22 [`aec7211`](https://github.com/nophead/NopSCADlib/commit/aec72118fac218ca033264fa7b28db2bff7db10a "show commit") [M.B.](# "Martin Budden") Fixed typos.
+
+### [v20.10.0](https://github.com/nophead/NopSCADlib/releases/tag/v20.10.0 "show release") Additions [...](https://github.com/nophead/NopSCADlib/compare/v20.9.0...v20.10.0 "diff with v20.9.0")
+*   2022-07-04 [`b58a59d`](https://github.com/nophead/NopSCADlib/commit/b58a59dab70bb414dd90dc5a9055d6bf3b4f6144 "show commit") [C.](# "Chris") Updated images and readme.
+
+*   2022-07-04 [`6b6ffb2`](https://github.com/nophead/NopSCADlib/commit/6b6ffb2b74cc89ffecbcad7c304c3c4f047a8805 "show commit") [C.](# "Chris") Added SOICs to tests.
+
+*   2022-07-04 [`1e30ad2`](https://github.com/nophead/NopSCADlib/commit/1e30ad24e802dc6e075fd73185551202101d4793 "show commit") [C.](# "Chris") Added `smd_soic` to  `pcb_component()`.
+
+*   2022-07-04 [`dc715ff`](https://github.com/nophead/NopSCADlib/commit/dc715ff2b70ae98615ee43750f3bb7613b481f7b "show commit") [C.](# "Chris") Tweaked SOIC text size.
+
+*   2022-07-04 [`c57c202`](https://github.com/nophead/NopSCADlib/commit/c57c202e31c70351f38ef6299c60b0deb54bd296 "show commit") [M.](# "MS3FGX") Adjust lead sizing
+
+*   2022-07-02 [`26bfe96`](https://github.com/nophead/NopSCADlib/commit/26bfe96614741206c8da6d126edfa9eb5326cb8f "show commit") [M.](# "MS3FGX") Add SOIC SMD Package
+
+### [v20.9.0](https://github.com/nophead/NopSCADlib/releases/tag/v20.9.0 "show release") Additions [...](https://github.com/nophead/NopSCADlib/compare/v20.8.0...v20.9.0 "diff with v20.8.0")
+*   2022-07-02 [`2cc3c6e`](https://github.com/nophead/NopSCADlib/commit/2cc3c6ec7c9d8ee285d49111559d40fb2a3112e1 "show commit") [C.](# "Chris") Updated images and readme.
+
+*   2022-07-02 [`633843d`](https://github.com/nophead/NopSCADlib/commit/633843d45eacd42619581a4619752700e1cd687b "show commit") [C.](# "Chris") Added LED1206 example to PCB test.
+
+*   2022-07-02 [`1a472c8`](https://github.com/nophead/NopSCADlib/commit/1a472c8ed549e230f7df93989f3e1db729b4b281 "show commit") [M.](# "MS3FGX") Add 1206 SMD LED
+
+### [v20.8.0](https://github.com/nophead/NopSCADlib/releases/tag/v20.8.0 "show release") Additions [...](https://github.com/nophead/NopSCADlib/compare/v20.7.0...v20.8.0 "diff with v20.7.0")
+*   2022-06-23 [`ecd534b`](https://github.com/nophead/NopSCADlib/commit/ecd534b5773928b9987023bd4370f661cc750fbd "show commit") [C.P.](# "Chris Palmer") Added `NEMA_connection_pos()`.
+Changed motor wire colours and tweaked wire position and size,
+
+### [v20.7.0](https://github.com/nophead/NopSCADlib/releases/tag/v20.7.0 "show release") Additions [...](https://github.com/nophead/NopSCADlib/compare/v20.6.1...v20.7.0 "diff with v20.6.1")
+*   2022-06-21 [`28c36a4`](https://github.com/nophead/NopSCADlib/commit/28c36a4e966cceccbbdc330cf9a6fdeaa0283889 "show commit") [C.P.](# "Chris Palmer") `rounded_polygon()` now copes with the degenerate case when tangents intersect to form a sharp corner with no arc.
+Added an `offset()` function with some limitations.
+
+#### [v20.6.1](https://github.com/nophead/NopSCADlib/releases/tag/v20.6.1 "show release") Fixes [...](https://github.com/nophead/NopSCADlib/compare/v20.6.0...v20.6.1 "diff with v20.6.0")
+*   2022-06-21 [`6a9af0a`](https://github.com/nophead/NopSCADlib/commit/6a9af0af8aef68978b8be248810d07c85150341b "show commit") [C.P.](# "Chris Palmer") Updates images
+
+*   2022-06-21 [`a6a0808`](https://github.com/nophead/NopSCADlib/commit/a6a08088d986dbcbc4d01c06e0475176ec8bc76f "show commit") [M.B.](# "Martin Budden") Fixed dimensions of E1515 extrusion.
+
+*   2022-06-21 [`bcf9fb3`](https://github.com/nophead/NopSCADlib/commit/bcf9fb38dfabaf93508a380b85b12e3b23f28cf8 "show commit") [M.B.](# "Martin Budden") Fixed typos.
+
+*   2022-06-21 [`06443a5`](https://github.com/nophead/NopSCADlib/commit/06443a558b407292a1e73f60c24cc90ec618d511 "show commit") [M.B.](# "Martin Budden") Standardised setting of imgsize in scripts.
+
+### [v20.6.0](https://github.com/nophead/NopSCADlib/releases/tag/v20.6.0 "show release") Additions [...](https://github.com/nophead/NopSCADlib/compare/v20.5.1...v20.6.0 "diff with v20.5.1")
+*   2022-06-14 [`18f3d43`](https://github.com/nophead/NopSCADlib/commit/18f3d43780d7e083fc3b21290db2049fb4364a46 "show commit") [C.P.](# "Chris Palmer") Added convexity parameter to `clip()`.
+
+#### [v20.5.1](https://github.com/nophead/NopSCADlib/releases/tag/v20.5.1 "show release") Fixes [...](https://github.com/nophead/NopSCADlib/compare/v20.5.0...v20.5.1 "diff with v20.5.0")
+*   2022-06-14 [`eda88cc`](https://github.com/nophead/NopSCADlib/commit/eda88cc8d75eb4c0cb59b368b4e2ad3db2115834 "show commit") [C.P.](# "Chris Palmer") Fixed `vero()` constructor documentation.
+Fixed missing space in veroboard vitamin description.
+
+*   2022-06-14 [`630268d`](https://github.com/nophead/NopSCADlib/commit/630268d71a0b478c28b6bde2a7c3ff9074c7a8fb "show commit") [C.P.](# "Chris Palmer") Changed `screw_knob()` facets to be suitable for 3D printing.
+Fixed `knob_height()` so it can take a screw as a type.
+
+### [v20.5.0](https://github.com/nophead/NopSCADlib/releases/tag/v20.5.0 "show release") Additions [...](https://github.com/nophead/NopSCADlib/compare/v20.4.0...v20.5.0 "diff with v20.4.0")
+*   2022-05-31 [`cc5654d`](https://github.com/nophead/NopSCADlib/commit/cc5654d7d756287f5311e35104003f38a4a94475 "show commit") [C.](# "Chris") Added `usb_miniA()`.
+
+### [v20.4.0](https://github.com/nophead/NopSCADlib/releases/tag/v20.4.0 "show release") Additions [...](https://github.com/nophead/NopSCADlib/compare/v20.3.1...v20.4.0 "diff with v20.3.1")
+*   2022-04-01 [`d46913c`](https://github.com/nophead/NopSCADlib/commit/d46913ce4f64656889fd29dccc0709d84d4d9c49 "show commit") [C.P.](# "Chris Palmer") Printed `screw_knob()` is now fully customisable by passing a parameter
+list, constructed by `screw_knob(),` in place of the screw.
+
+ * Screws can still be passed for backwards compatibility.
+
+#### [v20.3.1](https://github.com/nophead/NopSCADlib/releases/tag/v20.3.1 "show release") Fixes [...](https://github.com/nophead/NopSCADlib/compare/v20.3.0...v20.3.1 "diff with v20.3.0")
+*   2022-04-01 [`b9f676a`](https://github.com/nophead/NopSCADlib/commit/b9f676a75369d666540f79abe0392e209e20d0f0 "show commit") [C.P.](# "Chris Palmer") Documented `insert_hole_length()`.
+
+### [v20.3.0](https://github.com/nophead/NopSCADlib/releases/tag/v20.3.0 "show release") Additions [...](https://github.com/nophead/NopSCADlib/compare/v20.2.0...v20.3.0 "diff with v20.2.0")
+*   2022-03-17 [`ddc4150`](https://github.com/nophead/NopSCADlib/commit/ddc4150ed73c8300bc3ef4326a91cd4ec54ed9e3 "show commit") [C.P.](# "Chris Palmer") Updated images and readme.
+
+*   2022-03-16 [`7e126c9`](https://github.com/nophead/NopSCADlib/commit/7e126c94cadd120d686eaad8459723e0c1dfc0b2 "show commit") [M.](# "Mozza") Add A23 cell
+
+### [v20.2.0](https://github.com/nophead/NopSCADlib/releases/tag/v20.2.0 "show release") Additions [...](https://github.com/nophead/NopSCADlib/compare/v20.1.2...v20.2.0 "diff with v20.1.2")
+*   2022-03-17 [`744ebc2`](https://github.com/nophead/NopSCADlib/commit/744ebc293594e2d049220bba7325f3a22f40a71a "show commit") [C.P.](# "Chris Palmer") Added functions for generating twisted cable paths and calculating its radius.
+Top row of cable bundles reversed to match a twisted cable.
+
+#### [v20.1.2](https://github.com/nophead/NopSCADlib/releases/tag/v20.1.2 "show release") Fixes [...](https://github.com/nophead/NopSCADlib/compare/v20.1.1...v20.1.2 "diff with v20.1.1")
+*   2022-03-17 [`99a5570`](https://github.com/nophead/NopSCADlib/commit/99a5570e248be32747bead61e17feaa3bde13f9b "show commit") [C.P.](# "Chris Palmer") Fixed ziptie bug for small wires and corners made sharper.
+
+*   2022-03-17 [`b70911d`](https://github.com/nophead/NopSCADlib/commit/b70911dc132727f24798e92be06a87ab37f2917e "show commit") [C.P.](# "Chris Palmer") Image odd pixel changes due to move to summer computer.
+
+*   2022-03-01 [`2d20fb1`](https://github.com/nophead/NopSCADlib/commit/2d20fb130a260b1f7358ea9fbb9fca2b5a18a65b "show commit") [C.P.](# "Chris Palmer") Removed dead code in `spiral_paths()`.
+
+#### [v20.1.1](https://github.com/nophead/NopSCADlib/releases/tag/v20.1.1 "show release") Fixes [...](https://github.com/nophead/NopSCADlib/compare/v20.1.0...v20.1.1 "diff with v20.1.0")
+*   2022-02-25 [`943deed`](https://github.com/nophead/NopSCADlib/commit/943deededfe2b258f23ca64001ae7c010ed626bc "show commit") [C.P.](# "Chris Palmer") Updated the readme.
+
+*   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.
 
@@ -313,8 +629,6 @@ Fixed `M6_cs_cap_screw` and `M4_grub_screw` socket sizes.
 #### [v15.21.1](https://github.com/nophead/NopSCADlib/releases/tag/v15.21.1 "show release") Fixes [...](https://github.com/nophead/NopSCADlib/compare/v15.21.0...v15.21.1 "diff with v15.21.0")
 *   2021-08-09 [`be53547`](https://github.com/nophead/NopSCADlib/commit/be53547728834d8e786ad4cb5637c768320a3105 "show commit") [M.B.](# "Martin Budden") Fixed display of BLDC prop shaft when thread length `=` 0.
 
-*   2021-07-04 [`ba7d7d3`](https://github.com/nophead/NopSCADlib/commit/ba7d7d32adf554d163143c0ae1707565340bb35b "show commit") [C.P.](# "Chris Palmer") Updated chnagelog.
-
 ### [v15.21.0](https://github.com/nophead/NopSCADlib/releases/tag/v15.21.0 "show release") Additions [...](https://github.com/nophead/NopSCADlib/compare/v15.20.0...v15.21.0 "diff with v15.20.0")
 *   2021-07-01 [`df35e14`](https://github.com/nophead/NopSCADlib/commit/df35e14fc71794c3826d6c99ce3cab93a4cfa5fe "show commit") [M.B.](# "Martin Budden") Improved handling of pcb plating colour.
 

docs/usage.md

@@ -2,7 +2,7 @@
 
 ## Requirements
 1. OpenSCAD 2021.01 or later, download it from here: https://www.openscad.org/downloads.html
-1. Python 2.7+ or 3.6+ from https://www.python.org/downloads/
+1. Python 3.6+ from https://www.python.org/downloads/
 1. ImageMagick 7 www.imagemagick.org
 
 These are all cross platform tools so NopSCADlib should work on any platform that supports them, although it has currently only been tested on Win7.
@@ -28,6 +28,8 @@ by downloading https://github.com/nophead/NopSCADlib/archive/master.zip and unzi
 
 The `NopSCADlib/scripts` directory needs to be added to the executable search path, `PATH` on Windows and `path` on Linux and Mac.
 
+Note that on Linux and OSX the full file name including the `.py` will be needed.
+
 The installation can be tested by opening `NopSCADlib/libtest.scad` in the OpenSCAD GUI. It should render all the objects in the library in about 1 minute.
 
 Running `tests` from the command line will run all the tests in the `tests` directory and build the `readme.md` catalog for GitHub and render it to `readme.html`

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

global_defs.scad

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

lib.scad

@@ -37,6 +37,7 @@ include <vitamins/components.scad>
 include <vitamins/displays.scad>
 include <vitamins/extrusions.scad>
 include <vitamins/extrusion_brackets.scad>
+include <vitamins/fastons.scad>
 include <vitamins/geared_steppers.scad>
 include <vitamins/hot_ends.scad>
 include <vitamins/inserts.scad>
@@ -48,6 +49,7 @@ include <vitamins/magnets.scad>
 include <vitamins/mains_sockets.scad>
 include <vitamins/modules.scad>
 include <vitamins/panel_meters.scad>
+include <vitamins/photo_interrupters.scad>
 include <vitamins/pillars.scad>
 include <vitamins/pillow_blocks.scad>
 include <vitamins/pin_headers.scad>
@@ -63,6 +65,7 @@ include <vitamins/spools.scad>
 include <vitamins/ssrs.scad>
 include <vitamins/stepper_motors.scad>
 include <vitamins/swiss_clips.scad>
+include <vitamins/terminal.scad>
 include <vitamins/toggles.scad>
 include <vitamins/transformers.scad>
 include <vitamins/tubings.scad>
@@ -98,3 +101,4 @@ use <utils/round.scad>
 use <utils/offset.scad>
 use <utils/sector.scad>
 use <utils/thread.scad>
+use <vitamins/photo_interrupter.scad>

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>
@@ -62,6 +63,7 @@ use <tests/drag_chain.scad>
 use <tests/extrusions.scad>
 use <tests/extrusion_brackets.scad>
 use <tests/fans.scad>
+use <tests/fastons.scad>
 use <tests/fuseholder.scad>
 use <tests/geared_steppers.scad>
 use <tests/hot_ends.scad>
@@ -73,6 +75,7 @@ use <tests/LDRs.scad>
 use <tests/LEDs.scad>
 use <tests/light_strips.scad>
 use <tests/linear_bearings.scad>
+use <tests/LED_bezel.scad>
 use <tests/LED_meters.scad>
 use <tests/magnets.scad>
 use <tests/microswitches.scad>
@@ -82,6 +85,7 @@ use <tests/o_ring.scad>
 use <tests/opengrab.scad>
 use <tests/panel_meters.scad>
 use <tests/PCBs.scad>
+use <tests/photo_interrupters.scad>
 use <tests/pillars.scad>
 use <tests/pillow_blocks.scad>
 use <tests/potentiometers.scad>
@@ -148,25 +152,55 @@ cable_grommets_y = 0;
 translate([x5, cable_grommets_y])
     cable_grommets();
 
+translate([x5, cable_grommets_y + 30])
+    led_bezels();
+
 translate([x5 + 50, cable_grommets_y])
     ribbon_clamps();
 
 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 + 160])
-    feet();
-
-translate([x5 + 70, cable_grommets_y + 160])
+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();
 
@@ -174,31 +208,16 @@ translate([x5, cable_grommets_y + 470]) {
         flat_hinges();
 }
 
-translate([x5, cable_grommets_y + 380])
-    no_explode() socket_boxes();
-
-translate([640, cable_grommets_y + 200])
-    printed_pulley_test();
-
-translate([x5, cable_grommets_y + 200])
-    knobs();
-
-translate([x5 + 60, cable_grommets_y + 250])
-    strap_handles();
-
-translate([x5, cable_grommets_y + 300])
-    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([950, 1400])
+box_y = pbox_y + 150;
+translate([950, box_y])
+    box_test();
+
+
+translate([950, 1525])
     rotate(-90)
         bbox_test();
 
@@ -219,7 +238,7 @@ linear_bearings_y = leadnuts_y + 50;
 steppers_y = linear_bearings_y + 110;
 sheets_y = steppers_y + 55;
 pcbs_y = sheets_y + 60;
-displays_y = pcbs_y + 140;
+displays_y = pcbs_y + 265;
 fans_y = displays_y + 110;
 transformers_y = fans_y + 120;
 psus_y = transformers_y + 190;
@@ -266,6 +285,9 @@ translate([x0, pulleys_y])
 translate([x0, leadnuts_y])
     leadnuts();
 
+translate([x0 + 120, leadnuts_y])
+    leadnuthousings();
+
 translate([x0, linear_bearings_y]) {
     linear_bearings();
     rods();
@@ -316,9 +338,10 @@ leds_y = 0;
 carriers_y = leds_y + 40;
 magnets_y = carriers_y + 40;
 spades_y = magnets_y + 20;
-buttons_y = spades_y + 20;
-jacks_y = buttons_y + 40;
-microswitches_y = jacks_y + 40;
+fastons_y = spades_y + 20;
+buttons_y = fastons_y + 20;
+jacks_y = buttons_y + 30;
+microswitches_y = jacks_y + 30;
 rockers_y = microswitches_y + 40;
 toggles_y = rockers_y + 60;
 components_y = toggles_y + 40;
@@ -344,6 +367,9 @@ translate([x2 + 70, leds_y])
 translate([x2, spades_y])
     spades();
 
+translate([x2, fastons_y])
+    fastons();
+
 translate([x2,  buttons_y])
     buttons();
 
@@ -403,6 +429,9 @@ translate([x3 + 60, modules_y])
 translate([x3 + 90, modules_y])
     modules();
 
+translate([x3 + 150, modules_y])
+    photo_interrupters();
+
 translate([x3, ssrs_y]) {
     ssrs();
 
@@ -427,6 +456,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

@@ -86,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;
@@ -454,8 +453,6 @@ module box_screw_hole_positions(type) {
 }
 
 module box_base_blank(type) { //! Generates a 2D template for the base sheet
-    dxf(str(box_name(type), "_base"));
-
     difference() {
         sheet_2D(box_base_sheet(type), box_width(type), box_depth(type), box_sheet_r(type));
 
@@ -465,8 +462,6 @@ 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(str(box_name(type), "_top"));
-
     difference() {
         sheet_2D(box_top_sheet(type), box_width(type), box_depth(type), box_sheet_r(type));
 
@@ -479,18 +474,19 @@ function subst_sheet(type, sheet) =
     let(s = box_sheets(type))
         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(str(box_name(type), "_shelf"));
-
+module box_shelf_blank(type, sheet = false, wall = undef) { //! Generates a 2D template for a shelf sheet
     difference() {
         sheet_2D(subst_sheet(type, sheet), box_width(type) - bezel_clearance, box_depth(type) - bezel_clearance, 1);
 
         offset(bezel_clearance / 2)
             box_corner_quadrants(type, box_width(type), box_depth(type));
+
+        box_shelf_screw_positions(type, [], 0, wall)
+            drill(screw_clearance_radius(box_shelf_screw(type)), 0);
     }
 }
 
-module box_shelf_screw_positions(type, screw_positions, thickness = 0, wall = undef) { //! Place children at the shelf screw positions
+module box_shelf_screw_positions(type, screw_positions, thickness = 0, wall = undef, top_screws = true) { //! Place children at the shelf screw positions
     w = is_undef(wall) ? box_wall(type) : wall;
     insert = box_shelf_insert(type);
     translate_z(-insert_boss_radius(insert, w))
@@ -498,13 +494,22 @@ module box_shelf_screw_positions(type, screw_positions, thickness = 0, wall = un
             multmatrix(p)
                 translate_z(thickness)
                     children();
+
+    r = box_boss_r(type);
+    inset = box_intrusion(type) - r + (r + insert_boss_radius(insert, w) + bezel_clearance / 2) / sqrt(2);
+    if(top_screws)
+        translate_z(thickness)
+            for(x = [-1, 1], y = [-1, 1])
+                translate([x * (box_width(type) / 2 - inset), y * (box_depth(type) / 2 - inset)])
+                    rotate(45 * x * (2 + y))
+                        children();
 }
 
 module box_shelf_bracket(type, screw_positions, wall = undef) { //! Generates a shelf bracket, the first optional child is a 2D cutout and the second 3D cutouts
     w = is_undef(wall) ? box_wall(type) : wall;
     insert = box_shelf_insert(type);
     lip = 2 * insert_boss_radius(insert, w);
-    width = insert_length(insert) + w;
+    width = max(insert_length(insert) + w, lip);
 
     module shape()
         difference() {
@@ -580,50 +585,44 @@ module box_shelf_bracket_section(type, rows, cols, x, y) { //! Generates section
             children();
 }
 
-module box_left_blank(type, sheet = false) { //! Generates a 2D template for the left sheet, `sheet` can be set to override the type
-    dxf(str(box_name(type), "_left"));
-
+module box_left_blank(type, sheet = false) //! Generates a 2D template for the left sheet, `sheet` can be set to override the type
     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(str(box_name(type), "_right"));
 
+module box_right_blank(type, sheet = false) //! Generates a 2D template for the right sheet, `sheet` can be set to override the type
     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(str(box_name(type), "_front"));
 
+module box_front_blank(type, sheet = false) //! Generates a 2D template for the front sheet, `sheet` can be set to override the type
     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(str(box_name(type), "_back"));
 
+module box_back_blank(type, sheet = false) //! Generates a 2D template for the back sheet, `sheet` can be set to override the type
     sheet_2D(subst_sheet(type, sheet), box_width(type) - sheet_reduction(type), box_height(type) - sheet_reduction(type), 1);
-}
 
 module box_base(type)   //! Default base, can be overridden to customise
     render_2D_sheet(box_base_sheet(type))
-        box_base_blank(type);
+        dxf(str(box_name(type), "_base"))
+            box_base_blank(type);
 
 module box_top(type)    //! Default top, can be overridden to customise
     render_2D_sheet(box_top_sheet(type))
-        box_top_blank(type);
+        dxf(str(box_name(type), "_top"))
+            box_top_blank(type);
 
 module box_back(type)   //! Default back, can be overridden to customise
     render_2D_sheet(box_sheets(type))
-        box_back_blank(type);
+        dxf(str(box_name(type), "_back"))
+            box_back_blank(type);
 
 module box_front(type)  //! Default front, can be overridden to customise
     render_2D_sheet(box_sheets(type))
-        box_front_blank(type);
+        dxf(str(box_name(type), "_front"))
+            box_front_blank(type);
 
 module box_left(type)   //! Default left side, can be overridden to customise
     render_2D_sheet(box_sheets(type))
-        box_left_blank(type);
+        dxf(str(box_name(type), "_left"))
+            box_left_blank(type);
 
 module box_right(type) //! Default right side, can be overridden to customise
     render_2D_sheet(box_sheets(type))
-        box_right_blank(type);
+        dxf(str(box_name(type), "_right"))
+            box_right_blank(type);

printed/butt_box.scad

@@ -51,9 +51,10 @@ function bbox_name(type)       = type[8]; //! Optional name if there is more tha
 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_short_inserts(type)= type[12];//! Set to use short inserts in the blocks
 
-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(screw, sheets, base_sheet, top_sheet, span, size, name = "bbox", skip_blocks = [], star_washers = true, thin_blocks = false, short_inserts = 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, short_inserts ];
 
 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
@@ -78,7 +79,8 @@ function corner_block_positions(type) = let(
           rotate([z > 0 ? 180 : 0, 0, corner * 90 + (z > 0 ? 90 : 0)])
     ];
 
-function corner_holes(type) = [for(p = corner_block_positions(type), q = corner_block_holes(bbox_screw(type))) p * q];
+function corner_holes(type) = let(short = bbox_short_inserts(type))
+    [for(p = corner_block_positions(type), q = corner_block_holes(bbox_screw(type), short_insert = short)) p * q];
 
 function fixing_block_positions(type) = let(
         width = bbox_width(type),
@@ -112,7 +114,8 @@ function fixing_block_positions(type) = let(
 
 function side_holes(type) = let(
     screw = bbox_screw(type),
-    holes = bbox_thin_blocks(type) ? 2screw_block_holes(screw) : fixing_block_holes(screw))
+    short = bbox_short_inserts(type),
+    holes = bbox_thin_blocks(type) ? 2screw_block_holes(screw, short_insert = short) : fixing_block_holes(screw))
         [for(p = fixing_block_positions(type), q = holes) p * q];
 
 module bbox_drill_holes(type, t)
@@ -120,8 +123,6 @@ module bbox_drill_holes(type, t)
         drill(screw_clearance_radius(bbox_screw(type)), 0);
 
 module bbox_base_blank(type) { //! 2D template for the base
-    dxf(str(bbox_name(type), "_base"));
-
     difference() {
         sheet_2D(bbox_base_sheet(type), bbox_width(type), bbox_depth(type), 1);
 
@@ -130,8 +131,6 @@ module bbox_base_blank(type) { //! 2D template for the base
 }
 
 module bbox_top_blank(type) { //! 2D template for the top
-    dxf(str(bbox_name(type), "_top"));
-
     t = sheet_thickness(bbox_sheets(type));
 
     difference() {
@@ -147,8 +146,6 @@ function subst_sheet(type, sheet) =
         sheet ? assert(sheet_thickness(sheet) == sheet_thickness(s)) sheet : s;
 
 module bbox_left_blank(type, sheet = false) { //! 2D template for the left side
-    dxf(str(bbox_name(type), "_left"));
-
     t = sheet_thickness(bbox_sheets(type));
     bb = sheet_thickness(bbox_base_sheet(type));
 
@@ -161,8 +158,6 @@ module bbox_left_blank(type, sheet = false) { //! 2D template for the left side
 }
 
 module bbox_right_blank(type, sheet = false) { //! 2D template for the right side
-    dxf(str(bbox_name(type), "_right"));
-
     t = sheet_thickness(bbox_sheets(type));
     bb = sheet_thickness(bbox_base_sheet(type));
 
@@ -175,8 +170,6 @@ module bbox_right_blank(type, sheet = false) { //! 2D template for the right sid
 }
 
 module bbox_front_blank(type, sheet = false, width = 0) { //! 2D template for the front
-    dxf(str(bbox_name(type), "_front"));
-
     t = sheet_thickness(bbox_sheets(type));
     bb = sheet_thickness(bbox_base_sheet(type));
     bt = sheet_thickness(bbox_top_sheet(type));
@@ -190,8 +183,6 @@ module bbox_front_blank(type, sheet = false, width = 0) { //! 2D template for th
 }
 
 module bbox_back_blank(type, sheet = false) { //! 2D template for the back
-    dxf(str(bbox_name(type), "_back"));
-
     bb = sheet_thickness(bbox_base_sheet(type));
     t = sheet_thickness(bbox_sheets(type));
 
@@ -205,27 +196,33 @@ module bbox_back_blank(type, sheet = false) { //! 2D template for the back
 
 module bbox_base(type)  //! Default base, can be overridden to customise
     render_2D_sheet(bbox_base_sheet(type))
-        bbox_base_blank(type);
+        dxf(str(bbox_name(type), "_base"))
+            bbox_base_blank(type);
 
 module bbox_top(type)   //! Default top, can be overridden to customise
     render_2D_sheet(bbox_top_sheet(type))
-        bbox_top_blank(type);
+        dxf(str(bbox_name(type), "_top"))
+            bbox_top_blank(type);
 
 module bbox_back(type)  //! Default back, can be overridden to customise
     render_2D_sheet(bbox_sheets(type))
-        bbox_back_blank(type);
+        dxf(str(bbox_name(type), "_back"))
+            bbox_back_blank(type);
 
 module bbox_front(type) //! Default front, can be overridden to customise
     render_2D_sheet(bbox_sheets(type))
-        bbox_front_blank(type);
+        dxf(str(bbox_name(type), "_front"))
+            bbox_front_blank(type);
 
 module bbox_left(type)  //! Default left side, can be overridden to customise
     render_2D_sheet(bbox_sheets(type))
-        bbox_left_blank(type);
+        dxf(str(bbox_name(type), "_left"))
+            bbox_left_blank(type);
 
 module bbox_right(type) //! Default right side, can be overridden to customise
     render_2D_sheet(bbox_sheets(type))
-        bbox_right_blank(type);
+        dxf(str(bbox_name(type), "_right"))
+            bbox_right_blank(type);
 
 module _bbox_assembly(type, top = true, base = true, left = true, right = true, back = true, front = true) { //! The box assembly, wrap with a local copy without parameters
     width = bbox_width(type);
@@ -238,6 +235,7 @@ module _bbox_assembly(type, top = true, base = true, left = true, right = true,
     tt = sheet_thickness(bbox_top_sheet(type));
     star_washers = bbox_star_washers(type);
     thin_blocks = bbox_thin_blocks(type);
+    short = bbox_short_inserts(type);
 
     function is_missing_screw(p) = p.y > depth / 2 - 1 ? !back : false;
 
@@ -247,14 +245,14 @@ 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);
+                                                   is_missing_screw(q) && ((q.z > 0) == (q.x > 0)) ? 0 : t, star_washers = star_washers, short_insert = short);
 
         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)
                     if(thin_blocks)
-                        fastened_2screw_block_assembly(is_missing_screw(q) ? 0 : t, bbox_screw(type), thickness_below = thickness, star_washers = star_washers);
+                        fastened_2screw_block_assembly(is_missing_screw(q) ? 0 : t, bbox_screw(type), thickness_below = thickness, star_washers = star_washers, short_insert = short);
                     else
                         fastened_fixing_block_assembly(is_missing_screw(q) ? 0 : t, bbox_screw(type), thickness2 = thickness, star_washers = star_washers);
 

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/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

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

@@ -111,15 +111,16 @@ 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);
                                 }
         }
 }
 
-module hinge_female(type) hinge_male(type, true);
+module hinge_female(type) //! The half without the pin
+    hinge_male(type, true);
 
 module hinge_both(type) { //! Both parts together for printing
     hinge_male(type);

printed/knob.scad

@@ -20,7 +20,7 @@
 //
 //! Parametric knobs for potentiometers and encoders.
 //!
-//! A knob can be constructed by specififying 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.
+//! 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.

printed/led_bezel.scad

@@ -0,0 +1,85 @@
+//
+// 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/>.
+//
+
+//
+//! Printed LED bezels for panel mounting
+//
+include <../core.scad>
+
+use <../vitamins/led.scad>
+
+function led_bezel(led, flange = 1, flange_h = 1, wall = 1, height = 8) = [led, flange, flange_h, wall, height]; //! Constructor
+function led_bezel_led(type)      = type[0]; //! The LED
+function led_bezel_flange(type)   = type[1]; //! Flange width
+function led_bezel_flange_t(type) = type[2]; //! Flange thickness
+function led_bezel_wall(type)     = type[3]; //! Wall thickness
+function led_bezel_height(type)   = type[4]; //! Total height
+
+function led_bezel_r(type)   =     //! Radius of the tube
+    corrected_radius(led_rim_dia(led_bezel_led(type)) / 2) + led_bezel_wall(type);
+
+function led_bezel_hole_r(type)   =     //! Panel hole radius
+    led_bezel_r(type) + 0.1;
+
+module led_bezel(type) { //! Makes the STL for the bezel
+    led = led_bezel_led(type);
+    stl(str(led[0],"_bezel")) {
+        rl = led_diameter(led) / 2;
+        rr = led_rim_dia(led) / 2;
+        wall = led_bezel_wall(type);
+        poly_tube(or = rr + wall + led_bezel_flange(type), ir = rl, h = led_bezel_flange_t(type));              // Flange
+        poly_tube(or = rl + wall,                          ir = rl, h = led_height(led) - rl - led_rim_t(led)); // Tube up to LED flange
+        poly_tube(or = corrected_radius(rr) + wall,        ir = rr, h = led_bezel_height(type));                // Tube beyond the flange
+    }
+}
+
+module led_bezel_retainer(type) { //! Makes the STL for the retaining ring
+    led = led_bezel_led(type);
+    stl(str(led[0],"_bezel_retainer")) {
+        ir =  led_bezel_r(type);
+        poly_tube(or = ir + led_bezel_wall(type), ir = ir, h = 4);
+    }
+}
+
+module led_bezel_assembly(type, colour = "red") {//! Led bezel with LED
+    led = led_bezel_led(type);
+    assembly(str(led[0], "_", colour, "_bezel")) {
+        translate_z(led_bezel_flange_t(type)) {
+            vflip()
+                stl_colour(pp1_colour)
+                    led_bezel(type);
+
+            translate_z(-led_height(led) + led_diameter(led) / 2)
+                explode(-20)
+                    led(led, colour);
+        }
+    }
+}
+
+module led_bezel_fastened_assembly(type, t, colour = "red") //! Led bezel fitted to panel with  and retaining ring
+{
+    explode(20)
+        led_bezel_assembly(type, colour);
+
+    translate_z(-t)
+        vflip()
+            stl_colour(pp2_colour)
+                explode(60)
+                    led_bezel_retainer(type);
+}

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

@@ -32,8 +32,8 @@ use <../vitamins/washer.scad>
 use <../vitamins/insert.scad>
 use <foot.scad>
 
-function pbox(name, wall, top_t, base_t, radius, size, foot = false, screw = false, ridges = [0, 0]) //! Construct a printed box property list
-    = concat([name, wall, top_t, base_t, foot, screw, radius, ridges], size);
+function pbox(name, wall, top_t, base_t, radius, size, foot = false, screw = false, short_insert = false, ridges = [0, 0]) //! Construct a printed box property list
+    = concat([name, wall, top_t, base_t, foot, screw, short_insert, radius, ridges], size);
 
 function pbox_name(type)       = type[0]; //! Name to allow more than one box in a project
 function pbox_wall(type)       = type[1]; //! Wall thickness
@@ -41,11 +41,12 @@ function pbox_top(type)        = type[2]; //! Top thickness
 function pbox_base(type)       = type[3]; //! Base thickness, can be zero for no base
 function pbox_foot(type)       = type[4]; //! Printed foot, can be false to suppress feet
 function pbox_base_screw(type) = type[5]; //! Screw type if no feet
-function pbox_radius(type)     = type[6]; //! Internal corner radius
-function pbox_ridges(type)     = type[7]; //! Ridge wavelength and amplitude
-function pbox_width(type)      = type[8]; //! Internal width
-function pbox_depth(type)      = type[9]; //! Internal depth
-function pbox_height(type)     = type[10]; //! Internal height
+function pbox_short_insert(type)=type[6]; //! Use short inserts
+function pbox_radius(type)     = type[7]; //! Internal corner radius
+function pbox_ridges(type)     = type[8]; //! Ridge wavelength and amplitude
+function pbox_width(type)      = type[9]; //! Internal width
+function pbox_depth(type)      = type[10]; //! Internal depth
+function pbox_height(type)     = type[11]; //! Internal height
 
 base_outset = 1;    // How much the base overlaps the inner dimensions
 base_overlap = 2;   // The width of ledge the base sits on
@@ -63,12 +64,12 @@ function pbox_total_height(type) =  //! Total height including base overlap
 function pbox_screw(type) =         //! Foot screw if got feet else base_screw
     let(foot = pbox_foot(type)) foot ? foot_screw(foot) : pbox_base_screw(type);
 
-function pbox_insert(type) = screw_insert(pbox_screw(type)); //! The insert for the base screws
+function pbox_insert(type) = screw_insert(pbox_screw(type), short = pbox_short_insert(type)); //! The insert for the base screws
 function pbox_washer(type) = screw_washer(pbox_screw(type)); //! The washer for the base screws
 
 function pbox_screw_length(type, panel_thickness = 0) =  //! Length of the base screw
     let(foot = pbox_foot(type), screw = pbox_screw(type))
-        screw_length(screw, pbox_base(type) + (foot ? foot_thickness(foot) : panel_thickness), 1, true);
+        screw_length(screw, pbox_base(type) + (foot ? foot_thickness(foot) : panel_thickness), 1,  pbox_insert(type));
 
 function pbox_mid_offset(type) = pbox_ridges(type).y + pbox_wall(type) / 2; // Offset to wall midpoint
 

printed/ribbon_clamp.scad

@@ -20,7 +20,7 @@
 //
 //! 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 rubbon cable and a PP strip.
+//! * 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>
@@ -105,7 +105,7 @@ assembly(let(screw_d = screw_radius(screw) * 2)str("ribbon_clamp_", str_ways(way
 
 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

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

scripts/render.py

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

scripts/set_config.py

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

scripts/tests.py

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

scripts/views.py

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

tests/LED_bezel.scad

@@ -0,0 +1,37 @@
+//
+// NopSCADlib Copyright Chris Palmer 2018
+// nop.head@gmail.com
+// hydraraptor.blogspot.com
+//
+// This file is part of NopSCADlib.
+//
+// NopSCADlib is free software: you can redistribute it and/or modify it under the terms of the
+// GNU General Public License as published by the Free Software Foundation, either version 3 of
+// the License, or (at your option) any later version.
+//
+// NopSCADlib is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+// without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+// See the GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License along with NopSCADlib.
+// If not, see <https://www.gnu.org/licenses/>.
+//
+include <../core.scad>
+use <../utils/layout.scad>
+
+include <../vitamins/leds.scad>
+use <../printed/led_bezel.scad>
+
+module led_bezels()
+    layout([for(l = LEDs) led_diameter(l)], 6) let(l = LEDs[$i], b = led_bezel(l))
+        if($preview)
+            led_bezel_fastened_assembly(b, 3, ["yellow", "blue", "red", "orange"][$i % 4]);
+        else {
+            led_bezel(b);
+
+            translate([0, -20])
+                led_bezel_retainer(b);
+        }
+
+
+led_bezels();

tests/LEDs.scad

@@ -23,7 +23,7 @@ include <../vitamins/leds.scad>
 
 module leds()
     layout([for(l = LEDs) led_diameter(l)], 5)
-        led(LEDs[$i], ["green", "blue", "red"][$i % 3]);
+        led(LEDs[$i], ["green", "blue", "red", "orange"][$i % 4]);
 
 if($preview)
     leds();

tests/PCB.scad

@@ -21,6 +21,7 @@ include <../vitamins/microswitches.scad>
 include <../vitamins/d_connectors.scad>
 include <../vitamins/leds.scad>
 include <../vitamins/axials.scad>
+include <../vitamins/radials.scad>
 include <../vitamins/smds.scad>
 include <../vitamins/7_segments.scad>
 include <../vitamins/potentiometers.scad>
@@ -59,56 +60,75 @@ test_pcb = ["test_pcb", "Test PCB",
     [ [3, 3], [3, -3], [-3, 3], [-3, -3] ],
     // components
     [
-        [ 20, -5, 180, "trimpot10"],
+        [ 20, -5,  180, "trimpot10"],
         [ 20, -15,  90, "trimpot10", true],
+        [  7,  2,   90, "smd_led", LED1206, "blue"],
         [ 10,  2,   90, "smd_led", LED0805, "red"],
         [ 13,  2,   90, "smd_led", LED0603, "orange"],
         [ 16,  2,   90, "smd_res", RES1206, "1K"],
         [ 19,  2,   90, "smd_res", RES0805, "1K"],
         [ 22,  2,   90, "smd_res", RES0603, "1K"],
-        [ 25,  2,   90, "smd_cap", CAP1206, 1.5],
-        [ 28,  2,   90, "smd_cap", CAP0805, 1.0],
-        [ 31,  2,   90, "smd_cap", CAP0603, 0.7],
+        [ 25,  2,   90, "smd_cap", CAP1206, 1.5, "1uF"],
+        [ 28,  2,   90, "smd_cap", CAP0805, 1.0, "100nF"],
+        [ 31,  2,   90, "smd_cap", CAP0603, 0.7, "10nF"],
+        [ 34,  3,   90, "smd_diode",DO241AC, "SS34"],
+        [ 21,  6,  -90, "smd_pot", TC33X1, "10K"],
+        [ 16,  6,  -90, "smd_sot", SOT23, "2N7000"],
+        [ 28,  8,  -90, "smd_sot", SOT223, "LM117"],
 
-        [ 10,  10,   0, "2p54header", 4, 1],
-        [ 25,  10,   0, "2p54header", 5, 1, false, "blue" ],
-        [ 10,  20,   0, "2p54boxhdr", 4, 2],
-        [ 10,  30,   0, "2p54socket", 6, 1],
-        [ 25,  30,   0, "2p54socket", 4, 1, false, 0, false, "red" ],
-        [ 65,  50,   0, "led", LED3mm, "red"],
-        [ 75,  50,   0, "led", LED5mm, "orange"],
-        [ 90,  50,   0, "led", LED10mm, "yellow"],
-        [ 10,  45, 180, "rj45"],
+        [ 45,  35,   0, "2p54header", 4, 1],
+        [ 60,  35,   0, "2p54header", 5, 1, false, "blue" ],
+        [ 80,  33,   0, "2p54boxhdr", 4, 2],
+        [ 45,  30,   0, "2p54socket", 4, 1, false, 0, false, "red" ],
+        [ 60,  30,   0, "2p54socket", 6, 1],
+
+        [ 59,  50, 180, "led", LED3mm, "red"],
+        [ 66,  50, 180, "led", LED5mm, "orange"],
+        [ 77,  50, 180, "led", LED8mm, "blue"],
+        [ 90,  50, 180, "led", LED10mm, "yellow"],
+        [ 10,  35, 180, "rj45"],
+        [  7,  50, 180, "usb_vAx1"],
         [  8,  65, 180, "usb_A"],
         [  8, 105, 180, "usb_Ax2"],
         [  7,  85, 180, "molex_usb_Ax1"],
         [ 8.5,125, 180, "molex_usb_Ax2"],
-        [  3, 140, 180, "usb_uA"],
-        [  8, 155, 180, "usb_B"],
+        [  3, 138, 180, "usb_uA"],
+        [ 4.6,148, 180, "usb_miniA"],
+        [ 3.7,158, 180, "usb_C"],
+        [  8, 170, 180, "usb_B"],
+        [  6, 184, 180, "uSD", [12, 11.5, 1.4]],
+        [  8, 196, 180, "jack"],
+        [  6, 206, 180, "barrel_jack"],
+        [  5, 220, 180, "hdmi"],
+        [  3, 235, 180, "mini_hdmi"],
+        [ 38, 190, -90, "text", 25, 4, "Silkscreen", "Liberation Sans:style=Bold"],
         [ 25, 200,   0, "buzzer", 4.5, 8.5],
         [ 25, 218,   0, "buzzer"],
-        [  8, 190, 180, "jack"],
-        [  6, 200, 180, "barrel_jack"],
-        [  5, 218, 180, "hdmi"],
-        [  3, 235, 180, "mini_hdmi"],
-        [  6, 175, 180, "uSD", [12, 11.5, 1.4]],
 
-        [ 65,   9,   0, "link", inch(0.4)],
-        [ 65,  12,   0, "ax_res", res1_8, 1000],
-        [ 65,  17,   0, "ax_res", res1_4, 10000],
-        [ 65,  22,   0, "ax_res", res1_2, 100000],
-        [ 55,  22,   0, "vero_pin"],
-        [ 55,  17,   0, "vero_pin", true],
+        [ 45,   5,   0, "link", inch(0.4), 0.75, undef, undef, [1.5, "red"]], // Sleeved link
+        [ 45,   9,   0, "link", inch(0.4)], // Flat link
+        [ 45,  12,   0, "ax_res", res1_8, 1000],
+        [ 45,  17,   0, "ax_res", res1_4, 10000],
+        [ 45,  22,   0, "ax_res", res1_2, 100000],
+        [ 35,  22,   0, "vero_pin"],
+        [ 35,  17,   0, "vero_pin", true],
+        [ 35,   9,   0, "link", 0, 5], // Vertical wire
 
-        [ 80,   9,   0, "link", inch(0.2), inch(0.4)],
-        [ 80,  12,   0, "ax_res", res1_8, 1000000, 1, inch(0.1)],
-        [ 80,  17,   0, "ax_res", res1_4, 100,     2, inch(0.1)],
-        [ 80,  22,   0, "ax_res", res1_2, 10,     10, inch(0.2)],
+        [ 60,   9,   0, "link", inch(0.2), inch(0.4)], // Raised link
+        [ 60,  12,   0, "ax_res", res1_8, 1000000, 1, inch(0.1)],
+        [ 60,  17,   0, "ax_res", res1_4, 100,     2, inch(0.1)],
+        [ 60,  22,   0, "ax_res", res1_2, 10,     10, inch(0.2)],
 
-        [ 60,   3,   0, "flex"],
-        [ 50,  15, -90, "flat_flex"],
-        [ 40,  15, -90, "flat_flex", true],
-        [ 60,  35,   0, "D_plug", DCONN9],
+        [ 33,  110, -90, "rd_xtal", HC49,    "4MHz" ],
+        [ 28,  110, -90, "rd_xtal", HC49_4H, "10MHz" ],
+        [ 28,  103, -90, "rd_xtal", C_002RX, "60KHz", 2 ],
+
+        [ 30,  130,-90, "rd_xtal", ACT1100, "40MHz", 0.5 ],
+        [ 30,  150,-90, "rd_xtal", ACT1700, "80MHz", 0.5 ],
+
+        [ 77,  15, -90, "flex"],
+        [ 95,  15, -90, "flat_flex"],
+        [ 87,  15, -90, "flat_flex", true],
 
         [ 50,  50,   0, "molex_hdr", 2],
         [ 50,  60,   0, "jst_xh", 2],
@@ -133,8 +153,14 @@ test_pcb = ["test_pcb", "Test PCB",
         [ 55, 170,   0, "button_4p5mm"],
         [ 50, 185,   0, "microswitch", small_microswitch],
         [ 52, 200,   0, "pcb", 11, TMC2130 ],
-        [ 80, 200,   0, "pdip", 24, "27C32", true, inch(0.6) ],
-        [ 80, 170,   0, "pdip", 8, "NE555" ],
+        [ 80, 210,   0, "pdip", 24, "27C32", true, inch(0.6) ],
+        [ 80, 180,   0, "pdip", 8, "NE555" ],
+        [ 71, 180,    0, "smd_inductor", IND2525, "4R7"],
+
+        [ 87, 166, -90, "smd_soic", SOIC18, "PIC18F88"],
+        [ 78, 166, -90, "smd_soic", SOIC14, "74HC00"],
+        [ 71, 166, -90, "smd_soic", SOIC16, "ICL323"],
+        [ 64, 166, -90, "smd_soic", SOIC8, "M34063"],
         [ 80, 150,   0, "chip", 10, 5, 1, grey(20)],
 
         [ 52, 206,   0, "2p54socket", 8, 1 ],
@@ -142,7 +168,8 @@ test_pcb = ["test_pcb", "Test PCB",
         [ 50, 220,   0, "standoff",  5, 4.5, 12.5, 2.54],
         [ 50, 240,   0, "potentiometer"],
         [ 75, 240,   0, "potentiometer", KY_040_encoder, 8],
-        [ 30,  85,   -90, "7seg", WT5011BSR, 2],
+        [ 30,  85, -90, "7seg", WT5011BSR, 2],
+        [ 30,  55, -90, "D_plug", DCONN9],
     ],
     // accessories
     []

tests/PCBs.scad

@@ -39,6 +39,12 @@ module pcbs() {
             translate([0, -pcb_width(perfboards[$i]) / 2])
                 pcb_assembly(perfboards[$i], 5 + $i, 3);
 
+    translate([0, 125])
+        layout([for(p = big_pcbs) spacing(p)], 0)
+            translate([0, pcb_length(big_pcbs[$i]) / 2])
+                rotate(90)
+                    pcb_assembly(big_pcbs[$i], 5 + $i, 3);
+
     for(p = pcbs_not_shown)
         hidden()
             pcb(p);

tests/SMDs.scad

@@ -33,6 +33,31 @@ module smds() {
         layout([for(c = smd_capacitors) smd_cap_size(c).x], 1)
             let(c = smd_capacitors[$i])
                 smd_capacitor(c, smd_cap_size(c).y * 0.8);
+
+    translate([0, 9])
+        layout([for(d = smd_diodes) smd_diode_size(d).x], 1)
+            let(d = smd_diodes[$i])
+                smd_diode(d, ["SS34"][$i]);
+
+    translate([0, 15])
+        layout([for(s = smd_sots) smd_sot_size(s).x], 1)
+            let(s = smd_sots[$i])
+                smd_sot(s, ["2N7000", "FZT851"][$i]);
+
+    translate([0, 21])
+        layout([for(p = smd_pots) smd_pot_size(p).x], 1)
+            let(p = smd_pots[$i])
+                smd_pot(p, "10K");
+
+    translate([0, 28])
+        layout([for(s = smd_soics) smd_soic_size(s).x], 1)
+            let(s = smd_soics[$i])
+                smd_soic(s, s[0]);
+
+    translate([0, 36])
+        layout([for(i = smd_inductors) smd_inductor_size(i).x], 1)
+            let(i = smd_inductors[$i])
+                smd_inductor(i, "4R7");
 }
 
 if($preview)

tests/axials.scad

@@ -28,6 +28,13 @@ module axials() {
         rotate(90)
             wire_link(0.8, inch(0.4));
 
+    pcb_grid(pcb, 1, 1.5)
+        rotate(90)
+            wire_link(0.8, inch(0.3), 0.75, sleeve = [1.5, "red"]);
+
+    pcb_grid(pcb, 0, 7)
+        wire_link(0.8, 0, 5);
+
     for(i = [0 : len(ax_resistors) - 1]) {
         pcb_grid(pcb, 2 * i + 2, 1 + [0, 0.5, 1.5][i])
             rotate(90)

tests/bezier.scad

@@ -77,6 +77,17 @@ module beziers() {
 
     translate(control_points[1] - [0, 0, 2])
         label(str("bezier_length = ", length, ", bezier_min_z = ", bezier_min_z(curve)), valign = "top");
+
+    path1 = [[20, 20,  0], [40, 20, 0]];
+    path2 = [[70, 40, -5], [60, 40, 0]];
+
+    color("green")
+        for(p = concat(path1, path2))
+            translate(p)
+                sphere(1);
+
+    color("orange")
+        sweep(bezier_join(path1, path2, 10), circle_points(0.5, $fn = 64));
 }
 
 if($preview)

tests/cable_clip.scad

@@ -0,0 +1,59 @@
+//
+// 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/>.
+//
+
+include <../core.scad>
+use <../printed/cable_clip.scad>
+use <../vitamins/wire.scad>
+
+
+sheet_thickness = 3;
+
+cables = [
+    for(i = [1 : 6]) [i, 1.4], [1, 6], 0, [10, inch(0.05), true], 0
+];
+
+screw = M3_dome_screw;
+
+
+module cable_clips() {
+    for(i = [0 : ceil(len(cables) / 2) - 1])
+        translate([i * 25, 0]) {
+            cable1 = cables[2 * i];
+            cable2 = cables[2 * i + 1];
+
+            if($preview) {
+                cable_clip_assembly(screw, sheet_thickness, cable1, cable2);
+
+                for(j = [0 : 1])
+                    let(cable = cables[2 * i + j])
+                        if(cable)
+                            let(positions = cable_bundle_positions(cable))
+                                for(i = [0 : len(positions) - 1])
+                                    let(p = positions[i])
+                                        translate([p.x + [-1, 1][j] * cable_clip_offset(screw, cable), 0, p.y])
+                                            rotate([90, 0, 0])
+                                                color([grey(20), "blue", "red", "orange", "yellow", "green", "brown", "purple", "grey", "white"][i])
+                                                    cylinder(d = cable_wire_size(cable), h = 30, center = true);
+            }
+            else
+                cable_clip(screw, cable1, cable2);
+        }
+}
+
+cable_clips();

tests/core_xy.scad

@@ -55,7 +55,7 @@ module coreXY_belts_test() {
     translate([coreXYPosBL.x + separation.x/2, coreXYPosTR.y + upper_drive_pulley_offset.y, separation.z/2]) {
         // add the upper drive pulley stepper motor
         translate([coreXY_drive_pulley_x_alignment(coreXY_type) + upper_drive_pulley_offset.x, 0, -pulley_height(coreXY_drive_pulley(coreXY_type))])
-            NEMA(NEMA17M);
+            NEMA(NEMA17_40);
 
         // add the screws for the upper drive offset idler pulleys if required
         if (upper_drive_pulley_offset.x > 0) {
@@ -78,7 +78,7 @@ module coreXY_belts_test() {
     translate([coreXYPosTR.x - separation.x/2, coreXYPosTR.y + lower_drive_pulley_offset.y, -separation.z/2]) {
         // add the lower drive pulley stepper motor
         translate([-coreXY_drive_pulley_x_alignment(coreXY_type) + lower_drive_pulley_offset.x, 0, -pulley_height(coreXY_drive_pulley(coreXY_type))])
-            NEMA(NEMA17M);
+            NEMA(NEMA17_40);
 
         // add the screws for the lower drive offset idler pulleys if required
         if (lower_drive_pulley_offset.x < 0) {

tests/displays.scad

@@ -24,9 +24,10 @@ use <../vitamins/pcb.scad>
 
 module displays()
     layout([for(d = displays) pcb_length(display_pcb(d))], 10)
-        translate([0, pcb_width(displays[$i]) / 2])
-            vflip()
-                display(displays[$i]);
+        let(d = displays[$i], offset = display_pcb_offset(d))
+            translate([-offset.x, pcb_width(display_pcb(d)) / 2 - offset.y])
+                vflip()
+                    display(d);
 
 if($preview)
     let($show_threads = true)

tests/fastons.scad

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

tests/inserts.scad

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

tests/leadnuts.scad

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

tests/photo_interrupters.scad

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