Washer now uses sweep.scad instead of including it, leaking its interface.

show_path() now takes an optional radius.

CHANGELOG.md

@@ -3,6 +3,33 @@
 This changelog is generated by `changelog.py` using manually added semantic version tags to classify commits as breaking changes, additions or fixes.
 
 
+### [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.
+
+*   2024-03-14 [`c565f29`](https://github.com/nophead/NopSCADlib/commit/c565f2912e7319575fc6ec3262699b73305c46b4 "show commit") [V.](# "V.Shkriabets") Update MT3608 pcb module
+
+### [v21.17.0](https://github.com/nophead/NopSCADlib/releases/tag/v21.17.0 "show release") Additions [...](https://github.com/nophead/NopSCADlib/compare/v21.16.1...v21.17.0 "diff with v21.16.1")
+*   2024-03-14 [`5579c0d`](https://github.com/nophead/NopSCADlib/commit/5579c0d988c6d7983d3884afa7e42fdb283109a8 "show commit") [C.P.](# "Chris Palmer") Fixed `box_shelf_bracket()` horizontal holes.
+Added a third child to `box_shelf_bracket()` to allow custom additions.
+
+*   2024-03-14 [`67408f8`](https://github.com/nophead/NopSCADlib/commit/67408f8422918416c617ec7389dbc09b2c62a2ae "show commit") [C.P.](# "Chris Palmer") Added `d_hole()` module.
+
+*   2024-03-14 [`929abbe`](https://github.com/nophead/NopSCADlib/commit/929abbefda2c380b121c775371f197860c6c3aff "show commit") [C.P.](# "Chris Palmer") Updated front page image.
+
+*   2024-03-14 [`c7727e7`](https://github.com/nophead/NopSCADlib/commit/c7727e7106e3829a6b5f6c501b1a082d540a4a68 "show commit") [C.P.](# "Chris Palmer") Added Sellotape to sheets.
+
+*   2024-03-14 [`1dbba5a`](https://github.com/nophead/NopSCADlib/commit/1dbba5a650f8dac2d05a5668008e61a5ec22ea4f "show commit") [C.P.](# "Chris Palmer") Added `camera_lens_height()` function.
+
+#### [v21.16.1](https://github.com/nophead/NopSCADlib/releases/tag/v21.16.1 "show release") Fixes [...](https://github.com/nophead/NopSCADlib/compare/v21.16.0...v21.16.1 "diff with v21.16.0")
+*   2024-03-14 [`db2a9a8`](https://github.com/nophead/NopSCADlib/commit/db2a9a8a24966f098d4c0c8157de98a885b79a85 "show commit") [C.P.](# "Chris Palmer") Ziptie test can now show wires with t `=` 0.
+
+*   2024-03-14 [`6ced9c8`](https://github.com/nophead/NopSCADlib/commit/6ced9c871c5a637dbe8494836a4233e1f6cd4971 "show commit") [C.P.](# "Chris Palmer") Fixed FOV for ESP32 camera being rotated.
+Shortened the ESP32 camera header pins.
+
+*   2024-03-14 [`d6b00fb`](https://github.com/nophead/NopSCADlib/commit/d6b00fbf5719239adc5e8b66f863c003a50806d3 "show commit") [C.P.](# "Chris Palmer") Removed unused test code.
+
+*   2024-03-14 [`2c996bb`](https://github.com/nophead/NopSCADlib/commit/2c996bb7a143a85c21833a69f56f2f47afabe072 "show commit") [C.P.](# "Chris Palmer") Fixed random error caused by not running bom first.
+
 ### [v21.16.0](https://github.com/nophead/NopSCADlib/releases/tag/v21.16.0 "show release") Additions [...](https://github.com/nophead/NopSCADlib/compare/v21.15.0...v21.16.0 "diff with v21.15.0")
 *   2024-02-19 [`fdb92ec`](https://github.com/nophead/NopSCADlib/commit/fdb92ec263d60a42e04f06abfeec5e1648a12b6b "show commit") [C.P.](# "Chris Palmer") Improved layout to fit into front page view.
 

readme.md

@@ -4229,6 +4229,7 @@ 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 |
@@ -7450,6 +7451,7 @@ Each vertex, apart from the first and the last, has an associated radius and the
 | `cap(facets, segment = 0, end)` | Create the mesh for an end cap |
 | `circle_points(r = 1, z = 0, dir = -1)` | Generate the points of a circle, setting z makes a single turn spiral |
 | `helical_twist_per_segment(r, pitch, sides)` | Calculate the twist around Z that rotate_from_to() introduces |
+| `offset_paths(path, offsets, twists = 0)` | Create new paths offset from the original, optionally spiralling around it |
 | `rectangle_points(w, h)` | Generate the points of a rectangle |
 | `rounded_path(path)` | Convert a rounded_path, consisting of a start coordinate, vertex / radius pairs and then an end coordinate, to a path of points for sweep. |
 | `rounded_path_vertices(path)` | Show the unrounded version of a rounded_path for debug |
@@ -7461,7 +7463,7 @@ Each vertex, apart from the first and the last, has an associated radius and the
 ### Modules
 | Module | Description |
 |:--- |:--- |
-| `show_path(path)` | Show a path using a chain of hulls for debugging, duplicate points are highlighted. |
+| `show_path(path, r = 0.1)` | Show a path using a chain of hulls for debugging, duplicate points are highlighted. |
 | `sweep(path, profile, loop = false, twist = 0, convexity = 1)` | Draw a polyhedron that is the swept volume |
 
 ![sweep](tests/png/sweep.png)

tests/SMDs.scad

@@ -67,7 +67,7 @@ module smds() {
     translate([0, 39])
         layout([for(i = smd_inductors) smd_inductor_leads(i).x], 1)
             let(i = smd_inductors[$i])
-                smd_inductor(i, "4R7");
+                smd_inductor(i, ["4R7", "10R"][$i % 2]);
 
     translate([20, 6])
          layout([for(q = smd_qfps) smd_qfp_body_size(q).x], 3)

utils/sweep.scad

@@ -111,7 +111,7 @@ function helical_twist_per_segment(r, pitch, sides) = //! Calculate the twist ar
 //
 // Generate all the transforms for the profile of the swept volume.
 //
-function sweep_transforms(path, loop = false, twist = 0) =
+function sweep_transforms(path, loop = false, twist = 0, initial_rotation = undef) =
     let(len = len(path),
         last = len - 1,
 
@@ -122,7 +122,7 @@ function sweep_transforms(path, loop = false, twist = 0) =
         lengths = [for(i = 0, t = 0; i < len; t = t + norm(path[min(i + 1, last)] - path[i]), i = i + 1) t],
         length = lengths[last],
 
-        rotations = [for(i = 0, rot = fs_frame(tangents);
+        rotations = [for(i = 0, rot = is_undef(initial_rotation) ? fs_frame(tangents) : rot3_z(initial_rotation);
                          i < len;
                          i = i + 1,
                          rot = i < len ? rotate_from_to(tangents[i - 1], tangents[i]) * rot : undef) rot],
@@ -169,7 +169,7 @@ function sweep(path, profile, loop = false, twist = 0) = //! Generate the point
         points = skin_points(profile, path, loop, twist),
         skin_faces = skin_faces(points, npoints, facets, loop),
         faces = loop ? skin_faces : concat([cap(facets)], skin_faces, [cap(facets, npoints - 1)])
-        ) [points, faces];
+    ) [points, faces];
 
 module sweep(path, profile, loop = false, twist = 0, convexity = 1) { //! Draw a polyhedron that is the swept volume
     mesh = sweep(path, profile, loop, twist);
@@ -229,16 +229,20 @@ function rounded_path(path) = //! Convert a rounded_path, consisting of a start
 
 function segmented_path(path, min_segment) = [  //! Add points to a path to enforce a minimum segment length
     for(i = [0 : len(path) - 2])
-            let(delta =
-                    assert(path[i] != path[i + 1], str("Coincident points at path[", i, "] = ", path[i]))
-                    path[i+1] - path[i],
-                segs = ceil(norm(delta) / min_segment)
-            )
-            for(j = [0 : segs - 1])
-                path[i] + delta * j / segs, // Linear interpolation
-            path[len(path) - 1]
+        let(delta =
+            assert(path[i] != path[i + 1], str("Coincident points at path[", i, "] = ", path[i]))
+            path[i+1] - path[i],
+            segs = ceil(norm(delta) / min_segment)
+        )
+        for(j = [0 : segs - 1])
+            path[i] + delta * j / segs, // Linear interpolation
+        path[len(path) - 1]
 ];
 
+function offset_paths(path, offsets, twists = 0) = let( //! Create new paths offset from the original, optionally spiralling around it
+        transforms = sweep_transforms(path, twist = 360 * twists, initial_rotation = 0)
+    ) [for(o = offsets) let(initial = [o.x, o.y, o.z, 1]) [for(t = transforms) initial * t]];
+
 function spiral_paths(path, n, r, twists, start_angle) = let( //! Create a new paths which spiral around the given path. Use for making twisted cables
         segment = twists ? path_length(path) / twists / r2sides(2 * r) : inf,
         transforms = sweep_transforms(segmented_path(path, segment), twist = 360 * twists)
@@ -246,16 +250,16 @@ function spiral_paths(path, n, r, twists, start_angle) = let( //! Create a new p
 
 function rounded_path_vertices(path) = [path[0], for(i = [1 : 2 : len(path) - 1]) path[i]]; //! Show the unrounded version of a rounded_path for debug
 
-module show_path(path) //! Show a path using a chain of hulls for debugging, duplicate points are highlighted.
+module show_path(path, r = 0.1) //! Show a path using a chain of hulls for debugging, duplicate points are highlighted.
     for(i = [0 : len(path) - 2]) {
         hull($fn = 16) {
             translate(path[i])
-                sphere(0.1);
+                sphere(r);
 
             translate(path[i + 1])
-                sphere(0.1);
+                sphere(r);
         }
         if(path[i] == path[i + 1])
             translate(path[i])
-                color("red") sphere(1);
+                color("red") sphere($fn = 16, r * 4);
     }

vitamins/pcbs.scad

@@ -760,9 +760,15 @@ 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, [[3.0725, 5.095], [3.0725, -5.095], [-3.0725, 5.095], [-3.0725, -5.095]],
-    [ [-12.05 , -6.8, 180, "trimpot10"]
-    ]];
+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"],
+        [-12.3, -14.4, 0, "smd_diode",DO214AC, "SS34"],
+        [-28.5, 13.2, 90,"smd_cap", CAP1206, 0.5],
+        [-20, 13.2, 90,"smd_cap", CAP1206, 0.5],
+        [-24.05 , -11.8, 180, "smd_inductor", CDRH104, "220"]]
+      ];
 
 HW803_1WAY_RELAY = [
     "HW803_1WAY_RELAY", "HW-803 5V 1 way relay module",

vitamins/smds.scad

@@ -70,8 +70,9 @@ TANT_C = ["TANT_C", [5.8, 3.2, 2.6], 0.1, 1.3,  [6.0, 2.2, 0.08, 2.9], ["#E9D769
 smd_tants = [TANT_A, TANT_B, TANT_C];
 
 IND2525 = ["IND2525", [6.75, 6.75, 2], 0.1, 1.75, [7.24, 3.2, 0.15, 4.4], grey(50)];
+CDRH104 = ["CDRH104", [10.3, 10.3, 4.0], 0.1, 3.85, [10.5, 3.2, 0.15, 4.4], grey(50)];
 
-smd_inductors = [IND2525];
+smd_inductors = [IND2525, CDRH104];
 
 TC33X1 = ["TC33X1", [3.0, 3.8, 0.5], [0.95, 0.9, 0.88, 1.5, 0.2, 0.75],[3.0, 0.1, 0.2, 1.2, 1.7, 1.2, 1, 0.5], [2.1, 0.5], 1.5];
 

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