Merge branch 'xrxca-Add-ESP-01M-PCB'

Update pcbs.scad

Update pcbs.scad

Update pcbs.scad

CHANGELOG.md

@@ -3,6 +3,244 @@
 This changelog is generated by `changelog.py` using manually added semantic version tags to classify commits as breaking changes, additions or fixes.
 
 
+#### [v21.9.1](https://github.com/nophead/NopSCADlib/releases/tag/v21.9.1 "show release") Fixes [...](https://github.com/nophead/NopSCADlib/compare/v21.9.0...v21.9.1 "diff with v21.9.0")
+*   2023-11-26 [`b9d1017`](https://github.com/nophead/NopSCADlib/commit/b9d101749eb2b19963299d85b75f0fa489fba552 "show commit") [C.P.](# "Chris Palmer") Updated images due to pixel differences on new PC
+
+*   2023-11-26 [`17979d3`](https://github.com/nophead/NopSCADlib/commit/17979d320539ca861300ecd4e42c01a913861066 "show commit") [C.P.](# "Chris Palmer") Fixed typo in comment.
+
+*   2023-10-30 [`73567ed`](https://github.com/nophead/NopSCADlib/commit/73567eda396214f1f882d62fb1d8a0ecbf2e7d94 "show commit") [C.P.](# "Chris Palmer") MULTIWATT11 package now generates a BOM entry.
+
+*   2023-10-30 [`f5c74a8`](https://github.com/nophead/NopSCADlib/commit/f5c74a8561f1e76f331c2d0027ecfd34bb2e7f3b "show commit") [C.P.](# "Chris Palmer") Corrected gallery.
+
+*   2023-10-30 [`04090b8`](https://github.com/nophead/NopSCADlib/commit/04090b816bfa3b6587cf6dcddbd54e5a94cb2420 "show commit") [C.P.](# "Chris Palmer") Updated the gallery.
+
+*   2023-10-29 [`06d4918`](https://github.com/nophead/NopSCADlib/commit/06d49186300b03bf4699cefbbcef0c0b8f7e9caa "show commit") [C.P.](# "Chris Palmer") Updated examples.
+
+### [v21.9.0](https://github.com/nophead/NopSCADlib/releases/tag/v21.9.0 "show release") Additions [...](https://github.com/nophead/NopSCADlib/compare/v21.8.0...v21.9.0 "diff with v21.8.0")
+*   2023-10-29 [`2d091b9`](https://github.com/nophead/NopSCADlib/commit/2d091b9d16d33cf8b8751b2a436019c9032422a3 "show commit") [C.P.](# "Chris Palmer") Added a constructor function for PCBs.
+PCB text can now specify a colour.
+Added `SOT23_6,` `TSOT23_8` and CAP1210 SMD packages.
+Added ESP-201 Wifi Module PCB.
+Added ESP12F Wifi module.
+Added `tiny_buck` converter PCB.
+Made 2p54joiner a bit longer.
+Fixed SOIC gullwing shape.
+Added Wifi antennas.
+Added Yunpen filtered IEC mains inlet.
+Added power jack socket.
+Added right angle option for LEDs.
+Added `gear_motors`.
+Added 686ZZ and 696ZZ ball bearings.
+Added two larger box section tubes.
+Added right angle option to `square_buttons`. Doesn't draw the frame yet.
+Added multiwatt11 package for L6203.
+Added ONS9143A 13A mains socket.
+Added radial electrolytic capacitors.
+Added `LDE10_20B` PSU module.
+Added `screw_tearsink()` to make horizontal countersunk holes.
+Can now have solid tracks on veroboard.
+Added `veroboard_base()` module to make an STL for a base with spacers.
+Corrected M6 spring washer thickness.
+Can now specify the height of a solder meniscus.
+`slot()` now has a `center` option.
+Added `button_6mm_7` with a taller button.
+Added default fa, fs and fn constants used for drawing vitamins.
+These can be set via `$default_fa` and `$default_fs` that can also be set
+by environment variables: `NOPSCADLIB_DEFAULT_FA` and `NOPSCADLIB_DEFAULT_FS`.
+
+### [v21.8.0](https://github.com/nophead/NopSCADlib/releases/tag/v21.8.0 "show release") Additions [...](https://github.com/nophead/NopSCADlib/compare/v21.7.0...v21.8.0 "diff with v21.7.0")
+*   2023-07-28 [`74293b6`](https://github.com/nophead/NopSCADlib/commit/74293b6c22c51c326e2d541d1a68a1cd63659c2b "show commit") [C.](# "Chris") Added axial diodes, radial transistors, discs and modules.
+Verboard and perboard components get solder menisci added automatically.
+Radial leads now made by bezier curves rather than straights and arcs.
+
+### [v21.7.0](https://github.com/nophead/NopSCADlib/releases/tag/v21.7.0 "show release") Additions [...](https://github.com/nophead/NopSCADlib/compare/v21.6.1...v21.7.0 "diff with v21.6.1")
+*   2023-07-22 [`523fc9e`](https://github.com/nophead/NopSCADlib/commit/523fc9e9a5c8a566bde2bfe8555d5f6dddd8f05b "show commit") [C.](# "Chris") Adafruit Feather 405 contributed by Chris Lott.
+
+#### [v21.6.1](https://github.com/nophead/NopSCADlib/releases/tag/v21.6.1 "show release") Fixes [...](https://github.com/nophead/NopSCADlib/compare/v21.6.0...v21.6.1 "diff with v21.6.0")
+*   2023-07-22 [`09d2ffb`](https://github.com/nophead/NopSCADlib/commit/09d2ffb126cf9d9ad2d68171583e11708227b704 "show commit") [C.](# "Chris") Typo in comment fixed.
+
+*   2023-07-22 [`3c37035`](https://github.com/nophead/NopSCADlib/commit/3c370359c838a48d85e25709bcbced61249c237d "show commit") [C.](# "Chris") Make front page `readme.md` labels lower case as GitHub seems have stopped working with uppercase.
+
+### [v21.6.0](https://github.com/nophead/NopSCADlib/releases/tag/v21.6.0 "show release") Additions [...](https://github.com/nophead/NopSCADlib/compare/v21.5.1...v21.6.0 "diff with v21.5.1")
+*   2023-07-22 [`e3cde64`](https://github.com/nophead/NopSCADlib/commit/e3cde64b61b6abfc4a2883e8aa32b66346fde1c4 "show commit") [C.](# "Chris") `open_bearing_theta()` now derived from `open_bearing_width()`.
+
+*   2023-07-22 [`e61ce02`](https://github.com/nophead/NopSCADlib/commit/e61ce0241443fb2c1f0585953bd3f7383b217086 "show commit") [C.](# "Chris") Moved things around for better test images.
+
+*   2023-07-22 [`f8e1256`](https://github.com/nophead/NopSCADlib/commit/f8e125654ed60842d6ca7f33a91377d9cb5f1dc9 "show commit") [C.](# "Chris") Rendred the 3D difference.
+
+*   2023-07-22 [`62b1511`](https://github.com/nophead/NopSCADlib/commit/62b1511c82eacb5124302aed36a52fe0d8104385 "show commit") [C.](# "Chris") Removed 3D difference for speed.
+
+*   2023-06-27 [`84d98a1`](https://github.com/nophead/NopSCADlib/commit/84d98a1081d38c56d5b02645a99223b7616fcd70 "show commit") [J.R.](# "Jeroen Roos") Added SBR rails
+
+ * This change adds
+- SBR rails. For now only SBR16
+- The bearing block that goes with it (SBR16UU)
+- An 'open' linear bearing (LM16UUOP) that is used by the bearing block
+- A 28mm circlip that has a wider opening than then normal circlip.
+`(circlip_28iw)`
+
+#### [v21.5.1](https://github.com/nophead/NopSCADlib/releases/tag/v21.5.1 "show release") Fixes [...](https://github.com/nophead/NopSCADlib/compare/v21.5.0...v21.5.1 "diff with v21.5.0")
+*   2023-06-29 [`5899ffe`](https://github.com/nophead/NopSCADlib/commit/5899ffe88f7952108ce928a5a6188b4aad5044c5 "show commit") [C.](# "Chris") More typos in comments.
+
+*   2023-06-28 [`b051311`](https://github.com/nophead/NopSCADlib/commit/b05131145caf500cd9198b1e9b9fafc69506b50f "show commit") [C.](# "Chris") Comment typo.
+
+### [v21.5.0](https://github.com/nophead/NopSCADlib/releases/tag/v21.5.0 "show release") Additions [...](https://github.com/nophead/NopSCADlib/compare/v21.4.1...v21.5.0 "diff with v21.4.1")
+*   2023-05-08 [`c3f3d62`](https://github.com/nophead/NopSCADlib/commit/c3f3d629b1ff79d40cc5ad3efcb33e940d6c8056 "show commit") [C.P.](# "Chris Palmer") Added PanelDue V3.
+
+*   2023-05-08 [`c7ba052`](https://github.com/nophead/NopSCADlib/commit/c7ba052ccf24d764aa6460d4559e92596c9e4cf4 "show commit") [C.P.](# "Chris Palmer") Added SMD QFP package.
+
+*   2023-05-08 [`c2c5f50`](https://github.com/nophead/NopSCADlib/commit/c2c5f509860b909ca8fca5ffcc65dbef2f7177c5 "show commit") [C.P.](# "Chris Palmer") Can now used `smd_res()` to draw chokes.
+
+*   2023-05-08 [`d0ae8ca`](https://github.com/nophead/NopSCADlib/commit/d0ae8ca216108f53c9b8e60896ea9b59b845b7e0 "show commit") [C.P.](# "Chris Palmer") Added the ability to have more than one grid on a PCB.
+
+*   2023-05-08 [`e81dcfd`](https://github.com/nophead/NopSCADlib/commit/e81dcfdbd8163ce8e2db450f3a20c296c21327a8 "show commit") [C.P.](# "Chris Palmer") Added right angle option to box headers.
+
+#### [v21.4.1](https://github.com/nophead/NopSCADlib/releases/tag/v21.4.1 "show release") Fixes [...](https://github.com/nophead/NopSCADlib/compare/v21.4.0...v21.4.1 "diff with v21.4.0")
+*   2023-05-08 [`06a286d`](https://github.com/nophead/NopSCADlib/commit/06a286dc989e9cc8cf7918049cd16a862b1a9b94 "show commit") [C.P.](# "Chris Palmer") Fixed missing BOM entry for JST connectors.
+Fixed default colour for JST connectors.
+Corrected BOM entry to show right angle options on Molex and pin headers.
+
+*   2023-05-08 [`f5496c3`](https://github.com/nophead/NopSCADlib/commit/f5496c373a1ab8ae47d07cc0a52d76e4299876cc "show commit") [C.P.](# "Chris Palmer") Fixed typo in `smd_diode(DO214AC)` package name.
+
+### [v21.4.0](https://github.com/nophead/NopSCADlib/releases/tag/v21.4.0 "show release") Additions [...](https://github.com/nophead/NopSCADlib/compare/v21.3.1...v21.4.0 "diff with v21.3.1")
+*   2023-05-01 [`5e24a32`](https://github.com/nophead/NopSCADlib/commit/5e24a32a0b422e8032c3c5d377c1a756ff6f1022 "show commit") [C.P.](# "Chris Palmer") Added ESP32 camera.
+
+*   2023-05-01 [`fbd8d8c`](https://github.com/nophead/NopSCADlib/commit/fbd8d8c7cdff0bd7de0d42aa74bf0ab6551c205b "show commit") [C.P.](# "Chris Palmer") Added `smd_coax`
+
+#### [v21.3.1](https://github.com/nophead/NopSCADlib/releases/tag/v21.3.1 "show release") Fixes [...](https://github.com/nophead/NopSCADlib/compare/v21.3.0...v21.3.1 "diff with v21.3.0")
+*   2023-04-29 [`b1592f5`](https://github.com/nophead/NopSCADlib/commit/b1592f51d4b16a125d9b28edae56f758fcac2f02 "show commit") [C.P.](# "Chris Palmer") Fixed `bom.py,` `views.py` and `tests.py` so that vitamin descriptions can contain more than one colon.
+
+### [v21.3.0](https://github.com/nophead/NopSCADlib/releases/tag/v21.3.0 "show release") Additions [...](https://github.com/nophead/NopSCADlib/compare/v21.2.0...v21.3.0 "diff with v21.2.0")
+*   2023-04-23 [`61fc194`](https://github.com/nophead/NopSCADlib/commit/61fc19499524a2b750d17a90627a697bf626bbf0 "show commit") [C.P.](# "Chris Palmer") Refactored for readability.
+
+*   2023-04-23 [`f8af615`](https://github.com/nophead/NopSCADlib/commit/f8af61568a8362cf470bc9eb8de8323c8fc001c7 "show commit") [C.P.](# "Chris Palmer") Updated images and readme.
+
+*   2023-04-23 [`05d1684`](https://github.com/nophead/NopSCADlib/commit/05d16841c4d48c5c8f453e438af0ff6eb5bffe53 "show commit") [C.P.](# "Chris Palmer") Fixed thread pitch.
+
+*   2023-04-05 [`07e7eb7`](https://github.com/nophead/NopSCADlib/commit/07e7eb77f73fcaab4291388b49781b0e2de5a64c "show commit") [M.B.](# "Martin Budden") Added support for shoulder screws.
+
+### [v21.2.0](https://github.com/nophead/NopSCADlib/releases/tag/v21.2.0 "show release") Additions [...](https://github.com/nophead/NopSCADlib/compare/v21.1.2...v21.2.0 "diff with v21.1.2")
+*   2023-04-22 [`5fc70e1`](https://github.com/nophead/NopSCADlib/commit/5fc70e19ac5d320290f4a2151665e83f0829d796 "show commit") [C.P.](# "Chris Palmer") Added SMD Tantalum caps and 0502 and 0402 resistor and capacitors.
+
+#### [v21.1.2](https://github.com/nophead/NopSCADlib/releases/tag/v21.1.2 "show release") Fixes [...](https://github.com/nophead/NopSCADlib/compare/v21.1.1...v21.1.2 "diff with v21.1.1")
+*   2023-03-29 [`1c5d9a8`](https://github.com/nophead/NopSCADlib/commit/1c5d9a8ef5892caf9b2c4d0d84dc3d20eba699d3 "show commit") [C.P.](# "Chris Palmer") Removed utility functions used by `invert()` from documentation as not generally useful.
+
+#### [v21.1.1](https://github.com/nophead/NopSCADlib/releases/tag/v21.1.1 "show release") Fixes [...](https://github.com/nophead/NopSCADlib/compare/v21.1.0...v21.1.1 "diff with v21.1.0")
+*   2023-03-29 [`d3f0bfc`](https://github.com/nophead/NopSCADlib/commit/d3f0bfc17f82b42f2d81f2d72a54c3f0cc375604 "show commit") [C.P.](# "Chris Palmer") Fixed typo in resistor comment.
+
+### [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.
+
+### [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.
+
 ### [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.
 
@@ -383,7 +621,7 @@ veroboard track cuts made slightly bigger.
 
 *   2021-10-01 [`042d809`](https://github.com/nophead/NopSCADlib/commit/042d809ed056ba55c32f1d850b81dcf559fe9134 "show commit") [C.P.](# "Chris Palmer") Resistor and thermistor wires made more round.
 
-*   2021-10-01 [`3864839`](https://github.com/nophead/NopSCADlib/commit/3864839e521eb64189cba8453ea8835d6ffadd75 "show commit") [C.P.](# "Chris Palmer") Fixed encoder breakout descripion typo.
+*   2021-10-01 [`3864839`](https://github.com/nophead/NopSCADlib/commit/3864839e521eb64189cba8453ea8835d6ffadd75 "show commit") [C.P.](# "Chris Palmer") Fixed encoder breakout description typo.
 
 *   2021-10-01 [`2ba2c2c`](https://github.com/nophead/NopSCADlib/commit/2ba2c2c115d4ab6c2371c662a3e54d7c77aa7785 "show commit") [C.P.](# "Chris Palmer") Removed some unused dependencies.
 
@@ -402,9 +640,9 @@ Lead length removed from TO220 and TO247 vitamin string.
 Mainly text spacing changes.
 
 *   2021-09-27 [`9b5ec6a`](https://github.com/nophead/NopSCADlib/commit/9b5ec6af1aba313df6812a5313470ebb7e8fbdd7 "show commit") [C.P.](# "Chris Palmer") Fixed new `rounded_polygon` to work with last OpenSCAD release.
-Trainling commas in `let()`.
+Trailing commas in `let()`.
 
-*   2021-09-27 [`50958b0`](https://github.com/nophead/NopSCADlib/commit/50958b064d5a6d5ca3fd6525a8c3d3a2c5b20199 "show commit") [C.P.](# "Chris Palmer") Added `$show_plugs` to show crude reprentations of housings on `pin_headers` and Molex KK headers.
+*   2021-09-27 [`50958b0`](https://github.com/nophead/NopSCADlib/commit/50958b064d5a6d5ca3fd6525a8c3d3a2c5b20199 "show commit") [C.P.](# "Chris Palmer") Added `$show_plugs` to show crude representations of housings on `pin_headers` and Molex KK headers.
 
 *   2021-09-27 [`c37373c`](https://github.com/nophead/NopSCADlib/commit/c37373c920d3b438895ef535b0c06d0d00675609 "show commit") [C.P.](# "Chris Palmer") Added `TO247()` and `TO247_size()` to `component.scad`.
 
@@ -745,7 +983,7 @@ Changelog updated.
 
 *   2021-03-06 [`b83e567`](https://github.com/nophead/NopSCADlib/commit/b83e56713fbde2ac25e9750c369ae9cec4d67913 "show commit") [M.B.](# "Martin Budden") Reordered openscad command line parameters.
 
-*   2021-03-04 [`da4f9fb`](https://github.com/nophead/NopSCADlib/commit/da4f9fbdc31d2ceaa853c2fa0270e6961fde28b9 "show commit") [C.P.](# "Chris Palmer") Typo in `changlog.py` doc string.
+*   2021-03-04 [`da4f9fb`](https://github.com/nophead/NopSCADlib/commit/da4f9fbdc31d2ceaa853c2fa0270e6961fde28b9 "show commit") [C.P.](# "Chris Palmer") Typo in `changelog.py` doc string.
 
 *   2021-03-03 [`614e5f3`](https://github.com/nophead/NopSCADlib/commit/614e5f3a72db309a3dee996d7241317556883e8d "show commit") [C.P.](# "Chris Palmer") Issues in the changelog now link to to the issue.
 
@@ -928,7 +1166,7 @@ Smaller PCBs closer together to make space.
 *   2021-01-15 [`7f9122a`](https://github.com/nophead/NopSCADlib/commit/7f9122ae662ab0bd660e5c2f5ab6c507797030da "show commit") [C.P.](# "Chris Palmer") Added `--hardwarnings` to `openscad.py`
 
 ### [v10.33.0](https://github.com/nophead/NopSCADlib/releases/tag/v10.33.0 "show release") Additions [...](https://github.com/nophead/NopSCADlib/compare/v10.32.0...v10.33.0 "diff with v10.32.0")
-*   2021-01-15 [`93b260b`](https://github.com/nophead/NopSCADlib/commit/93b260b7b9a016e2afe1ab7df22f5c0c8c906708 "show commit") [C.P.](# "Chris Palmer") Added `screw_length()` to calculuate screw lengths includin washers, inserts and nuts.
+*   2021-01-15 [`93b260b`](https://github.com/nophead/NopSCADlib/commit/93b260b7b9a016e2afe1ab7df22f5c0c8c906708 "show commit") [C.P.](# "Chris Palmer") Added `screw_length()` to calculate screw lengths includin washers, inserts and nuts.
 
 ### [v10.32.0](https://github.com/nophead/NopSCADlib/releases/tag/v10.32.0 "show release") Additions [...](https://github.com/nophead/NopSCADlib/compare/v10.31.1...v10.32.0 "diff with v10.31.1")
 *   2021-01-13 [`8fea8f4`](https://github.com/nophead/NopSCADlib/commit/8fea8f437b4c4efe1aecf24cf8ddb6c8f006cad2 "show commit") [C.P.](# "Chris Palmer") Updated images and readme for green terminals.
@@ -1064,7 +1302,7 @@ Updated pics and readme.
 *   2020-12-28 [`f6f4fcc`](https://github.com/nophead/NopSCADlib/commit/f6f4fcc7e84e40669446708e2352ea68c49b7961 "show commit") [M.B.](# "Martin Budden") Added `M5_cs_cap` screw
 
 #### [v10.21.1](https://github.com/nophead/NopSCADlib/releases/tag/v10.21.1 "show release") Fixes [...](https://github.com/nophead/NopSCADlib/compare/v10.21.0...v10.21.1 "diff with v10.21.0")
-*   2020-12-28 [`ba586b3`](https://github.com/nophead/NopSCADlib/commit/ba586b368582db163af143ebb60afed270f77b1c "show commit") [C.P.](# "Chris Palmer") Example images update to match new contersink screws and teardrops.
+*   2020-12-28 [`ba586b3`](https://github.com/nophead/NopSCADlib/commit/ba586b368582db163af143ebb60afed270f77b1c "show commit") [C.P.](# "Chris Palmer") Example images update to match new countersink screws and teardrops.
 
 ### [v10.21.0](https://github.com/nophead/NopSCADlib/releases/tag/v10.21.0 "show release") Additions [...](https://github.com/nophead/NopSCADlib/compare/v10.20.1...v10.21.0 "diff with v10.20.1")
 *   2020-12-28 [`8d22940`](https://github.com/nophead/NopSCADlib/commit/8d22940506df525ac52ef6f8a00ea03661f3b682 "show commit") [C.P.](# "Chris Palmer") Project blurb can now be split with into sections with markdown horizontal rules
@@ -1286,7 +1524,7 @@ Updated images and readme.
 
 *   2020-11-13 [`0c9ae8d`](https://github.com/nophead/NopSCADlib/commit/0c9ae8d60c96d8c5b16adfce98081adc8e20b001 "show commit") [C.P.](# "Chris Palmer") PCBs now drawn before components so that transparent LEDs draw correctly.
 
-*   2020-11-12 [`9a0bad4`](https://github.com/nophead/NopSCADlib/commit/9a0bad4e61acbd0ae27ef5c2d324d88deb7ee672 "show commit") [C.P.](# "Chris Palmer") Made stepper motor encap paramatric.
+*   2020-11-12 [`9a0bad4`](https://github.com/nophead/NopSCADlib/commit/9a0bad4e61acbd0ae27ef5c2d324d88deb7ee672 "show commit") [C.P.](# "Chris Palmer") Made stepper motor encap parametric.
 Made connector position based on encap height and added PCB.
 
 *   2020-11-12 [`9004781`](https://github.com/nophead/NopSCADlib/commit/90047815b0189c628c96807785d0d93a4895d411 "show commit") [C.P.](# "Chris Palmer") Added JST PH connectors.
@@ -1342,7 +1580,7 @@ Reverted the jst header pin position change.
 
 *   2020-09-20 [`933fea6`](https://github.com/nophead/NopSCADlib/commit/933fea687c54d7d8ec48fe92aae12ffca0666789 "show commit") [C.P.](# "Chris Palmer") Removed debug code
 
-*   2020-09-19 [`a7803b1`](https://github.com/nophead/NopSCADlib/commit/a7803b1efbf92c5e27f3171d7e2a92634fa2d84f "show commit") [C.P.](# "Chris Palmer") Improved numerical accuarcy of catenary calculations.
+*   2020-09-19 [`a7803b1`](https://github.com/nophead/NopSCADlib/commit/a7803b1efbf92c5e27f3171d7e2a92634fa2d84f "show commit") [C.P.](# "Chris Palmer") Improved numerical accuracy of catenary calculations.
 
 ### [v9.7.0](https://github.com/nophead/NopSCADlib/releases/tag/v9.7.0 "show release") Additions [...](https://github.com/nophead/NopSCADlib/compare/v9.6.1...v9.7.0 "diff with v9.6.1")
 *   2020-09-19 [`1255e71`](https://github.com/nophead/NopSCADlib/commit/1255e712719ce66fd3b231e5c212ea69b0bb9f1c "show commit") [C.P.](# "Chris Palmer") Added catenary curves.
@@ -1415,7 +1653,7 @@ Reduced J-Head inset.
 Removed J-Head MK4.
 
 ### [v9.2.0](https://github.com/nophead/NopSCADlib/releases/tag/v9.2.0 "show release") Additions [...](https://github.com/nophead/NopSCADlib/compare/v9.1.1...v9.2.0 "diff with v9.1.1")
-*   2020-08-13 [`2419d50`](https://github.com/nophead/NopSCADlib/commit/2419d5064182d63634183a5762c995d0bdfacf0a "show commit") [C.P.](# "Chris Palmer") Added more PTFE tube sizes and amde them whiter.
+*   2020-08-13 [`2419d50`](https://github.com/nophead/NopSCADlib/commit/2419d5064182d63634183a5762c995d0bdfacf0a "show commit") [C.P.](# "Chris Palmer") Added more PTFE tube sizes and made them whiter.
 
 *   2020-08-13 [`02211c2`](https://github.com/nophead/NopSCADlib/commit/02211c20348ef4f134c0d3c734a5d922fe9a9a3c "show commit") [C.P.](# "Chris Palmer") Added `tubing_or()` and `center` option.
 
@@ -1950,7 +2188,7 @@ already included by other vitamins.
 
 *   2020-02-24 [`065ec0a`](https://github.com/nophead/NopSCADlib/commit/065ec0a430da6c62cbd6d06b3de822e8a6751425 "show commit") [C.P.](# "Chris Palmer") Corrected nut placement
 
-*   2020-02-24 [`e7eea05`](https://github.com/nophead/NopSCADlib/commit/e7eea0520c7e4bd20e505084d7c17a64a915ef75 "show commit") [C.P.](# "Chris Palmer") T nut thickness no longer includes the stem to simplyfy placement and screw
+*   2020-02-24 [`e7eea05`](https://github.com/nophead/NopSCADlib/commit/e7eea0520c7e4bd20e505084d7c17a64a915ef75 "show commit") [C.P.](# "Chris Palmer") T nut thickness no longer includes the stem to simplify placement and screw
 length calculations.
 
 *   2020-02-24 [`5cb994b`](https://github.com/nophead/NopSCADlib/commit/5cb994b58b204a9f59d17001e4061aa5f60328bc "show commit") [C.P.](# "Chris Palmer") Retabulated nut table
@@ -2170,7 +2408,7 @@ Both added to the insert test.
 
 *   2019-08-18 [`e35fb69`](https://github.com/nophead/NopSCADlib/commit/e35fb695a21a42216b7f5b58c12b6bc5d3a43eff "show commit") [C.P.](# "Chris Palmer") Ziptie width added to BOM description.
 
-*   2019-08-18 [`61bec65`](https://github.com/nophead/NopSCADlib/commit/61bec656d7d9328a6eb90ca003d5ae5888e5a18c "show commit") [C.P.](# "Chris Palmer") Fixed box header BOM descripion.
+*   2019-08-18 [`61bec65`](https://github.com/nophead/NopSCADlib/commit/61bec656d7d9328a6eb90ca003d5ae5888e5a18c "show commit") [C.P.](# "Chris Palmer") Fixed box header BOM description.
 
 *   2019-08-18 [`854adab`](https://github.com/nophead/NopSCADlib/commit/854adab6650e7617588e2da821cd91fa97657eaa "show commit") [C.P.](# "Chris Palmer") Fix for Python 2
 

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,7 +28,9 @@ 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.
 
-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.
+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 2 minutes.
 
 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`
 for local preview.

examples/EnviroPlus/bom/bom.csv

@@ -1,6 +1,6 @@
 'Micro SD card',  1
 'Fan 17mm x 8mm',  1
-'Heatfit insert M2',  4
+'Heatfit insert M2 x 4mm',  4
 'Nut M2.5 x 2.2mm nyloc',  4
 'Enviro+',  1
 'Raspberry Pi Zero',  1
@@ -13,7 +13,7 @@
 'SMD capacitor 1206 10uF',  1
 'SMD resistor 0805 3K3 0.125W',  1
 'SOT223 package FZT851',  1
-'Veroboard 6 holes x 6strips',  1
+'Veroboard 6 holes x 6 strips',  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

examples/EnviroPlus/bom/bom.json

@@ -49,13 +49,13 @@
     },
     {
         "name": "fan_controller_assembly",
-        "big": null,
+        "big": true,
         "ngb": false,
         "zoomed": 0,
         "count": 1,
         "assemblies": {},
         "vitamins": {
-            "veroboard(fan_vb): Veroboard 6 holes x 6strips": {
+            "veroboard(fan_vb): Veroboard 6 holes x 6 strips": {
                 "count": 1
             },
             "wire_link(0.8, 10.16, tail = 2.5): Wire link 0.8mm x 0.4\"": {
@@ -102,7 +102,7 @@
         "count": 1,
         "assemblies": {},
         "vitamins": {
-            "insert(F1BM2): Heatfit insert M2": {
+            "insert(F1BM2): Heatfit insert M2 x 4mm": {
                 "count": 4
             },
             "washer(M3_washer): Washer  M3 x 7mm x 0.5mm": {

examples/EnviroPlus/bom/bom.txt

@@ -15,7 +15,7 @@ Vitamins:
  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 Heatfit insert M2 x 4mm
   |  |  |  |  | 4|  |  |  4 Nut M2.5 x 2.2mm nyloc
   |  |  |  | 1|  |  |  |  1 Enviro+
  1|  |  |  |  |  |  |  |  1 Raspberry Pi Zero
@@ -28,7 +28,7 @@ Vitamins:
   |  |  |  |  |  | 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
+  |  |  |  |  |  | 1|  |  1 Veroboard 6 holes x 6 strips
   |  |  |  |  |  |  | 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

examples/EnviroPlus/bom/case_assembly.txt

@@ -1,6 +1,6 @@
 case_assembly:
 Vitamins:
-  4 Heatfit insert M2
+  4 Heatfit insert M2 x 4mm
   3 Screw M3 pan x  6mm
   3 Washer  M3 x 7mm x 0.5mm
 

examples/EnviroPlus/bom/fan_controller_assembly.txt

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

examples/EnviroPlus/readme.md

@@ -29,7 +29,7 @@ Environmental monitor using Enviro+ sensor board and a Raspberry Pi Zero.
 |  |  |  |  |  |  |  |  | | **Vitamins** |
 |   .  |   .  |   .  |   1  |   .  |   .  |   .  |   .  |    1  |    Enviro+ |
 |   1  |   .  |   .  |   .  |   .  |   .  |   .  |   .  |    1  |    Fan 17mm x 8mm |
-|   .  |   .  |   .  |   .  |   4  |   .  |   .  |   .  |    4  |    Heatfit insert M2 |
+|   .  |   .  |   .  |   .  |   4  |   .  |   .  |   .  |    4  |    Heatfit insert M2 x 4mm |
 |   .  |   1  |   .  |   .  |   .  |   .  |   .  |   .  |    1  |    Micro SD card |
 |   .  |   .  |   .  |   .  |   .  |   4  |   .  |   .  |    4  |    Nut M2.5 x 2.2mm nyloc |
 |   1  |   .  |   .  |   .  |   .  |   .  |   .  |   .  |    1  |    PMS5003 particle detector |
@@ -42,7 +42,7 @@ Environmental monitor using Enviro+ sensor board and a Raspberry Pi Zero.
 |   .  |   .  |   .  |   .  |   .  |   .  |   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  |    Veroboard 6 holes x 6strips |
+|   .  |   .  |   1  |   .  |   .  |   .  |   .  |   .  |    1  |    Veroboard 6 holes x 6 strips |
 |   .  |   .  |   .  |   .  |   .  |   .  |   .  |   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 |
@@ -121,13 +121,13 @@ Environmental monitor using Enviro+ sensor board and a Raspberry Pi Zero.
 |1| SMD capacitor 1206 10uF|
 |1| SMD resistor 0805 3K3 0.125W|
 |1| SOT223 package FZT851|
-|1| Veroboard 6 holes x 6strips|
+|1| Veroboard 6 holes x 6 strips|
 |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)
+![fan_controller_assembly](assemblies/fan_controller_assembly.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.
@@ -145,7 +145,7 @@ It converts the PWM signal on GPI4 to a stead DC voltage so that the fan doesn't
 ![SMT](docs/smt.jpg)
 
 
-![fan_controller_assembled](assemblies/fan_controller_assembled_tn.png)
+![fan_controller_assembled](assemblies/fan_controller_assembled.png)
 
 <span></span>
 [Top](#TOP)
@@ -168,11 +168,11 @@ It converts the PWM signal on GPI4 to a stead DC voltage so that the fan doesn't
 
 
 ### Assembly instructions
-![enviro_assembly](assemblies/enviro_assembly_tn.png)
+![enviro_assembly](assemblies/enviro_assembly.png)
 
 * Solder the fan_controller to the Enviro+ expansion connector at the 5V, GND and #4 pins.
 
-![enviro_assembled](assemblies/enviro_assembled_tn.png)
+![enviro_assembled](assemblies/enviro_assembled.png)
 
 <span></span>
 [Top](#TOP)
@@ -183,7 +183,7 @@ It converts the PWM signal on GPI4 to a stead DC voltage so that the fan doesn't
 ### Vitamins
 |Qty|Description|
 |---:|:----------|
-|4| Heatfit insert M2|
+|4| Heatfit insert M2 x 4mm|
 |3| Screw M3 pan x  6mm|
 |3| Washer  M3 x 7mm x 0.5mm|
 

examples/EnviroPlus/scad/fan_controller.scad

@@ -7,7 +7,6 @@
 //
 // Top level model
 //
-
 include <NopSCADlib/core.scad>
 use <NopSCADlib/vitamins/veroboard.scad>
 include <NopSCADlib/vitamins/smds.scad>
@@ -19,10 +18,9 @@ fan_vb = vero("fan_vb", "fan_controller", 6, 6, breaks = [[2, 1], [2 + eps, 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"],
+        [4, 4.5,  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.
@@ -40,6 +38,6 @@ fan_vb = vero("fan_vb", "fan_controller", 6, 6, breaks = [[2, 1], [2 + eps, 5]],
 //!
 //! ![SMT](docs/smt.jpg)
 //!
-module fan_controller_assembly() rotate(90) vflip(!exploded()) veroboard_assembly(fan_vb, -vero_thickness(fan_vb) - 1.4, 0);
+module fan_controller_assembly() rotate(90) vflip() veroboard_fastened_assembly(fan_vb, -vero_thickness(fan_vb) - 1.4, 0);
 
 fan_controller_assembly();

examples/EnviroPlus/scad/main.scad

@@ -25,6 +25,7 @@ include <NopSCADlib/vitamins/fans.scad>
 use <NopSCADlib/vitamins/insert.scad>
 use <NopSCADlib/vitamins/veroboard.scad>
 use <NopSCADlib/utils/round.scad>
+use <NopSCADlib/utils/pcb_utils.scad>
 use <NopSCADlib/printed/foot.scad>
 use <NopSCADlib/printed/printed_box.scad>
 use <fan_controller.scad>
@@ -402,7 +403,7 @@ assembly("enviro") {
     if(!exploded())
         for(x = [8, 7, 3])
             pcb_grid(pcb, x, 0, 0.05)
-                solder_meniscus(pcb, 0.39, 1);
+                solder_meniscus(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.

examples/MainsBreakOutBox/bom/base_assembly.txt

@@ -1,6 +1,6 @@
 base_assembly:
 Vitamins:
-  2 Heatfit insert M3
+  2 Heatfit insert M3 x 5.8mm
 
 Printed:
   1 socket_box.stl

examples/MainsBreakOutBox/bom/bom.csv

@@ -3,7 +3,7 @@
 'Wire brown 30/0.25mm strands, length 150mm - not shown',  2
 'Wire green & yellow 30/0.25mm strands, length 150mm - not shown',  2
 'IEC inlet for ATX',  1
-'Heatfit insert M3',  2
+'Heatfit insert M3 x 5.8mm',  2
 '4mm shielded jack socket blue',  2
 '4mm shielded jack socket brown',  1
 '4mm shielded jack socket green',  2

examples/MainsBreakOutBox/bom/bom.json

@@ -7,7 +7,7 @@
         "count": 1,
         "assemblies": {},
         "vitamins": {
-            "insert(F1BM3): Heatfit insert M3": {
+            "insert(F1BM3): Heatfit insert M3 x 5.8mm": {
                 "count": 2
             }
         },

examples/MainsBreakOutBox/bom/bom.txt

@@ -12,7 +12,7 @@ Vitamins:
   |  |  | 2|  2 Wire brown 30/0.25mm strands, length 150mm - not shown
   |  | 1| 1|  2 Wire green & yellow 30/0.25mm strands, length 150mm - not shown
   |  |  | 1|  1 IEC inlet for ATX
- 2|  |  |  |  2 Heatfit insert M3
+ 2|  |  |  |  2 Heatfit insert M3 x 5.8mm
   |  | 2|  |  2 4mm shielded jack socket blue
   |  | 1|  |  1 4mm shielded jack socket brown
   |  | 2|  |  2 4mm shielded jack socket green

examples/MainsBreakOutBox/readme.md

@@ -38,7 +38,7 @@ Earth leakage can be measured Canadian CSA style by disconnected the neutral lin
 |   .  |   .  |   .  |   1  |    1  |    4mm shielded jack socket brown |
 |   .  |   .  |   .  |   2  |    2  |    4mm shielded jack socket green |
 |   .  |   .  |   .  |   3  |    3  |    Ferrule for 1.5mm^2 wire - not shown |
-|   2  |   .  |   .  |   .  |    2  |    Heatfit insert M3 |
+|   2  |   .  |   .  |   .  |    2  |    Heatfit insert M3 x 5.8mm |
 |   .  |   .  |   3  |   5  |    8  |    Heatshrink sleeving ID 3.2mm x 15mm - not shown |
 |   .  |   .  |   1  |   .  |    1  |    IEC inlet for ATX |
 |   .  |   .  |   .  |   1  |    1  |    Mains socket 13A |
@@ -65,7 +65,7 @@ Earth leakage can be measured Canadian CSA style by disconnected the neutral lin
 ### Vitamins
 |Qty|Description|
 |---:|:----------|
-|2| Heatfit insert M3|
+|2| Heatfit insert M3 x 5.8mm|
 
 
 ### 3D Printed parts

gallery/readme.md

@@ -4,6 +4,18 @@ Arduino thermostat to control a beer fridge to use it as an environmental chambe
 
 ![](ArduinoThermostat.png)
 
+## Blinder
+
+Tasmota roller blind open / close mechanism
+
+
+![](Blinder.png)
+
+## ClockSetter
+An IOT device for programming UK wireless clocks that are out of reach of the UK MSF time signal but are on UK time, e.g. in Tenerife.
+
+![](ClockSetter.png)
+
 ## EnviroPlus
 Environmental monitor using Enviro+ sensor board and a Raspberry Pi Zero.
 
@@ -19,7 +31,6 @@ Current state of HydraRaptor after being modified for laser engraving.
 
 ![](HydraBot.png)
 
-
 ## IOT 50V PSU
 WiFi controllable PSU
 
@@ -30,6 +41,11 @@ WiFi controllable programmable load
 
 ![](IOT_LOAD.png)
 
+## LED Box
+Indicator LEDs used to debug a Bosch diswasher problem.
+
+![](LED_box.png)
+
 ## Lab ATX PSU
 Bench power supply built around an ATX PSU.
 
@@ -70,16 +86,36 @@ Mains isolated and variable supply with metering.
 
 
 
+## MultiSwitch
+Multi Tasmota switch to replace 5 Sonoffs
+
+![](MultiSwitch.png)
+
+## MultiSwitch2
+Multi Tasmota switch to replace 5 Sonoffs
+
+![](MultiSwitch2.png)
+
 ## PSU Cover
 A base and shroud to make PSU safe to sit on a desk
 
 ![](PSU_cover.png)
 
+## PSU Tube
+12V power supply made in an aluminium tube for fire safety
+
+![](PSU_tube.png)
+
 ## PotBox
 Potentiometer box with course and fine controls and three 4mm binding posts
 
 ![](PotBox.png)
 
+## PowerBank
+LION powerbank with e-paper charge status display
+
+![](PowerBank.png)
+
 ## SunBot
 A solar tracker to keep a solar panel pointing at the sun.
 

global_defs.scad

@@ -49,8 +49,14 @@ squeezed_wall = $preview ? 2 * extrusion_width - layer_height * (1 - PI / 4)
 
 inf = 1e10;      // very big
 eps = 1/128;     // small fudge factor to stop CSG barfing on coincident faces.
-$fa = 6;
-$fs = extrusion_width / 2;
+
+fa = is_undef($vitamin_fa) ? 6    : $vitamin_fa;          // Used for drawing vitamins, rather than printing.
+fs = is_undef($vitamin_fs) ? 0.25 : $vitamin_fs;
+fn = 32;
+
+$fa = $fa == 12 ? 6 : $fa;          // Defaults for printing
+$fs = $fs == 2 ? extrusion_width / 2 : $fs;
+
 
 // Some additional named colours
 silver           = [0.75, 0.75, 0.75];

lib.scad

@@ -25,18 +25,20 @@ include <core.scad>
 include <vitamins/psus.scad>
 include <vitamins/pcbs.scad>
 
+include <vitamins/antennas.scad>
 include <vitamins/batteries.scad>
 include <vitamins/bearing_blocks.scad>
 include <vitamins/blowers.scad>
 include <vitamins/bldc_motors.scad>
 include <vitamins/box_sections.scad>
 include <vitamins/bulldogs.scad>
-include <vitamins/buttons.scad>
 include <vitamins/cameras.scad>
 include <vitamins/components.scad>
 include <vitamins/displays.scad>
 include <vitamins/extrusions.scad>
 include <vitamins/extrusion_brackets.scad>
+include <vitamins/fastons.scad>
+include <vitamins/gear_motors.scad>
 include <vitamins/geared_steppers.scad>
 include <vitamins/hot_ends.scad>
 include <vitamins/inserts.scad>
@@ -48,6 +50,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>
@@ -97,5 +100,7 @@ use <utils/rounded_triangle.scad>
 use <utils/layout.scad>
 use <utils/round.scad>
 use <utils/offset.scad>
+use <utils/pcb_utils.scad>
 use <utils/sector.scad>
 use <utils/thread.scad>
+use <vitamins/photo_interrupter.scad>

libtest.scad

@@ -42,6 +42,7 @@
 include <lib.scad>
 
 use <tests/7_segments.scad>
+use <tests/antennas.scad>
 use <tests/ball_bearings.scad>
 use <tests/batteries.scad>
 use <tests/bearing_blocks.scad>
@@ -63,7 +64,9 @@ 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/gear_motors.scad>
 use <tests/geared_steppers.scad>
 use <tests/hot_ends.scad>
 use <tests/IECs.scad>
@@ -74,6 +77,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>
@@ -83,6 +87,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>
@@ -93,6 +98,7 @@ use <tests/rails.scad>
 use <tests/ring_terminals.scad>
 use <tests/rockers.scad>
 use <tests/rod.scad>
+use <tests/SBR_rails.scad>
 use <tests/screws.scad>
 use <tests/sealing_strip.scad>
 use <tests/servo_motors.scad>
@@ -141,7 +147,7 @@ x1 = x0 + 110;
 x2 = x1 + 90;
 x3 = x2 + 130;
 x4 = x3 + 200;
-x5 = 850;
+x5 = 900;
 x6 = x5 + 150;
 
 cable_grommets_y = 0;
@@ -149,6 +155,9 @@ 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();
 
@@ -211,7 +220,7 @@ translate([950, box_y])
     box_test();
 
 
-translate([950, 1400])
+translate([950, 1525])
     rotate(-90)
         bbox_test();
 
@@ -219,7 +228,7 @@ inserts_y = 0;
 nuts_y = inserts_y + 20;
 washers_y = nuts_y + 120;
 screws_y = washers_y + 120;
-circlips_y = screws_y + 160;
+circlips_y = screws_y + 180;
 springs_y = circlips_y + 20;
 o_rings_y = springs_y;
 sealing_strip_y = springs_y + 20;
@@ -227,12 +236,12 @@ tubings_y = sealing_strip_y + 20;
 pillars_y = tubings_y + 20;
 ball_bearings_y = pillars_y + 40;
 pulleys_y = ball_bearings_y + 40;
-leadnuts_y = pulleys_y + 60;
-linear_bearings_y = leadnuts_y + 50;
+leadnuts_y = pulleys_y + 35;
+linear_bearings_y = leadnuts_y + 65;
 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;
@@ -283,13 +292,18 @@ translate([x0 + 120, leadnuts_y])
     leadnuthousings();
 
 translate([x0, linear_bearings_y]) {
-    linear_bearings();
+    translate([0, -30])
+        linear_bearings();
+
     rods();
 }
 
 translate([x0, steppers_y])
     stepper_motors();
 
+translate([x0 + 400, steppers_y])
+    gear_motors();
+
 translate([x0, sheets_y])
     sheets();
 
@@ -332,9 +346,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;
@@ -360,6 +375,9 @@ translate([x2 + 70, leds_y])
 translate([x2, spades_y])
     spades();
 
+translate([x2, fastons_y])
+    fastons();
+
 translate([x2,  buttons_y])
     buttons();
 
@@ -387,26 +405,26 @@ blowers_y = ssrs_y + 60;
 hot_ends_y = blowers_y + 100;
 batteries_y = hot_ends_y + 55;
 panel_meters_y = batteries_y + 70;
-extrusions_y = panel_meters_y + 80;
+extrusions_y = panel_meters_y + 100;
 
 translate([x3, veroboard_y])
     veroboard_test();
 
-translate([x3 + 60, veroboard_y + 20])
+translate([x3 + 50, veroboard_y + 20])
     geared_steppers();
 
 translate([x3 + 160, ssrs_y])
     pcb_mounts();
 
-translate([x3 + 170, veroboard_y + 16])
+translate([x3 + 145, veroboard_y + 16])
     cameras();
 
+translate([x3 + 145, d_connectors_y - 10])
+    camera_housings();
+
 translate([x3, d_connectors_y])
     d_connectors();
 
-translate([x3 + 170, d_connectors_y - 10])
-    camera_housings();
-
 translate([x3, iecs_y])
     iecs();
 
@@ -419,6 +437,9 @@ translate([x3 + 60, modules_y])
 translate([x3 + 90, modules_y])
     modules();
 
+translate([x3 + 150, modules_y])
+    photo_interrupters();
+
 translate([x3, ssrs_y]) {
     ssrs();
 
@@ -440,10 +461,10 @@ translate([x2, panel_meters_y])
 translate([x2, extrusions_y])
     extrusions();
 
-translate([400, transformers_y])
+translate([370, transformers_y])
     transformers();
 
-translate([x4 + 50, transformers_y])
+translate([x4, transformers_y])
     no_explode() socket_boxes();
 
 
@@ -452,11 +473,11 @@ rails_y = belts_y + 200;
 extrusion_brackets_y = rails_y + 250;
 sk_brackets_y = extrusion_brackets_y + 80;
 kp_pillow_blocks_y = sk_brackets_y + 60;
-scs_bearing_blocks_y = kp_pillow_blocks_y + 60;
+bearing_blocks_y = kp_pillow_blocks_y + 60;
 box_sections_y = batteries_y;
-BLDC_y = scs_bearing_blocks_y + 120;
-pot_y = BLDC_y + 40;
-cable_strip_y = pot_y + 50;
+BLDC_y = bearing_blocks_y + 180;
+pot_y = bearing_blocks_y;
+cable_strip_y = sheets_y + 30;
 
 translate([0, transformers_y])
     servo_motors();
@@ -471,12 +492,19 @@ translate([x4 + 200, belts_y + 58]) {
 translate([x4 + 175, belts_y, -20])
     drag_chains();
 
-translate([x4, rails_y + 130])
+translate([x4, rails_y + 130]) {
     rails();
 
+    translate([305, 0])
+        sbr_rails();
+}
+
 translate([x4, cable_strip_y])
     cable_strips();
 
+translate([x4 + 150, cable_strip_y])
+    antennas();
+
 translate([x4, kp_pillow_blocks_y])
     kp_pillow_blocks();
 
@@ -489,8 +517,8 @@ translate([x4, extrusion_brackets_y])
 translate([x1, swiss_clips_y + 50])
     shaft_couplings();
 
-translate([x4, scs_bearing_blocks_y])
-    scs_bearing_blocks();
+translate([x4, bearing_blocks_y])
+    bearing_blocks();
 
 translate([x4, BLDC_y])
     bldc_motors();

printed/box.scad

@@ -453,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));
 
@@ -464,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));
 
@@ -478,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))
@@ -497,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() {
@@ -579,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/flat_hinge.scad

@@ -119,7 +119,8 @@ module hinge_male(type, female = false) {       //! The half with the stationary
         }
 }
 
-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/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);
+}

scripts/bom.py

@@ -140,7 +140,7 @@ class BOM:
         for part in sorted(self.vitamins):
             i += 1
             if ': ' in part:
-                part_no, description = part.split(': ')
+                part_no, description = part.split(': ', 1)
             else:
                 part_no, description = "", part
             qty = self.vitamins[part].count
@@ -183,7 +183,7 @@ class BOM:
 
         for part in sorted(self.vitamins):
             if ': ' in part:
-                part_no, description = part.split(': ')
+                part_no, description = part.split(': ', 1)
             else:
                 part_no, description = "", part
             if breakdown:

scripts/changelog.py

@@ -80,9 +80,16 @@ def codify(word, url):
             return  '`' + word + '`'
     return word
 
+typos = [ # Typos that are ambiguous to codespell
+    ('cnc_bit+_r', 'cnc_bit_r'),
+    ('Udated',     'Updated'),
+    ('decription', 'description'),
+    ('Trainling',  'Trailing'),
+]
 
 def fixup_comment(comment, url):
-    comment = comment.replace('cnc_bit+_r', 'cnc_bit_r')
+    for typo in typos:
+        comment = comment.replace(typo[0], typo[1])
     """ markup code words and fix new paragraphs """
     result = ''
     word = ''
@@ -162,6 +169,6 @@ if __name__ == '__main__':
 
             # 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 ch.*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/options.py

@@ -24,7 +24,11 @@ from colorama import Fore, init
 
 def check_options(dir = '.'):
     global options, options_mtime
-    options = { "show_threads": str(os.getenv("NOPSCADLIB_SHOW_THREADS")) }
+    options = {
+        "show_threads": str(os.getenv("NOPSCADLIB_SHOW_THREADS")),
+        "vitamin_fa":   str(os.getenv("NOPSCADLIB_VITAMIN_FA")),
+        "vitamin_fs":   str(os.getenv("NOPSCADLIB_VITAMIN_FS"))
+    }
     options_fname = dir + '/options.json'
     try:
         with open(options_fname) as json_file:

scripts/tests.py

@@ -201,7 +201,7 @@ def tests(tests):
             body = bodies[type]
 
             index[type] += [cap_name]
-            body += ['<a name="%s"></a>' % cap_name]
+            body += ['<a name="%s"></a>' % cap_name.lower()]
             body += ["## " + cap_name]
 
             doc = None
@@ -259,11 +259,11 @@ def tests(tests):
                     things = BOM[thing]
                     if things:
                         body += ['### %s\n| Qty | %s |\n| ---:|:--- |%s' % (thing.title(), heading, ':---|' if '|' in heading else '')]
-                        for item in sorted(things, key = lambda s: s.split(":")[-1]):
+                        for item in sorted(things, key = lambda s: s.split(":",1)[-1]):
                             name = item
                             desc = ''
                             if thing == "vitamins":
-                                vit = item.split(':')
+                                vit = item.split(':', 1)
                                 name = '`' + vit[0] + '`' if vit[0] else ''
                                 while '[[' in name and ']]' in name:
                                     i = name.find('[[')
@@ -301,7 +301,7 @@ def tests(tests):
             for type in types:
                 if i < len(index[type]):
                     name = sorted(index[type])[i]
-                    print('<td> <a href = "#' + name + '">' + name + '</a> </td>', file = doc_file, end = '')
+                    print('<td> <a href = "#' + name.lower() + '">' + name + '</a> </td>', file = doc_file, end = '')
                 else:
                     print('<td></td>', file = doc_file, end = '')
             print('</tr>', file = doc_file)

scripts/views.py

@@ -303,7 +303,7 @@ def views(target, do_assemblies = None):
                 grand_total2 = 0
                 heading = headings[t][0].upper() + headings[t][1:]
                 print(('|  ' * len(global_bom) + '| | **%s** |') % heading, file = doc_file)
-                for thing in sorted(things[t], key = lambda s: s.split(":")[-1]):
+                for thing in sorted(things[t], key = lambda s: s.split(":",1)[-1]):
                     for ass in global_bom:
                         count = ass[t][thing]["count"] if thing in ass[t] else 0
                         print('| %s ' % pad(count if count else '.', 2, 1), file = doc_file, end = '')
@@ -313,7 +313,7 @@ def views(target, do_assemblies = None):
                         else:
                             totals[name] = count
                         grand_total2 += count
-                    print('|  %s | %s |' % (pad(things[t][thing], 2, 1), pad(thing.split(":")[-1], 2)), file = doc_file)
+                    print('|  %s | %s |' % (pad(things[t][thing], 2, 1), pad(thing.split(":",1)[-1], 2)), file = doc_file)
 
                 grand_total = 0
                 for ass in global_bom:
@@ -344,8 +344,8 @@ def views(target, do_assemblies = None):
                 print("### Vitamins",         file = doc_file)
                 print("|Qty|Description|",    file = doc_file)
                 print("|---:|:----------|",    file = doc_file)
-                for v in sorted(vitamins, key = lambda s: s.split(":")[-1]):
-                    print("|%d|%s|" % (vitamins[v]["count"], v.split(":")[1]),     file = doc_file)
+                for v in sorted(vitamins, key = lambda s: s.split(":",1)[-1]):
+                    print("|%d|%s|" % (vitamins[v]["count"], v.split(":",1)[1]),     file = doc_file)
                 print("\n", file = doc_file)
 
             printed = ass["printed"]

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>
@@ -61,27 +62,46 @@ test_pcb = ["test_pcb", "Test PCB",
     [
         [ 20, -5,  180, "trimpot10"],
         [ 20, -15,  90, "trimpot10", true],
-        [  7,  2,   90, "smd_led", LED1206, "blue"],
-        [ 10,  2,   90, "smd_led", LED0805, "red"],
+        [ 19,  2,   90, "smd_led", LED1206, "blue"],
+        [ 16,  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],
-        [ 16,  6,  -90, "smd_sot", SOT23, "2N7000"],
-        [ 28,  20, -90, "smd_sot", SOT223, "LM117"],
+        [ 10,  2,  -90, "smd_res", L2012C, "1u"],
+        [ 19,  6,  -90, "smd_res", RES1206, "1M"],
+        [ 16,  6,  -90, "smd_res", RES0805, "1K"],
+        [ 13,  6,  -90, "smd_res", RES0603, "100"],
+        [ 10,  6,  -90, "smd_res", RES0502, "10"],
+        [  7,  6,  -90, "smd_res", RES0402, "1"],
+        [ 19, 10,   90, "smd_cap", CAP1206, 1.5, "1uF"],
+        [ 16, 10,   90, "smd_cap", CAP0805, 1.0, "100nF"],
+        [ 13, 10,   90, "smd_cap", CAP0603, 0.7, "10nF"],
+        [ 10, 10,   90, "smd_cap", CAP0502, 0.6, "10nF"],
+        [  7, 10,   90, "smd_cap", CAP0402, 0.5, "10nF"],
+        [ 19, 16,  -90, "smd_tant", TANT_C, "107C"],
+        [ 13, 16,  -90, "smd_tant", TANT_B, "106A"],
+        [  7, 16,  -90, "smd_tant", TANT_A, "105e"],
+        [ 32,  3,  -90, "smd_diode",DO214AC, "SS34"],
+        [ 26,  2,  -90, "smd_pot", TC33X1, "10K"],
+        [ 26,  6,  -90, "smd_coax",U_FL_R_SMT_1],
 
-        [ 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"],
+        [ 26, 10,  -90, "smd_sot", SOT23, "2N7000"],
+        [ 28, 16,  -90, "smd_sot", SOT223, "LM117"],
+
+        [ 30, 30,  -90, "smd_qfp", QFP50P1200X1200X160_64N, "ATSAM4S4BA"],
+
+        [ 45,  35,   0, "2p54header", 4, 1],
+        [ 60,  35,   0, "2p54header", 5, 1, false, "blue" ],
+        [ 60,  40, 180, "2p54header", 5, 1, false, undef, true],
+        [ 80,  33,   0, "2p54boxhdr", 4, 2],
+        [ 80,  40,   0, "2p54boxhdr", 4, 2, false, true, true],
+        [ 45,  30,   0, "2p54socket", 4, 1, false, 0, false, "red" ],
+        [ 60,  30,   0, "2p54socket", 6, 1],
+
+        [ 59,  60, 180, "led", LED3mm, "red"],
+        [ 66,  60, 180, "led", LED5mm, "orange"],
+        [ 77,  60, 180, "led", LED8mm, "blue"],
+        [ 90,  60, 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"],
@@ -99,28 +119,48 @@ test_pcb = ["test_pcb", "Test PCB",
         [ 25, 200,   0, "buzzer", 4.5, 8.5],
         [ 25, 218,   0, "buzzer"],
 
-        [ 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],
-        [ 55,   9,   0, "link", 0, 5],
+        [ 45,   1,   0, "link", inch(0.4), 0.75, undef, undef, [1.5, "red"]], // Sleeved link
+        [ 45,   3,   0, "link", inch(0.4)], // Flat link
+        [ 45,   6,   0, "ax_diode", DO_41, "1N4007"],
+        [ 45,  10,   0, "ax_diode", DO_35, "1N4148"],
+        [ 45,  14,   0, "ax_res", res1_8, 1000],
+        [ 45,  18,   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,   8, 180, "rd_transistor", TO92, "78L05", undef,  undef, "Regulator"],
+        [ 35,  13, 180, "rd_transistor", E_LINE, "ZTX853"],
+        [ 35,   3,   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,   3,   0, "link", inch(0.2), inch(0.4)], // Raised link
+        [ 60,   6,   0, "ax_diode", DO_41, "1N4007", inch(0.1)],
+        [ 60,  10,   0, "ax_diode", DO_35, "1N4148", inch(0.1)],
 
-        [ 60,   3,   0, "flex"],
-        [ 50,  15, -90, "flat_flex"],
-        [ 40,  15, -90, "flat_flex", true],
+        [ 60,  14,   0, "ax_res", res1_8, 1000000, 1, inch(0.1)],
+        [ 60,  18,   0, "ax_res", res1_4, 100,     2, inch(0.1)],
+        [ 60,  22,   0, "ax_res", res1_2, 10,     10, inch(0.2)],
 
-        [ 50,  50,   0, "molex_hdr", 2],
-        [ 50,  60,   0, "jst_xh", 2],
-        [ 50,  70, 180, "term254", 3],
-        [ 63,  70, 180, "term254", 3, undef, grey(20)],
-        [ 75,  70, 180, "gterm508",2, undef, "blue"],
+        [ 33,  110, -90, "rd_xtal", HC49,    "4MHz" ],
+        [ 28,  110, -90, "rd_xtal", HC49_4H, "10MHz" ],
+        [ 28,  102, -90, "rd_xtal", C_002RX, "60KHz", 3, inch(0.1) ],
+
+        [ 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],
+
+        [ 47,  55,   0, "molex_hdr", 2],
+        [ 51,  48,   0, "molex_hdr", 2, 1],
+        [ 51,  41,   0, "molex_hdr", 2, -1],
+        [ 45,  65,   0, "jst_xh", 2],
+        [ 54,  65,   0, "jst_ph", 2],
+        [ 61,  65,   0, "jst_zh", 2],
+
+        [ 50,  75, 180, "term254", 3],
+        [ 63,  75, 180, "term254", 3, undef, grey(20)],
+        [ 75,  75, 180, "gterm508",2, undef, "blue"],
 
         [ 50,  90, 180, "gterm35", 4, [1,2]],
         [ 63,  90, 180, "gterm35", 4, [1,2], "red"],
@@ -141,10 +181,16 @@ test_pcb = ["test_pcb", "Test PCB",
         [ 52, 200,   0, "pcb", 11, TMC2130 ],
         [ 80, 210,   0, "pdip", 24, "27C32", true, inch(0.6) ],
         [ 80, 180,   0, "pdip", 8, "NE555" ],
-        [ 80, 166, -90, "smd_soic", SOIC18, "PIC18F88"],
+        [ 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)],
+        [ 70, 150,   0, "chip", 10, 5, 1, grey(20)],
+
+         [90, 140, -90, "relay", HF33F, "012-HSL-3F"],
+
 
         [ 52, 206,   0, "2p54socket", 8, 1 ],
         [ 52, 194,   0, "2p54socket", 8, 1, false, 0, false, "red" ],
@@ -152,7 +198,7 @@ test_pcb = ["test_pcb", "Test PCB",
         [ 50, 240,   0, "potentiometer"],
         [ 75, 240,   0, "potentiometer", KY_040_encoder, 8],
         [ 30,  85, -90, "7seg", WT5011BSR, 2],
-        [ 30, 55, -90, "D_plug", DCONN9],
+        [ 30,  55, -90, "D_plug", DCONN9],
     ],
     // accessories
     []
@@ -160,5 +206,5 @@ test_pcb = ["test_pcb", "Test PCB",
 
 
 if($preview)
-    let($show_threads = true)
+    let($show_threads = true, $solder = pcb_solder(test_pcb))
         pcb(test_pcb);

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

@@ -0,0 +1,46 @@
+//
+// 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 <../core.scad>
+include <../vitamins/sbr_rails.scad>
+
+use <../utils/layout.scad>
+use <../vitamins/bearing_block.scad>
+
+length = 200;
+sheet = 3;
+
+module sbr_rails()
+    layout([for(r = sbr_rails) sbr_rail_base_width(r)], 10)
+        rotate([90, 180,0]) {
+            rail = sbr_rails[$i];
+            sbr_rail(rail, length);
+            carriage = sbr_rail_carriage(rail);
+            screw = sbr_rail_screw(rail);
+
+            sbr_bearing_block_assembly(carriage, sheet);
+
+            sbr_screw_positions(rail, length)
+                explode(20)
+                    rotate([90,0,0])
+                        screw(sbr_rail_screw(rail), 18);
+
+         }
+
+if($preview)
+    sbr_rails();

tests/SMDs.scad

@@ -23,7 +23,7 @@ include <../vitamins/smds.scad>
 
 module smds() {
     layout([for(r = smd_resistors) smd_res_size(r).x], 1)
-        smd_resistor(smd_resistors[$i], ["1R0", "10M", "100K"][$i % 3]);
+        smd_resistor(smd_resistors[$i], ["1R0", "10", "100", "10M", "100K", "10u"][$i % 6]);
 
     translate([0, 3])
         layout([for(l = smd_leds) smd_led_size(l).x], 1)
@@ -34,16 +34,45 @@ module smds() {
             let(c = smd_capacitors[$i])
                 smd_capacitor(c, smd_cap_size(c).y * 0.8);
 
-    translate([0, 12])
+    translate([0, 9])
+        layout([for(t = smd_tants) smd_tant_leads(t).x], 1)
+            let(t = smd_tants[$i])
+                smd_tant(t, ["105e","106J", "107A"][$i]);
+
+    translate([0, 12.5])
+        layout([for(d = smd_diodes) smd_diode_leads(d).x], 1)
+            let(d = smd_diodes[$i])
+                smd_diode(d, ["SS34"][$i]);
+
+    translate([0, 24])
         layout([for(s = smd_sots) smd_sot_size(s).x], 1)
             let(s = smd_sots[$i])
                 smd_sot(s, ["2N7000", "FZT851"][$i]);
 
-    translate([0, 20])
+    translate([0, 18])
+        layout([for(p = smd_pots) smd_pot_size(p).x], 1)
+            let(p = smd_pots[$i])
+                smd_pot(p, "10K");
+
+    translate([6, 18])
+        layout([for(c = smd_coaxs) smd_coax_base_size(c).x], 1)
+            let(c = smd_coaxs[$i])
+                smd_coax(c);
+
+    translate([0, 31])
         layout([for(s = smd_soics) smd_soic_size(s).x], 1)
             let(s = smd_soics[$i])
                 smd_soic(s, s[0]);
 
+    translate([0, 39])
+        layout([for(i = smd_inductors) smd_inductor_leads(i).x], 1)
+            let(i = smd_inductors[$i])
+                smd_inductor(i, "4R7");
+
+    translate([20, 6])
+         layout([for(q = smd_qfps) smd_qfp_body_size(q).x], 3)
+            let(q = smd_qfps[$i])
+                smd_qfp(q, ["ATSAM4S4BA"][$i]);
 }
 
 if($preview)

tests/antennas.scad

@@ -0,0 +1,31 @@
+//
+// 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 <../core.scad>
+use <../utils/layout.scad>
+
+include <../vitamins/antennas.scad>
+
+module antennas()
+    layout([for(a = antennas) cos(10) * antenna_length(a) ], 5, true) {
+        antenna(antennas[$i], 3, 10);
+
+    }
+
+if($preview)
+    antennas();

tests/axials.scad

@@ -23,23 +23,40 @@ include <../vitamins/pcbs.scad>
 module axials() {
     pcb = PERF60x40;
     pcb(pcb);
+    $solder = pcb_solder(pcb);
 
     pcb_grid(pcb, 0, 2)
         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])
+        x = 2 * i + 3 + len(ax_diodes);
+        pcb_grid(pcb, x, 1 + [0, 0.5, 1.5][i])
             rotate(90)
                 ax_res(ax_resistors[i], [1000, 47000, 8200][i], 5);
 
-        pcb_grid(pcb, 2 * i + 2, 6.5)
+        pcb_grid(pcb, x, 6.5)
             rotate(-90)
                 ax_res(ax_resistors[i], [2200, 39000, 8250][i], 1, inch(0.1));
     }
+
+    d_values = ["1N4148", "1N4007"];
+    for(i = [0 : len(ax_diodes) - 1]) {
+        pcb_grid(pcb, i + 2, 1 + [0, 0.5, 1.5][i])
+            rotate(90)
+                ax_diode(ax_diodes[i], d_values[i]);
+
+        pcb_grid(pcb, i + 2, 6.5)
+            rotate(-90)
+                ax_diode(ax_diodes[i], d_values[i], inch(0.1));
+    }
 }
 
 if($preview)

tests/ball_bearings.scad

@@ -22,20 +22,24 @@ use <../utils/layout.scad>
 include <../vitamins/ball_bearings.scad>
 
 
-module do_bearings(list)
-    layout([for(b = list) bb_diameter(b)])
-        ball_bearing(list[$i])
-            if (bb_width(list[$i]) >= 5)
-                bearing_ball(3);
+module do_bearings(list) {
+    diameters = [for(b = list) bb_diameter(b)];
+    max = max(diameters);
+    layout(diameters) let(b = list[$i])
+        //translate([0, (max - bb_diameter(b)) / 2])
+            ball_bearing(list[$i])
+                if (bb_width(list[$i]) >= 5)
+                    bearing_ball(3);
+}
 
 module ball_bearings() {
-    small_bearings = [for(b = ball_bearings) if(bb_diameter(b) < 12) b];
+    small_bearings = [for(b = ball_bearings) if(bb_diameter(b) <= 13) b];
     big_bearings = [for(b = ball_bearings) if(!in(small_bearings, b)) b];
 
     translate([0, 0])
         do_bearings(big_bearings);
 
-    translate([0, -20])
+    translate([0, -25])
         do_bearings(small_bearings);
 }
 

tests/bearing_blocks.scad

@@ -24,12 +24,26 @@ use <../utils/layout.scad>
 module scs_bearing_blocks()
     layout([for(s = scs_bearing_blocks) scs_size(s).x], 10) {
         part_thickness = 5;
-        scs_bearing_block_assembly(scs_bearing_blocks[$i], part_thickness);
+        translate([0, 60])
+            scs_bearing_block_assembly(scs_bearing_blocks[$i], part_thickness);
 
         if($i > 0) // skip $i==0, since no SCS6LUU long variant to match SCS6UU
-            translate([0, 60])
+            translate([0, 120])
                 scs_bearing_block_assembly(scs_bearing_blocks_long[$i - 1], part_thickness);
     }
 
-if($preview)
+module sbr_bearing_blocks()
+    layout([for(s = sbr_bearing_blocks) sbr_size(s).x], 10) {
+        part_thickness = 5;
+        sbr_bearing_block_assembly(sbr_bearing_blocks[$i], part_thickness);
+    }
+
+module bearing_blocks() {
     scs_bearing_blocks();
+
+    translate([190, 0])
+        sbr_bearing_blocks();
+}
+
+if($preview)
+    bearing_blocks();

tests/box_sections.scad

@@ -22,8 +22,15 @@ use <../utils/layout.scad>
 include <../vitamins/box_sections.scad>
 
 module box_sections() {
-    layout([for(b = box_sections) box_section_size(b).x], 20)
-        box_section(box_sections[$i], 100);
+    woven = [for(b = box_sections) if(box_section_is_woven(b)) b];
+    plain = [for(b = box_sections) if(!box_section_is_woven(b)) b];
+    layout([for(b = woven) box_section_size(b).x * 0], 10)
+        box_section(box_sections[$i], 100 - $i * 20);
+
+    translate([50, 0])
+        for(i = [0 : len(plain) - 1])
+            box_section(plain[i], 100 - i * 20);
+
 }
 
 if($preview)

tests/camera_housing.scad

@@ -26,8 +26,9 @@ include <../vitamins/cameras.scad>
 use <../vitamins/pcb.scad>
 
 module camera_housings()
-    layout([for(c = cameras) pcb_length(camera_pcb(c))], 15, false) let(c = cameras[$i])
-        camera_fastened_assembly(c, 3);
+    layout([for(c = cameras) pcb_length(camera_pcb(c))], 10, false) let(c = cameras[$i])
+        if(pcb_screw(camera_pcb(c)))
+            camera_fastened_assembly(c, 3);
 
 if($preview)
     camera_housings();