Merge branch 'allTexas-stage4upstream'

Fixed rod_end colours.
Added new pulleys to the test list and reodered.
Printed pulleys nopw shown in two rows.
Updated images and readme.

CHANGELOG.md

@@ -3,6 +3,50 @@
 This changelog is generated by `changelog.py` using manually added semantic version tags to classify commits as breaking changes, additions or fixes.
 
 
+### [v21.25.0](https://github.com/nophead/NopSCADlib/releases/tag/v21.25.0 "show release") Additions [...](https://github.com/nophead/NopSCADlib/compare/v21.24.1...v21.25.0 "diff with v21.24.1")
+*   2024-08-15 [`bc7f294`](https://github.com/nophead/NopSCADlib/commit/bc7f294f995d8aa8ba500a1ef666c8fb50f94fd3 "show commit") [C.P.](# "Chris Palmer") Added `smd_250V_fuse()` and `rd_box_cap()`.
+Fixed missing value parameters from a lot of the SMD component instantiation examples.
+
+#### [v21.24.1](https://github.com/nophead/NopSCADlib/releases/tag/v21.24.1 "show release") Fixes [...](https://github.com/nophead/NopSCADlib/compare/v21.24.0...v21.24.1 "diff with v21.24.0")
+*   2024-06-30 [`07866f7`](https://github.com/nophead/NopSCADlib/commit/07866f72845c9e08c90e371c92315bab54f003c6 "show commit") [H.](# "Hermann-SW") Add `PT_camera` to examples and gallery
+
+### [v21.24.0](https://github.com/nophead/NopSCADlib/releases/tag/v21.24.0 "show release") Additions [...](https://github.com/nophead/NopSCADlib/compare/v21.23.2...v21.24.0 "diff with v21.23.2")
+*   2024-06-30 [`53d1ea9`](https://github.com/nophead/NopSCADlib/commit/53d1ea93cd339d3fb6e085be9314d7ec0b547796 "show commit") [C.P.](# "Chris Palmer") Can now specify a rotation angle for a `geared_stepper's` shaft.
+
+#### [v21.23.2](https://github.com/nophead/NopSCADlib/releases/tag/v21.23.2 "show release") Fixes [...](https://github.com/nophead/NopSCADlib/compare/v21.23.1...v21.23.2 "diff with v21.23.1")
+*   2024-06-12 [`b00709d`](https://github.com/nophead/NopSCADlib/commit/b00709da820e1241422b6e156b0c61157c18d63d "show commit") [C.P.](# "Chris Palmer") Image edge pixel changes due to new PC.
+
+*   2024-06-12 [`c76be23`](https://github.com/nophead/NopSCADlib/commit/c76be2386715b80bbbc9a71c99214df7f3c71bc7 "show commit") [C.P.](# "Chris Palmer") Fixed thread bug on threaded inserts revealed by latest OpenSCAD snapshot.
+
+*   2024-06-12 [`f6f348b`](https://github.com/nophead/NopSCADlib/commit/f6f348b76e7986927a571e1c07c3f866bcbeeafe "show commit") [C.P.](# "Chris Palmer") Fixed rocker slot height.
+
+#### [v21.23.1](https://github.com/nophead/NopSCADlib/releases/tag/v21.23.1 "show release") Fixes [...](https://github.com/nophead/NopSCADlib/compare/v21.23.0...v21.23.1 "diff with v21.23.0")
+*   2024-05-08 [`870b396`](https://github.com/nophead/NopSCADlib/commit/870b396574935603305462f1fea88564c909aad8 "show commit") [C.](# "Chris") Revoved strailing comma in `let()` in `splines.scad`.
+
+### [v21.23.0](https://github.com/nophead/NopSCADlib/releases/tag/v21.23.0 "show release") Additions [...](https://github.com/nophead/NopSCADlib/compare/v21.22.0...v21.23.0 "diff with v21.22.0")
+*   2024-04-21 [`c1fdb2e`](https://github.com/nophead/NopSCADlib/commit/c1fdb2e701672b2404e34f224e77f21fb2ff34da "show commit") [C.P.](# "Chris Palmer") Dpdated images and readme.
+
+*   2024-04-20 [`cbe2c08`](https://github.com/nophead/NopSCADlib/commit/cbe2c085b72d0e5d9f0c6485d5fa7df0e172a4cc "show commit") [V.](# "V.Shcriabets") Add  RCWL-0516 PCB
+
+### [v21.22.0](https://github.com/nophead/NopSCADlib/releases/tag/v21.22.0 "show release") Additions [...](https://github.com/nophead/NopSCADlib/compare/v21.21.0...v21.22.0 "diff with v21.21.0")
+*   2024-04-21 [`dbf930f`](https://github.com/nophead/NopSCADlib/commit/dbf930fd366c28aa9e581d9fe01e3654b882923a "show commit") [C.P.](# "Chris Palmer") Added cubic splines and Catmull Rom splines.
+
+### [v21.21.0](https://github.com/nophead/NopSCADlib/releases/tag/v21.21.0 "show release") Additions [...](https://github.com/nophead/NopSCADlib/compare/v21.20.0...v21.21.0 "diff with v21.20.0")
+*   2024-04-21 [`97cea65`](https://github.com/nophead/NopSCADlib/commit/97cea65f41714acd31a3a3b968d8c133ce1a91d2 "show commit") [C.P.](# "Chris Palmer") Cable clips can now use inserts or nut traps.
+
+### [v21.20.0](https://github.com/nophead/NopSCADlib/releases/tag/v21.20.0 "show release") Additions [...](https://github.com/nophead/NopSCADlib/compare/v21.19.2...v21.20.0 "diff with v21.19.2")
+*   2024-04-21 [`c7e912c`](https://github.com/nophead/NopSCADlib/commit/c7e912cd77e189ef729f94956245f1c6a9f72012 "show commit") [C.P.](# "Chris Palmer") A optional path can now be specified for tubing.
+
+#### [v21.19.2](https://github.com/nophead/NopSCADlib/releases/tag/v21.19.2 "show release") Fixes [...](https://github.com/nophead/NopSCADlib/compare/v21.19.1...v21.19.2 "diff with v21.19.1")
+*   2024-04-21 [`f563645`](https://github.com/nophead/NopSCADlib/commit/f563645e45817a4f89ef3cb1be9d932310c485c6 "show commit") [C.P.](# "Chris Palmer") Corrected M2 `nut_trap_depth,` was too big.
+
+#### [v21.19.1](https://github.com/nophead/NopSCADlib/releases/tag/v21.19.1 "show release") Fixes [...](https://github.com/nophead/NopSCADlib/compare/v21.19.0...v21.19.1 "diff with v21.19.0")
+*   2024-04-21 [`2840cc2`](https://github.com/nophead/NopSCADlib/commit/2840cc2390a8e776add8ca3ef715abfc8d15dadc "show commit") [C.P.](# "Chris Palmer") Washer now uses `sweep.scad` instead of including it, leaking its interface.
+
+### [v21.19.0](https://github.com/nophead/NopSCADlib/releases/tag/v21.19.0 "show release") Additions [...](https://github.com/nophead/NopSCADlib/compare/v21.18.0...v21.19.0 "diff with v21.18.0")
+*   2024-04-21 [`a5b2018`](https://github.com/nophead/NopSCADlib/commit/a5b20180083ba8d3014bc298cf0e28c20e6be437 "show commit") [C.P.](# "Chris Palmer") Added `offset_paths()` to `sweep.scad`.
+`show_path()` now takes an optional radius.
+
 ### [v21.18.0](https://github.com/nophead/NopSCADlib/releases/tag/v21.18.0 "show release") Additions [...](https://github.com/nophead/NopSCADlib/compare/v21.17.0...v21.18.0 "diff with v21.17.0")
 *   2024-03-14 [`19dadcb`](https://github.com/nophead/NopSCADlib/commit/19dadcb58db0dd7408726c69d46cf2b7b26c764b "show commit") [C.P.](# "Chris Palmer") Updated images and readme.
 

examples/PT_camera/PT_camera.scad

@@ -0,0 +1,54 @@
+include <../../vitamins/geared_steppers.scad>
+include <../../core.scad>
+include <../../vitamins/cameras.scad>
+use <../../vitamins/pcb.scad>
+
+module ptc(ang2) {
+  rotate([180,0,0])
+    union(){
+      geared_stepper(28BYJ_48,ang2);
+      rotate([90,0,180-ang2])
+        translate([9.8,-16.5,1.7])
+          rotate([0,0,90])
+            camera(cameras[0]);
+    }
+}
+
+module pt(ang,ang2) {
+  rotate([180,0,0]) geared_stepper(28BYJ_48,ang);
+  rotate([0,0,ang]) rotate([270,0,0]) translate([0,-29.0,-1.5]) ptc(ang2);
+}
+
+deg=90;
+c=90;
+
+if($t<0.125){
+  a=180+$t/0.125*deg;
+  pt(a,c);
+}else if ($t<0.25){
+  a=180+deg-($t-0.125)/0.125*deg;
+  pt(a,c);
+}else if ($t<0.375){
+  b=c+($t-0.25)/0.125*deg;
+  pt(180,b);
+}else if ($t<0.5){
+  b=c+deg-($t-0.375)/0.125*deg;
+  pt(180,b);
+}   
+else if($t<0.625){
+  a=180+($t-0.5)/0.125*deg;
+  b=c+deg-90+($t-0.5)/0.125*deg;
+  pt(a,b);
+}else if ($t<0.75){
+  a=180+deg-($t-0.625)/0.125*deg;
+  b=c+deg-($t-0.625)/0.125*deg;
+  pt(a,b);
+}else if ($t<0.875){
+  a=180-($t-0.75)/0.125*deg;
+  b=c-($t-0.75)/0.125*deg;
+  pt(a,b);
+}else{
+  a=90+($t-0.875)/0.125*deg;
+  b=c+deg-180+($t-0.875)/0.125*deg;
+  pt(a,b);
+}   

gallery/readme.md

@@ -106,6 +106,10 @@ A base and shroud to make PSU safe to sit on a desk
 
 ![](PSU_tube.png)
 
+## PT_camera
+Two 28BYJ_48 geared stepper motors and a Raspberry v1 camera, combined with [4 drops of superglue](https://forums.raspberrypi.com/viewtopic.php?p=1810000#p1810000). Script [PT_camera.scad](../examples/PT_camera/PT_camera.scad) nicely demonstrates new 2nd optional arg (motor shaft angle) of ```geared_stepper()```.  
+![](PT_camera.anim.gif)
+
 ## PotBox
 Potentiometer box with course and fine controls and three 4mm binding posts
 

lib.scad

@@ -58,6 +58,7 @@ include <vitamins/pulleys.scad>
 include <vitamins/ring_terminals.scad>
 include <vitamins/rails.scad>
 include <vitamins/rod.scad>
+include <vitamins/rod_ends.scad>
 include <vitamins/servo_motors.scad>
 include <vitamins/shaft_couplings.scad>
 include <vitamins/sheets.scad>
@@ -97,6 +98,7 @@ use <utils/hanging_hole.scad>
 use <utils/fillet.scad>
 use <utils/rounded_polygon.scad>
 use <utils/rounded_triangle.scad>
+use <utils/splines.scad>
 use <utils/layout.scad>
 use <utils/round.scad>
 use <utils/offset.scad>

libtest.scad

@@ -98,6 +98,7 @@ use <tests/rails.scad>
 use <tests/ring_terminals.scad>
 use <tests/rockers.scad>
 use <tests/rod.scad>
+use <tests/rod_ends.scad>
 use <tests/SBR_rails.scad>
 use <tests/screws.scad>
 use <tests/sealing_strip.scad>
@@ -178,7 +179,7 @@ translate([x5, screw_knobs_y])
     screw_knobs();
 
 knobs_y = screw_knobs_y + 40;
-translate([640, knobs_y])
+translate([660, knobs_y])
     printed_pulley_test();
 
 translate([x5, knobs_y])
@@ -223,7 +224,7 @@ translate([950, box_y])
 
 inserts_y = 0;
 nuts_y = inserts_y + 20;
-washers_y = nuts_y + 140;
+washers_y = nuts_y + 160;
 screws_y = washers_y + 120;
 threaded_inserts_y = screws_y + 180;
 circlips_y = threaded_inserts_y + 30;
@@ -293,6 +294,9 @@ translate([x0, pulleys_y])
 translate([x0, leadnuts_y])
     leadnuts();
 
+translate([x0 + 170, leadnuts_y])
+    rod_ends();
+
 translate([x0 + 120, leadnuts_y])
     leadnuthousings();
 
@@ -306,7 +310,7 @@ translate([x0, linear_bearings_y]) {
 translate([x0, steppers_y])
     stepper_motors();
 
-translate([x0 + 400, steppers_y])
+translate([x0 + 450, steppers_y])
     gear_motors();
 
 translate([x0, sheets_y])
@@ -410,7 +414,7 @@ blowers_y = ssrs_y + 60;
 hot_ends_y = blowers_y + 100;
 batteries_y = hot_ends_y + 55;
 panel_meters_y = batteries_y + 70;
-extrusions_y = panel_meters_y + 100;
+extrusions_y = panel_meters_y + 130;
 
 translate([x3, veroboard_y])
     veroboard_test();

printed/cable_clip.scad

@@ -18,7 +18,7 @@
 //
 
 //
-//! Cable clips to order. Can be for one or two cables of different sizes. Can use an insert and a screw from below or a screw and nut either way up.
+//! Cable clips to order. Can be for one or two cables of different sizes. Can use an insert and a screw from below or a screw and nut, nyloc or plain, either way up.
 //
 include <../core.scad>
 use <../vitamins/wire.scad>
@@ -30,27 +30,29 @@ wall = 2;
 function cable_clip_insert(screw, insert = true) = //! Insert type for clip, given screw.
     is_list(insert) ? insert : insert ? screw_insert(screw, true) : false;
 
-function cable_clip_width(screw, insert = false) = //! Width given the `screw` and possibly insert.
+function cable_clip_width(screw, insert = false, nut = false) = //! Width given the `screw` and possibly insert or nut.
     let(insert = cable_clip_insert(screw, insert))
         insert ? 2 * (insert_hole_radius(insert) + wall) :
-            max(wall + 2 * screw_clearance_radius(screw) + wall, washer_diameter(screw_washer(screw)));
+            nut ? 2 * (nut_radius(screw_nut(screw)) + wall) :
+                max(wall + 2 * screw_clearance_radius(screw) + wall, washer_diameter(screw_washer(screw)));
 
-function cable_clip_height(cable, screw = false, insert = false) = //! Height given the `cable`.
+function cable_clip_height(cable, screw = false, insert = false, nut = false) = //! Height given the `cable`.
     let(insert = cable_clip_insert(screw, insert))
-        max(cable_height(cable) + wall, insert ? insert_hole_length(insert) + 1 : 0);
+        max(cable_height(cable) + wall, insert ? insert_hole_length(insert) + 1 : 0, nut ? nut_trap_depth(screw_nut(screw)) + wall : 0);
 
-function cable_clip_extent(screw, cable, insert = false) = cable_clip_width(screw, insert) / 2 + cable_width(cable) + wall; //! How far it extends from the screw.
-function cable_clip_offset(screw, cable, insert = false) = cable_clip_width(screw, insert) / 2 + cable_width(cable) / 2; //! The offset of the cable from the screw.
+function cable_clip_extent(screw, cable, insert = false, nut = false) = cable_clip_width(screw, insert, nut) / 2 + cable_width(cable) + wall; //! How far it extends from the screw.
+function cable_clip_offset(screw, cable, insert = false, nut = false) = cable_clip_width(screw, insert, nut) / 2 + cable_width(cable) / 2; //! The offset of the cable from the screw.
 
-module single_cable_clip(screw, cable, h = 0, insert = false) {
+module single_cable_clip(screw, cable, h = 0, insert = false, nut = false) {
     insert = cable_clip_insert(screw, insert);
-    height = cable_clip_width(screw, insert);
-    depth = h ? h : cable_clip_height(cable, screw, insert);
+    height = cable_clip_width(screw, insert, nut);
+    depth = h ? h : cable_clip_height(cable, screw, insert, nut);
     w = cable_width(cable);
     width = wall + w + height;
     hole_x = wall + w + height / 2;
     rad = min(wall + cable_wire_size(cable) / 2, depth / 2);
     r = extrusion_width - eps;
+    the_nut = screw_nut(screw);
     translate([-hole_x, 0])
         difference() {
             linear_extrude(height)
@@ -85,62 +87,68 @@ module single_cable_clip(screw, cable, h = 0, insert = false) {
                     if(insert)
                         insert_hole(insert, 10, horizontal = true);
                     else
-                        teardrop_plus(h = 2 * depth + 1, r = screw_clearance_radius(screw), center = true);
+                        if(nut) {
+                            translate_z(depth - wall - nut_trap_depth(the_nut))
+                                nut_trap(screw, the_nut, horizontal = true);
+                            nut_trap(screw, the_nut, horizontal = true);
+                        }
+                        else
+                            teardrop_plus(h = 2 * depth + 1, r = screw_clearance_radius(screw), center = true);
         }
 }
 
 
-module double_cable_clip(screw, cable1, cable2, insert = false) {
-    h = max(cable_clip_height(cable1, screw, insert), cable_clip_height(cable2, screw, insert));
+module double_cable_clip(screw, cable1, cable2, insert = false, nut = false) {
+    h = max(cable_clip_height(cable1, screw, insert, nut), cable_clip_height(cable2, screw, insert, nut));
     union() {
-        single_cable_clip(screw, cable1, h, insert);
+        single_cable_clip(screw, cable1, h, insert, nut);
 
-        mirror([1,0,0]) single_cable_clip(screw, cable2, h, insert);
+        mirror([1,0,0]) single_cable_clip(screw, cable2, h, insert, nut);
     }
 }
 
-module cable_clip(screw, cable1, cable2 = 0, insert = false) { //! Create the STL for a single cable or two cable clip
-    function clip_str(screw) = str("cable_clip_", screw_radius(screw) * 20, insert ? "I" : "");
+module cable_clip(screw, cable1, cable2 = 0, insert = false, nut = false) { //! Create the STL for a single cable or two cable clip
+    function clip_str(screw) = str("cable_clip_", screw_radius(screw) * 20, insert ? "I" : nut ? "N" : "");
     function cable_str(cable) = str("_", cable_wires(cable), "_", round(cable_wire_size(cable) * 10));
-
-    if(cable2) {
-        stl(str(clip_str(screw), cable_str(cable1), cable_str(cable2)));
-
-        double_cable_clip(screw, cable1, cable2, insert);
-    }
-    else {
-        stl(str(clip_str(screw), cable_str(cable1)));
-
-        single_cable_clip(screw, cable1, h = 0, insert = insert);
-    }
+    assert(!(insert && nut), "insert and nut mutually exclusive");
+    if(cable2)
+        stl(str(clip_str(screw), cable_str(cable1), cable_str(cable2)))
+            double_cable_clip(screw, cable1, cable2, insert, nut);
+    else
+        stl(str(clip_str(screw), cable_str(cable1)))
+            single_cable_clip(screw, cable1, h = 0, insert = insert, nut = nut);
 }
 
-
-module cable_clip_assembly(screw, thickness, cable1, cable2 = 0, flip = false, insert = false) { //! Cable clip with the fasteners
-    flip = flip || insert;          // Screw must be below if using an insert
+module cable_clip_assembly(screw, thickness, cable1, cable2 = 0, flip = false, insert = false, nut = false, nyloc = true) { //! Cable clip with the fasteners
+    flip = flip || insert || nut;          // Screw must be below if using an insert or nut
     insert = cable_clip_insert(screw, insert);
-    height = max(cable_clip_height(cable1, screw, insert), cable2 ? cable_clip_height(cable2, screw, insert) : 0);
+    height = max(cable_clip_height(cable1, screw, insert, nut), cable2 ? cable_clip_height(cable2, screw, insert, nut) : 0);
 
     stl_colour(pp1_colour) render()
-        translate([0, cable_clip_width(screw, insert) / 2])
+        translate([0, cable_clip_width(screw, insert, nut) / 2])
             rotate([90, 0, 0])
-                cable_clip(screw, cable1, cable2, insert);
+                cable_clip(screw, cable1, cable2, insert, nut);
 
-    nut = screw_nut(screw);
-    screw_len = screw_length(screw, height + thickness, 2, nyloc = !insert, insert = insert);
+    the_nut = screw_nut(screw);
+    screw_len = nut ? screw_length(screw, thickness + wall,   nyloc ? 1 : 2, nyloc = nyloc, nut = !nyloc)
+                    : screw_length(screw, thickness + height, 2, nut = !nyloc && !insert, nyloc = !insert && nyloc, insert = insert);
     translate_z(height)
         if(flip)
             if(insert)
                 insert(insert);
             else
-                nut_and_washer(nut, true);
+                if(nut)
+                    translate_z(-height + wall)
+                        nut(the_nut, nyloc);
+                else
+                    nut_and_washer(the_nut, nyloc);
         else
             screw_and_washer(screw, screw_len);
 
     translate_z(-thickness)
         vflip()
             if(flip)
-                screw_and_washer(screw, screw_len, insert);
+                screw_and_washer(screw, screw_len, insert || !nyloc);
             else
-                nut_and_washer(nut, true);
+                nut_and_washer(the_nut, nyloc);
 }

readme.md

@@ -26,30 +26,31 @@ A list of changes classified as breaking, additions or fixes is maintained in [C
 <tr><td> <a href = "#axials">Axials</a> </td><td> <a href = "#jack">Jack</a> </td><td> <a href = "#ring_terminals">Ring_terminals</a> </td><td> <a href = "#cable_clip">Cable_clip</a> </td><td> <a href = "#catenary">Catenary</a> </td><td> <a href = "#global">Global</a> </td></tr>
 <tr><td> <a href = "#bldc_motors">BLDC_motors</a> </td><td> <a href = "#ldrs">LDRs</a> </td><td> <a href = "#rockers">Rockers</a> </td><td> <a href = "#cable_grommets">Cable_grommets</a> </td><td> <a href = "#core_xy">Core_xy</a> </td><td> <a href = "#polyholes">Polyholes</a> </td></tr>
 <tr><td> <a href = "#ball_bearings">Ball_bearings</a> </td><td> <a href = "#led_meters">LED_meters</a> </td><td> <a href = "#rod">Rod</a> </td><td> <a href = "#camera_housing">Camera_housing</a> </td><td> <a href = "#dogbones">Dogbones</a> </td><td> <a href = "#rounded_rectangle">Rounded_rectangle</a> </td></tr>
-<tr><td> <a href = "#batteries">Batteries</a> </td><td> <a href = "#leds">LEDs</a> </td><td> <a href = "#sbr_rails">SBR_rails</a> </td><td> <a href = "#carriers">Carriers</a> </td><td> <a href = "#fillet">Fillet</a> </td><td> <a href = "#sphere">Sphere</a> </td></tr>
-<tr><td> <a href = "#bearing_blocks">Bearing_blocks</a> </td><td> <a href = "#leadnuts">Leadnuts</a> </td><td> <a href = "#sk_brackets">SK_brackets</a> </td><td> <a href = "#corner_block">Corner_block</a> </td><td> <a href = "#gears">Gears</a> </td><td> <a href = "#teardrops">Teardrops</a> </td></tr>
-<tr><td> <a href = "#belts">Belts</a> </td><td> <a href = "#light_strips">Light_strips</a> </td><td> <a href = "#smds">SMDs</a> </td><td> <a href = "#door_hinge">Door_hinge</a> </td><td> <a href = "#hanging_hole">Hanging_hole</a> </td><td></td></tr>
-<tr><td> <a href = "#blowers">Blowers</a> </td><td> <a href = "#linear_bearings">Linear_bearings</a> </td><td> <a href = "#ssrs">SSRs</a> </td><td> <a href = "#door_latch">Door_latch</a> </td><td> <a href = "#horiholes">Horiholes</a> </td><td></td></tr>
-<tr><td> <a href = "#box_sections">Box_sections</a> </td><td> <a href = "#magnets">Magnets</a> </td><td> <a href = "#screws">Screws</a> </td><td> <a href = "#drag_chain">Drag_chain</a> </td><td> <a href = "#layout">Layout</a> </td><td></td></tr>
-<tr><td> <a href = "#bulldogs">Bulldogs</a> </td><td> <a href = "#mains_sockets">Mains_sockets</a> </td><td> <a href = "#sealing_strip">Sealing_strip</a> </td><td> <a href = "#fan_guard">Fan_guard</a> </td><td> <a href = "#maths">Maths</a> </td><td></td></tr>
-<tr><td> <a href = "#buttons">Buttons</a> </td><td> <a href = "#microswitches">Microswitches</a> </td><td> <a href = "#servo_motors">Servo_motors</a> </td><td> <a href = "#fixing_block">Fixing_block</a> </td><td> <a href = "#offset">Offset</a> </td><td></td></tr>
-<tr><td> <a href = "#cable_strips">Cable_strips</a> </td><td> <a href = "#microview">Microview</a> </td><td> <a href = "#shaft_couplings">Shaft_couplings</a> </td><td> <a href = "#flat_hinge">Flat_hinge</a> </td><td> <a href = "#pcb_utils">PCB_utils</a> </td><td></td></tr>
-<tr><td> <a href = "#cameras">Cameras</a> </td><td> <a href = "#modules">Modules</a> </td><td> <a href = "#sheets">Sheets</a> </td><td> <a href = "#foot">Foot</a> </td><td> <a href = "#quadrant">Quadrant</a> </td><td></td></tr>
-<tr><td> <a href = "#circlips">Circlips</a> </td><td> <a href = "#nuts">Nuts</a> </td><td> <a href = "#spades">Spades</a> </td><td> <a href = "#handle">Handle</a> </td><td> <a href = "#round">Round</a> </td><td></td></tr>
-<tr><td> <a href = "#components">Components</a> </td><td> <a href = "#o_ring">O_ring</a> </td><td> <a href = "#spools">Spools</a> </td><td> <a href = "#knob">Knob</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 = "#opengrab">Opengrab</a> </td><td> <a href = "#springs">Springs</a> </td><td> <a href = "#led_bezel">LED_bezel</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 = "#pcb">PCB</a> </td><td> <a href = "#stepper_motors">Stepper_motors</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 = "#pcbs">PCBs</a> </td><td> <a href = "#swiss_clips">Swiss_clips</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 = "#psus">PSUs</a> </td><td> <a href = "#terminals">Terminals</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 = "#panel_meters">Panel_meters</a> </td><td> <a href = "#toggles">Toggles</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 = "#photo_interrupters">Photo_interrupters</a> </td><td> <a href = "#transformers">Transformers</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 = "#fastons">Fastons</a> </td><td> <a href = "#pillars">Pillars</a> </td><td> <a href = "#ttracks">Ttracks</a> </td><td> <a href = "#printed_pulleys">Printed_pulleys</a> </td><td></td><td></td></tr>
-<tr><td> <a href = "#fuseholder">Fuseholder</a> </td><td> <a href = "#pillow_blocks">Pillow_blocks</a> </td><td> <a href = "#tubings">Tubings</a> </td><td> <a href = "#ribbon_clamp">Ribbon_clamp</a> </td><td></td><td></td></tr>
-<tr><td> <a href = "#gear_motors">Gear_motors</a> </td><td> <a href = "#pin_headers">Pin_headers</a> </td><td> <a href = "#variacs">Variacs</a> </td><td> <a href = "#ssr_shroud">SSR_shroud</a> </td><td></td><td></td></tr>
-<tr><td> <a href = "#geared_steppers">Geared_steppers</a> </td><td> <a href = "#potentiometers">Potentiometers</a> </td><td> <a href = "#veroboard">Veroboard</a> </td><td> <a href = "#screw_knob">Screw_knob</a> </td><td></td><td></td></tr>
-<tr><td> <a href = "#green_terminals">Green_terminals</a> </td><td> <a href = "#pulleys">Pulleys</a> </td><td> <a href = "#washers">Washers</a> </td><td> <a href = "#socket_box">Socket_box</a> </td><td></td><td></td></tr>
-<tr><td> <a href = "#hot_ends">Hot_ends</a> </td><td></td><td> <a href = "#wire">Wire</a> </td><td> <a href = "#strap_handle">Strap_handle</a> </td><td></td><td></td></tr>
-<tr><td> <a href = "#hygrometer">Hygrometer</a> </td><td></td><td> <a href = "#zipties">Zipties</a> </td><td></td><td></td><td></td></tr>
+<tr><td> <a href = "#batteries">Batteries</a> </td><td> <a href = "#leds">LEDs</a> </td><td> <a href = "#rod_ends">Rod_ends</a> </td><td> <a href = "#carriers">Carriers</a> </td><td> <a href = "#fillet">Fillet</a> </td><td> <a href = "#sphere">Sphere</a> </td></tr>
+<tr><td> <a href = "#bearing_blocks">Bearing_blocks</a> </td><td> <a href = "#leadnuts">Leadnuts</a> </td><td> <a href = "#sbr_rails">SBR_rails</a> </td><td> <a href = "#corner_block">Corner_block</a> </td><td> <a href = "#gears">Gears</a> </td><td> <a href = "#teardrops">Teardrops</a> </td></tr>
+<tr><td> <a href = "#belts">Belts</a> </td><td> <a href = "#light_strips">Light_strips</a> </td><td> <a href = "#sk_brackets">SK_brackets</a> </td><td> <a href = "#door_hinge">Door_hinge</a> </td><td> <a href = "#hanging_hole">Hanging_hole</a> </td><td></td></tr>
+<tr><td> <a href = "#blowers">Blowers</a> </td><td> <a href = "#linear_bearings">Linear_bearings</a> </td><td> <a href = "#smds">SMDs</a> </td><td> <a href = "#door_latch">Door_latch</a> </td><td> <a href = "#horiholes">Horiholes</a> </td><td></td></tr>
+<tr><td> <a href = "#box_sections">Box_sections</a> </td><td> <a href = "#magnets">Magnets</a> </td><td> <a href = "#ssrs">SSRs</a> </td><td> <a href = "#drag_chain">Drag_chain</a> </td><td> <a href = "#layout">Layout</a> </td><td></td></tr>
+<tr><td> <a href = "#bulldogs">Bulldogs</a> </td><td> <a href = "#mains_sockets">Mains_sockets</a> </td><td> <a href = "#screws">Screws</a> </td><td> <a href = "#fan_guard">Fan_guard</a> </td><td> <a href = "#maths">Maths</a> </td><td></td></tr>
+<tr><td> <a href = "#buttons">Buttons</a> </td><td> <a href = "#microswitches">Microswitches</a> </td><td> <a href = "#sealing_strip">Sealing_strip</a> </td><td> <a href = "#fixing_block">Fixing_block</a> </td><td> <a href = "#offset">Offset</a> </td><td></td></tr>
+<tr><td> <a href = "#cable_strips">Cable_strips</a> </td><td> <a href = "#microview">Microview</a> </td><td> <a href = "#servo_motors">Servo_motors</a> </td><td> <a href = "#flat_hinge">Flat_hinge</a> </td><td> <a href = "#pcb_utils">PCB_utils</a> </td><td></td></tr>
+<tr><td> <a href = "#cameras">Cameras</a> </td><td> <a href = "#modules">Modules</a> </td><td> <a href = "#shaft_couplings">Shaft_couplings</a> </td><td> <a href = "#foot">Foot</a> </td><td> <a href = "#quadrant">Quadrant</a> </td><td></td></tr>
+<tr><td> <a href = "#circlips">Circlips</a> </td><td> <a href = "#nuts">Nuts</a> </td><td> <a href = "#sheets">Sheets</a> </td><td> <a href = "#handle">Handle</a> </td><td> <a href = "#round">Round</a> </td><td></td></tr>
+<tr><td> <a href = "#components">Components</a> </td><td> <a href = "#o_ring">O_ring</a> </td><td> <a href = "#spades">Spades</a> </td><td> <a href = "#knob">Knob</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 = "#opengrab">Opengrab</a> </td><td> <a href = "#spools">Spools</a> </td><td> <a href = "#led_bezel">LED_bezel</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 = "#pcb">PCB</a> </td><td> <a href = "#springs">Springs</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 = "#pcbs">PCBs</a> </td><td> <a href = "#stepper_motors">Stepper_motors</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 = "#psus">PSUs</a> </td><td> <a href = "#swiss_clips">Swiss_clips</a> </td><td> <a href = "#pocket_handle">Pocket_handle</a> </td><td> <a href = "#splines">Splines</a> </td><td></td></tr>
+<tr><td> <a href = "#extrusions">Extrusions</a> </td><td> <a href = "#panel_meters">Panel_meters</a> </td><td> <a href = "#terminals">Terminals</a> </td><td> <a href = "#press_fit">Press_fit</a> </td><td> <a href = "#sweep">Sweep</a> </td><td></td></tr>
+<tr><td> <a href = "#fans">Fans</a> </td><td> <a href = "#photo_interrupters">Photo_interrupters</a> </td><td> <a href = "#toggles">Toggles</a> </td><td> <a href = "#printed_box">Printed_box</a> </td><td> <a href = "#thread">Thread</a> </td><td></td></tr>
+<tr><td> <a href = "#fastons">Fastons</a> </td><td> <a href = "#pillars">Pillars</a> </td><td> <a href = "#transformers">Transformers</a> </td><td> <a href = "#printed_pulleys">Printed_pulleys</a> </td><td> <a href = "#tube">Tube</a> </td><td></td></tr>
+<tr><td> <a href = "#fuseholder">Fuseholder</a> </td><td> <a href = "#pillow_blocks">Pillow_blocks</a> </td><td> <a href = "#ttracks">Ttracks</a> </td><td> <a href = "#ribbon_clamp">Ribbon_clamp</a> </td><td></td><td></td></tr>
+<tr><td> <a href = "#gear_motors">Gear_motors</a> </td><td> <a href = "#pin_headers">Pin_headers</a> </td><td> <a href = "#tubings">Tubings</a> </td><td> <a href = "#ssr_shroud">SSR_shroud</a> </td><td></td><td></td></tr>
+<tr><td> <a href = "#geared_steppers">Geared_steppers</a> </td><td> <a href = "#potentiometers">Potentiometers</a> </td><td> <a href = "#variacs">Variacs</a> </td><td> <a href = "#screw_knob">Screw_knob</a> </td><td></td><td></td></tr>
+<tr><td> <a href = "#green_terminals">Green_terminals</a> </td><td> <a href = "#pulleys">Pulleys</a> </td><td> <a href = "#veroboard">Veroboard</a> </td><td> <a href = "#socket_box">Socket_box</a> </td><td></td><td></td></tr>
+<tr><td> <a href = "#hot_ends">Hot_ends</a> </td><td></td><td> <a href = "#washers">Washers</a> </td><td> <a href = "#strap_handle">Strap_handle</a> </td><td></td><td></td></tr>
+<tr><td> <a href = "#hygrometer">Hygrometer</a> </td><td></td><td> <a href = "#wire">Wire</a> </td><td></td><td></td><td></td></tr>
+<tr><td></td><td></td><td> <a href = "#zipties">Zipties</a> </td><td></td><td></td><td></td></tr>
 </table>
 
 ---
@@ -233,13 +234,16 @@ Also single bearing balls are modelled as just a silver sphere and a BOM entry.
 |   1 | `ball_bearing(BB686)` |  Ball bearing 686ZZ 6mm x 13mm x 5mm |
 |   1 | `ball_bearing(BB696)` |  Ball bearing 696ZZ 6mm x 16mm x 5mm |
 |   1 | `ball_bearing(BBF623)` |  Ball bearing F623-2RS 3mm x 10mm x 4mm |
+|   1 | `ball_bearing(BBF625)` |  Ball bearing F625ZZ 5mm x 16mm x 5mm |
 |   1 | `ball_bearing(BBF693)` |  Ball bearing F693ZZ 3mm x 8mm x 3mm |
 |   1 | `ball_bearing(BBF695)` |  Ball bearing F695ZZ 5mm x 13mm x 4mm |
 |   1 | `ball_bearing(BBMR63)` |  Ball bearing MR63ZZ 3mm x 6mm x 2.5mm |
 |   1 | `ball_bearing(BBMR83)` |  Ball bearing MR83ZZ 3mm x 8mm x 3mm |
+|   1 | `ball_bearing(BBMR85)` |  Ball bearing MR85ZZ 5mm x 8mm x 2.5mm |
 |   1 | `ball_bearing(BBMR93)` |  Ball bearing MR93ZZ 3mm x 9mm x 4mm |
+|   1 | `ball_bearing(BBMR95)` |  Ball bearing MR95ZZ 5mm x 9mm x 3mm |
 |   1 | `ball_bearing(BBSMR95)` |  Ball bearing SMR95ZZ 5mm x 9mm x 2.5mm |
-|   7 | ` bearing_ball(3)` |  Steel ball 3mm |
+|   8 | ` bearing_ball(3)` |  Steel ball 3mm |
 
 
 <a href="#top">Top</a>
@@ -1459,7 +1463,7 @@ Geared tin can steppers
 ### Modules
 | Module | Description |
 |:--- |:--- |
-| `geared_stepper(type)` | Draw the specified geared stepper |
+| `geared_stepper(type, angle = 0)` | Draw the specified geared stepper with optional shaft angle. |
 | `geared_stepper_screw_positions(type)` | Place children at the screw positions |
 
 ![geared_steppers](tests/png/geared_steppers.png)
@@ -2374,6 +2378,8 @@ If a nut is given a child then it gets placed on its top surface.
 | `nut_square_width(type)` | Width of the square nut |
 | `nut_trap_depth(type)` | Depth of nut trap |
 | `nut_washer(type)` | Corresponding washer |
+| `nut_weld_base_r(type)` | Weld nut base radius |
+| `nut_weld_base_t(type)` | Weld nut base thickness |
 
 ### Functions
 | Function | Description |
@@ -2393,7 +2399,9 @@ If a nut is given a child then it gets placed on its top surface.
 | `nut_and_washer(type, nyloc)` | Draw nut with corresponding washer |
 | `nut_square(type, brass = false, nylon = false)` | Draw specified square nut |
 | `nut_trap(screw, nut, depth = 0, horizontal = false, supported = false, h = 200)` | Make a nut trap |
+| `sliding_ball_t_nut(size, w, h, r)` | Draw a sliding ball t nut |
 | `sliding_t_nut(type)` | Draw a sliding T nut, T nut with a spring loaded ball or a hammer nut. |
+| `weld_nut(type)` | draw a weld nut |
 | `wingnut(type)` | Draw a wingnut |
 
 ![nuts](tests/png/nuts.png)
@@ -2436,6 +2444,8 @@ If a nut is given a child then it gets placed on its top surface.
 |   1 | `nut(M8_nut, nyloc = true)` |  Nut M8 x 6.5mm nyloc |
 |   1 | `nut(M8nS_thin_nut)` |  Nut M8nS 13 x 4mm  |
 |   1 | `washer(M6_washer)` |  Washer  M6 x 12.5mm x 1.5mm |
+|   1 | `weld nut(M4_weld_nut)` |  Weld Nut M4 |
+|   1 | `weld nut(M6_weld_nut)` |  Weld Nut M6 |
 |   1 | `wingnut(M4_wingnut)` |  Wingnut M4 |
 
 
@@ -2668,6 +2678,7 @@ PCBs and perfboard with optional components. The shape can be a rectangle with o
 |   1 | `potentiometer(BTT_encoder)` |  BTT_encoder |
 |   1 | `box_header(2p54header, 4, 2)` |  Box header 4 x 2 |
 |   1 | `box_header(2p54header, 4, 2, right_angle = true)` |  Box header 4 x 2 right angle  |
+|   1 | `rd_disc(6p4mm_disc, "100n")` |  Ceramic capacitor, 6p4mm_disc 100n |
 |   1 | `rd_xtal(ACT1100, "40MHz")` |  Crystal ACT1100 40MHz |
 |   1 | `rd_xtal(ACT1700, "80MHz")` |  Crystal ACT1700 80MHz |
 |   1 | `rd_xtal(C_002RX, "60KHz")` |  Crystal C_002RX 60KHz |
@@ -2675,14 +2686,15 @@ PCBs and perfboard with optional components. The shape can be a rectangle with o
 |   1 | `rd_xtal(HC49_4H, "10MHz")` |  Crystal HC49_4H 10MHz |
 |   1 | `d_plug(DCONN9, pcb = true)` |  D-type 9 way PCB mount plug |
 |   1 | `dil_socket(12, 15.24)` |  DIL socket 24 x 0.6" |
-|   1 | `smd_diode(DO214AC)` |  DO214AC package SS34 |
+|   1 | `smd_diode(DO214AC, "SS34")` |  DO214AC package SS34 |
 |   2 | `ax_diode(DO_41, "1N4007")` |  Diode 1N4007 |
 |   2 | `ax_diode(DO_35, "1N4148")` |  Diode 1N4148 |
+|   1 | `rd_electrolytic(ECAP8x12, "220uF35V")` |  Electolytic capacitor ECAP8x12 220uF35V |
 |   1 | `hdmi(hdmi_full)` |  HDMI socket |
 |   1 | `pdip(24, 27C32, w = 15.24)` |  IC 27C32 PDIP24 |
 |   1 | `pdip(8, NE555)` |  IC NE555 PDIP8 |
 |   1 | `idc_transition(2p54header, 5)` |  IDC transition header 5 x 2 |
-|   1 | `smd_inductor(IND2525)` |  IND2525 package 4R7 |
+|   1 | `smd_inductor(IND2525 ,"4R7")` |  IND2525 package 4R7 |
 |   1 | `jst_xh_header(jst_ph_header, 2)` |  JST PH connector 2 way |
 |   1 | `jst_xh_header(jst_xh_header, 2)` |  JST XH connector 2 way |
 |   1 | `jst_xh_header(jst_zh_header, 2)` |  JST ZH connector 2 way |
@@ -2703,40 +2715,42 @@ PCBs and perfboard with optional components. The shape can be a rectangle with o
 |   1 | `pin_socket(2p54header, 6, 1)` |  Pin socket 6 x 1 |
 |   2 | `pin_socket(2p54header, 8, 1)` |  Pin socket 8 x 1 |
 |   1 | `rd_transistor(TO92, "78L05")` |  Regulator TO92 78L05 |
+|   1 | `rd_module(HF33F, "012-HSL-3F")` |  Relay HF33F / 012-HSL-3F |
 |   1 | `ax_res(res1_2, 10, tol = 10)` |  Resistor 10 Ohms 10% 0.5W |
 |   1 | `ax_res(res1_4, 100, tol = 2)` |  Resistor 100 Ohms 2% 0.25W |
 |   1 | `ax_res(res1_8, 1000)` |  Resistor 1000 Ohms 5% 0.125W |
 |   1 | `ax_res(res1_4, 10000)` |  Resistor 10000 Ohms 5% 0.25W |
 |   1 | `ax_res(res1_2, 100000)` |  Resistor 100000 Ohms 5% 0.5W |
 |   1 | `ax_res(res1_8, 1e+6, tol = 1)` |  Resistor 1e+6 Ohms 1% 0.125W |
-|   1 | `smd_led(LED0603, orange)` |  SMD LED 0603 orange |
-|   1 | `smd_led(LED0805, red)` |  SMD LED 0805 red |
-|   1 | `smd_led(LED1206, blue)` |  SMD LED 1306 blue |
-|   1 | `smd_tant(TANT_A)` |  SMD Tantalum capacitor package A ,1uF, 2.5V |
-|   1 | `smd_tant(TANT_B)` |  SMD Tantalum capacitor package B ,10uF, 10V |
-|   1 | `smd_tant(TANT_C)` |  SMD Tantalum capacitor package C ,100uF, 16V |
-|   1 | `smd_capacitor(CAP0402)` |  SMD capacitor 0402 10nF |
-|   1 | `smd_capacitor(CAP0502)` |  SMD capacitor 0502 10nF |
-|   1 | `smd_capacitor(CAP0603)` |  SMD capacitor 0603 10nF |
-|   1 | `smd_capacitor(CAP0805)` |  SMD capacitor 0805 100nF |
-|   1 | `smd_capacitor(CAP1206)` |  SMD capacitor 1206 1uF |
-|   1 | `smd_qfp(QFP50P1200X1200X160_64N)` |  SMD chip: ATSAM4S4BA, package : QFP50P1200X1200X160_64N |
+|   1 | `smd_led(LED0603, "orange")` |  SMD LED 0603 orange |
+|   1 | `smd_led(LED0805, "red")` |  SMD LED 0805 red |
+|   1 | `smd_led(LED1206, "blue")` |  SMD LED 1306 blue |
+|   1 | `smd_tant(TANT_A, value = "105e")` |  SMD Tantalum capacitor package A ,1uF, 2.5V |
+|   1 | `smd_tant(TANT_B, value = "106A")` |  SMD Tantalum capacitor package B ,10uF, 10V |
+|   1 | `smd_tant(TANT_C, value = "107C")` |  SMD Tantalum capacitor package C ,100uF, 16V |
+|   1 | `smd_capacitor(CAP0402, value = "10nF")` |  SMD capacitor 0402 10nF |
+|   1 | `smd_capacitor(CAP0502, value = "10nF")` |  SMD capacitor 0502 10nF |
+|   1 | `smd_capacitor(CAP0603, value = "10nF")` |  SMD capacitor 0603 10nF |
+|   1 | `smd_capacitor(CAP0805, value = "100nF")` |  SMD capacitor 0805 100nF |
+|   1 | `smd_capacitor(CAP1206, value = "1uF")` |  SMD capacitor 1206 1uF |
+|   1 | `smd_qfp(QFP50P1200X1200X160_64N, "ATSAM4S4BA")` |  SMD chip: ATSAM4S4BA, package : QFP50P1200X1200X160_64N |
 |   1 | `smd_resistor(L2012C, 1u)` |  SMD choke 0805 1u |
 |   1 | `smd_coax(U_FL_R_SMT_1)` |  SMD coax connector type: U_FL_R_SMT_1 |
+|   1 | `smd_250V_fuse(OMT250, "2A 250V")` |  SMD fuse: OMT250 2A 250V |
 |   1 | `smd_resistor(RES0402, 1)` |  SMD resistor 0402 1 0.0625W |
 |   1 | `smd_resistor(RES0502, 10)` |  SMD resistor 0502 10 0.05W |
 |   1 | `smd_resistor(RES0603, 100)` |  SMD resistor 0603 100 0.1W |
 |   1 | `smd_resistor(RES0805, 1K)` |  SMD resistor 0805 1K 0.125W |
 |   1 | `smd_resistor(RES1206, 1M)` |  SMD resistor 1206 1M 0.25W |
-|   1 | `smd_soic(SOIC14)` |  SOIC14 package 74HC00 |
-|   1 | `smd_soic(SOIC16)` |  SOIC16 package ICL323 |
-|   1 | `smd_soic(SOIC18)` |  SOIC18 package PIC18F88 |
-|   1 | `smd_soic(SOIC8)` |  SOIC8 package M34063 |
-|   1 | `smd_sot(SOT223)` |  SOT223 package LM117 |
-|   1 | `smd_sot(SOT23)` |  SOT23 package 2N7000 |
+|   1 | `smd_soic(SOIC14, "74HC00")` |  SOIC14 package 74HC00 |
+|   1 | `smd_soic(SOIC16, "ICL323")` |  SOIC16 package ICL323 |
+|   1 | `smd_soic(SOIC18, "PIC18F88")` |  SOIC18 package PIC18F88 |
+|   1 | `smd_soic(SOIC8, "M34063")` |  SOIC8 package M34063 |
+|   1 | `smd_sot(SOT223, "LM117")` |  SOT223 package LM117 |
+|   1 | `smd_sot(SOT23, "2N7000")` |  SOT23 package 2N7000 |
 |   1 | `square_button(button_4p5mm)` |  Square button 4.5mm |
 |   1 | `square_button(button_6mm)` |  Square button 6mm |
-|   1 | `smd_pot(TC33X1)` |  TC33X1 package 10K |
+|   1 | `smd_pot(TC33X1, "10K")` |  TC33X1 package 10K |
 |   1 | `pcb(TMC2130)` |  TMC2130 |
 |   1 | `green_terminal(gt_5p08, 2)` |  Terminal block 2 way 0.2" |
 |   2 | `green_terminal(gt_6p35, 2)` |  Terminal block 2 way 0.25" |
@@ -2749,11 +2763,14 @@ PCBs and perfboard with optional components. The shape can be a rectangle with o
 |   1 | `terminal_35(4)` |  Terminal block 4 way 3.5mm |
 |   1 | `pcb(test_pcb)` |  Test PCB |
 |   1 | `rd_transistor(E_LINE, "ZTX853")` |  Transistor E_LINE ZTX853 |
+|   1 | `rd_disc(ERZV07D471, "471")` |  Varistor, ERZV07D471 471 |
 |   2 | `vero_pin()` |  Vero board pin |
 |   1 | `wire_link(0.8, 5.08, h = 10.16)` |  Wire link 0.8mm x 0.2" |
 |   1 | `wire_link(0.8, 10.16)` |  Wire link 0.8mm x 0.4" |
 |   1 | `wire_link(0.8, 10.16, h = 0.75, sleeve = [1.5, "red"])` |  Wire link 0.8mm x 0.4" with red sleeving |
 |   1 | `wire_link(0.8, 0, h = 5)` |  Wire link 0.8mm x 8mm |
+|   1 | `rd_boxc(BOXC18x5x11, "X2 rated film capacitor", "0.1uF 250V" )` |  X2 rated film capacitor 0.1uF 250V |
+|   1 | `rd_boxc(BOXC18x10x16, "X2 rated film capacitor", "0.47uF 250V" )` |  X2 rated film capacitor 0.47uF 250V |
 
 
 <a href="#top">Top</a>
@@ -2884,6 +2901,7 @@ PCBs and perfboard with optional components. The shape can be a rectangle with o
 |   1 | `pcb(Melzi)` |  Melzi electronics - not shown |
 |   6 |  |  Micro SD card |
 |   1 |  |  Micro SD card - not shown |
+|   1 | `pcb(RCWL-0516)` |  Microwave Radar Sensor |
 |   1 | `molex_254(2)` |  Molex KK header 2 way - not shown |
 |   1 | `molex_254(3)` |  Molex KK header 3 way - not shown |
 |  20 | `nut(M2_nut, nyloc = true)` |  Nut M2 x 1.6mm nyloc |
@@ -2911,8 +2929,7 @@ PCBs and perfboard with optional components. The shape can be a rectangle with o
 |   8 | `screw(M2_cap_screw, 20)` |  Screw M2 cap x 20mm |
 |   4 | `screw(M2_cap_screw, 25)` |  Screw M2 cap x 25mm |
 |   2 | `screw(M2p5_cap_screw, 20)` |  Screw M2.5 cap x 20mm |
-|   4 | `screw(M2p5_cap_screw, 25)` |  Screw M2.5 cap x 25mm |
-|   4 | `screw(M2p5_cap_screw, 30)` |  Screw M2.5 cap x 30mm |
+|   8 | `screw(M2p5_cap_screw, 30)` |  Screw M2.5 cap x 30mm |
 |  12 | `screw(M2p5_cap_screw, 35)` |  Screw M2.5 cap x 35mm |
 |   4 | `screw(M2p5_dome_screw, 25)` |  Screw M2.5 dome x 25mm |
 |   4 | `screw(M2p5_pan_screw, 20)` |  Screw M2.5 pan x 20mm |
@@ -2920,8 +2937,7 @@ PCBs and perfboard with optional components. The shape can be a rectangle with o
 |  19 | `screw(M3_cap_screw, 16)` |  Screw M3 cap x 16mm |
 |  13 | `screw(M3_cap_screw, 20)` |  Screw M3 cap x 20mm |
 |   4 | `screw(M3_cap_screw, 25)` |  Screw M3 cap x 25mm |
-|   8 | `screw(M3_cap_screw, 30)` |  Screw M3 cap x 30mm |
-|   3 | `screw(M3_cap_screw, 35)` |  Screw M3 cap x 35mm |
+|  11 | `screw(M3_cap_screw, 35)` |  Screw M3 cap x 35mm |
 |   4 | `screw(M4_cap_screw, 20)` |  Screw M4 cap x 20mm |
 |   4 | `screw(M4_cap_screw, 25)` |  Screw M4 cap x 25mm |
 |   1 | `pcb(XIAO)` |  Seeeduino XIAO |
@@ -2941,24 +2957,24 @@ PCBs and perfboard with optional components. The shape can be a rectangle with o
 | Qty | Filename |
 | ---:|:--- |
 |   4 | pcb_spacer20100.stl |
-|   4 | pcb_spacer20140.stl |
+|   4 | pcb_spacer20150.stl |
 |   4 | pcb_spacer2070.stl |
 |   4 | pcb_spacer2080.stl |
 |   4 | pcb_spacer2090.stl |
-|   2 | pcb_spacer25100.stl |
-|   4 | pcb_spacer25130.stl |
-|   4 | pcb_spacer25160.stl |
+|   2 | pcb_spacer25110.stl |
+|   4 | pcb_spacer25140.stl |
 |   4 | pcb_spacer25170.stl |
-|   4 | pcb_spacer25180_2.stl |
+|   4 | pcb_spacer25180.stl |
 |   4 | pcb_spacer25190_2.stl |
-|   4 | pcb_spacer25230.stl |
+|   4 | pcb_spacer25200_2.stl |
 |   4 | pcb_spacer25240.stl |
 |   4 | pcb_spacer25250.stl |
+|   4 | pcb_spacer25260.stl |
 |   4 | pcb_spacer2580.stl |
-|   4 | pcb_spacer30120.stl |
-|   4 | pcb_spacer30200.stl |
+|   4 | pcb_spacer30130.stl |
 |   4 | pcb_spacer30210.stl |
-|   3 | pcb_spacer30220.stl |
+|   4 | pcb_spacer30220.stl |
+|   3 | pcb_spacer30230.stl |
 |  10 | pcb_spacer3050.stl |
 |   9 | pcb_spacer3060.stl |
 |   9 | pcb_spacer3070.stl |
@@ -3366,9 +3382,14 @@ Timing belt pulleys, both toothed and plain with internal bearings for idlers.
 ### Vitamins
 | Qty | Module call | BOM entry |
 | ---:|:--- |:---|
+|   1 | `pulley(GT2x16_pulley_9)` |  Pulley GT2 16 teeth |
 |   1 | `pulley(GT2x16_pulley)` |  Pulley GT2 16 teeth |
+|   1 | `pulley(GT2x20_pulley_9)` |  Pulley GT2 20 teeth |
+|   1 | `pulley(GT2x80_pulley)` |  Pulley GT2 80 teeth |
 |   1 | `pulley(GT2x16_toothed_idler)` |  Pulley GT2 idler 16 teeth |
+|   1 | `pulley(GT2x16_toothed_idler_9)` |  Pulley GT2 idler 16 teeth |
 |   1 | `pulley(GT2x20_toothed_idler)` |  Pulley GT2 idler 20 teeth |
+|   1 | `pulley(GT2x20_toothed_idler_9)` |  Pulley GT2 idler 20 teeth |
 |   1 | `pulley(GT2x20_plain_idler)` |  Pulley GT2 idler smooth 12mm |
 |   1 | `pulley(GT2x16_plain_idler)` |  Pulley GT2 idler smooth 9.63mm |
 |   1 | `pulley(GT2x16x7_plain_idler)` |  Pulley GT2 idler smooth 9.63mm |
@@ -3380,8 +3401,9 @@ Timing belt pulleys, both toothed and plain with internal bearings for idlers.
 |   1 | `screw(M3_grub_screw, 3)` |  Screw M3 grub x  3mm |
 |   2 | `screw(M3_grub_screw, 4.5)` |  Screw M3 grub x  4.5mm |
 |   2 | `screw(M3_grub_screw, 4)` |  Screw M3 grub x  4mm |
-|   4 | `screw(M3_grub_screw, 6)` |  Screw M3 grub x  6mm |
-|   1 | `screw(M4_grub_screw, 6)` |  Screw M4 grub x  6mm |
+|   6 | `screw(M3_grub_screw, 6)` |  Screw M3 grub x  6mm |
+|   3 | `screw(M4_grub_screw, 6)` |  Screw M4 grub x  6mm |
+|   2 | `screw(M5_grub_screw, 6)` |  Screw M5 grub x  6mm |
 
 
 <a href="#top">Top</a>
@@ -3400,6 +3422,11 @@ Radial components for PCBs.
 ### Properties
 | Function | Description |
 |:--- |:--- |
+| `rd_boxc_colours(type)` | Case colour and resin fill colour |
+| `rd_boxc_leads(type)` | Lead pitch, diameter and length |
+| `rd_boxc_size(type)` | Overall size and corner radius |
+| `rd_boxc_skirt(type)` | Skirt slot, thickness, height |
+| `rd_boxc_z(type)` | Height of inner base above PCB. |
 | `rd_disc_colours(type)` | Colours of body and text |
 | `rd_disc_kind(type)` | Capacitor, etc |
 | `rd_disc_lead_d(type)` | Lead diameter and sleeve diameter |
@@ -3429,6 +3456,7 @@ Radial components for PCBs.
 ### Modules
 | Module | Description |
 |:--- |:--- |
+| `rd_box_cap(type, kind, value)` | Draw radial boxed film capacitor |
 | `rd_disc(type, value, pitch = undef, z = 0, tail = 3)` | Draw a radial disc component |
 | `rd_electrolytic(type, value, pitch = undef, z = 0, tail = 3)` | Draw a radial electrolytic capcacitor |
 | `rd_module(type, value)` | Draw a PCB mounted potted module, e.g. PSU or relay |
@@ -3454,6 +3482,8 @@ Radial components for PCBs.
 |   1 | `rd_transistor(E_LINE, "ZTX853")` |  Transistor E_LINE ZTX853 |
 |   1 | `rd_transistor(TO92, "BC337")` |  Transistor TO92 BC337 |
 |   1 | `rd_disc(ERZV07D471, "470V")` |  Varistor, ERZV07D471 470V |
+|   1 | `rd_boxc(BOXC18x5x11, "X2 rated film capacitor", "0.1uF 250V" )` |  X2 rated film capacitor 0.1uF 250V |
+|   1 | `rd_boxc(BOXC18x10x16, "X2 rated film capacitor", "0.47uF 250V" )` |  X2 rated film capacitor 0.47uF 250V |
 
 
 <a href="#top">Top</a>
@@ -3709,6 +3739,48 @@ These items are symmetrical, so by default the origin is in the centre but it ca
 |   1 | `studding(8, 80)` |  Threaded rod M8 x 80mm |
 
 
+<a href="#top">Top</a>
+
+---
+<a name="rod_ends"></a>
+## Rod_ends
+A rod end, sometimes called a spherical bearing or rod-end eye, is a component used in mechanical systems to create a flexible connection between two parts.
+
+[vitamins/rod_ends.scad](vitamins/rod_ends.scad) Object definitions.
+
+[vitamins/rod_end.scad](vitamins/rod_end.scad) Implementation.
+
+[tests/rod_ends.scad](tests/rod_ends.scad) Code for this example.
+
+### Properties
+| Function | Description |
+|:--- |:--- |
+| `rod_end_bearing_bore(type)` | radius of the  bore hole in the bearing |
+| `rod_end_bearing_od(type)` | Outer diameter of the bearing |
+| `rod_end_bearing_rim(type)` | Outer rim thickness guesstimate |
+| `rod_end_bearing_shield_colour(type)` | Shield colour, "silver" for metal |
+| `rod_end_bearing_width(type)` | Width |
+| `rod_end_bore_width(type)` | Width |
+| `rod_end_overall_length(type)` |  overall length of the rod end |
+| `rod_end_screw_length(type)` | length of the screw from eye center, not the bore |
+| `rod_end_screw_radius(type)` | radius of the screw end, not the bore |
+| `rod_end_sphere_radius(type)` | radius of the rod end sphere |
+| `rod_end_sphere_seg_width(type)` | the width of the pivoting part, effectively a (sphere - sphereCaps - center bore) |
+| `rod_end_thread_length(type)` | length of the threads |
+
+### Modules
+| Module | Description |
+|:--- |:--- |
+| `rod_end_bearing(type)` | Draw a rod end bearing |
+
+![rod_ends](tests/png/rod_ends.png)
+
+### Vitamins
+| Qty | Module call | BOM entry |
+| ---:|:--- |:---|
+|   1 | `Rod End Bearing(RE_m5_bearing, 33)` |  Rod End Bearing 5 x 33mm |
+
+
 <a href="#top">Top</a>
 
 ---
@@ -3842,11 +3914,13 @@ For an explanation of `screw_polysink()` see <https://hydraraptor.blogspot.com/2
 |   1 | `screw(M5_pan_screw, 30)` |  Screw M5 pan x 30mm |
 |   1 | `screw(M6_cap_screw, 30)` |  Screw M6 cap x 30mm |
 |   1 | `screw(M6_cs_cap_screw, 30)` |  Screw M6 cs cap x 30mm |
+|   1 | `screw(M6_dome_screw, 30)` |  Screw M6 dome x 30mm |
 |   1 | `screw(M6_grub_screw, 12)` |  Screw M6 grub x 12mm |
 |   1 | `screw(M6_hex_screw, 30)` |  Screw M6 hex x 30mm |
 |   1 | `screw(M6_pan_screw, 30)` |  Screw M6 pan x 30mm |
 |   1 | `screw(M8_cap_screw, 35)` |  Screw M8 cap x 35mm |
 |   1 | `screw(M8_cs_cap_screw, 35)` |  Screw M8 cs cap x 35mm |
+|   1 | `screw(M8_dome_screw, 35)` |  Screw M8 dome x 35mm |
 |   1 | `screw(M8_hex_screw, 30)` |  Screw M8 hex x 30mm |
 |   1 | `screw(No2_screw, 10)` |  Screw No2 pan wood x 10mm |
 |   1 | `screw(No4_screw, 10)` |  Screw No4 pan wood x 10mm |
@@ -4148,6 +4222,10 @@ E.g. 475A is 4.7uF 10V on the parts list.
 ### Properties
 | Function | Description |
 |:--- |:--- |
+| `smd_250V_fuse_base(type)` | Base length |
+| `smd_250V_fuse_size(type)` | Bounding box of the body |
+| `smd_250V_fuse_step(type)` | End cutout length, width and height |
+| `smd_250V_fuse_z(type)` | Height of body above the PCB surface |
 | `smd_cap_end_cap(type)` | End cap width |
 | `smd_cap_size(type)` | Body length, width |
 | `smd_coax_base_r(type)` | Corner radius of the base |
@@ -4212,6 +4290,7 @@ E.g. 475A is 4.7uF 10V on the parts list.
 ### Modules
 | Module | Description |
 |:--- |:--- |
+| `smd_250V_fuse(type, value)` | Draw an SMD mains fuse |
 | `smd_capacitor(type, height, value = undef)` | Draw an SMD capacitor with specified height |
 | `smd_coax(type)` | Draw an SMD coaxial connector |
 | `smd_diode(type, value)` | Draw an SMD diode |
@@ -4229,38 +4308,39 @@ E.g. 475A is 4.7uF 10V on the parts list.
 ### Vitamins
 | Qty | Module call | BOM entry |
 | ---:|:--- |:---|
-|   1 | `smd_inductor(CDRH104)` |  CDRH104 package 10R |
-|   1 | `smd_diode(DO214AC)` |  DO214AC package SS34 |
-|   1 | `smd_inductor(IND2525)` |  IND2525 package 4R7 |
-|   1 | `smd_led(LED0603, green)` |  SMD LED 0603 green |
-|   1 | `smd_led(LED0805, blue)` |  SMD LED 0805 blue |
-|   1 | `smd_led(LED1206, red)` |  SMD LED 1306 red |
-|   1 | `smd_tant(TANT_A)` |  SMD Tantalum capacitor package A ,1uF, 2.5V |
-|   1 | `smd_tant(TANT_B)` |  SMD Tantalum capacitor package B ,10uF, 6.3V |
-|   1 | `smd_tant(TANT_C)` |  SMD Tantalum capacitor package C ,100uF, 10V |
+|   1 | `smd_inductor(CDRH104 ,"10R")` |  CDRH104 package 10R |
+|   1 | `smd_diode(DO214AC, "SS34")` |  DO214AC package SS34 |
+|   1 | `smd_inductor(IND2525 ,"4R7")` |  IND2525 package 4R7 |
+|   1 | `smd_led(LED0603, "green")` |  SMD LED 0603 green |
+|   1 | `smd_led(LED0805, "blue")` |  SMD LED 0805 blue |
+|   1 | `smd_led(LED1206, "red")` |  SMD LED 1306 red |
+|   1 | `smd_tant(TANT_A, value = "105e")` |  SMD Tantalum capacitor package A ,1uF, 2.5V |
+|   1 | `smd_tant(TANT_B, value = "106J")` |  SMD Tantalum capacitor package B ,10uF, 6.3V |
+|   1 | `smd_tant(TANT_C, value = "107A")` |  SMD Tantalum capacitor package C ,100uF, 10V |
 |   1 | `smd_capacitor(CAP0402)` |  SMD capacitor 0402 |
 |   1 | `smd_capacitor(CAP0502)` |  SMD capacitor 0502 |
 |   1 | `smd_capacitor(CAP0603)` |  SMD capacitor 0603 |
 |   1 | `smd_capacitor(CAP0805)` |  SMD capacitor 0805 |
 |   1 | `smd_capacitor(CAP1206)` |  SMD capacitor 1206 |
 |   1 | `smd_capacitor(CAP1210)` |  SMD capacitor 1210 |
-|   1 | `smd_qfp(QFP50P1200X1200X160_64N)` |  SMD chip: ATSAM4S4BA, package : QFP50P1200X1200X160_64N |
+|   1 | `smd_qfp(QFP50P1200X1200X160_64N, "ATSAM4S4BA")` |  SMD chip: ATSAM4S4BA, package : QFP50P1200X1200X160_64N |
 |   1 | `smd_resistor(L2012C, 10u)` |  SMD choke 0805 10u |
 |   1 | `smd_coax(U_FL_R_SMT_1)` |  SMD coax connector type: U_FL_R_SMT_1 |
+|   1 | `smd_250V_fuse(OMT250, "2A 250V")` |  SMD fuse: OMT250 2A 250V |
 |   1 | `smd_resistor(RES0402, 1R0)` |  SMD resistor 0402 1R0 0.0625W |
 |   1 | `smd_resistor(RES0502, 10)` |  SMD resistor 0502 10 0.05W |
 |   1 | `smd_resistor(RES0603, 100)` |  SMD resistor 0603 100 0.1W |
 |   1 | `smd_resistor(RES0805, 10M)` |  SMD resistor 0805 10M 0.125W |
 |   1 | `smd_resistor(RES1206, 100K)` |  SMD resistor 1206 100K 0.25W |
-|   1 | `smd_soic(SOIC14)` |  SOIC14 package SOIC14 |
-|   1 | `smd_soic(SOIC16)` |  SOIC16 package SOIC16 |
-|   1 | `smd_soic(SOIC18)` |  SOIC18 package SOIC18 |
-|   1 | `smd_soic(SOIC8)` |  SOIC8 package SOIC8 |
-|   1 | `smd_sot(SOT223)` |  SOT223 package FZT851 |
-|   1 | `smd_sot(SOT23)` |  SOT23 package 2N7000 |
-|   1 | `smd_soic(SOT23_6)` |  SOT23_6 package SOT23_6 |
-|   1 | `smd_pot(TC33X1)` |  TC33X1 package 10K |
-|   1 | `smd_soic(TSOT23_8)` |  TSOT23_8 package TSOT23_8 |
+|   1 | `smd_soic(SOIC14, "SOIC14")` |  SOIC14 package SOIC14 |
+|   1 | `smd_soic(SOIC16, "SOIC16")` |  SOIC16 package SOIC16 |
+|   1 | `smd_soic(SOIC18, "SOIC18")` |  SOIC18 package SOIC18 |
+|   1 | `smd_soic(SOIC8, "SOIC8")` |  SOIC8 package SOIC8 |
+|   1 | `smd_sot(SOT223, "FZT851")` |  SOT223 package FZT851 |
+|   1 | `smd_sot(SOT23, "2N7000")` |  SOT23 package 2N7000 |
+|   1 | `smd_soic(SOT23_6, "SOT23_6")` |  SOT23_6 package SOT23_6 |
+|   1 | `smd_pot(TC33X1, "10K")` |  TC33X1 package 10K |
+|   1 | `smd_soic(TSOT23_8, "TSOT23_8")` |  TSOT23_8 package TSOT23_8 |
 
 
 <a href="#top">Top</a>
@@ -4385,6 +4465,7 @@ By default springs have their origin at the bottom but can be centered.
 | ---:|:--- |:---|
 |   1 | `comp_spring(batt_spring)` |  Spring 5 - 6mm spiral OD, 0.5mm gauge x 8mm long, closed end |
 |   1 | `comp_spring(peg_spring)` |  Spring 6.4mm OD, 0.9mm gauge x 15.5mm long, closed end |
+|   1 | `comp_spring(yellow_bed_spring)` |  Spring 8mm OD, 0.9mm gauge x 20mm long, closed end |
 
 
 <a href="#top">Top</a>
@@ -4484,18 +4565,19 @@ NEMA stepper motor model.
 | Qty | Module call | BOM entry |
 | ---:|:--- |:---|
 |   4 | `ring_terminal(M3_ringterm)` |  Ring terminal 3mm |
-|  20 | `screw(M3_pan_screw, 8)` |  Screw M3 pan x  8mm |
-|   1 | `NEMA(NEMA14_36)` |  Stepper motor NEMA14 x 36mm |
-|   1 | `NEMA(NEMA16_19)` |  Stepper motor NEMA16 x 19.2mm |
-|   1 | `NEMA(NEMA17_27)` |  Stepper motor NEMA17 x 26.5mm |
-|   1 | `NEMA(NEMA17_34)` |  Stepper motor NEMA17 x 34mm |
-|   1 | `NEMA(NEMA17_40)` |  Stepper motor NEMA17 x 40mm |
-|   1 | `NEMA(NEMA17_47)` |  Stepper motor NEMA17 x 47mm |
-|   1 | `NEMA(NEMA23_51)` |  Stepper motor NEMA22 x 51.2mm |
-|   1 | `NEMA(NEMA8_30)` |  Stepper motor NEMA8 x 30mm |
-|   1 | `NEMA(NEMA8_30BH)` |  Stepper motor NEMA8 x 30mm |
-|  16 | `washer(M3_washer)` |  Washer  M3 x 7mm x 0.5mm |
-|  20 | `star_washer(M3_washer)` |  Washer star M3 x 0.5mm |
+|  25 | `screw(M3_pan_screw, 8)` |  Screw M3 pan x  8mm |
+|   1 | `NEMA(NEMA14_36)` |  Stepper motor NEMA14 x 36mm (5x21 shaft) |
+|   1 | `NEMA(NEMA16_19)` |  Stepper motor NEMA16 x 19.2mm (5x12 shaft) |
+|   1 | `NEMA(NEMA17_27)` |  Stepper motor NEMA17 x 26.5mm (5x26.5 shaft) |
+|   1 | `NEMA(NEMA17_34)` |  Stepper motor NEMA17 x 34mm (5x24 shaft) |
+|   1 | `NEMA(NEMA17_40)` |  Stepper motor NEMA17 x 40mm (5x20 shaft) |
+|   1 | `NEMA(NEMA17_47)` |  Stepper motor NEMA17 x 47mm (5x24 shaft) |
+|   1 | `NEMA(NEMA17_47L80)` |  Stepper motor NEMA17 x 47mm (5x80 shaft) |
+|   1 | `NEMA(NEMA23_51)` |  Stepper motor NEMA22 x 51.2mm (6.35x24 shaft) |
+|   1 | `NEMA(NEMA8_30)` |  Stepper motor NEMA8 x 30mm (4x6 shaft) |
+|   1 | `NEMA(NEMA8_30BH)` |  Stepper motor NEMA8 x 30mm (5x12 shaft) |
+|  21 | `washer(M3_washer)` |  Washer  M3 x 7mm x 0.5mm |
+|  25 | `star_washer(M3_washer)` |  Washer star M3 x 0.5mm |
 
 
 <a href="#top">Top</a>
@@ -4771,7 +4853,7 @@ T-Tracks used in woodworking jigs
 ---
 <a name="tubings"></a>
 ## Tubings
-Tubing and sleeving. The internal diameter can be forced to stretch it over something.
+Tubing and sleeving. The internal diameter can be forced to stretch it over something. A path can be specified, otherwise it is just straight with the specified length.
 
 [vitamins/tubings.scad](vitamins/tubings.scad) Object definitions.
 
@@ -4796,7 +4878,7 @@ Tubing and sleeving. The internal diameter can be forced to stretch it over some
 ### Modules
 | Module | Description |
 |:--- |:--- |
-| `tubing(type, length = 15, forced_id = 0, center = true)` | Draw specified tubing with optional forced internal diameter |
+| `tubing(type, length = 15, forced_id = 0, center = true, path = [])` | Draw specified tubing with optional forced internal diameter and optional path. |
 
 ![tubings](tests/png/tubings.png)
 
@@ -5365,7 +5447,7 @@ fixing_blocks along the sides.
 ---
 <a name="cable_clip"></a>
 ## Cable_clip
-Cable clips to order. Can be for one or two cables of different sizes. Can use an insert and a screw from below or a screw and nut either way up.
+Cable clips to order. Can be for one or two cables of different sizes. Can use an insert and a screw from below or a screw and nut, nyloc or plain, either way up.
 
 [printed/cable_clip.scad](printed/cable_clip.scad) Implementation.
 
@@ -5374,17 +5456,17 @@ Cable clips to order. Can be for one or two cables of different sizes. Can use a
 ### Functions
 | Function | Description |
 |:--- |:--- |
-| `cable_clip_extent(screw, cable, insert = false)` | How far it extends from the screw. |
-| `cable_clip_height(cable, screw = false, insert = false)` | Height given the `cable`. |
+| `cable_clip_extent(screw, cable, insert = false, nut = false)` | How far it extends from the screw. |
+| `cable_clip_height(cable, screw = false, insert = false, nut = false)` | Height given the `cable`. |
 | `cable_clip_insert(screw, insert = true)` | Insert type for clip, given screw. |
-| `cable_clip_offset(screw, cable, insert = false)` | The offset of the cable from the screw. |
-| `cable_clip_width(screw, insert = false)` | Width given the `screw` and possibly insert. |
+| `cable_clip_offset(screw, cable, insert = false, nut = false)` | The offset of the cable from the screw. |
+| `cable_clip_width(screw, insert = false, nut = false)` | Width given the `screw` and possibly insert or nut. |
 
 ### Modules
 | Module | Description |
 |:--- |:--- |
-| `cable_clip(screw, cable1, cable2 = 0, insert = false)` | Create the STL for a single cable or two cable clip |
-| `cable_clip_assembly(screw, thickness, cable1, cable2 = 0, flip = false, insert = false)` | Cable clip with the fasteners |
+| `cable_clip(screw, cable1, cable2 = 0, insert = false, nut = false)` | Create the STL for a single cable or two cable clip |
+| `cable_clip_assembly(screw, thickness, cable1, cable2 = 0, flip = false, insert = false, nut = false, nyloc = true)` | Cable clip with the fasteners |
 
 ![cable_clip](tests/png/cable_clip.png)
 
@@ -5393,10 +5475,10 @@ Cable clips to order. Can be for one or two cables of different sizes. Can use a
 | ---:|:--- |:---|
 |   2 | `insert(CNCKM3)` |  Heatfit insert M3 x 3mm |
 |   5 | `nut(M3_nut, nyloc = true)` |  Nut M3 x 2.4mm nyloc |
-|   2 | `screw(M3_dome_screw, 10)` |  Screw M3 dome x 10mm |
+|   3 | `screw(M3_dome_screw, 10)` |  Screw M3 dome x 10mm |
 |   1 | `screw(M3_dome_screw, 12)` |  Screw M3 dome x 12mm |
-|   4 | `screw(M3_dome_screw, 16)` |  Screw M3 dome x 16mm |
-|  12 | `washer(M3_washer)` |  Washer  M3 x 7mm x 0.5mm |
+|   3 | `screw(M3_dome_screw, 16)` |  Screw M3 dome x 16mm |
+|  11 | `washer(M3_washer)` |  Washer  M3 x 7mm x 0.5mm |
 |   2 | `star_washer(M3_washer)` |  Washer star M3 x 0.5mm |
 
 ### Printed
@@ -5404,10 +5486,10 @@ Cable clips to order. Can be for one or two cables of different sizes. Can use a
 | ---:|:--- |
 |   1 | cable_clip_30I_10_13.stl |
 |   1 | cable_clip_30I_5_14_6_14.stl |
+|   1 | cable_clip_30N_7_14_8_14.stl |
 |   1 | cable_clip_30_1_14_2_14.stl |
 |   1 | cable_clip_30_1_60.stl |
 |   1 | cable_clip_30_3_14_4_14.stl |
-|   1 | cable_clip_30_7_14_8_14.stl |
 |   1 | cable_clip_30_9_14.stl |
 
 
@@ -5488,7 +5570,8 @@ Housings for PCB cameras.
 |   1 | `camera(rpi_camera_v1)` |  Raspberry Pi camera V1 |
 |   1 | `camera(rpi_camera_v2)` |  Raspberry Pi camera V2 |
 |   1 | `camera(rpi_camera)` |  Raspberry Pi focusable camera |
-|   7 | `screw(M2_cap_screw, 10)` |  Screw M2 cap x 10mm |
+|   3 | `screw(M2_cap_screw, 8)` |  Screw M2 cap x  8mm |
+|   4 | `screw(M2_cap_screw, 10)` |  Screw M2 cap x 10mm |
 |   4 | `screw(M3_cap_screw, 16)` |  Screw M3 cap x 16mm |
 |   4 | `screw(M3_dome_screw, 10)` |  Screw M3 dome x 10mm |
 |   2 | `screw(M3_dome_screw, 12)` |  Screw M3 dome x 12mm |
@@ -6491,8 +6574,9 @@ Creative Commons - Attribution - Share Alike license (see <https://creativecommo
 |   1 | `screw(M3_grub_screw, 3)` |  Screw M3 grub x  3mm |
 |   2 | `screw(M3_grub_screw, 4.5)` |  Screw M3 grub x  4.5mm |
 |   2 | `screw(M3_grub_screw, 4)` |  Screw M3 grub x  4mm |
-|   4 | `screw(M3_grub_screw, 6)` |  Screw M3 grub x  6mm |
-|   1 | `screw(M4_grub_screw, 6)` |  Screw M4 grub x  6mm |
+|   6 | `screw(M3_grub_screw, 6)` |  Screw M3 grub x  6mm |
+|   3 | `screw(M4_grub_screw, 6)` |  Screw M4 grub x  6mm |
+|   2 | `screw(M5_grub_screw, 6)` |  Screw M5 grub x  6mm |
 
 ### Printed
 | Qty | Filename |
@@ -6500,12 +6584,17 @@ Creative Commons - Attribution - Share Alike license (see <https://creativecommo
 |   1 | printed_pulley_GT2x12_pulley.stl |
 |   1 | printed_pulley_GT2x16_plain_idler.stl |
 |   1 | printed_pulley_GT2x16_pulley.stl |
+|   1 | printed_pulley_GT2x16_pulley_9.stl |
 |   1 | printed_pulley_GT2x16_toothed_idler.stl |
+|   1 | printed_pulley_GT2x16_toothed_idler_9.stl |
 |   1 | printed_pulley_GT2x16x7_plain_idler.stl |
 |   1 | printed_pulley_GT2x20_plain_idler.stl |
+|   1 | printed_pulley_GT2x20_pulley_9.stl |
 |   1 | printed_pulley_GT2x20_toothed_idler.stl |
+|   1 | printed_pulley_GT2x20_toothed_idler_9.stl |
 |   1 | printed_pulley_GT2x20ob_pulley.stl |
 |   1 | printed_pulley_GT2x20um_pulley.stl |
+|   1 | printed_pulley_GT2x80_pulley.stl |
 |   1 | printed_pulley_T2p5x16_pulley.stl |
 |   1 | printed_pulley_T5x10_pulley.stl |
 
@@ -6514,13 +6603,18 @@ Creative Commons - Attribution - Share Alike license (see <https://creativecommo
 | ---:|:--- |
 |   1 | printed_pulley_GT2x12_pulley_assembly |
 |   1 | printed_pulley_GT2x16_plain_idler_assembly |
+|   1 | printed_pulley_GT2x16_pulley_9_assembly |
 |   1 | printed_pulley_GT2x16_pulley_assembly |
+|   1 | printed_pulley_GT2x16_toothed_idler_9_assembly |
 |   1 | printed_pulley_GT2x16_toothed_idler_assembly |
 |   1 | printed_pulley_GT2x16x7_plain_idler_assembly |
 |   1 | printed_pulley_GT2x20_plain_idler_assembly |
+|   1 | printed_pulley_GT2x20_pulley_9_assembly |
+|   1 | printed_pulley_GT2x20_toothed_idler_9_assembly |
 |   1 | printed_pulley_GT2x20_toothed_idler_assembly |
 |   1 | printed_pulley_GT2x20ob_pulley_assembly |
 |   1 | printed_pulley_GT2x20um_pulley_assembly |
+|   1 | printed_pulley_GT2x80_pulley_assembly |
 |   1 | printed_pulley_T2p5x16_pulley_assembly |
 |   1 | printed_pulley_T5x10_pulley_assembly |
 
@@ -7017,7 +7111,7 @@ allows flexible positioning of the motors.
 |   2 | `pulley(GT2x20ob_pulley)` |  Pulley GT2OB 20 teeth |
 |   8 | `screw(M3_cap_screw, 20)` |  Screw M3 cap x 20mm |
 |   4 | `screw(M3_grub_screw, 6)` |  Screw M3 grub x  6mm |
-|   2 | `NEMA(NEMA17_40)` |  Stepper motor NEMA17 x 40mm |
+|   2 | `NEMA(NEMA17_40)` |  Stepper motor NEMA17 x 40mm (5x20 shaft) |
 
 
 <a href="#top">Top</a>
@@ -7419,6 +7513,32 @@ A sector of a circle between two angles.
 ![sector](tests/png/sector.png)
 
 
+<a href="#top">Top</a>
+
+---
+<a name="splines"></a>
+## Splines
+Cubic splines that interpolate between a list of 2D points passing through all of them.
+Translated from the Python version at <https://community.alteryx.com/t5/Engine-Works/Creating-a-Cubic-Spline-in-Python-and-Alteryx/ba-p/581173>.
+Note the x values of the points must be strictly increasing.
+
+Catmull-Rom splines are well behaved but the ends points are control points and the curve only goes from the second point to the penultimate point.
+Coded from <https://en.wikipedia.org/wiki/Centripetal_Catmull%E2%80%93Rom_spline#Code_example_in_Python>.
+No restrictions on points and they can be 3D.
+
+[utils/splines.scad](utils/splines.scad) Implementation.
+
+[tests/splines.scad](tests/splines.scad) Code for this example.
+
+### Functions
+| Function | Description |
+|:--- |:--- |
+| `catmull_rom_spline(points, n, alpha = 0.5)` | Interpolate n new points between the specified points with a Catmull-Rom spline, alpha = 0.5 for centripetal, 0 for uniform and 1 for chordal. |
+| `cubic_spline(points, N = 100)` | Interpolate the list of points given to produce N points on a cubic spline that passes through points given. |
+
+![splines](tests/png/splines.png)
+
+
 <a href="#top">Top</a>
 
 ---

tests/PCB.scad

@@ -61,7 +61,7 @@ test_pcb = ["test_pcb", "Test PCB",
     // components
     [
         [ 20, -5,  180, "trimpot10"],
-        [ 20, -15,  90, "trimpot10", true],
+        [ 20, -18,  90, "trimpot10", true],
         [ 19,  2,   90, "smd_led", LED1206, "blue"],
         [ 16,  2,   90, "smd_led", LED0805, "red"],
         [ 13,  2,   90, "smd_led", LED0603, "orange"],
@@ -82,6 +82,7 @@ test_pcb = ["test_pcb", "Test PCB",
         [ 32,  3,  -90, "smd_diode",DO214AC, "SS34"],
         [ 26,  2,  -90, "smd_pot", TC33X1, "10K"],
         [ 26,  6,  -90, "smd_coax",U_FL_R_SMT_1],
+        [  8, 23,    0, "smd_250V_fuse", OMT250, "2A 250V"],
 
         [ 26, 10,  -90, "smd_sot", SOT23, "2N7000"],
         [ 28, 16,  -90, "smd_sot", SOT223, "LM117"],
@@ -116,8 +117,8 @@ test_pcb = ["test_pcb", "Test PCB",
         [  5, 220, 180, "hdmi"],
         [  3, 235, 180, "mini_hdmi"],
         [ 38, 190, -90, "text", 25, 4, "Silkscreen", "Liberation Sans:style=Bold"],
-        [ 25, 200,   0, "buzzer", 4.5, 8.5],
-        [ 25, 218,   0, "buzzer"],
+        [ 25, 205,   0, "buzzer", 4.5, 8.5],
+        [ 25, 220,   0, "buzzer"],
 
         [ 45,   1,   0, "link", inch(0.4), 0.75, undef, undef, [1.5, "red"]], // Sleeved link
         [ 45,   3,   0, "link", inch(0.4)], // Flat link
@@ -130,6 +131,10 @@ test_pcb = ["test_pcb", "Test PCB",
         [ 35,  17,   0, "vero_pin", true],
         [ 35,   8, 180, "rd_transistor", TO92, "78L05", undef,  undef, "Regulator"],
         [ 35,  13, 180, "rd_transistor", E_LINE, "ZTX853"],
+        [ 25, 190,   0, "rd_electrolytic", ECAP8x11, "220uF35V"],
+        [ 25, 180,  90, "rd_disc",  ERZV07D471, "471"],
+        [ 25, 170,  90, "rd_disc", 6p4mm_disc, "100n"],
+        [ 90, 135, -90, "rd_module", HF33F, "012-HSL-3F"],
         [ 35,   3,   0, "link", 0, 5], // Vertical wire
 
         [ 60,   3,   0, "link", inch(0.2), inch(0.4)], // Raised link
@@ -147,6 +152,9 @@ test_pcb = ["test_pcb", "Test PCB",
         [ 30,  130,-90, "rd_xtal", ACT1100, "40MHz", 0.5 ],
         [ 30,  150,-90, "rd_xtal", ACT1700, "80MHz", 0.5 ],
 
+        [ 93,  230,-90, "rd_box_cap", BOXC18x10x16, "X2 rated film capacitor", "0.47uF 250V" ],
+        [ 93,  210,-90, "rd_box_cap", BOXC18x5x11,  "X2 rated film capacitor", "0.1uF 250V" ],
+
         [ 77,  15, -90, "flex"],
         [ 95,  15, -90, "flat_flex"],
         [ 87,  15, -90, "flat_flex", true],
@@ -179,7 +187,7 @@ test_pcb = ["test_pcb", "Test PCB",
         [ 55, 170,   0, "button_4p5mm"],
         [ 50, 185,   0, "microswitch", small_microswitch],
         [ 52, 200,   0, "pcb", 11, TMC2130 ],
-        [ 80, 210,   0, "pdip", 24, "27C32", true, inch(0.6) ],
+        [ 76, 210,   0, "pdip", 24, "27C32", true, inch(0.6) ],
         [ 80, 180,   0, "pdip", 8, "NE555" ],
         [ 71, 180,    0, "smd_inductor", IND2525, "4R7"],
 

tests/SMDs.scad

@@ -64,7 +64,12 @@ module smds() {
             let(s = smd_soics[$i])
                 smd_soic(s, s[0]);
 
-    translate([0, 39])
+    translate([0, 36.5])
+        layout([for(i = smd_250V_fuses) smd_250V_fuse_size(i).x], 1)
+            let(i = smd_250V_fuses[$i])
+                smd_250V_fuse(i, "2A 250V");
+
+    translate([0, 45])
         layout([for(i = smd_inductors) smd_inductor_leads(i).x], 1)
             let(i = smd_inductors[$i])
                 smd_inductor(i, ["4R7", "10R"][$i % 2]);

tests/cable_clip.scad

@@ -20,33 +20,39 @@
 include <../core.scad>
 use <../printed/cable_clip.scad>
 use <../vitamins/wire.scad>
+use <../utils/layout.scad>
 
-
+screw = M3_dome_screw;
 sheet_thickness = 3;
 
 cables = [
     [10, inch(0.05), true], 0, for(i = [1 : 9]) [i, 1.4], 0,  [1, 6], 0,
 ];
 
-screw = M3_dome_screw;
+clips = [for(i = [0 : ceil(len(cables) / 2) - 1]) let(c1= cables[2 * i], c2 = cables[2 * i + 1]) [c1, c2]];
 
+function use_insert(i) = in([0, 3], i);
+function use_nut(i)    = in([4],    i);
+
+clip_lengths = [for(i = [0 : len(clips) - 1])
+    let(c = clips[i], c1 = c.x, c2 = c.y, ins = use_insert(i), nut = use_nut(i))
+        cable_clip_extent(screw, c1, insert = ins, nut = nut) + (c2 ? cable_clip_extent(screw, c2, insert = ins, nut = nut) : cable_clip_width(screw, insert = ins, nut = nut) / 2)];
 
 module cable_clips() {
-    for(i = [0 : ceil(len(cables) / 2) - 1]) {
-        cable1 = cables[2 * i];
-        cable2 = cables[2 * i + 1];
-        translate([i * 21 + (!cable2 ? cable_clip_offset(screw, cable1) / 2 : 0), 0]) {
-            insert = in([0, 3], i);
+    layout(clip_lengths, 3, true) let(cable1 = clips[$i].x, cable2 = clips[$i].y) {
+        insert = use_insert($i);
+        nut = use_nut($i);
+        translate([cable_clip_extent(screw, cable1, insert = insert, nut = nut) - clip_lengths[$i] / 2, 0]) {
             if($preview) {
-                cable_clip_assembly(screw, sheet_thickness, cable1, cable2, insert = insert, flip = i == 1);
+                cable_clip_assembly(screw, sheet_thickness, cable1, cable2, insert = insert, nut = nut, flip = $i == 1);
 
                 for(j = [0 : 1])
-                    let(cable = cables[2 * i + j])
+                    let(cable = clips[$i][j])
                         if(cable)
                             let(positions = cable_bundle_positions(cable))
                                 for(i = [0 : len(positions) - 1])
                                     let(p = positions[i])
-                                        translate([p.x + [-1, 1][j] * cable_clip_offset(screw, cable, insert = insert), 0, p.y])
+                                        translate([p.x + [-1, 1][j] * cable_clip_offset(screw, cable, insert = insert, nut = nut), 0, p.y])
                                             rotate([90, 0, 0])
                                                 color([grey(20), "blue", "red", "orange", "yellow", "green", "brown", "purple", "grey", "white"][i])
                                                     cylinder(d = cable_wire_size(cable), h = 30, center = true);

tests/nuts.scad

@@ -85,6 +85,13 @@ module nuts() {
             if(n == M8_nut)
                nut_square(M8nS_thin_nut);
        }
+
+       translate([0,140]) {
+            if(n==M4_nut)
+                weld_nut(M4_weld_nut);
+            if(n==M6_nut)
+                weld_nut(M6_weld_nut);
+       }
     }
 }
 

tests/printed_pulleys.scad

@@ -22,9 +22,16 @@ include <../vitamins/pulleys.scad>
 include <../printed/printed_pulleys.scad>
 use <../utils/layout.scad>
 
+n = len(pulleys) - 1;
+half = floor((n - 1) / 2);
+split = n - half;
+pulleys1 = [for(i = [0 : split - 1]) pulleys[i]];
+pulleys2 = [for(i = [split : n - 1]) pulleys[i]];
 
-module printed_pulley_test(show_metal = false) {
-    layout([for (p = pulleys) pulley_flange_dia(p)]) let(p = pulleys[$i]) {
+max_d = max([for(p = concat(pulleys1, pulleys2)) pulley_flange_dia(p)]);
+
+module do_list(list, show_metal) {
+    layout([for (p = list) max_d]) let(p = list[$i]) {
         rotate(-145)
             if($preview)
                 printed_pulley_assembly(p);
@@ -33,12 +40,23 @@ module printed_pulley_test(show_metal = false) {
 
         if(show_metal)
             not_on_bom()
-                translate([0, 20])
+                translate([0, 60])
                     rotate(-145)
                         pulley_assembly(p);
     }
 }
 
+module printed_pulley_test(show_metal = false) {
+    translate([0, 10])
+        do_list(pulleys1, show_metal);
+
+    translate([0, -10])
+        do_list(pulleys2, show_metal);
+
+    translate([split * (max_d + 5), 0])
+        do_list([pulleys[n]], show_metal);
+}
+
 if($preview)
     printed_pulley_test(true);
 else

tests/radials.scad

@@ -28,10 +28,14 @@ module radials() {
         pcb_grid(pcb, 10, 12)
             rd_module(rd_modules[2], "12V 900ma");
 
-        for(i = [0: len(rd_electrolytics) - 1])
+        for(i = [0 : len(rd_electrolytics) - 1])
             pcb_grid(pcb, i * 3, 2)
                 rotate(-90)
                     rd_electrolytic(rd_electrolytics[i], "220uF35V", z = 3, pitch = inch(0.2));
+
+        for(i = [0 : len(rd_box_caps) - 1])
+            pcb_grid(pcb, 20, i * 4)
+                rd_box_cap(rd_box_caps[i], "X2 rated film capacitor", ["0.1uF 250V", "0.47uF 250V"][i]);
     }
 
     $solder = pcb_solder(pcb);

tests/rod_ends.scad

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

tests/splines.scad

@@ -0,0 +1,38 @@
+//
+// NopSCADlib Copyright Chris Palmer 2024
+// nop.head@gmail.com
+// hydraraptor.blogspot.com
+//
+// This file is part of NopSCADlib.
+//
+// NopSCADlib is free software: you can redistribute it and/or modify it under the terms of the
+// GNU General Public License as published by the Free Software Foundation, either version 3 of
+// the License, or (at your option) any later version.
+//
+// NopSCADlib is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+// without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+// See the GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License along with NopSCADlib.
+// If not, see <https://www.gnu.org/licenses/>.
+//
+include <../utils/core/core.scad>
+
+use <../utils/splines.scad>
+use <../utils/sweep.scad>
+
+points = [[0, 1.5], [2, 2], [3, 1], [4, -2], [5, 1], [6, 2], [7, 3]];
+
+module splines() {
+    cm_spline = catmull_rom_spline(points, 100 / len(points), 0.5);
+    color("green") show_path(cm_spline, 0.01);
+
+    cu_spline = cubic_spline(points, 100);
+    color("blue") show_path(cu_spline, 0.01);
+
+    for(p = points)
+        translate(p) color("red")
+            cylinder($fn = 64, r = 0.03, h = 0.02, center = true);
+}
+
+rotate([70, 0, 315]) splines();

utils/splines.scad

@@ -0,0 +1,101 @@
+//
+// NopSCADlib Copyright Chris Palmer 2024
+// 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/>.
+//
+
+//
+//! Cubic splines that interpolate between a list of 2D points passing through all of them.
+//! Translated from the Python version at <https://community.alteryx.com/t5/Engine-Works/Creating-a-Cubic-Spline-in-Python-and-Alteryx/ba-p/581173>.
+//! Note the x values of the points must be strictly increasing.
+//!
+//! Catmull-Rom splines are well behaved but the ends points are control points and the curve only goes from the second point to the penultimate point.
+//! Coded from <https://en.wikipedia.org/wiki/Centripetal_Catmull%E2%80%93Rom_spline#Code_example_in_Python>.
+//! No restrictions on points and they can be 3D.
+//
+include <../utils/core/core.scad>
+
+use <maths.scad>
+use <sweep.scad>
+
+function cubic_spline(points, N = 100) = let( //! Interpolate the list of points given to produce N points on a cubic spline that passes through points given.
+        N = N - 1,
+        n = len(points),
+        ass1 = assert(n >= 3, "must be at least 3 points")0,
+
+        dx = [for(i = [0 : n - 2]) points[i + 1].x - points[i].x], // x deltas
+        ass2 = assert(min(dx) > 0, "X must strictly increase")0,
+
+        //
+        // A and C are diagonals above and below the main diagonal B, which is all 2's
+        //
+        A = [for(i = [0 : n - 3]) dx[i] / (dx[i] + dx[i + 1]), 0],
+        C = [0, for(i = [0 : n - 3]) dx[i + 1] / (dx[i] + dx[i + 1]), 0],
+        //
+        // D are the target values on the right hand side of the equation
+        //
+        D = [0, for(i = [1 : n - 2]) 6 * ((points[i + 1].y - points[i].y) / dx[i] - (points[i].y - points[i - 1].y) / dx[i - 1]) / (dx[i] + dx[i - 1]), 0],
+        //
+        // Solve the tridiagonal equation using the Thomas algorithm
+        //
+        c = [for(i = 1, c = 0; i < n; c = C[i] / (2 - c * A[i - 1]), i = i + 1) c, 0],
+        d = [for(i = 1, d = 0; i < n; d = (D[i] - d * A[i - 1]) / (2 - c[i - 1] * A[i - 1]), i = i + 1) d, 0],
+        M = [for(i = n - 2, x = 0; i >= 0; x = d[i] - c[i] * x, i = i - 1) x, 0],
+        //
+        // Calculate the coefficients of each cubic curve
+        //
+        coefficients = [for(i = [0 : n - 2], dx2 = sqr(dx[i]), j = n - 1 - i)
+                            [(M[j - 1] - M[j]) * dx2 / 6,
+                             M[j] * dx2 / 2,
+                             points[i + 1].y - points[i].y - (M[j - 1] + 2 * M[j]) * dx2 / 6,
+                             points[i].y]
+                       ],
+        //
+        // Use the coefficients to interpolate between the points
+        //
+        x0 = points[0].x,
+        x1 = points[n - 1].x,
+        spline = [for(i = 0, j = 0, z = 0, x = x0; i <= N + 1;
+                      x = x0 + (x1 - x0) * i / N,
+                      j = i < N - 1 && x > points[j + 1].x ? j + 1 : j,
+                      z = (x - points[j].x) / dx[j],
+                      i = i + 1,
+                      C = coefficients[j]
+                     ) if(i) [x, (((C[0] * z) + C[1]) * z + C[2]) * z + C[3]]
+                 ]
+    ) spline;
+
+function tj(ti, pi, pj, alpha = 0.5) = ti + pow(norm(pi - pj), alpha);
+
+function catmull_rom_segment(P0, P1, P2, P3, n, alpha = 0.5, last = false) = let(
+        t0 = 0,
+        t1 = tj(t0, P0, P1, alpha),
+        t2 = tj(t1, P1, P2, alpha),
+        t3 = tj(t2, P2, P3, alpha),
+        end = last ? n : n - 1,
+        points  = [for(i = [0 : end], t = t1 + (t2 - t1) * i / n) let(
+            A1 = (t1 - t) / (t1 - t0) * P0 + (t - t0) / (t1 - t0) * P1,
+            A2 = (t2 - t) / (t2 - t1) * P1 + (t - t1) / (t2 - t1) * P2,
+            A3 = (t3 - t) / (t3 - t2) * P2 + (t - t2) / (t3 - t2) * P3,
+            B1 = (t2 - t) / (t2 - t0) * A1 + (t - t0) / (t2 - t0) * A2,
+            B2 = (t3 - t) / (t3 - t1) * A2 + (t - t1) / (t3 - t1) * A3
+        ) (t2 - t) / (t2 - t1) * B1 + (t - t1) / (t2 - t1) * B2]
+    ) points;
+
+
+function catmull_rom_spline(points, n, alpha = 0.5) = let( //! Interpolate n new points between the specified points with a Catmull-Rom spline, alpha = 0.5 for centripetal, 0 for uniform and 1 for chordal.
+        segs = len(points) - 3
+    ) [for(i = [0 : segs - 1]) each catmull_rom_segment(points[i], points[i + 1], points[i + 2], points[i + 3], n, alpha, last = i == segs - 1)];

utils/thread.scad

@@ -47,7 +47,7 @@ thread_colour_factor = 0.8; // 60 degree threads appear too bright due to the an
 
 function thread_profile(h, crest, angle, overlap = 0.1) = //! Create thread profile path
     let(base = crest + 2 * (h + overlap) * tan(angle / 2))
-        [[-base / 2, -overlap, 0], [-crest / 2, h, 0], [crest / 2, h, 0], [base / 2, -overlap, 0]];
+        [[-base / 2, -overlap, 0], [-crest / 2, h, 0], if(crest) [crest / 2, h, 0], [base / 2, -overlap, 0]];
 
 module thread(dia, pitch, length, profile, center = true, top = -1, bot = -1, starts = 1, solid = true, female = false, colour = undef) { //! Create male or female thread, ends can be tapered, chamfered or square
     assert(is_undef(colour) || is_list(colour), "Thread colour must be in [r, g, b] form");

vitamins/ball_bearings.scad

@@ -34,8 +34,9 @@ BBMR93   = ["MR93",  3,  9,  4,   "silver",    0.5,  0.5,   0,    0];
 BBMR95   = ["MR95",  5,  9,  3,   "silver",    0.5,  0.5,   0,    0];
 BBF623   = ["F623",  3,  10, 4,   "black",     0.6,  0.7,  11.5,  1];
 BBF693   = ["F693",  3,  8,  3,   "silver",    0.5,  0.7,  9.5,   0.7];
+BBF625   = ["F625",  5,  16, 5,   "silver",    1.0,  1.0,  18,    1];
 BBF695   = ["F695",  5,  13, 4,   "silver",    1.0,  1.0,  15,    1];
 
-ball_bearings = [BBF693, BBF623, BBF695, BBMR63, BBMR83, BBMR93, BBSMR95, BB624, BB686, BB696, BB608, BB6200, BB6201, BB6808];
+ball_bearings = [BBF625, BBF693, BBF623, BBF695, BBMR63, BBMR83, BBMR85, BBMR93, BBMR95, BBSMR95, BB624, BB686, BB696, BB608, BB6200, BB6201, BB6808];
 
 use <ball_bearing.scad>

vitamins/geared_stepper.scad

@@ -52,7 +52,7 @@ module geared_stepper_screw_positions(type) //! Place children at the screw posi
 motor_colour = "#9BA2AC";
 gearbox_colour = "#FFF7EE";
 
-module geared_stepper(type) { //! Draw the specified geared stepper
+module geared_stepper(type, angle = 0) { //! Draw the specified geared stepper with optional shaft angle.
     vitamin(str("geared_stepper(", type[0], "): Geared stepper - ", type[1]));
 
     radius = gs_diameter(type) / 2;
@@ -125,19 +125,20 @@ module geared_stepper(type) { //! Draw the specified geared stepper
     f = gs_shaft_flat(type);
     two_flats = f < 0;
     vflip()
-        color(two_flats ? brass : gearbox_colour) {
-            d = gs_shaft_d(type);
-            h = gs_shaft_length(type);
-            linear_extrude(h)
-                intersection() {
-                    circle(d = d);
+        rotate(angle)
+            color(two_flats ? brass : gearbox_colour) {
+                d = gs_shaft_d(type);
+                h = gs_shaft_length(type);
+                linear_extrude(h)
+                    intersection() {
+                        circle(d = d);
 
-                    translate([0, two_flats ? 0 : (f - d) / 2])
-                        square([d + 1, abs(f)], center = true);
-                }
+                        translate([0, two_flats ? 0 : (f - d) / 2])
+                            square([d + 1, abs(f)], center = true);
+                    }
 
-            cylinder(d = d, h = h - gs_flat_length(type));
-        }
+                cylinder(d = d, h = h - gs_flat_length(type));
+            }
 
     // Wire block
     color(bulge_z ? "white" : "skyblue") {

vitamins/insert.scad

@@ -212,13 +212,10 @@ module threaded_insert(type) { //! Draw specified threaded insert, for use in wo
 
     thread_l = insert_length(type) - z; // - insert_ring1_h(type);
 
-
-
-
     vitamin(str("threaded_insert(", type[0], "): Threaded insert M", insert_screw_diameter(type), " x ", length, "mm"));
     union() {
         color(silver)
-            difference() {
+            render() difference() {
                 base_insert(type);
                 translate_z(-socket/2 + 0.01)
                     cylinder(r=socket, $fn = 6, h=socket/2);
@@ -245,5 +242,4 @@ module threaded_insert(type) { //! Draw specified threaded insert, for use in wo
                 female = false,
                 colour = silver);
     }
-
 }

vitamins/nut.scad

@@ -41,9 +41,12 @@ function nut_dome(type)       = type[8];        //! Dome height and max thread d
 
 function nut_flat_radius(type) = nut_radius(type) * cos(30); //! Radius across the flats
 
-function nut_square_size(type)      = type[1]; //! Diameter of the corresponding screw
-function nut_square_width(type)     = type[2]; //! Width of the square nut
-function nut_square_thickness(type) = type[3]; //! Thickness of the square nut
+function nut_square_size(type)      = type[1];  //! Diameter of the corresponding screw
+function nut_square_width(type)     = type[2];  //! Width of the square nut
+function nut_square_thickness(type) = type[3];  //! Thickness of the square nut
+
+function nut_weld_base_r(type) = type[7] / 2;   //! Weld nut base radius
+function nut_weld_base_t(type) = type[8];       //! Weld nut base thickness
 
 function nut_dome_height(type)  = let(d = nut_dome(type)) d ? d[0] : nut_thickness(type); //! Height of the domed version
 function nut_thread_depth(type) = let(d = nut_dome(type)) d ? d[1] : nut_thickness(type); //! Max thread depth in domed version
@@ -190,7 +193,7 @@ module wingnut(type) { //! Draw a wingnut
 
 function t_nut_tab(type) = [type[8], type[9]]; //! Sliding t-nut T dimensions
 
-module sliding_ball_t_nut(size, w, h, r) {
+module sliding_ball_t_nut(size, w, h, r) { //! Draw a sliding ball t nut
     rad = 0.5;
     stem = size.z - h;
     ball_d = 4;
@@ -245,6 +248,38 @@ module sliding_t_nut(type) { //! Draw a sliding T nut, T nut with a spring loade
             extrusionSlidingNut(size, tab[0], tab[1], tabSizeZ, holeRadius, 0, hammerNut);
 }
 
+module weld_nut(type) { //! draw a weld nut
+    thread_d = nut_size(type);
+    hole_rad  = thread_d / 2;
+    nut_neck_rad = nut_radius(type);
+    thickness = nut_thickness(type);
+    base_rad = nut_weld_base_r(type);
+    base_thickness = nut_weld_base_t(type);
+
+
+    vitamin(str("weld nut(", type[0], "): Weld Nut M", nut_size(type)));
+    colour = silver;
+    explode(-20) {
+        color(colour) {
+
+            rotate_extrude()
+                polygon([
+                    [hole_rad, -base_thickness],
+                    [base_rad, -base_thickness],
+                    [base_rad, 0],
+                    [hole_rad, 0],
+                    [nut_neck_rad, 0],
+                    [nut_neck_rad, thickness],
+                    [hole_rad, thickness]
+                ]);
+        }
+
+        if(show_threads)
+            female_metric_thread(thread_d, metric_coarse_pitch(thread_d), thickness, center = false, colour = colour);
+    }
+
+}
+
 module extrusionSlidingNut(size, tabSizeY1, tabSizeY2, tabSizeZ, holeRadius, holeOffset = 0, hammerNut = false) {
     // center section
     stem_h = size.z - tabSizeZ;

vitamins/nuts.scad

@@ -20,7 +20,7 @@ include <washers.scad>
 //
 // Nuts
 //
-M2_nut_trap_depth = 2.5;
+M2_nut_trap_depth = 1.75;
 M2p5_nut_trap_depth = 2.5;
 M3_nut_trap_depth = 3;
 M4_nut_trap_depth = 4;
@@ -49,7 +49,11 @@ M6_half_nut =      ["M6_half_nut",      6,  11.5, 3,   8,    M6_washer,     3,
 M8_nut      =      ["M8_nut",           8,  15,   6.5, 8,    M8_washer,     M8_nut_depth,      0, [15, 11.35]];
 toggle_nut  =      ["toggle_nut",       6.1, 9.2, 1.5, 1.5,  M6_washer,     1.5,               inch(1/40)];
 
-M4_wingnut  =      ["M4_wingnut",       4,  10,   3.75,8,    M4_washer,     0, 22, 10, 6, 3];
+M4_wingnut  =      ["M4_wingnut",       4,  10,   3.75,8,    M4_washer,     0, 22,   10, 6, 3];
+
+M4_weld_nut  =     ["M4_weld_nut",      4,  5.3,  6.3, 8,    M4_washer,     0, 18,   0.8,]; // Base diameter and thickness
+M6_weld_nut  =     ["M6_weld_nut",      6,  7.7,  7.9, 8,    M6_washer,     0, 19.1, 1.2,];
+
 //                                                                              sx  ty1 ty2 hammer
 M3_sliding_t_nut = ["M3_sliding_t_nut", 3,   6,   3.0, 4.0,  false,         0,  10,  10,  6, false];
 M4_sliding_t_nut = ["M4_sliding_t_nut", 4,   6,   3.7, 4.7,  false,         0,  11,  10,  6, false];

vitamins/pcb.scad

@@ -1169,6 +1169,7 @@ module pcb_component(comp, cutouts = false, angle = undef) { //! Draw pcb compon
             if(show(comp, "rd_module"))     rd_module(type = comp[4], value = comp[5]);
             if(show(comp, "rd_transistor")) rd_transistor(type = comp[4], value = comp[5], lead_positions = param(6, undef), z = param(7, 5), kind = param(8,"Transistor"));
                                              // type, value, lead positions, z, kind
+            if(show(comp, "rd_box_cap"))    rd_box_cap(type = comp[4], kind = comp[5], value = comp[6]);
             if(show(comp, "link"))          wire_link(l = comp[4], h = param(5, 1), d = param(6, 0.8), tail = param(7, 3), sleeve = param(8, false));
             if(show(comp, "D_plug"))        translate_z(d_pcb_offset(comp[4])) d_plug(comp[4], pcb = true);
             if(show(comp, "molex_hdr"))     molex_254(comp[4], param(5, 0), param(6, undef));
@@ -1177,6 +1178,7 @@ module pcb_component(comp, cutouts = false, angle = undef) { //! Draw pcb compon
             if(show(comp, "jst_zh"))        jst_xh_header(jst_zh_header, comp[4], param(5, false), param(6, false), param(7, undef));
             if(show(comp, "potentiometer")) let(pot = param(4, BTT_encoder)) translate_z(pot_size(pot).z) vflip() potentiometer(pot, shaft_length = param(5, undef));
             if(show(comp, "buzzer"))        buzzer(param(4, 9), param(5, 12), param(6, grey(20)));
+            if(show(comp, "smd_250V_fuse")) smd_250V_fuse(comp[4], comp[5]);
             if(show(comp, "smd_res"))       smd_resistor(comp[4], comp[5]);
             if(show(comp, "smd_cap"))       smd_capacitor(comp[4], comp[5], param(6, undef));
             if(show(comp, "smd_tant"))      smd_tant(comp[4], param(5, undef));

vitamins/pcbs.scad

@@ -760,7 +760,7 @@ ZC_A0591 = ["ZC_A0591", "ZC-A0591 ULN2003 driver PCB", 35, 32, 1.6, 0, 2.5, 0, "
     ], [], [], [], M2p5_pan_screw];
 
 
-MT3608 = ["MT3608", "MT3608 boost converter module",        37, 17, 1.2, 2, 1.5, [5, 3], "#2140BE", false, 
+MT3608 = ["MT3608", "MT3608 boost converter module",        37, 17, 1.2, 2, 1.5, [5, 3], "#2140BE", false,
       [[3.0725, 5.095], [3.0725, -5.095], [-3.0725, 5.095], [-3.0725, -5.095]],
       [[-12.05 , -6.8, 180, "trimpot10"],
        [-24.05 , 13.8, 90, "smd_soic", SOT23_6, "B628"],
@@ -1202,6 +1202,28 @@ ESP_12F = pcb("ESP_12F", "ESP-12F ESP8266 WiFi module", [24, 16, 0.8],
     ]
 );
 
+RCWL0516 = pcb(
+    "RCWL-0516", "Microwave Radar Sensor",
+    size = [36, 17.3, 1.2],
+    colour = "#17682d",
+    hole_d = 1.7,
+    holes = [
+          [  inch(0.05),  inch(0.05) ],
+          [ -inch(0.05),  inch(0.05) ],
+          [ -inch(0.05), -inch(0.05) ],
+          [  inch(0.05), -inch(0.05) ],
+          [ -inch(0.65), -inch(0.05) ],
+          [ -inch(0.65),  inch(0.05) ],
+    ],
+    grid = [inch(0.05), inch(0.13), 1,  5, silver, inch(0.1), inch(0.1)],
+  components = [
+        [inch(0.18), inch(0.13), 90,"smd_cap", CAP1206, 0.5],
+        [inch(0.18), inch(0.32), 90,"smd_cap", CAP1206, 0.5],
+        [inch(0.18), inch(0.54), 90,"smd_cap", CAP1206, 0.5],
+        [inch(0.45), inch(0.34),  0,"smd_soic", SOIC16, "RCWL9196"],
+            ]
+);
+
 tiny_buck = pcb("tiny_buck", "Ultra Small 3A buck regulator", [20, 11, 1.6],
     hole_d = 1.2,
     land_d = [2, 2],
@@ -1226,7 +1248,7 @@ tiny_pcbs = [ESP_201, ESP_01M, XIAO, ESP_12F, MP1584EN, ESP_01,tiny_buck, LIPO_f
 
 big_pcbs = [BTT_RELAY_V1_2, BTT_SKR_MINI_E3_V2_0, BTT_SKR_E3_TURBO, BTT_SKR_V1_4_TURBO, DuetE, Duex5];
 
-pcbs = [KY_040, TP4056, L9110S, ZC_A0591, MT3608, RAMPSEndstop, ArduinoNano, HW803_1WAY_RELAY, Feather405, RPI_Pico, ESP32_DOIT_V1, RPI0, EnviroPlus, ArduinoUno3, ArduinoLeonardo, WD2002SJ, OPZ2, PanelDue_v3, RPI3A, RPI3, RPI4];
+pcbs = [KY_040, TP4056, L9110S, ZC_A0591, RCWL0516, MT3608,RAMPSEndstop, ArduinoNano, HW803_1WAY_RELAY, Feather405, RPI_Pico, ESP32_DOIT_V1, RPI0, EnviroPlus, ArduinoUno3, ArduinoLeonardo, WD2002SJ, OPZ2, PanelDue_v3, RPI3A, RPI3, RPI4];
 
 pcbs_not_shown = [Melzi, Duex2, PSU12V1A, Keyes5p1, PI_IO, ExtruderPCB];
 

vitamins/pulleys.scad

@@ -18,37 +18,54 @@
 //
 include <belts.scad>
 //
-//                                               n       t   o      b         w    h  h    b     f    f  s   s    s              s
-//                                               a       e   d      e         i    u  u    o     l    l  c   c    c              c
-//                                               m       e          l         d    b  b    r     a    a  r   r    r              r
-//                                               e       t          t         t            e     n    n  e   e    e              e
-//                                                       h                    h    d  l          g    g  w   w    w              w
-//                                                                                               e    e                          s
-//                                                                                                       l   z
-//                                                                                               d    t
+//                                                 n       t   o      b         w    h  h    b     f    f  s   s    s              s
+//                                                 a       e   d      e         i    u  u    o     l    l  c   c    c              c
+//                                                 m       e          l         d    b  b    r     a    a  r   r    r              r
+//                                                 e       t          t         t            e     n    n  e   e    e              e
+//                                                         h                    h    d  l          g    g  w   w    w              w
+//                                                                                                 e    e                          s
+//                                                                                                         l   z
+//                                                                                                 d    t
 //
-T5x10_pulley         = ["T5x10_pulley",         "T5",    10, 15,    T5x6,  11.6, 7.9, 7,   5, 19.3, 1.7, 3, 10.7, M3_grub_screw, 1];
-T2p5x16_pulley       = ["T2p5x16_pulley",       "T2.5",  16, 12.16, T2p5x6,   8,  16, 5.7, 5, 16.0, 1.0, 6, 3.75, M4_grub_screw, 1];
-GT2x20um_pulley      = ["GT2x20um_pulley",      "GT2UM", 20, 12.22, GT2x6,  7.5,  18, 6.5, 5, 18.0, 1.0, 6, 3.75, M3_grub_screw, 2]; //Ultimaker
-GT2x20ob_pulley      = ["GT2x20ob_pulley",      "GT2OB", 20, 12.22, GT2x6,  7.5,  16, 5.5, 5, 16.0, 1.0, 6, 3.25, M3_grub_screw, 2]; //Openbuilds
-GT2x16_pulley        = ["GT2x16_pulley",        "GT2",   16,  9.75, GT2x6,  7.0,  13, 5,   5, 13.0, 1.0,4.5,3.0,  M3_grub_screw, 2];
-GT2x12_pulley        = ["GT2x12_pulley",        "GT2RD", 12,  7.15, GT2x6,  6.5,  12, 5.5, 4, 12.0, 1.0, 4, 3.0,  M3_grub_screw, 2]; //Robotdigg
-GT2x20_toothed_idler = ["GT2x20_toothed_idler", "GT2",   20, 12.22, GT2x6,  6.5,  18, 0,   4, 18.0, 1.0, 0, 0,    false,         0];
-GT2x20_plain_idler   = ["GT2x20_plain_idler",   "GT2",    0, 12.0,  GT2x6,  6.5,  18, 0,   4, 18.0, 1.0, 0, 0,    false,         0];
-GT2x16_toothed_idler = ["GT2x16_toothed_idler", "GT2",   16,  9.75, GT2x6,  6.5,  14, 0,   3, 14.0, 1.0, 0, 0,    false,         0];
-GT2x16_plain_idler   = ["GT2x16_plain_idler",   "GT2",    0,  9.63, GT2x6,  6.5,  13, 0,   3, 13.0, 1.0, 0, 0,    false,         0];
-GT2x16x7_plain_idler = ["GT2x16x7_plain_idler", "GT2",    0,  9.63, GT2x6,  7.0,  13, 0,   3, 13.0, 1.0, 0, 0,    false,         0];
+T5x10_pulley           = ["T5x10_pulley",         "T5",    10, 15,    T5x6,  11.6, 7.9, 7,   5, 19.3, 1.7, 3, 10.7, M3_grub_screw, 1];
+T2p5x16_pulley         = ["T2p5x16_pulley",       "T2.5",  16, 12.16, T2p5x6,   8,  16, 5.7, 5, 16.0, 1.0, 6, 3.75, M4_grub_screw, 1];
+GT2x20um_pulley        = ["GT2x20um_pulley",      "GT2UM", 20, 12.22, GT2x6,  7.5,  18, 6.5, 5, 18.0, 1.0, 6, 3.75, M3_grub_screw, 2]; //Ultimaker
+GT2x20ob_pulley        = ["GT2x20ob_pulley",      "GT2OB", 20, 12.22, GT2x6,  7.5,  16, 5.5, 5, 16.0, 1.0, 6, 3.25, M3_grub_screw, 2]; //Openbuilds
+GT2x16_pulley          = ["GT2x16_pulley",        "GT2",   16,  9.75, GT2x6,  7.0,  13, 5,   5, 13.0, 1.0,4.5,3.0,  M3_grub_screw, 2];
+GT2x12_pulley          = ["GT2x12_pulley",        "GT2RD", 12,  7.15, GT2x6,  6.5,  12, 5.5, 4, 12.0, 1.0, 4, 3.0,  M3_grub_screw, 2]; //Robotdigg
+GT2x20_toothed_idler   = ["GT2x20_toothed_idler", "GT2",   20, 12.22, GT2x6,  6.5,  18, 0,   4, 18.0, 1.0, 0, 0,    false,         0];
+GT2x20_plain_idler     = ["GT2x20_plain_idler",   "GT2",    0, 12.0,  GT2x6,  6.5,  18, 0,   4, 18.0, 1.0, 0, 0,    false,         0];
+GT2x16_toothed_idler   = ["GT2x16_toothed_idler", "GT2",   16,  9.75, GT2x6,  6.5,  14, 0,   3, 14.0, 1.0, 0, 0,    false,         0];
+GT2x16_plain_idler     = ["GT2x16_plain_idler",   "GT2",    0,  9.63, GT2x6,  6.5,  13, 0,   3, 13.0, 1.0, 0, 0,    false,         0];
+GT2x16x7_plain_idler   = ["GT2x16x7_plain_idler", "GT2",    0,  9.63, GT2x6,  7.0,  13, 0,   3, 13.0, 1.0, 0, 0,    false,         0];
 
-pulleys = [T5x10_pulley,
-           T2p5x16_pulley,
-           GT2x20um_pulley,
-           GT2x20ob_pulley,
-           GT2x16_pulley,
-           GT2x12_pulley,
-           GT2x20_toothed_idler,
-           GT2x20_plain_idler,
-           GT2x16_toothed_idler,
-           GT2x16_plain_idler,
-           GT2x16x7_plain_idler];
+GT2x80_pulley          = ["GT2x80_pulley",        "GT2",   80, 50.42, GT2x6,  7,    35, 9,   5, 55,   1.0, 6, 4.5,  M5_grub_screw, 2]; // Powge branded from West3D
+GT2x16_toothed_idler_9 = ["GT2x16_toothed_idler_9", "GT2", 16, 9.75,  GT2x9,  10,   14, 0,   3, 14.0, 1.0, 0, 0,    false,         0];//Robotdigg
+GT2x16_pulley_9        = ["GT2x16_pulley_9",      "GT2",   16, 9.65,  GT2x9,  9.5,  14, 6.5, 5, 14.0, 1.0, 6, 3.5,  M3_grub_screw, 2];
+GT2x20_pulley_9        = ["GT2x20_pulley_9",      "GT2",   20, 12.22, GT2x9,  11,   16, 7,   5, 16.0, 1.0, 6, 3.25, M4_grub_screw, 2];//Powge
+GT2x20_toothed_idler_9 = ["GT2x20_toothed_idler_9", "GT2", 20, 12.22, GT2x9,  10,   18, 0,   5, 18.0, 1.0, 0, 0,    false,         0];
+
+
+
+pulleys = [
+       T5x10_pulley,
+       T2p5x16_pulley,
+       GT2x20_pulley_9,
+       GT2x20um_pulley,
+       GT2x20ob_pulley,
+       GT2x16_pulley_9,
+       GT2x16_pulley,
+       GT2x12_pulley,
+
+       GT2x16_plain_idler,
+       GT2x16x7_plain_idler,
+       GT2x20_plain_idler,
+       GT2x16_toothed_idler,
+       GT2x16_toothed_idler_9,
+       GT2x20_toothed_idler,
+       GT2x20_toothed_idler_9,
+
+       GT2x80_pulley,
+];
 
 use <pulley.scad>

vitamins/radial.scad

@@ -158,6 +158,7 @@ module rd_module(type, value) { //! Draw a PCB mounted potted module, e.g. PSU o
     r = rd_module_radius(type);
     size = rd_module_size(type);
     pin = rd_module_pin_size(type);
+
     color(rd_module_colour(type))
         rounded_top_rectangle(size, r, r);
 
@@ -393,3 +394,60 @@ module rd_electrolytic(type, value, pitch = undef, z = 0, tail = 3) { //! Draw a
                 cylinder(r = jacket_ir, h = eps);
     }
 }
+
+function rd_boxc_size(type)    = type[1]; //! Overall size and corner radius
+function rd_boxc_z(type)       = type[2]; //! Height of inner base above PCB.
+function rd_boxc_skirt(type)   = type[3]; //! Skirt slot, thickness, height
+function rd_boxc_leads(type)   = type[4]; //! Lead pitch, diameter and length
+function rd_boxc_colours(type) = type[5]; //! Case colour and resin fill colour
+
+module rd_box_cap(type, kind, value) { //! Draw radial boxed film capacitor
+    vitamin(str("rd_boxc(", type[0], ", \"", kind, "\", \"", value, "\" ): ", kind, " ", value));
+
+    size = rd_boxc_size(type);
+    r = size[3];
+    skirt = rd_boxc_skirt(type);
+    inset = skirt.y * 2;
+    leads = rd_boxc_leads(type);
+    c = rd_boxc_colours(type);
+    z = rd_boxc_z(type);
+    $fn = fn;
+
+    color(c[0]) {
+        translate_z(z)
+            rounded_top_rectangle([size.x, size.y, size.z - z], r, r);
+
+        for(i = [0, 1])
+            translate_z(i * skirt.z)
+                linear_extrude(z)
+                    difference() {
+                        rounded_square([size.x, size.y], r);
+
+                        square([size.x - inset, size.y - inset], center = true);
+
+                        if(!i)
+                            square([skirt.x, size.y], center = true);
+                    }
+    }
+
+    color(c[1])
+        translate_z(z)
+            cube([size.x - inset, size.y - inset, 2 * eps], center = true);
+
+    color(silver)
+        for(end = [-1, 1])
+            translate([end * leads.x / 2, 0]) {
+                translate_z(- leads.z)
+                    cylinder(d = leads.y, h = leads.z + z);
+
+                solder(leads.y / 2);
+            }
+
+    color("black")
+        translate([0, -size.y / 2])
+            rotate([90, 0, 0])
+                linear_extrude(eps)
+                    translate([-size.x * 0.45, size.z * 0.75])
+                         resize([size.x * 0.9, size.z / 6])
+                            text(value, halign = "left", valign = "top");
+}

vitamins/radials.scad

@@ -54,4 +54,10 @@ ECAP8x11 = ["ECAP8x12", [8.2, 7.5, 12.5], 0.5, [2.4, 2.5], 0.5, inch(0.1), [grey
 
 rd_electrolytics = [ECAP8x11];
 
+// Boxed plastic film capacitors
+BOXC18x5x11  = ["BOXC18x5x11",  [18,  5, 11, 0.25], 1.2, [8,  0.6, 0.4], [15, 0.6, 4.4], [grey(40), "LightYellow"]];
+BOXC18x10x16 = ["BOXC18x10x16", [18, 10, 16, 0.25], 1.7, [12, 0.8, 0.4], [15, 0.8, 4.4], [grey(40), "LightYellow"]];
+
+rd_box_caps = [BOXC18x5x11, BOXC18x10x16];
+
 use <radial.scad>

vitamins/rockers.scad

@@ -35,8 +35,8 @@ neon_spades  = [[spade4p8, 7.3, 0, -7, 0],
 //
 //                                                                               w   h   t
 //
-small_rocker   = ["small_rocker",   "Rocker Switch PRASA1-16F-BB0BW", 13, 19.8, 15, 21, 2, 12.8, 18.5, 11.8, 2.5,  -1, 3.8, small_spades];
-neon_indicator = ["neon_indicator", "Neon Indicator H8630FBNAL",      13, 19.8, 15, 21, 2, 12.8, 18.5, 12.5, 2.5,  0,  0.3, neon_spades];
+small_rocker   = ["small_rocker",   "Rocker Switch PRASA1-16F-BB0BW", 13, 19.25, 15, 21, 2, 12.8, 18.5, 11.8, 2.5,  -1, 3.8, small_spades];
+neon_indicator = ["neon_indicator", "Neon Indicator H8630FBNAL",      13, 19.25, 15, 21, 2, 12.8, 18.5, 12.5, 2.5,  0,  0.3, neon_spades];
 
 rockers = [small_rocker, neon_indicator];
 

vitamins/rod_end.scad

@@ -0,0 +1,134 @@
+//
+// NopSCADlib Copyright Chris Palmer 2024
+// 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/>.
+//
+
+//
+//! A rod end, sometimes called a spherical bearing or rod-end eye, is a component used in mechanical systems to create a flexible connection between two parts.
+//
+include <NopSCADlib/utils/core/core.scad>
+include <NopSCADlib/utils/thread.scad>
+
+function rod_end_bearing_bore(type)          = type[1];    //! radius of the  bore hole in the bearing
+function rod_end_bearing_od(type)            = type[2];    //! Outer diameter of the bearing
+function rod_end_bore_width(type)            = type[3];    //! Width
+function rod_end_bearing_width(type)         = type[4];    //! Width
+function rod_end_bearing_shield_colour(type) = type[5];    //! Shield colour, "silver" for metal
+function rod_end_screw_radius(type)          = type[6] / 2;//! radius of the screw end, not the bore
+function rod_end_sphere_seg_width(type)      = type[7];    //! the width of the pivoting part, effectively a (sphere - sphereCaps - center bore)
+function rod_end_sphere_radius(type)         = type[8];    //!radius of the rod end sphere
+function rod_end_screw_length(type)          = type[9];    //! length of the screw from eye center, not the bore
+function rod_end_thread_length(type)         = type[10];   //! length of the threads
+function rod_end_overall_length(type)        = type[11];   //!  overall length of the rod end
+function rod_end_bearing_rim(type)           = type[12];   //! Outer rim thickness guesstimate
+
+module rod_end_bearing(type) {  //! Draw a rod end bearing
+
+    bb_bore = rod_end_bearing_bore(type);
+    bb_od = rod_end_bearing_od(type);
+    bb_rim = rod_end_bearing_rim(type);
+
+    bb_width = rod_end_bearing_width(type);
+    bb_shield_colour = rod_end_bearing_shield_colour(type);
+    length = rod_end_screw_length(type);
+    sphere_rad = rod_end_sphere_radius(type) / 2;
+    rod_end_sphere_seg_width= rod_end_sphere_seg_width(type);
+    shaft_rad = rod_end_screw_radius(type) - eps;
+    thread_rad = rod_end_screw_radius(type);
+    thread = rod_end_thread_length(type); //length - bb_od/2;
+    thread_offset = 0;
+    thread_d = 2 * thread_rad;
+    pitch = metric_coarse_pitch(thread_d);
+    colour =  grey(80);
+    shield_width=bb_width - (bb_width < 5 ? 0.5 : 1);
+    chamfer = bb_rim / 6;
+
+    description = str("Rod End Bearing ", type[1], length < 10 ? " x  " : " x ", length, "mm");
+    vitamin(str("Rod End Bearing(", type[0], ", ", length, "): ", description));
+
+    module shaft(socket = 0, headless = false) {
+        shank  = length;
+
+        if(show_threads && pitch)
+            translate_z(-length - thread_offset)
+                male_metric_thread(thread_d, pitch, thread, false, top = headless ? -1 : 0, solid = !headless, colour = colour);
+        else
+            color(colour * 0.9)
+                rotate_extrude() {
+                    translate([0, -length - thread_offset])
+                        square([thread_rad - eps, thread ]);
+                }
+    }
+
+    module bearingEye() {
+        color(colour)
+            rotate_extrude()
+                difference() {
+                    circle(r = sphere_rad);
+
+                    translate(v = [0, -sphere_rad])
+                        square(size = sphere_rad * 2);
+
+                    for(i=[0, 1])
+                        mirror(v = [0, i])
+                            translate(v = [-sphere_rad,rod_end_sphere_seg_width / 2])
+                                square(size = sphere_rad * 2);
+
+                    square([bb_bore, rod_end_sphere_seg_width + 1], center = true);
+                }
+
+        color(bb_shield_colour)
+            rotate_extrude()
+                difference() {
+                    translate([0, -shield_width / 2])
+                        square([bb_od / 2 - bb_rim,shield_width]);
+
+                    circle(r = sphere_rad);
+                }
+
+        color(colour) {
+            rotate_extrude()
+                hull() {
+                    or = bb_od / 2;
+                    h = bb_width;
+                    translate([or - bb_rim, -h / 2 + chamfer])
+                        square([bb_rim, h - 2 * chamfer]);
+
+                    translate([or - bb_rim, -h / 2])
+                        square([bb_rim - chamfer, h]);
+                }
+
+            translate_z(-bb_width/2+chamfer)
+                linear_extrude(bb_width-chamfer*2)
+                    difference() {
+                        hull() {
+                            circle(r = bb_od/2);
+                            translate([length-thread,-shaft_rad])
+                            square([0.5,shaft_rad*2]);
+                        }
+                        circle(r = bb_od/2-bb_rim);
+                    }
+        }
+    }
+
+
+
+    shaft();
+
+    rotate([0,90,0])
+        bearingEye();
+}

vitamins/rod_ends.scad

@@ -0,0 +1,23 @@
+//
+// NopSCADlib Copyright Chris Palmer 2024
+// 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/>.
+//
+RE_m5_bearing    = ["RE_m5_bearing",   5,  16, 8, 6,   brass,    5, 8, 11.11,  33, 21, 41,  2.0,  2.0,   0,    0];  // uxcell M5x0.8 Right Hand Thread, Self-Lubricating Joint Rod Ends
+
+rod_ends= [ RE_m5_bearing];
+
+use<rod_end.scad>

vitamins/screw.scad

@@ -235,20 +235,32 @@ module screw(type, length, hob_point = 0, nylon = false) { //! Draw specified sc
                     cylinder(h=2 * eps, r=socket_rad + eps);
             shaft();
         }
-
         if(head_type == hs_dome) {
-            lift = 0.38;
-            h = head_height - lift;
-            r = min(2 * head_height, (sqr(head_rad) + sqr(h)) / 2 * h); // Special case for M2
-            y = sqrt(sqr(r) - sqr(head_rad));
+            edge_height = head_rad / 7.5;
+            head_chamfer_angle= 15; // degrees
+            head_chamfer_x=edge_height*tan(head_chamfer_angle);
+            head_fillet_radius= 0.3;
+            p0 = [head_rad, edge_height];                   // Lowest point on the arc
+            p1 = [1.3 * socket_rad / cos(30), head_height]; // Highest point on the arc
+            p = (p0 + p1) / 2;                              // Start of bisector
+            gradient = (p0.x - p1.x) / (p1.y - p0.y);       // Gradient of perpendicular bisector = -1 / gradient of the line between p10 and p1
+            c = p.y - gradient * p.x;                       // Y ordinate of the centre of the dome
+            r = norm(p1 - [0, c]);                          // Dome radius is distance from centre
             color(colour) {
                 rotate_extrude() {
                     difference() {
                         intersection() {
-                            translate([0, -y + lift])
+                            translate([0, c])
                                 circle(r);
 
-                            square([head_rad, head_height]);
+                            // offset(head_fillet_radius) offset(-head_fillet_radius)
+                            polygon(points = [
+                                [0,0],
+                                [head_rad-head_chamfer_x,0],
+                                [head_rad, edge_height],
+                                [head_rad,head_height],
+                                [0,head_height],
+                                ]);
                         }
                         translate([0, head_height - socket_depth])
                             square([socket_rad, 10]);

vitamins/screws.scad

@@ -87,6 +87,8 @@ M2p5_dome_screw  = ["M2p5_dome", "M2.5 dome",   hs_dome,2.5, 5.35,1.6,  0.8, 2.0
 M3_dome_screw    = ["M3_dome", "M3 dome",       hs_dome,  3, 5.7, 1.65, 1.04,2.0, 18,  M3_washer, M3_nut,   M3_tap_radius,    M3_clearance_radius];
 M4_dome_screw    = ["M4_dome", "M4 dome",       hs_dome,  4, 7.6, 2.2,  1.3, 2.5, 20,  M4_washer, M4_nut,   M4_tap_radius,    M4_clearance_radius];
 M5_dome_screw    = ["M5_dome", "M5 dome",       hs_dome,  5, 9.5, 2.75, 1.56,3.0, 22,  M5_washer, M5_nut,   M5_tap_radius,    M5_clearance_radius];
+M6_dome_screw    = ["M6_dome", "M6 dome",       hs_dome,  6, 10.5, 3.3,  2.5,4.0, 24,  M6_washer, M6_nut,   M6_tap_radius,    M6_clearance_radius];
+M8_dome_screw    = ["M8_dome", "M8 dome",       hs_dome,  8, 14,   4.4,  3,  5.0, 30,  M8_washer, M8_nut,   M8_tap_radius,    M8_clearance_radius];
 
 M2p5_pan_screw   = ["M2p5_pan", "M2.5 pan",     hs_pan, 2.5, 4.7, 1.7,    0,   0, 0, M2p5_washer, M2p5_nut, M2p5_tap_radius,  M2p5_clearance_radius];
 M3_pan_screw     = ["M3_pan", "M3 pan",         hs_pan,   3, 5.4, 2.0,    0,   0, 0,   M3_washer, M3_nut,   M3_tap_radius,    M3_clearance_radius];
@@ -122,7 +124,7 @@ screw_lists = [
 [ 0,               0,              M3_low_cap_screw],
 [ 0,               0,              M3_shoulder_screw, M4_shoulder_screw],
 [ M2_cs_cap_screw, 0,              M3_cs_cap_screw, M4_cs_cap_screw, M5_cs_cap_screw, M6_cs_cap_screw, M8_cs_cap_screw],
-[ M2_dome_screw,   M2p5_dome_screw,M3_dome_screw,   M4_dome_screw,   M5_dome_screw],
+[ M2_dome_screw,   M2p5_dome_screw,M3_dome_screw,   M4_dome_screw,   M5_dome_screw, M6_dome_screw, M8_dome_screw],
 [ 0,               0,              M3_hex_screw,    M4_hex_screw,    M5_hex_screw,    M6_hex_screw, M8_hex_screw],
 [ 0,               M2p5_pan_screw, M3_pan_screw,    M4_pan_screw,    M5_pan_screw,    M6_pan_screw, No632_pan_screw],
 [ No2_screw,       0,              No4_screw,       No6_screw,       No8_screw,       No6_cs_screw],

vitamins/smd.scad

@@ -55,7 +55,7 @@ function smd_size(size) = //! Convert size to 1/100" notation
 
 module smd_led(type, colour, cutout) { //! Draw an SMD LED with specified `colour`
     size = smd_led_size(type);
-    vitamin(str("smd_led(", type[0], ", ", colour, "): SMD LED ", smd_size(size), " ", colour));
+    vitamin(str("smd_led(", type[0], ", \"", colour, "\"): SMD LED ", smd_size(size), " ", colour));
 
     lens = smd_led_lens(type);
     r = size.y * 0.32;
@@ -137,7 +137,7 @@ function smd_cap_end_cap(type) = type[2]; //! End cap width
 
 module smd_capacitor(type, height, value = undef) { //! Draw an SMD capacitor with specified height
     size = smd_cap_size(type);
-    vitamin(str("smd_capacitor(", type[0], "): SMD capacitor ", smd_size(size), !is_undef(value) ? str(" ", value) : ""));
+    vitamin(str("smd_capacitor(", type[0], arg(value, undef, "value"), "): SMD capacitor ", smd_size(size), !is_undef(value) ? str(" ", value) : ""));
 
     cap = smd_cap_end_cap(type);
 
@@ -161,7 +161,7 @@ function smd_sot_lead_size(type)  = type[6];    //! Lead width, foot depth, lead
 function smd_sot_tab_width(type)  = type[7];    //! The wide lead at the top
 
 module smd_sot(type, value) { //! Draw an SMD transistor
-    vitamin(str("smd_sot(", type[0], "): ", type[0], " package ", value));
+    vitamin(str("smd_sot(", type[0], ", \"", value, "\"): ", type[0], " package ", value));
 
     size = smd_sot_size(type);
     z0 = smd_sot_z(type);
@@ -197,7 +197,6 @@ module smd_sot(type, value) { //! Draw an SMD transistor
             linear_extrude(eps)
                 resize([size.x - 4 * (z2 - z1) * tan(slant), size.y / 2])
                     text(value, halign = "center", valign = "center");
-
 }
 
 function smd_soic_size(type)       = type[1];    //! Body length, width and height
@@ -208,7 +207,7 @@ function smd_soic_lead_span(type)  = type[5];    //! Total span of leads
 function smd_soic_lead_size(type)  = type[6];    //! Lead width, foot depth, lead thickness
 
 module smd_soic(type, value) { //! Draw an SMD SOIC
-    vitamin(str("smd_soic(", type[0], "): ", type[0], " package ", value));
+    vitamin(str("smd_soic(", type[0], ", \"", value, "\"): ", type[0], " package ", value));
 
     size = smd_soic_size(type);
     z0 = smd_soic_z(type);
@@ -261,7 +260,7 @@ function smd_diode_leads(type)  = type[4]; //! Lead extent in x, width, thicknes
 function smd_diode_colour(type) = type[5]; //! Body colour
 
 module smd_diode(type, value) { //! Draw an SMD diode
-    vitamin(str("smd_diode(", type[0], "): ", type[0], " package ", value));
+    vitamin(str("smd_diode(", type[0], ", \"", value, "\"): ", type[0], " package ", value));
 
     slant = 5;                              //! 5 degree body draft angle
     size = smd_diode_size(type);
@@ -326,7 +325,7 @@ module smd_tant(type, value) { //! Draw an SMD tantalum capacitor
     volts = is_undef(value) ? "" : let(c = value[3])
         assert(in(codes, c), str("expected the 4th character of value to be a voltage code: ", codes, ", got ", c))
             str(", ", voltages[search(c, codes)[0]], "V");
-    vitamin(str("smd_tant(", type[0], "): SMD Tantalum capacitor package ", type[0][len(type[0]) -1], uF, volts));
+    vitamin(str("smd_tant(", type[0], arg(value, undef, "value"), "): SMD Tantalum capacitor package ", type[0][len(type[0]) -1], uF, volts));
 
     size = smd_tant_size(type);
     slant = 5;                              //! 5 degree body draft angle
@@ -388,7 +387,7 @@ function smd_inductor_leads(type)  = type[4]; //! Lead extent in x, width, thick
 function smd_inductor_colour(type) = type[5]; //! Body colour
 
 module smd_inductor(type, value) { //! Draw an SMD inductor
-    vitamin(str("smd_inductor(", type[0], "): ", type[0], " package ", value));
+    vitamin(str("smd_inductor(", type[0], " ,\"", value, "\"): ", type[0], " package ", value));
 
     size = smd_inductor_size(type);
     z0 = smd_inductor_z(type);
@@ -437,7 +436,7 @@ function smd_pot_cross(type)    = type[4]; //! Cross head slot for screwdriver
 function smd_pot_flat(type)     = type[5]; //! Flat at the back of the wiper
 
 module smd_pot(type, value) { //! Draw an SMD pot
-    vitamin(str("smd_pot(", type[0], "): ", type[0], " package ", value));
+    vitamin(str("smd_pot(", type[0], ", \"", value, "\"): ", type[0], " package ", value));
 
     size = smd_pot_size(type);
     contacts = smd_pot_contacts(type);
@@ -601,7 +600,7 @@ function smd_qfp_pin_size(type)  = type[5]; //! Pins dimensions
 function smd_qfp_gullwing(type)  = type[6]; //! Gullwing S, L, R1, R2
 
 module smd_qfp(type, value) { //! Draw and SMD QFP package
-    vitamin(str("smd_qfp(", type[0], "): SMD chip: ", value, ", package : ", type[0]));
+    vitamin(str("smd_qfp(", type[0], ", \"", value, "\"): SMD chip: ", value, ", package : ", type[0]));
 
     size = smd_qfp_body_size(type);
     offset = size.z / 2 * tan(smd_qfp_slant(type));
@@ -652,3 +651,66 @@ module smd_qfp(type, value) { //! Draw and SMD QFP package
                     circle(r = pin.y, $fn = fn);
             }
 }
+
+function smd_250V_fuse_size(type) = type[1]; //! Bounding box of the body
+function smd_250V_fuse_z(type)    = type[2]; //! Height of body above the PCB surface
+function smd_250V_fuse_step(type) = type[3]; //! End cutout length, width and height
+function smd_250V_fuse_base(type) = type[4]; //! Base length
+
+module gcube(s) translate_z(s.z / 2) cube(s, center = true);
+
+module smd_250V_fuse(type, value) { //! Draw an SMD mains fuse
+    size = smd_250V_fuse_size(type);
+    step = smd_250V_fuse_step(type);
+    base = smd_250V_fuse_base(type);
+    z = smd_250V_fuse_z(type);
+
+    vitamin(str("smd_250V_fuse(", type[0], ", \"", value, "\"): SMD fuse: ", type[0], " ", value));
+
+    color("LightYellow")
+        translate_z(z) {
+            gcube(base);
+
+            translate_z(base.z)
+                gcube([size.x - step.x * 2, size.y, size.z - base.z]);
+
+            for(end = [-1, 1], side = [-1,1]) {
+                translate([end * (size.x / 2 - step.x / 2), side * (size.y / 2 - step.y / 2)])
+                    gcube(step);
+
+                translate([end * (size.x / 2 - step.x / 2 - eps), 0])
+                    gcube([step.x, size.y, base.z]);
+
+            }
+        }
+
+    color(silver) {
+        contact_h = step.z - 0.2;
+        fuse_d = size.y - 2 * step.y;
+
+        for(end = [-1, 1])
+            translate([end * (size.x / 2 - step.x), 0, contact_h / 2])
+                rotate([90, 0, 0])
+                    linear_extrude(size.y - 2 * step.y, center = true)
+                        difference() {
+                            rounded_square([step.x * 2, contact_h], 0.2, $fn = fn);
+
+                            translate([-step.x * end, 0])
+                                square([step.x * 2, contact_h], center = true);
+                        }
+
+        translate_z(step.z - fuse_d / 2)
+            rotate([0, 90, 0])
+                linear_extrude(size.x - (2 * step.x - eps), center = true)
+                    scale([1, size.y / fuse_d - eps])
+                    rotate(90)
+                        semi_circle(fuse_d / 2);
+
+    }
+
+    color("black")
+        translate_z(z + size.z)
+            linear_extrude(eps)
+                resize([(size.x - 2 * step.x) * 0.9, size.y / 2])
+                    text(value, halign = "center", valign = "center");
+}

vitamins/smds.scad

@@ -87,4 +87,8 @@ QFP50P1200X1200X160_64N = ["QFP50P1200X1200X160_64N", [10, 10, 1.6], 12, 64, 0.5
 
 smd_qfps = [ QFP50P1200X1200X160_64N ];
 
+OMT250 = ["OMT250", [11, 4.6, 3.3], 0.15, [1.9,0.5, 2.7], [5.5, 4.6, 0.5]];
+
+smd_250V_fuses = [OMT250];
+
 use <smd.scad>

vitamins/springs.scad

@@ -17,9 +17,11 @@
 // If not, see <https://www.gnu.org/licenses/>.
 //
 
-peg_spring  = ["peg_spring",  6.4,  0.9,  15.5,  8,    1, false, 0,   "silver"];
-batt_spring = ["batt_spring", 5,    0.5,  8,     5,    1, false, 6,   "silver"];
+//                    name                  OD    wireG  len   #trns clsd flat  OD2   color
+peg_spring  =        ["peg_spring",         6.4,  0.9,   15.5,  8,    1, false, 0,   "silver"];
+yellow_bed_spring  = ["yellow_bed_spring",  8,    0.9,   20,    10,   1, false, 0,   "yellow"];
+batt_spring =        ["batt_spring",        5,    0.5,   8,     5,    1, false, 6,   "silver"];
 
-springs = [peg_spring, batt_spring];
+springs = [peg_spring, batt_spring, yellow_bed_spring];
 
 use <spring.scad>

vitamins/stepper_motor.scad

@@ -80,7 +80,7 @@ module NEMA(type, shaft_angle = 0, jst_connector = false) { //! Draw specified N
     shaft_rad = NEMA_shaft_dia(type) / 2;
     cap = NEMA_cap_heights(type)[1];
     cap2 = NEMA_cap_heights(type)[0];
-    vitamin(str("NEMA(", type[0], "): Stepper motor NEMA", round(NEMA_width(type) / 2.54), " x ", length, "mm"));
+    vitamin(str("NEMA(", type[0], "): Stepper motor NEMA", round(NEMA_width(type) / 2.54), " x ", length, "mm (", type[7],"x",type[8], " shaft)"));
     thread_d = NEMA_thread_d(type);
     corner_r = 0.9;
     bore = NEMA_shaft_bore(type);

vitamins/stepper_motors.scad

@@ -26,6 +26,7 @@
 NEMA8_30      = ["NEMA8_30",        20, 30,       30/2, 20,    7.5,   1.6,     4,      6,          16,    [8,     8], 2,     true,  true,  0,       0];
 NEMA8_30BH    = ["NEMA8_30BH",      20, 30,       30/2, 20,    7.5,   1.6,     5,     12,          16,    [8,     8], 2,     true,  true,  7,       2.8];
 NEMA17_47     = ["NEMA17_47",     42.3, 47,     53.6/2, 25,     11,     2,     5,     24,          31,    [11.5,  9], 3,     false, false, 0,       0];
+NEMA17_47L80  = ["NEMA17_47L80",  42.3, 47,     53.6/2, 25,     11,     2,     5,     80,          31,    [11.5,  9], 3,     false, true,  0,       0];
 NEMA17_40     = ["NEMA17_40",     42.3, 40,     53.6/2, 25,     11,     2,     5,     20,          31,    [12.5, 11], 3,     false, false, 0,       0];
 NEMA17_40L280 = ["NEMA17_40L280", 42.3, 40,     53.6/2, 25,     11,     2,     8,     [280, 8, 4], 31,    [12.5, 11], 3,     false, false, 0,       0];
 NEMA17_34     = ["NEMA17_34",     42.3, 34,     53.6/2, 25,     11,     2,     5,     24,          31,    [8,     8], 3,     false, false, 0,       0];
@@ -34,7 +35,7 @@ NEMA16_19     = ["NEMA16_19",     39.5, 19.2,   50.6/2, 50.6/2, 11,     2,     5
 NEMA14_36     = ["NEMA14_36",     35.2, 36,     46.4/2, 21,     11,     2,     5,     21,          26,    [8,     8], 3,     false, false, 0,       0];
 NEMA23_51     = ["NEMA23_51",     56.4, 51.2,   75.7/2, 35,   38.1/2, 1.6,   6.35,    24,        47.1,    [8,     8], 3,     false, false, 0,       0];
 
-stepper_motors = [NEMA8_30, NEMA8_30BH, NEMA14_36, NEMA16_19, NEMA17_27, NEMA17_34, NEMA17_40, NEMA17_47, NEMA23_51];
+stepper_motors = [NEMA8_30, NEMA8_30BH, NEMA14_36, NEMA16_19, NEMA17_27, NEMA17_34, NEMA17_40, NEMA17_47,NEMA17_47L80, NEMA23_51];
 small_steppers = [];
 
 use <stepper_motor.scad>

vitamins/tubing.scad

@@ -18,10 +18,11 @@
 //
 
 //
-//! Tubing and sleeving. The internal diameter can be forced to stretch it over something.
+//! Tubing and sleeving. The internal diameter can be forced to stretch it over something. A path can be specified, otherwise it is just straight with the specified length.
 //
 include <../utils/core/core.scad>
 include <../utils/tube.scad>
+include <../utils/sweep.scad>
 
 function tubing_material(type) = type[1]; //! Material description
 function tubing_od(type)       = type[2]; //! Outside diameter
@@ -31,11 +32,12 @@ function tubing_colour(type)   = type[4]; //! Colour
 function tubing_or(type)        = tubing_od(type) / 2; //! Outside radius
 function tubing_ir(type)        = tubing_id(type) / 2; //! Inside radius
 
-module tubing(type, length = 15, forced_id = 0, center = true) { //! Draw specified tubing with optional forced internal diameter
+module tubing(type, length = 15, forced_id = 0, center = true, path = []) { //! Draw specified tubing with optional forced internal diameter and optional path.
     original_od = tubing_od(type);
     original_id = tubing_id(type);
     id = forced_id ? forced_id : original_id;
     od = original_od + id - original_id;
+    length = path ? round(path_length(path)) : length;
     if(tubing_material(type) == "Heatshrink sleeving")
         vitamin(str("tubing(", type[0], arg(length, 15), "): ", tubing_material(type), " ID ", original_id, "mm x ",length, "mm"));
     else
@@ -45,9 +47,19 @@ module tubing(type, length = 15, forced_id = 0, center = true) { //! Draw specif
         woven_tube(od / 2, id /2, center = center, length, colour = tubing_colour(type));
     else
         color(tubing_colour(type))
-            linear_extrude(length, center = center, convexity = 4)
-                difference() {
-                    circle(d = od);
-                    circle(d = id);
-                }
+            if(path)
+                render_if(manifold)
+                    difference() {
+                        sweep(path, circle_points(od / 2));
+                        start = path[0] - eps * unit(path[1] - path[0]);
+                        n = len(path) - 1;
+                        end = path[n] + eps * unit(path[n] - path[n - 1]);
+                        sweep(concat([start], path, [end]), circle_points(id / 2));
+                    }
+            else
+                linear_extrude(length, center = center, convexity = 4)
+                    difference() {
+                        circle(d = od);
+                        circle(d = id);
+                    }
 }

vitamins/washer.scad

@@ -23,7 +23,7 @@
 //! If a washer is given a child, usually a screw or a nut, then it is placed on its top surface.
 //
 include <../utils/core/core.scad>
-include <../utils/sweep.scad>
+use <../utils/sweep.scad>
 
 soft_washer_colour = grey(20);
 hard_washer_colour = grey(85);