Added screw_keyhole() module.

Client code now calls dxf() so that the generated files can be used to speed up assembly views.

.gitignore

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

CHANGELOG.md

@@ -3,6 +3,77 @@
 This changelog is generated by `changelog.py` using manually added semantic version tags to classify commits as breaking changes, additions or fixes.
 
 
+#### [v20.15.1](https://github.com/nophead/NopSCADlib/releases/tag/v20.15.1 "show release") Fixes [...](https://github.com/nophead/NopSCADlib/compare/v20.15.0...v20.15.1 "diff with v20.15.0")
+*   2022-12-06 [`e256801`](https://github.com/nophead/NopSCADlib/commit/e256801206189eafcf020cc7fdb50fff4314c397 "show commit") [C.P.](# "Chris Palmer") Added comment to indicate the `.py` suffix may be needed on linux and OSX.
+
+### [v20.15.0](https://github.com/nophead/NopSCADlib/releases/tag/v20.15.0 "show release") Additions [...](https://github.com/nophead/NopSCADlib/compare/v20.14.1...v20.15.0 "diff with v20.14.1")
+*   2022-12-05 [`9dc8062`](https://github.com/nophead/NopSCADlib/commit/9dc8062befa72c6650b17d34428bfe39e709fdc2 "show commit") [M.W.](# "Marek Wodzinski") Include `terminal.scad` in `lib.scad` to allow use of `terminal_block()`.
+
+#### [v20.14.1](https://github.com/nophead/NopSCADlib/releases/tag/v20.14.1 "show release") Fixes [...](https://github.com/nophead/NopSCADlib/compare/v20.14.0...v20.14.1 "diff with v20.14.0")
+*   2022-10-20 [`f2313a3`](https://github.com/nophead/NopSCADlib/commit/f2313a3f0ccbb130a7bd974b9a02f5ef6841f39e "show commit") [D.](# "drf5n") update `nuts.scad` table comment
+
+ * Change comment about nut sizes from radius to diameter.
+
+*   2022-09-29 [`d95e1e6`](https://github.com/nophead/NopSCADlib/commit/d95e1e64edba4ef51852a1e72d00497154c80c88 "show commit") [C.](# "Chris") Udated changelog.
+
+### [v20.14.0](https://github.com/nophead/NopSCADlib/releases/tag/v20.14.0 "show release") Additions [...](https://github.com/nophead/NopSCADlib/compare/v20.13.0...v20.14.0 "diff with v20.13.0")
+*   2022-09-29 [`f1737d2`](https://github.com/nophead/NopSCADlib/commit/f1737d257b54957772ab6faea102f8ddb829119b "show commit") [C.](# "Chris") Updated images and readme.
+
+*   2022-09-27 [`ce258d6`](https://github.com/nophead/NopSCADlib/commit/ce258d6d4f1de5fbdda76a78b0ad2cbf1b41a3f9 "show commit") [J.R.](# "Jeroen Roos") Leadnuts: add nuthousing
+
+### [v20.13.0](https://github.com/nophead/NopSCADlib/releases/tag/v20.13.0 "show release") Additions [...](https://github.com/nophead/NopSCADlib/compare/v20.12.0...v20.13.0 "diff with v20.12.0")
+*   2022-09-27 [`ec85cc5`](https://github.com/nophead/NopSCADlib/commit/ec85cc5d4c76baedae670a5652194bd1799a7094 "show commit") [C.](# "Chris") Updated images and readme.
+
+*   2022-09-24 [`fb66954`](https://github.com/nophead/NopSCADlib/commit/fb6695471f935057a0949e55f70a39911ac81f4c "show commit") [J.R.](# "Jeroen Roos") Shaft coupling: Add flexible SC `/` 6x8 flexible SC
+
+ * Added the possibility for shaft couplings to be flexible and added a 6x8
+example of such a coupling.
+
+### [v20.12.0](https://github.com/nophead/NopSCADlib/releases/tag/v20.12.0 "show release") Additions [...](https://github.com/nophead/NopSCADlib/compare/v20.11.0...v20.12.0 "diff with v20.11.0")
+*   2022-09-27 [`c9ac393`](https://github.com/nophead/NopSCADlib/commit/c9ac393c0c7b025b3e6ad9e1030d1b13f8b879c3 "show commit") [C.](# "Chris") Printed corner blocks now have a `short_insert` option.
+
+*   2022-09-27 [`208334a`](https://github.com/nophead/NopSCADlib/commit/208334a585ed0605bf7dbaab1050c060aa15edb7 "show commit") [C.](# "Chris") Printed box now has a short insert option.
+
+*   2022-09-27 [`3a17b89`](https://github.com/nophead/NopSCADlib/commit/3a17b89d5ceb69834b23ff6bc46523f2dfb15f99 "show commit") [C.](# "Chris") Added short inserts and M5 inserts.
+`screw_insert()` now takes a short flag.
+`screw_length()` can now be passed an insert object.
+
+*   2022-09-25 [`0f36c02`](https://github.com/nophead/NopSCADlib/commit/0f36c02b5e34b0b45d258ff8e6ed4536f0601d92 "show commit") [C.](# "Chris") Added `layer_height0` global variable and updated `round_to_layer()` to handle it.
+
+ * Moved functions from `global_defs.scad` to `global.scad` so they get documented.
+
+### [v20.11.0](https://github.com/nophead/NopSCADlib/releases/tag/v20.11.0 "show release") Additions [...](https://github.com/nophead/NopSCADlib/compare/v20.10.3...v20.11.0 "diff with v20.10.3")
+*   2022-08-30 [`c1e4625`](https://github.com/nophead/NopSCADlib/commit/c1e4625382646faf6a00e78ac01e495a88169b35 "show commit") [C.](# "Chris") Replaced generic chips with SOIC8.
+Updated images and readme.
+
+*   2022-08-29 [`6059c5f`](https://github.com/nophead/NopSCADlib/commit/6059c5f5569a9fc2ba08e448bbf90328fb985ed3 "show commit") [C.](# "ChemicalXandco") add L9110S 2-Channel motor driver module
+
+#### [v20.10.3](https://github.com/nophead/NopSCADlib/releases/tag/v20.10.3 "show release") Fixes [...](https://github.com/nophead/NopSCADlib/compare/v20.10.2...v20.10.3 "diff with v20.10.2")
+*   2022-08-03 [`4ceb6bd`](https://github.com/nophead/NopSCADlib/commit/4ceb6bd8639cd39ac39798b3eccd178526a56c13 "show commit") [C.](# "Chris") Fixed a gap in printed hinges.
+
+#### [v20.10.2](https://github.com/nophead/NopSCADlib/releases/tag/v20.10.2 "show release") Fixes [...](https://github.com/nophead/NopSCADlib/compare/v20.10.1...v20.10.2 "diff with v20.10.1")
+*   2022-07-16 [`664d04a`](https://github.com/nophead/NopSCADlib/commit/664d04ad93c28c2614d5991e2b8dfa78964f6a99 "show commit") [C.](# "Chris") Now logs the time taken to run non OpenSCAD commands in `cmd_times.txt`
+
+#### [v20.10.1](https://github.com/nophead/NopSCADlib/releases/tag/v20.10.1 "show release") Fixes [...](https://github.com/nophead/NopSCADlib/compare/v20.10.0...v20.10.1 "diff with v20.10.0")
+*   2022-06-30 [`f44d9ae`](https://github.com/nophead/NopSCADlib/commit/f44d9ae424f407baa4f8b5187819b43b30800257 "show commit") [M.B.](# "Martin Budden") Made includes relative in `bldc_motors`.
+
+*   2022-07-15 [`1238dba`](https://github.com/nophead/NopSCADlib/commit/1238dba90ac5c48ba01abb9e7926a064353489de "show commit") [C.](# "Chris") Updated readme.
+
+*   2022-06-22 [`aec7211`](https://github.com/nophead/NopSCADlib/commit/aec72118fac218ca033264fa7b28db2bff7db10a "show commit") [M.B.](# "Martin Budden") Fixed typos.
+
+### [v20.10.0](https://github.com/nophead/NopSCADlib/releases/tag/v20.10.0 "show release") Additions [...](https://github.com/nophead/NopSCADlib/compare/v20.9.0...v20.10.0 "diff with v20.9.0")
+*   2022-07-04 [`b58a59d`](https://github.com/nophead/NopSCADlib/commit/b58a59dab70bb414dd90dc5a9055d6bf3b4f6144 "show commit") [C.](# "Chris") Updated images and readme.
+
+*   2022-07-04 [`6b6ffb2`](https://github.com/nophead/NopSCADlib/commit/6b6ffb2b74cc89ffecbcad7c304c3c4f047a8805 "show commit") [C.](# "Chris") Added SOICs to tests.
+
+*   2022-07-04 [`1e30ad2`](https://github.com/nophead/NopSCADlib/commit/1e30ad24e802dc6e075fd73185551202101d4793 "show commit") [C.](# "Chris") Added `smd_soic` to  `pcb_component()`.
+
+*   2022-07-04 [`dc715ff`](https://github.com/nophead/NopSCADlib/commit/dc715ff2b70ae98615ee43750f3bb7613b481f7b "show commit") [C.](# "Chris") Tweaked SOIC text size.
+
+*   2022-07-04 [`c57c202`](https://github.com/nophead/NopSCADlib/commit/c57c202e31c70351f38ef6299c60b0deb54bd296 "show commit") [M.](# "MS3FGX") Adjust lead sizing
+
+*   2022-07-02 [`26bfe96`](https://github.com/nophead/NopSCADlib/commit/26bfe96614741206c8da6d126edfa9eb5326cb8f "show commit") [M.](# "MS3FGX") Add SOIC SMD Package
+
 ### [v20.9.0](https://github.com/nophead/NopSCADlib/releases/tag/v20.9.0 "show release") Additions [...](https://github.com/nophead/NopSCADlib/compare/v20.8.0...v20.9.0 "diff with v20.8.0")
 *   2022-07-02 [`2cc3c6e`](https://github.com/nophead/NopSCADlib/commit/2cc3c6ec7c9d8ee285d49111559d40fb2a3112e1 "show commit") [C.](# "Chris") Updated images and readme.
 

docs/usage.md

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

global_defs.scad

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

lib.scad

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

libtest.scad

@@ -74,6 +74,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>
@@ -149,6 +150,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();
 
@@ -279,6 +283,9 @@ translate([x0, pulleys_y])
 translate([x0, leadnuts_y])
     leadnuts();
 
+translate([x0 + 120, leadnuts_y])
+    leadnuthousings();
+
 translate([x0, linear_bearings_y]) {
     linear_bearings();
     rods();

printed/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));
 
@@ -479,8 +475,6 @@ function subst_sheet(type, sheet) =
         sheet ? assert(sheet_thickness(sheet) == sheet_thickness(s)) sheet : s;
 
 module box_shelf_blank(type, sheet = false) { //! Generates a 2D template for a shelf sheet
-    dxf(str(box_name(type), "_shelf"));
-
     difference() {
         sheet_2D(subst_sheet(type, sheet), box_width(type) - bezel_clearance, box_depth(type) - bezel_clearance, 1);
 
@@ -579,50 +573,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

@@ -120,8 +120,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 +128,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 +143,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 +155,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 +167,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 +180,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 +193,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);

printed/camera_housing.scad

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

printed/corner_block.scad

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

printed/flat_hinge.scad

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

printed/led_bezel.scad

@@ -0,0 +1,85 @@
+//
+// NopSCADlib Copyright Chris Palmer 2022
+// nop.head@gmail.com
+// hydraraptor.blogspot.com
+//
+// This file is part of NopSCADlib.
+//
+// NopSCADlib is free software: you can redistribute it and/or modify it under the terms of the
+// GNU General Public License as published by the Free Software Foundation, either version 3 of
+// the License, or (at your option) any later version.
+//
+// NopSCADlib is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+// without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+// See the GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License along with NopSCADlib.
+// If not, see <https://www.gnu.org/licenses/>.
+//
+
+//
+//! Printed LED bezels for panel mounting
+//
+include <../core.scad>
+
+use <../vitamins/led.scad>
+
+function led_bezel(led, flange = 1, flange_h = 1, wall = 1, height = 8) = [led, flange, flange_h, wall, height]; //! Constructor
+function led_bezel_led(type)      = type[0]; //! The LED
+function led_bezel_flange(type)   = type[1]; //! Flange width
+function led_bezel_flange_t(type) = type[2]; //! Flange thickness
+function led_bezel_wall(type)     = type[3]; //! Wall thickness
+function led_bezel_height(type)   = type[4]; //! Total height
+
+function led_bezel_r(type)   =     //! Radius of the tube
+    corrected_radius(led_rim_dia(led_bezel_led(type)) / 2) + led_bezel_wall(type);
+
+function led_bezel_hole_r(type)   =     //! Panel hole radius
+    led_bezel_r(type) + 0.1;
+
+module led_bezel(type) { //! Makes the STL for the bezel
+    led = led_bezel_led(type);
+    stl(str(led[0],"_bezel")) {
+        rl = led_diameter(led) / 2;
+        rr = led_rim_dia(led) / 2;
+        wall = led_bezel_wall(type);
+        poly_tube(or = rr + wall + led_bezel_flange(type), ir = rl, h = led_bezel_flange_t(type));              // Flange
+        poly_tube(or = rl + wall,                          ir = rl, h = led_height(led) - rl - led_rim_t(led)); // Tube up to LED flange
+        poly_tube(or = corrected_radius(rr) + wall,        ir = rr, h = led_bezel_height(type));                // Tube beyond the flange
+    }
+}
+
+module led_bezel_retainer(type) { //! Makes the STL for the retaining ring
+    led = led_bezel_led(type);
+    stl(str(led[0],"_bezel_retainer")) {
+        ir =  led_bezel_r(type);
+        poly_tube(or = ir + led_bezel_wall(type), ir = ir, h = 4);
+    }
+}
+
+module led_bezel_assembly(type, colour = "red") {//! Led bezel with LED
+    led = led_bezel_led(type);
+    assembly(str(led[0], "_", colour, "_bezel")) {
+        translate_z(led_bezel_flange_t(type)) {
+            vflip()
+                stl_colour(pp1_colour)
+                    led_bezel(type);
+
+            translate_z(-led_height(led) + led_diameter(led) / 2)
+                explode(-20)
+                    led(led, colour);
+        }
+    }
+}
+
+module led_bezel_fastened_assembly(type, t, colour = "red") //! Led bezel fitted to panel with  and retaining ring
+{
+    explode(20)
+        led_bezel_assembly(type, colour);
+
+    translate_z(-t)
+        vflip()
+            stl_colour(pp2_colour)
+                explode(60)
+                    led_bezel_retainer(type);
+}

printed/printed_box.scad

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

printed/screw_knob.scad

@@ -44,7 +44,7 @@ function knob_height(type) = //! Total height of the knob
         screw_knob_stem_h(type) + screw_knob_flange_t(type);
 
 module screw_knob(type) { //! Generate the STL for a knob to fit the specified hex screw
-    type = !is_list(type[0]) ? screw_knob(type) : type;         // Allow just the screw to be specified for backwards compatability
+    type = !is_list(type[0]) ? screw_knob(type) : type;         // Allow just the screw to be specified for backwards compatibility
     screw = screw_knob_screw(type);
     wall = screw_knob_wall(type);
     trap_r = nut_trap_radius(screw_nut(screw));

readme.md

@@ -37,16 +37,17 @@ A list of changes classified as breaking, additions or fixes is maintained in [C
 <tr><td> <a href = "#Circlips">Circlips</a> </td><td> <a href = "#Modules">Modules</a> </td><td> <a href = "#Spools">Spools</a> </td><td> <a href = "#Foot">Foot</a> </td><td> <a href = "#Round">Round</a> </td><td></td></tr>
 <tr><td> <a href = "#Components">Components</a> </td><td> <a href = "#Nuts">Nuts</a> </td><td> <a href = "#Springs">Springs</a> </td><td> <a href = "#Handle">Handle</a> </td><td> <a href = "#Rounded_cylinder">Rounded_cylinder</a> </td><td></td></tr>
 <tr><td> <a href = "#DIP">DIP</a> </td><td> <a href = "#O_ring">O_ring</a> </td><td> <a href = "#Stepper_motors">Stepper_motors</a> </td><td> <a href = "#Knob">Knob</a> </td><td> <a href = "#Rounded_polygon">Rounded_polygon</a> </td><td></td></tr>
-<tr><td> <a href = "#D_connectors">D_connectors</a> </td><td> <a href = "#Opengrab">Opengrab</a> </td><td> <a href = "#Swiss_clips">Swiss_clips</a> </td><td> <a href = "#PCB_mount">PCB_mount</a> </td><td> <a href = "#Rounded_triangle">Rounded_triangle</a> </td><td></td></tr>
-<tr><td> <a href = "#Displays">Displays</a> </td><td> <a href = "#PCB">PCB</a> </td><td> <a href = "#Terminals">Terminals</a> </td><td> <a href = "#PSU_shroud">PSU_shroud</a> </td><td> <a href = "#Sector">Sector</a> </td><td></td></tr>
-<tr><td> <a href = "#Extrusion_brackets">Extrusion_brackets</a> </td><td> <a href = "#PCBs">PCBs</a> </td><td> <a href = "#Toggles">Toggles</a> </td><td> <a href = "#Pocket_handle">Pocket_handle</a> </td><td> <a href = "#Sweep">Sweep</a> </td><td></td></tr>
-<tr><td> <a href = "#Extrusions">Extrusions</a> </td><td> <a href = "#PSUs">PSUs</a> </td><td> <a href = "#Transformers">Transformers</a> </td><td> <a href = "#Press_fit">Press_fit</a> </td><td> <a href = "#Thread">Thread</a> </td><td></td></tr>
-<tr><td> <a href = "#Fans">Fans</a> </td><td> <a href = "#Panel_meters">Panel_meters</a> </td><td> <a href = "#Tubings">Tubings</a> </td><td> <a href = "#Printed_box">Printed_box</a> </td><td> <a href = "#Tube">Tube</a> </td><td></td></tr>
-<tr><td> <a href = "#Fuseholder">Fuseholder</a> </td><td> <a href = "#Pillars">Pillars</a> </td><td> <a href = "#Variacs">Variacs</a> </td><td> <a href = "#Printed_pulleys">Printed_pulleys</a> </td><td></td><td></td></tr>
-<tr><td> <a href = "#Geared_steppers">Geared_steppers</a> </td><td> <a href = "#Pillow_blocks">Pillow_blocks</a> </td><td> <a href = "#Veroboard">Veroboard</a> </td><td> <a href = "#Ribbon_clamp">Ribbon_clamp</a> </td><td></td><td></td></tr>
-<tr><td> <a href = "#Green_terminals">Green_terminals</a> </td><td> <a href = "#Pin_headers">Pin_headers</a> </td><td> <a href = "#Washers">Washers</a> </td><td> <a href = "#SSR_shroud">SSR_shroud</a> </td><td></td><td></td></tr>
-<tr><td> <a href = "#Hot_ends">Hot_ends</a> </td><td> <a href = "#Potentiometers">Potentiometers</a> </td><td> <a href = "#Wire">Wire</a> </td><td> <a href = "#Screw_knob">Screw_knob</a> </td><td></td><td></td></tr>
-<tr><td> <a href = "#Hygrometer">Hygrometer</a> </td><td> <a href = "#Pulleys">Pulleys</a> </td><td> <a href = "#Zipties">Zipties</a> </td><td> <a href = "#Socket_box">Socket_box</a> </td><td></td><td></td></tr>
+<tr><td> <a href = "#D_connectors">D_connectors</a> </td><td> <a href = "#Opengrab">Opengrab</a> </td><td> <a href = "#Swiss_clips">Swiss_clips</a> </td><td> <a href = "#LED_bezel">LED_bezel</a> </td><td> <a href = "#Rounded_triangle">Rounded_triangle</a> </td><td></td></tr>
+<tr><td> <a href = "#Displays">Displays</a> </td><td> <a href = "#PCB">PCB</a> </td><td> <a href = "#Terminals">Terminals</a> </td><td> <a href = "#PCB_mount">PCB_mount</a> </td><td> <a href = "#Sector">Sector</a> </td><td></td></tr>
+<tr><td> <a href = "#Extrusion_brackets">Extrusion_brackets</a> </td><td> <a href = "#PCBs">PCBs</a> </td><td> <a href = "#Toggles">Toggles</a> </td><td> <a href = "#PSU_shroud">PSU_shroud</a> </td><td> <a href = "#Sweep">Sweep</a> </td><td></td></tr>
+<tr><td> <a href = "#Extrusions">Extrusions</a> </td><td> <a href = "#PSUs">PSUs</a> </td><td> <a href = "#Transformers">Transformers</a> </td><td> <a href = "#Pocket_handle">Pocket_handle</a> </td><td> <a href = "#Thread">Thread</a> </td><td></td></tr>
+<tr><td> <a href = "#Fans">Fans</a> </td><td> <a href = "#Panel_meters">Panel_meters</a> </td><td> <a href = "#Tubings">Tubings</a> </td><td> <a href = "#Press_fit">Press_fit</a> </td><td> <a href = "#Tube">Tube</a> </td><td></td></tr>
+<tr><td> <a href = "#Fuseholder">Fuseholder</a> </td><td> <a href = "#Pillars">Pillars</a> </td><td> <a href = "#Variacs">Variacs</a> </td><td> <a href = "#Printed_box">Printed_box</a> </td><td></td><td></td></tr>
+<tr><td> <a href = "#Geared_steppers">Geared_steppers</a> </td><td> <a href = "#Pillow_blocks">Pillow_blocks</a> </td><td> <a href = "#Veroboard">Veroboard</a> </td><td> <a href = "#Printed_pulleys">Printed_pulleys</a> </td><td></td><td></td></tr>
+<tr><td> <a href = "#Green_terminals">Green_terminals</a> </td><td> <a href = "#Pin_headers">Pin_headers</a> </td><td> <a href = "#Washers">Washers</a> </td><td> <a href = "#Ribbon_clamp">Ribbon_clamp</a> </td><td></td><td></td></tr>
+<tr><td> <a href = "#Hot_ends">Hot_ends</a> </td><td> <a href = "#Potentiometers">Potentiometers</a> </td><td> <a href = "#Wire">Wire</a> </td><td> <a href = "#SSR_shroud">SSR_shroud</a> </td><td></td><td></td></tr>
+<tr><td> <a href = "#Hygrometer">Hygrometer</a> </td><td> <a href = "#Pulleys">Pulleys</a> </td><td> <a href = "#Zipties">Zipties</a> </td><td> <a href = "#Screw_knob">Screw_knob</a> </td><td></td><td></td></tr>
+<tr><td></td><td></td><td></td><td> <a href = "#Socket_box">Socket_box</a> </td><td></td><td></td></tr>
 <tr><td></td><td></td><td></td><td> <a href = "#Strap_handle">Strap_handle</a> </td><td></td><td></td></tr>
 </table>
 
@@ -371,7 +372,7 @@ Individual teeth are not drawn, instead they are represented by a lighter colour
 |   1 | `belt(T2p5x6, [ ... ])` |  Belt T2.5 x 6mm x 130mm |
 |   1 | `belt(T5x10, [ ... ])` |  Belt T5 x 10mm x 130mm |
 |   1 | `belt(T5x6, [ ... ])` |  Belt T5 x 6mm x 130mm |
-|   2 | `insert(F1BM3)` |  Heatfit insert M3 |
+|   2 | `insert(F1BM3)` |  Heatfit insert M3 x 5.8mm |
 |   2 | `pulley(GT2x16_toothed_idler)` |  Pulley GT2 idler 16 teeth |
 |   4 | `pulley(GT2x20_toothed_idler)` |  Pulley GT2 idler 20 teeth |
 |   6 | `pulley(GT2x16_plain_idler)` |  Pulley GT2 idler smooth 9.63mm |
@@ -1528,10 +1529,14 @@ Heatfit threaded inserts. Can be pushed into thermoplastics using a soldering ir
 ### Vitamins
 | Qty | Module call | BOM entry |
 | ---:|:--- |:---|
-|   1 | `insert(F1BM2)` |  Heatfit insert M2 |
-|   1 | `insert(F1BM2p5)` |  Heatfit insert M2.5 |
-|   1 | `insert(F1BM3)` |  Heatfit insert M3 |
-|   1 | `insert(F1BM4)` |  Heatfit insert M4 |
+|   2 | `insert(F1BM2)` |  Heatfit insert M2 x 4mm |
+|   1 | `insert(CNCKM2p5)` |  Heatfit insert M2.5 x 4mm |
+|   1 | `insert(F1BM2p5)` |  Heatfit insert M2.5 x 5.8mm |
+|   1 | `insert(CNCKM3)` |  Heatfit insert M3 x 3mm |
+|   1 | `insert(F1BM3)` |  Heatfit insert M3 x 5.8mm |
+|   1 | `insert(CNCKM4)` |  Heatfit insert M4 x 4mm |
+|   1 | `insert(F1BM4)` |  Heatfit insert M4 x 8.2mm |
+|   2 | `insert(CNCKM5)` |  Heatfit insert M5 x 5.8mm |
 
 
 <a href="#top">Top</a>
@@ -1646,6 +1651,16 @@ Nuts for leadscrews.
 | `leadnut_od(type)` | Outer diameter of the shank |
 | `leadnut_pitch(type)` | Screw pitch |
 | `leadnut_screw(type)` | The type of the fixing screws |
+| `leadnuthousing_height(type)` | Height of housing |
+| `leadnuthousing_hole_pos(type)` | Offset from center for nut hole |
+| `leadnuthousing_length(type)` | Length of housing |
+| `leadnuthousing_mount_screw(type)` | Mounting screw |
+| `leadnuthousing_mount_screw_len(type)` | Mounting screw length |
+| `leadnuthousing_nut(type)` | Nut type this is suitable for |
+| `leadnuthousing_nut_screw_length(type)` | Length of mounting screw for nut |
+| `leadnuthousing_screw_dist_l(type)` | Distance between mounting holes length |
+| `leadnuthousing_screw_dist_w(type)` | Distance between mounting holes width |
+| `leadnuthousing_width(type)` | Width of housing |
 
 ### Functions
 | Function | Description |
@@ -1657,15 +1672,21 @@ Nuts for leadscrews.
 |:--- |:--- |
 | `leadnut(type)` | Draw specified leadnut |
 | `leadnut_screw_positions(type)` | Position children at the screw holes |
+| `leadnuthousing(type)` | Nut housing, to connect a lead nut to another object |
+| `leadnuthousing_nut_position(type)` | The position of the nut may be off-center, use this to get the position |
+| `leadnuthousing_nut_screw_positions(type)` | get screw positions to mount the nut to the nut housing |
+| `leadnuthousing_screw_positions(type)` | Get screw positions to mount the leadnut housing |
 
 ![leadnuts](tests/png/leadnuts.png)
 
 ### Vitamins
 | Qty | Module call | BOM entry |
 | ---:|:--- |:---|
-|   1 | `leadnut(LSN8x2)` |  Leadscrew nut 8 x 2 |
+|   1 | `nuthousing(LNHT8x2)` |  Lead Screw Nut Housing T8 |
+|   2 | `leadnut(LSN8x2)` |  Leadscrew nut 8 x 2 |
 |   1 | `leadnut(LSN8x8)` |  Leadscrew nut 8 x 8 RobotDigg |
 |   1 | `leadnut(SFU1610)` |  Leadscrew nut for SFU1610 |
+|   4 | `screw(M3_cap_screw, 15)` |  Screw M3 cap x 15mm |
 
 
 <a href="#top">Top</a>
@@ -1768,9 +1789,10 @@ Standard domed through hole LEDs. Can specify colour and lead length.
 ### Vitamins
 | Qty | Module call | BOM entry |
 | ---:|:--- |:---|
-|   1 | `led(LED10mm)` |  LED 10 mm red |
+|   1 | `led(LED10mm, "orange")` |  LED 10 mm orange |
 |   1 | `led(LED3mm, "green")` |  LED 3 mm green |
 |   1 | `led(LED5mm, "blue")` |  LED 5 mm blue |
+|   1 | `led(LED8mm)` |  LED 8 mm red |
 
 
 <a href="#top">Top</a>
@@ -2585,6 +2607,7 @@ PCBs and perfboard with optional components. The shape can be a rectangle with o
 |   1 | `pcb(ExtruderPCB)` |  Extruder connection PCB - not shown |
 |   1 | `pcb(KY_040)` |  KY-040 rotart encoder breakout |
 |   1 | `pcb(Keyes5p1)` |  Keyes5.1 Arduino Uno expansion board - not shown |
+|   1 | `pcb(L9110S)` |  L9110S 2-Channel motor driver module |
 |   1 | `pcb(LIPO_fuel_gauge)` |  LIPO fuel gauge |
 |   1 | `pcb(MP1584EN)` |  MP1584EN 3A buck converter |
 |   1 | `pcb(MT3608)` |  MT3608 boost converter module |
@@ -2595,7 +2618,7 @@ PCBs and perfboard with optional components. The shape can be a rectangle with o
 |   1 | `molex_254(3)` |  Molex KK header 3 way - not shown |
 |  20 | `nut(M2_nut, nyloc = true)` |  Nut M2 x 1.6mm nyloc |
 |  30 | `nut(M2p5_nut, nyloc = true)` |  Nut M2.5 x 2.2mm nyloc |
-|  32 | `nut(M3_nut, nyloc = true)` |  Nut M3 x 2.4mm nyloc |
+|  36 | `nut(M3_nut, nyloc = true)` |  Nut M3 x 2.4mm nyloc |
 |   8 | `nut(M4_nut, nyloc = true)` |  Nut M4 x 3.2mm nyloc |
 |   1 | `pcb(PI_IO)` |  PI_IO V2 - not shown |
 |   1 | `pcb(PSU12V1A)` |  PSU 12V 1A - not shown |
@@ -2618,10 +2641,12 @@ PCBs and perfboard with optional components. The shape can be a rectangle with o
 |   8 | `screw(M2p5_cap_screw, 30)` |  Screw M2.5 cap x 30mm |
 |   4 | `screw(M2p5_pan_screw, 20)` |  Screw M2.5 pan x 20mm |
 |   8 | `screw(M2p5_pan_screw, 25)` |  Screw M2.5 pan x 25mm |
-|  10 | `screw(M3_cap_screw, 16)` |  Screw M3 cap x 16mm |
-|  13 | `screw(M3_cap_screw, 30)` |  Screw M3 cap x 30mm |
-|   9 | `screw(M3_cap_screw, 35)` |  Screw M3 cap x 35mm |
-|   8 | `screw(M4_cap_screw, 35)` |  Screw M4 cap x 35mm |
+|   8 | `screw(M3_cap_screw, 16)` |  Screw M3 cap x 16mm |
+|   6 | `screw(M3_cap_screw, 20)` |  Screw M3 cap x 20mm |
+|   8 | `screw(M3_cap_screw, 30)` |  Screw M3 cap x 30mm |
+|  14 | `screw(M3_cap_screw, 35)` |  Screw M3 cap x 35mm |
+|   4 | `screw(M4_cap_screw, 35)` |  Screw M4 cap x 35mm |
+|   4 | `screw(M4_cap_screw, 40)` |  Screw M4 cap x 40mm |
 |   1 | `pcb(XIAO)` |  Seeeduino XIAO |
 |   1 | `pcb(TP4056)` |  TP4056 Li-lon Battery charger module |
 |   3 | `terminal_35(2)` |  Terminal block 2 way 3.5mm - not shown |
@@ -2630,34 +2655,37 @@ PCBs and perfboard with optional components. The shape can be a rectangle with o
 |   1 | `pcb(WD2002SJ)` |  WD2002SJ Buck Boost DC-DC converter |
 |  20 | `washer(M2_washer)` |  Washer  M2 x 5mm x 0.3mm |
 |  30 | `washer(M2p5_washer)` |  Washer  M2.5 x 5.9mm x 0.5mm |
-|  32 | `washer(M3_washer)` |  Washer  M3 x 7mm x 0.5mm |
+|  36 | `washer(M3_washer)` |  Washer  M3 x 7mm x 0.5mm |
 |   8 | `washer(M4_washer)` |  Washer  M4 x 9mm x 0.8mm |
 |   1 | `pcb(ZC_A0591)` |  ZC-A0591 ULN2003 driver PCB |
 
 ### Printed
 | Qty | Filename |
 | ---:|:--- |
-|   8 | pcb_spacer20100.stl |
+|   4 | pcb_spacer20100.stl |
+|   4 | pcb_spacer20110.stl |
 |   4 | pcb_spacer2070.stl |
 |   4 | pcb_spacer2080.stl |
 |   4 | pcb_spacer2090.stl |
-|   4 | pcb_spacer25120.stl |
 |   4 | pcb_spacer25130.stl |
-|   4 | pcb_spacer25140_2.stl |
+|   4 | pcb_spacer25140.stl |
 |   4 | pcb_spacer25150_2.stl |
-|   4 | pcb_spacer25170.stl |
+|   4 | pcb_spacer25160_2.stl |
 |   4 | pcb_spacer25180.stl |
+|   4 | pcb_spacer25190.stl |
 |   2 | pcb_spacer2550.stl |
-|   4 | pcb_spacer2580.stl |
-|   4 | pcb_spacer30160.stl |
-|   4 | pcb_spacer30190.stl |
-|   5 | pcb_spacer30200.stl |
+|   4 | pcb_spacer2590.stl |
+|   4 | pcb_spacer30170.stl |
+|   4 | pcb_spacer30200.stl |
 |   5 | pcb_spacer30210.stl |
-|   4 | pcb_spacer30220.stl |
+|   5 | pcb_spacer30220.stl |
+|   4 | pcb_spacer30230.stl |
 |   4 | pcb_spacer3050.stl |
-|   6 | pcb_spacer3060.stl |
-|   4 | pcb_spacer40230.stl |
+|   4 | pcb_spacer3060.stl |
+|   2 | pcb_spacer3070.stl |
+|   4 | pcb_spacer3080.stl |
 |   4 | pcb_spacer40240.stl |
+|   4 | pcb_spacer40250.stl |
 
 
 <a href="#top">Top</a>
@@ -3307,6 +3335,7 @@ For an explanation of `screw_polysink()` see <https://hydraraptor.blogspot.com/2
 |:--- |:--- |
 | `screw_boss_diameter(type)` | Boss big enough for nut trap and washer |
 | `screw_head_depth(type, d = 0)` | How far a counter sink head will go into a straight hole diameter d |
+| `screw_insert(screw, short = false, i = 0)` | Find insert to fit specified screw, defaults to longest but can specify the shortest |
 | `screw_length(screw, thickness, washers, insert = false, nyloc = false, nut = false, longer = false)` | Returns the length of the longest or shortest screw that will got through `thickness` and `washers` and possibly an `insert`, `nut` or `nyloc` |
 | `screw_longer_than(x)` | Returns the length of the shortest screw length longer or equal to x |
 | `screw_nut_radius(type)` | Radius of matching nut |
@@ -3319,6 +3348,7 @@ For an explanation of `screw_polysink()` see <https://hydraraptor.blogspot.com/2
 | `screw(type, length, hob_point = 0, nylon = false)` | Draw specified screw, optionally hobbed or nylon |
 | `screw_and_washer(type, length, star = false, penny = false)` | Screw with a washer which can be standard or penny and an optional star washer on top |
 | `screw_countersink(type, drilled = true)` | Countersink shape |
+| `screw_keyhole(type, h = 0)` | Make keyhole slot to accept and retain screw head |
 | `screw_polysink(type, h = 100, alt = false, sink = 0)` | A countersink hole made from stacked polyholes for printed parts, default is flush, `sink` can be used to recess the head |
 
 ![screws](tests/png/screws.png)
@@ -3470,6 +3500,7 @@ Shaft couplings
 | `sc_diameter(type)` | Coupling outer diameter |
 | `sc_diameter1(type)` | Diameter of smaller shaft |
 | `sc_diameter2(type)` | Diameter of larger shaft |
+| `sc_flexible(type)` | Flexible coupling |
 | `sc_length(type)` | Coupling length |
 
 ### Modules
@@ -3483,6 +3514,7 @@ Shaft couplings
 | Qty | Module call | BOM entry |
 | ---:|:--- |:---|
 |   1 | `shaft_coupling(SC_5x8_rigid)` |  Shaft coupling SC_5x8_rigid |
+|   1 | `shaft_coupling(SC_6x8_flex)` |  Shaft coupling SC_6x8_flex |
 
 
 <a href="#top">Top</a>
@@ -4573,7 +4605,7 @@ The top bezel can have an optional child, which is subtracted to allow modificat
 ### Vitamins
 | Qty | Module call | BOM entry |
 | ---:|:--- |:---|
-|   8 | `insert(F1BM3)` |  Heatfit insert M3 |
+|   8 | `insert(F1BM3)` |  Heatfit insert M3 x 5.8mm |
 |   4 | `screw(M3_dome_screw, 16)` |  Screw M3 dome x 16mm |
 |   4 | `screw(M3_dome_screw, 20)` |  Screw M3 dome x 20mm |
 |   2 | `sheet(DiBond, 143, 63, 1)` |  Sheet DiBond 143mm x 63mm x 3mm |
@@ -4677,7 +4709,7 @@ fixing_blocks along the sides.
 ### Vitamins
 | Qty | Module call | BOM entry |
 | ---:|:--- |:---|
-|  60 | `insert(F1BM3)` |  Heatfit insert M3 |
+|  60 | `insert(F1BM3)` |  Heatfit insert M3 x 5.8mm |
 |  44 | `screw(M3_dome_screw, 10)` |  Screw M3 dome x 10mm |
 |   4 | `screw(M3_dome_screw, 12)` |  Screw M3 dome x 12mm |
 |  12 | `screw(M3_dome_screw, 16)` |  Screw M3 dome x 16mm |
@@ -4923,42 +4955,42 @@ high lateral rigidity is not required.
 ### Functions
 | Function | Description |
 |:--- |:--- |
-| `2screw_block_h_hole(screw = def_screw)` | Transform to front hole |
-| `2screw_block_holes(screw)` | List of transforms to both holes |
-| `2screw_block_v_hole(screw = def_screw)` | Transform to bottom hole |
-| `2screw_block_width(screw = def_screw)` | 2 screw block width is narrower, height and depth are as corner_block |
-| `corner_block_h_holes(screw = def_screw)` | List of transforms to side holes |
-| `corner_block_hole_offset(screw = def_screw)` | Hole offset from the edge |
-| `corner_block_holes(screw)` | List of transforms to all holes |
+| `2screw_block_h_hole(screw = def_screw, short_insert = false)` | Transform to front hole |
+| `2screw_block_holes(screw, short_insert = false)` | List of transforms to both holes |
+| `2screw_block_v_hole(screw = def_screw, short_insert = false)` | Transform to bottom hole |
+| `2screw_block_width(screw = def_screw, short_insert = false)` | 2 screw block width is narrower, height and depth are as corner_block |
+| `corner_block_h_holes(screw = def_screw, short_insert = false)` | List of transforms to side holes |
+| `corner_block_hole_offset(screw = def_screw, short_insert = false)` | Hole offset from the edge |
+| `corner_block_holes(screw, short_insert = false)` | List of transforms to all holes |
 | `corner_block_screw()` | Default screw type |
-| `corner_block_v_hole(screw = def_screw)` | Transform to bottom hole |
-| `corner_block_width(screw = def_screw)` | Block width, depth and height |
+| `corner_block_v_hole(screw = def_screw, short_insert = false)` | Transform to bottom hole |
+| `corner_block_width(screw = def_screw, short_insert = false)` | Block width, depth and height |
 
 ### Modules
 | Module | Description |
 |:--- |:--- |
-| `2screw_block(screw = def_screw, name = false)` | Generate the STL for a printed 2screw block |
-| `2screw_block_assembly(screw = def_screw, name = false)` | The printed block with inserts |
-| `2screw_block_h_hole(screw = def_screw)` | Place children at the front screw hole |
-| `2screw_block_holes(screw = def_screw)` | Place children at both screw holes |
-| `2screw_block_v_hole(screw = def_screw)` | Place children at the bottom screw hole |
-| `corner_block(screw = def_screw, name = false)` | Generate the STL for a printed corner block |
-| `corner_block_assembly(screw = def_screw, name = false)` | The printed block with inserts |
-| `corner_block_h_holes(screw = def_screw, index = undef)` | Place children at the side screw holes |
-| `corner_block_holes(screw = def_screw)` | Place children at all the holes |
-| `corner_block_v_hole(screw = def_screw)` | Place children at the bottom screw hole |
-| `fastened_2screw_block_assembly(thickness, screw = def_screw, thickness_below = undef, name = false, show_block = true, star_washers = true)` | Printed block with fasteners |
-| `fastened_corner_block_assembly(thickness, screw = def_screw, thickness_below = undef, thickness_side2 = undef, name = false, show_block = true, star_washers = true)` | Printed block with all fasteners |
+| `2screw_block(screw = def_screw, name = false, short_insert = false)` | Generate the STL for a printed 2screw block |
+| `2screw_block_assembly(screw = def_screw, name = false, short_insert = false)` | The printed block with inserts |
+| `2screw_block_h_hole(screw = def_screw, short_insert = false)` | Place children at the front screw hole |
+| `2screw_block_holes(screw = def_screw, short_insert = false)` | Place children at both screw holes |
+| `2screw_block_v_hole(screw = def_screw, short_insert = false)` | Place children at the bottom screw hole |
+| `corner_block(screw = def_screw, name = false, short_insert = false)` | Generate the STL for a printed corner block |
+| `corner_block_assembly(screw = def_screw, name = false, short_insert = false)` | The printed block with inserts |
+| `corner_block_h_holes(screw = def_screw, index = undef, short_insert = false)` | Place children at the side screw holes |
+| `corner_block_holes(screw = def_screw, short_insert = false)` | Place children at all the holes |
+| `corner_block_v_hole(screw = def_screw, short_insert = false)` | Place children at the bottom screw hole |
+| `fastened_2screw_block_assembly(thickness, screw = def_screw, thickness_below = undef, name = false, show_block = true, star_washers = true, short_insert = false)` | Printed block with fasteners |
+| `fastened_corner_block_assembly(thickness, screw = def_screw, thickness_below = undef, thickness_side2 = undef, name = false, show_block = true, star_washers = true, short_insert = false)` | Printed block with all fasteners |
 
 ![corner_block](tests/png/corner_block.png)
 
 ### Vitamins
 | Qty | Module call | BOM entry |
 | ---:|:--- |:---|
-|   5 | `insert(F1BM2)` |  Heatfit insert M2 |
-|   5 | `insert(F1BM2p5)` |  Heatfit insert M2.5 |
-|   5 | `insert(F1BM3)` |  Heatfit insert M3 |
-|   5 | `insert(F1BM4)` |  Heatfit insert M4 |
+|   5 | `insert(F1BM2)` |  Heatfit insert M2 x 4mm |
+|   5 | `insert(F1BM2p5)` |  Heatfit insert M2.5 x 5.8mm |
+|   5 | `insert(F1BM3)` |  Heatfit insert M3 x 5.8mm |
+|   5 | `insert(F1BM4)` |  Heatfit insert M4 x 8.2mm |
 |   5 | `screw(M2_cap_screw, 8)` |  Screw M2 cap x  8mm |
 |   5 | `screw(M2p5_pan_screw, 10)` |  Screw M2.5 pan x 10mm |
 |   5 | `screw(M3_dome_screw, 10)` |  Screw M3 dome x 10mm |
@@ -5247,10 +5279,10 @@ Star washers can be omitted by setting `star_washers` to false.
 ### Vitamins
 | Qty | Module call | BOM entry |
 | ---:|:--- |:---|
-|   3 | `insert(F1BM2)` |  Heatfit insert M2 |
-|   3 | `insert(F1BM2p5)` |  Heatfit insert M2.5 |
-|   3 | `insert(F1BM3)` |  Heatfit insert M3 |
-|   3 | `insert(F1BM4)` |  Heatfit insert M4 |
+|   3 | `insert(F1BM2)` |  Heatfit insert M2 x 4mm |
+|   3 | `insert(F1BM2p5)` |  Heatfit insert M2.5 x 5.8mm |
+|   3 | `insert(F1BM3)` |  Heatfit insert M3 x 5.8mm |
+|   3 | `insert(F1BM4)` |  Heatfit insert M4 x 8.2mm |
 |   3 | `screw(M2_cap_screw, 8)` |  Screw M2 cap x  8mm |
 |   3 | `screw(M2p5_pan_screw, 10)` |  Screw M2.5 pan x 10mm |
 |   3 | `screw(M3_dome_screw, 10)` |  Screw M3 dome x 10mm |
@@ -5397,7 +5429,7 @@ inserts don't grip well in rubber.
 ### Vitamins
 | Qty | Module call | BOM entry |
 | ---:|:--- |:---|
-|   1 | `insert(F1BM3)` |  Heatfit insert M3 |
+|   1 | `insert(F1BM3)` |  Heatfit insert M3 x 5.8mm |
 |   1 | `nut(M4_nut, nyloc = true)` |  Nut M4 x 3.2mm nyloc |
 |   1 | `screw(M3_cap_screw, 8)` |  Screw M3 cap x  8mm |
 |   1 | `screw(M4_cap_screw, 16)` |  Screw M4 cap x 16mm |
@@ -5450,7 +5482,7 @@ Printed handle that can be printed without needing support material due to its t
 ### Vitamins
 | Qty | Module call | BOM entry |
 | ---:|:--- |:---|
-|   2 | `insert(F1BM4)` |  Heatfit insert M4 |
+|   2 | `insert(F1BM4)` |  Heatfit insert M4 x 8.2mm |
 |   2 | `screw(M4_cap_screw, 16)` |  Screw M4 cap x 16mm |
 |   2 | `washer(M4_washer)` |  Washer  M4 x 9mm x 0.8mm |
 |   2 | `star_washer(M4_washer)` |  Washer star M4 x 0.8mm |
@@ -5535,6 +5567,72 @@ The STL includes a support membrane that needs to be cut out and a thread needs
 |   1 | metric_pot_knob.stl |
 
 
+<a href="#top">Top</a>
+
+---
+<a name="LED_bezel"></a>
+## LED_bezel
+Printed LED bezels for panel mounting
+
+[printed/led_bezel.scad](printed/led_bezel.scad) Implementation.
+
+[tests/LED_bezel.scad](tests/LED_bezel.scad) Code for this example.
+
+### Properties
+| Function | Description |
+|:--- |:--- |
+| `led_bezel_flange(type)` | Flange width |
+| `led_bezel_flange_t(type)` | Flange thickness |
+| `led_bezel_height(type)` | Total height |
+| `led_bezel_led(type)` | The LED |
+| `led_bezel_wall(type)` | Wall thickness |
+
+### Functions
+| Function | Description |
+|:--- |:--- |
+| `led_bezel(led, flange = 1, flange_h = 1, wall = 1, height = 8)` | Constructor |
+| `led_bezel_hole_r(type)` | Panel hole radius |
+| `led_bezel_r(type)` | Radius of the tube |
+
+### Modules
+| Module | Description |
+|:--- |:--- |
+| `led_bezel(type)` | Makes the STL for the bezel |
+| `led_bezel_assembly(type, colour = "red")` | Led bezel with LED |
+| `led_bezel_fastened_assembly(type, t, colour = "red")` | Led bezel fitted to panel with  and retaining ring |
+| `led_bezel_retainer(type)` | Makes the STL for the retaining ring |
+
+![led_bezel](tests/png/led_bezel.png)
+
+### Vitamins
+| Qty | Module call | BOM entry |
+| ---:|:--- |:---|
+|   1 | `led(LED10mm, "orange")` |  LED 10 mm orange |
+|   1 | `led(LED3mm, "yellow")` |  LED 3 mm yellow |
+|   1 | `led(LED5mm, "blue")` |  LED 5 mm blue |
+|   1 | `led(LED8mm)` |  LED 8 mm red |
+
+### Printed
+| Qty | Filename |
+| ---:|:--- |
+|   1 | LED10mm_bezel.stl |
+|   1 | LED10mm_bezel_retainer.stl |
+|   1 | LED3mm_bezel.stl |
+|   1 | LED3mm_bezel_retainer.stl |
+|   1 | LED5mm_bezel.stl |
+|   1 | LED5mm_bezel_retainer.stl |
+|   1 | LED8mm_bezel.stl |
+|   1 | LED8mm_bezel_retainer.stl |
+
+### Assemblies
+| Qty | Name |
+| ---:|:--- |
+|   1 | LED10mm_orange_bezel_assembly |
+|   1 | LED3mm_yellow_bezel_assembly |
+|   1 | LED5mm_blue_bezel_assembly |
+|   1 | LED8mm_red_bezel_assembly |
+
+
 <a href="#top">Top</a>
 
 ---
@@ -5682,6 +5780,7 @@ It can also have printed feet on the base with the screws doubling up to hold th
 | `pbox_name(type)` | Name to allow more than one box in a project |
 | `pbox_radius(type)` | Internal corner radius |
 | `pbox_ridges(type)` | Ridge wavelength and amplitude |
+| `pbox_short_insert(type)` | Use short inserts |
 | `pbox_top(type)` | Top thickness |
 | `pbox_wall(type)` | Wall thickness |
 | `pbox_width(type)` | Internal width |
@@ -5689,7 +5788,7 @@ It can also have printed feet on the base with the screws doubling up to hold th
 ### Functions
 | Function | Description |
 |:--- |:--- |
-| `pbox(name, wall, top_t, base_t, radius, size, foot = false, screw = false, ridges = [0, 0])` | Construct a printed box property list |
+| `pbox(name, wall, top_t, base_t, radius, size, foot = false, screw = false, short_insert = false, ridges = [0, 0])` | Construct a printed box property list |
 | `pbox_inclusion(type)` | How far the ledge for the base extends inwards |
 | `pbox_insert(type)` | The insert for the base screws |
 | `pbox_screw(type)` | Foot screw if got feet else base_screw |
@@ -5713,8 +5812,8 @@ It can also have printed feet on the base with the screws doubling up to hold th
 ### Vitamins
 | Qty | Module call | BOM entry |
 | ---:|:--- |:---|
-|   4 | `insert(F1BM2)` |  Heatfit insert M2 |
-|   4 | `insert(F1BM3)` |  Heatfit insert M3 |
+|   4 | `insert(F1BM2)` |  Heatfit insert M2 x 4mm |
+|   4 | `insert(F1BM3)` |  Heatfit insert M3 x 5.8mm |
 |   4 | `screw(M2_cap_screw, 6)` |  Screw M2 cap x  6mm |
 |   3 | `screw(M3_pan_screw, 6)` |  Screw M3 pan x  6mm |
 |   4 | `screw(M3_pan_screw, 10)` |  Screw M3 pan x 10mm |
@@ -5843,7 +5942,7 @@ The stl and assembly must be given a name and parameterless wrappers for the stl
 ### Vitamins
 | Qty | Module call | BOM entry |
 | ---:|:--- |:---|
-|   6 | `insert(F1BM3)` |  Heatfit insert M3 |
+|   6 | `insert(F1BM3)` |  Heatfit insert M3 x 5.8mm |
 |   6 | `screw(M3_cap_screw, 10)` |  Screw M3 cap x 10mm |
 |   6 | `washer(M3_washer)` |  Washer  M3 x 7mm x 0.5mm |
 |   6 | `star_washer(M3_washer)` |  Washer star M3 x 0.5mm |
@@ -5899,8 +5998,8 @@ Clamp for ribbon cable and polypropylene strip or one or more ribbon cables.
 ### Vitamins
 | Qty | Module call | BOM entry |
 | ---:|:--- |:---|
-|   2 | `insert(F1BM2)` |  Heatfit insert M2 |
-|   2 | `insert(F1BM3)` |  Heatfit insert M3 |
+|   2 | `insert(F1BM2)` |  Heatfit insert M2 x 4mm |
+|   2 | `insert(F1BM3)` |  Heatfit insert M3 x 5.8mm |
 |   1 |  |  Ribbon cable 20 way 100mm |
 |   1 |  |  Ribbon cable 8 way 100mm |
 |   2 | `screw(M2_dome_screw, 8)` |  Screw M2 dome x  8mm |
@@ -6018,7 +6117,7 @@ UK 13A socket and printed backbox with earth terminal for the panel it is mounte
 ### Vitamins
 | Qty | Module call | BOM entry |
 | ---:|:--- |:---|
-|   4 | `insert(F1BM3)` |  Heatfit insert M3 |
+|   4 | `insert(F1BM3)` |  Heatfit insert M3 x 5.8mm |
 |   1 | `mains_socket(Contactum)` |  Mains socket 13A |
 |   1 | `mains_socket(MKLOGIC)` |  Mains socket 13A, switched |
 |   2 | `nut(M3_nut, nyloc = true)` |  Nut M3 x 2.4mm nyloc |
@@ -6075,7 +6174,7 @@ The STL and assembly must be given a name and parameterless wrappers for the stl
 ### Vitamins
 | Qty | Module call | BOM entry |
 | ---:|:--- |:---|
-|   4 | `insert(F1BM3)` |  Heatfit insert M3 |
+|   4 | `insert(F1BM3)` |  Heatfit insert M3 x 5.8mm |
 |   4 | `screw(M3_cap_screw, 10)` |  Screw M3 cap x 10mm |
 |   4 | `washer(M3_washer)` |  Washer  M3 x 7mm x 0.5mm |
 |   4 | `star_washer(M3_washer)` |  Washer star M3 x 0.5mm |
@@ -6137,7 +6236,7 @@ be fully customised by passing a list of properties.
 ### Vitamins
 | Qty | Module call | BOM entry |
 | ---:|:--- |:---|
-|   2 | `insert(F1BM3)` |  Heatfit insert M3 |
+|   2 | `insert(F1BM3)` |  Heatfit insert M3 x 5.8mm |
 |   2 | `screw(M3_pan_screw, 8)` |  Screw M3 pan x  8mm |
 |   2 | `washer(M3_penny_washer)` |  Washer penny  M3 x 12mm x 0.8mm |
 |   2 | `star_washer(M3_washer)` |  Washer star M3 x 0.5mm |
@@ -6714,7 +6813,7 @@ Each vertex, apart from the first and the last, has an associated radius and the
 | `rounded_path_vertices(path)` | Show the unrounded version of a rounded_path for debug |
 | `segmented_path(path, min_segment)` | Add points to a path to enforce a minimum segment length |
 | `skin_faces(points, npoints, facets, loop, offset = 0)` | Create the mesh for the swept volume without end caps |
-| `spiral_paths(path, n, r, twists, start_angle)` | Create a new paths which sprial around the given path. Use for making twisted cables |
+| `spiral_paths(path, n, r, twists, start_angle)` | Create a new paths which spiral around the given path. Use for making twisted cables |
 | `sweep(path, profile, loop = false, twist = 0)` | Generate the point list and face list of the swept volume |
 
 ### Modules
@@ -6859,7 +6958,7 @@ The `pose()` module allows assembly views in the readme to be posed differently
 ### Vitamins
 | Qty | Module call | BOM entry |
 | ---:|:--- |:---|
-|   1 | `insert(F1BM3)` |  Heatfit insert M3 |
+|   1 | `insert(F1BM3)` |  Heatfit insert M3 x 5.8mm |
 |   1 | `widget(3)` |  Rivet like thing for 3mm sheets |
 |   1 | `screw(M3_cap_screw, 8)` |  Screw M3 cap x  8mm |
 |   1 | `sheet(PMMA3, 20, 20, 1)` |  Sheet acrylic 20mm x 20mm x 3mm |
@@ -6912,6 +7011,7 @@ Original version by Doug Moen on the OpenSCAD forum
 <a name="Global"></a>
 ## Global
 Global constants, functions and modules. This file is used directly or indirectly in every scad file.
+See [global_defs.scad](../../global_defs.scad) for a list of global constants.
 
 [utils/core/global.scad](utils/core/global.scad) Implementation.
 
@@ -6924,6 +7024,7 @@ Global constants, functions and modules. This file is used directly or indirectl
 | `cm(x)` | cm to mm conversion |
 | `echoit(x)` | Echo expression and return it, useful for debugging |
 | `foot(x)` | Foot to mm conversion |
+| `grey(n)` | Generate a shade of grey to pass to color(). |
 | `in(list, x)` | Returns true if `x` is an element in the `list` |
 | `inch(x)` | Inch to mm conversion (For fractional inches, 'inch(1 + 7/8)' will work as expected.) |
 | `limit(x, min, max)` | Force x in range min <= x <= max |
@@ -6932,6 +7033,7 @@ Global constants, functions and modules. This file is used directly or indirectl
 | `no_point(str)` | Replace decimal point in string with 'p' |
 | `r2sides(r)` | Replicates the OpenSCAD logic to calculate the number of sides from the radius |
 | `r2sides4n(r)` | Round up the number of sides to a multiple of 4 to ensure points land on all axes |
+| `round_to_layer(z)` | Round up to a layer boundary using `layer_height0` for the first layer and `layer_height` for subsequent layers. |
 | `slice(list, start = 0, end = undef)` | Slice a list or string with Python type semantics |
 | `sqr(x)` | Returns the square of `x` |
 | `yard(x)` | Yard to mm conversion |

scripts/tests.py

@@ -47,7 +47,12 @@ def do_cmd(cmd, output = sys.stdout):
     for arg in cmd:
         print(arg, end = " ")
     print()
-    return subprocess.call(cmd, stdout = output, stderr = output)
+    t = time.time()
+    rv = subprocess.call(cmd, stdout = output, stderr = output)
+    elapsed = time.time() - t
+    with open("cmd_times.txt", 'at') as f:
+        print(cmd[0], cmd[-1], elapsed, file = f)
+    return rv
 
 def compare_images(a, b, c):
     if not os.path.isfile(b):

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

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

tests/leadnuts.scad

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

utils/core/global.scad

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

utils/sweep.scad

@@ -239,7 +239,7 @@ function segmented_path(path, min_segment) = [  //! Add points to a path to enfo
             path[len(path) - 1]
 ];
 
-function spiral_paths(path, n, r, twists, start_angle) = let( //! Create a new paths which sprial around the given path. Use for making twisted cables
+function spiral_paths(path, n, r, twists, start_angle) = let( //! Create a new paths which spiral around the given path. Use for making twisted cables
         segment = twists ? path_length(path) / twists / r2sides(2 * r) : inf,
         transforms = sweep_transforms(segmented_path(path, segment), twist = 360 * twists)
     ) [for(i = [0 : n - 1]) let(initial = [r, 0, 0, 1] * rotate(start_angle + i * 360 / n)) [for(t = transforms) initial * t]];

vitamins/bldc_motor.scad

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

vitamins/insert.scad

@@ -53,7 +53,7 @@ module insert(type) { //! Draw specified insert
     ring2_h = ring1_h + chamfer1;
     gap = (length - ring1_h - ring2_h - chamfer2) / 3;
 
-    vitamin(str("insert(", type[0], "): Heatfit insert M", insert_screw_diameter(type)));
+    vitamin(str("insert(", type[0], "): Heatfit insert M", insert_screw_diameter(type), " x ", length, "mm"));
     $fn = 64;
     thread_d = insert_screw_diameter(type);
     explode(20, offset = [0, 0, -5]) translate_z(eps) vflip() {

vitamins/inserts.scad

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

vitamins/leadnut.scad

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

vitamins/leadnuts.scad

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

vitamins/leds.scad

@@ -25,10 +25,11 @@
 //                          d    t     h     h
 //                                     t          t
 //
-LED3mm  = ["LED3mm",   3,  3.1, 1.0,  4.5, 2.54, 0.4];
-LED5mm  = ["LED5mm",   5,  5.6, 0.9,  8.5, 2.54, 0.4];
-LED10mm = ["LED10mm", 10, 11.0, 2.0, 13.5, 2.54, 0.4];
+LED3mm  = ["LED3mm",   3,  3.15, 1.15, 4.6, 2.54, 0.4];
+LED5mm  = ["LED5mm",   5,  5.9,  1.1,  9.0, 2.54, 0.4];
+LED8mm  = ["LED8mm",   8,  9.2,  1.95,11.0, 2.54, 0.4];
+LED10mm = ["LED10mm", 10, 11.0,  2.0, 13.5, 2.54, 0.4];
 
-LEDs = [LED3mm, LED5mm, LED10mm];
+LEDs = [LED3mm, LED5mm, LED8mm, LED10mm];
 
 use <led.scad>

vitamins/nuts.scad

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

vitamins/pcbs.scad

@@ -908,9 +908,19 @@ KY_040 = ["KY_040", "KY-040 rotart encoder breakout",
     ],
     []];
 
+L9110S = ["L9110S", "L9110S 2-Channel motor driver module", 29.2, 23, 1.6, 0, 3, 0, "#2140BE", false, [[10.7, 2.3], [10.7, -2.3], [-5.3, 2.3], [-5.3, -2.3] ],
+    [
+        [ -1.3,  11.5,      0, "2p54header", 1, 6],
+        [  16, 9.5      ,   0, "smd_led", LED0805, "red"],
+        for(i = [-1, 1]) [ 4, 5.5*i, 180, "gterm508", 2],
+        for(i = [-1, 1]) [ 17.38, 3*i, 90, "smd_soic", SOIC8, "" ]
+    ],
+    []];
+
+
 tiny_pcbs = [XIAO, MP1584EN, TP4056, ESP_01, LIPO_fuel_gauge];
 
-pcbs = [RAMPSEndstop, KY_040, MT3608, ZC_A0591, ArduinoNano, RPI_Pico, ESP32_DOIT_V1, RPI0, EnviroPlus, ArduinoUno3, ArduinoLeonardo, WD2002SJ, RPI3, RPI4, BTT_RELAY_V1_2, BTT_SKR_MINI_E3_V2_0, BTT_SKR_E3_TURBO, BTT_SKR_V1_4_TURBO, DuetE, Duex5];
+pcbs = [RAMPSEndstop, MT3608, KY_040, L9110S, ZC_A0591, ArduinoNano, RPI_Pico, ESP32_DOIT_V1, RPI0, EnviroPlus, ArduinoUno3, ArduinoLeonardo, WD2002SJ, RPI3, RPI4, BTT_RELAY_V1_2, BTT_SKR_MINI_E3_V2_0, BTT_SKR_E3_TURBO, BTT_SKR_V1_4_TURBO, DuetE, Duex5];
 
 pcbs_not_shown = [Melzi, Duex2, PSU12V1A, Keyes5p1, PI_IO, ExtruderPCB];
 

vitamins/screw.scad

@@ -68,7 +68,7 @@ function screw_shorter_than(x) = x >= 20 ? floor(x / 5) * 5 : //! Returns the le
 
 function screw_length(screw, thickness, washers, insert = false, nyloc = false, nut = false, longer = false) = //! Returns the length of the longest or shortest screw that will got through `thickness` and `washers` and possibly an `insert`, `nut` or `nyloc`
     let(washer = washers ? washers * washer_thickness(screw_washer(screw)) : 0,
-        insert = insert ? insert_length(screw_insert(screw)) : 0,
+        insert = insert ? insert_length(is_list(insert) ? insert : screw_insert(screw)) : 0,
         nut = nut || nyloc ? nut_thickness(screw_nut(screw), nyloc)  : 0,
         total = thickness + washer + insert + nut
        )
@@ -76,10 +76,11 @@ function screw_length(screw, thickness, washers, insert = false, nyloc = false,
 
 function screw_smaller_than(d) = d >= 2.5 && d < 3 ? 2.5 : floor(d); // Largest diameter screw less than or equal to specified diameter
 
-function screw_insert(screw, i = 0) = let(d = screw_radius(screw) * 2)
-     i >= len(inserts) ? undef
-                       : insert_screw_diameter(inserts[i]) == d ? inserts[i]
-                                                                : screw_insert(screw, i + 1);
+function screw_insert(screw, short = false, i = 0) =  //! Find insert to fit specified screw, defaults to longest but can specify the shortest
+    let(d = screw_radius(screw) * 2, list = short ? short_inserts : inserts)
+        i >= len(list) ? undef
+                       : insert_screw_diameter(list[i]) == d ? list[i]
+                                                             : screw_insert(screw, short, i + 1);
 
 module screw(type, length, hob_point = 0, nylon = false) { //! Draw specified screw, optionally hobbed or nylon
     description = str("Screw ", nylon ? "Nylon " : "", type[1], length < 10 ? " x  " : " x ", length, "mm", hob_point ? str(", hobbed at ", hob_point) : "");
@@ -327,6 +328,19 @@ module screw_polysink(type, h = 100, alt = false, sink = 0) { //! A countersink
         }
 }
 
+module screw_keyhole(type, h = 0) { //! Make keyhole slot to accept and retain screw head
+    r = screw_head_radius(type);
+    extrude_if(h) {
+        translate([0, - 2 * r])
+            drill(r + 0.5, 0);
+
+        hull()
+            for(y = [0, -2 * r])
+                translate([0, y])
+                    drill(screw_clearance_radius(type), 0);
+    }
+}
+
 module screw_and_washer(type, length, star = false, penny = false) { //! Screw with a washer which can be standard or penny and an optional star washer on top
     washer = screw_washer(type);
     head_type = screw_head_type(type);

vitamins/shaft_coupling.scad

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

vitamins/shaft_couplings.scad

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