Fixed ziptie bug for small wires and corners made sharper.

This means they can be distinguished from bolts when viewed from directly
above.

CHANGELOG.md

@@ -3,6 +3,32 @@
 This changelog is generated by `changelog.py` using manually added semantic version tags to classify commits as breaking changes, additions or fixes.
 
 
+#### [v20.1.1](https://github.com/nophead/NopSCADlib/releases/tag/v20.1.1 "show release") Fixes [...](https://github.com/nophead/NopSCADlib/compare/v20.1.0...v20.1.1 "diff with v20.1.0")
+*   2022-02-25 [`943deed`](https://github.com/nophead/NopSCADlib/commit/943deededfe2b258f23ca64001ae7c010ed626bc "show commit") [C.P.](# "Chris Palmer") Updated the readme.
+
+*   2022-02-24 [`c0d9067`](https://github.com/nophead/NopSCADlib/commit/c0d9067b740fc5ea4a41e696c88613a284685118 "show commit") [M.B.](# "Martin Budden") Fixed typos.
+
+*   2022-02-25 [`a30aff9`](https://github.com/nophead/NopSCADlib/commit/a30aff9613f51092bbad7052bfe1194a61557efc "show commit") [C.P.](# "Chris Palmer") Fixed missing brackets for sheets with chamfered corners.
+
+### [v20.1.0](https://github.com/nophead/NopSCADlib/releases/tag/v20.1.0 "show release") Additions [...](https://github.com/nophead/NopSCADlib/compare/v20.0.1...v20.1.0 "diff with v20.0.1")
+*   2022-02-23 [`f173284`](https://github.com/nophead/NopSCADlib/commit/f173284709acdbd32de21f0d27cb3ab10b42eb2a "show commit") [C.P.](# "Chris Palmer") Can now inhibit exploded lines for issue [#220](https://github.com/nophead/NopSCADlib/issues/220 "show issue").
+
+#### [v20.0.1](https://github.com/nophead/NopSCADlib/releases/tag/v20.0.1 "show release") Fixes [...](https://github.com/nophead/NopSCADlib/compare/v20.0.0...v20.0.1 "diff with v20.0.0")
+*   2022-02-23 [`0206b2e`](https://github.com/nophead/NopSCADlib/commit/0206b2e868119b3b5fdea6111839bf5055eae438 "show commit") [C.P.](# "Chris Palmer") Updated images.
+
+*   2022-02-03 [`1ac5a6f`](https://github.com/nophead/NopSCADlib/commit/1ac5a6f6cbe518646f19c4372a2393eb2e020a18 "show commit") [M.B.](# "Martin Budden") Made hard washers slightly lighter.
+This means they can be distinguished from bolts when viewed from directly
+above.
+
+## [v20.0.0](https://github.com/nophead/NopSCADlib/releases/tag/v20.0.0 "show release") Breaking Changes [...](https://github.com/nophead/NopSCADlib/compare/v19.21.0...v20.0.0 "diff with v19.21.0")
+*   2022-02-23 [`f8d17c6`](https://github.com/nophead/NopSCADlib/commit/f8d17c6f1615b9ff9b615ad2947c4b0119bf7597 "show commit") [C.P.](# "Chris Palmer") Updated readme.
+
+*   2022-02-22 [`662db2b`](https://github.com/nophead/NopSCADlib/commit/662db2bd4103dbeb4265c148d5f7e31c98d5dae2 "show commit") [M.B.](# "Martin Budden") Improved stepper motor naming convention.
+
+### [v19.21.0](https://github.com/nophead/NopSCADlib/releases/tag/v19.21.0 "show release") Additions [...](https://github.com/nophead/NopSCADlib/compare/v19.20.0...v19.21.0 "diff with v19.20.0")
+*   2022-02-23 [`42fccc1`](https://github.com/nophead/NopSCADlib/commit/42fccc1afbf28ef6a94f0480d1306e5bc2e48e46 "show commit") [C.P.](# "Chris Palmer") Added `bezier_join()`.
+Moved `path_length()` from `sweep.scad` to `maths.scad`.
+
 ### [v19.20.0](https://github.com/nophead/NopSCADlib/releases/tag/v19.20.0 "show release") Additions [...](https://github.com/nophead/NopSCADlib/compare/v19.9.1...v19.20.0 "diff with v19.9.1")
 *   2022-02-15 [`0e2778e`](https://github.com/nophead/NopSCADlib/commit/0e2778e13de2e68fc21a7b4c706aada27a17842c "show commit") [C.P.](# "Chris Palmer") Cables can now have a list of wire colours.
 Added a constructor for cables.

printed/corner_block.scad

@@ -31,7 +31,7 @@
 //! Star washers can be omitted by setting `star_washers` to false.
 //!
 //! A 2screw_block is a thinner version with two screws and two mating surfaces. It can be used as an alternative to fixing blocks when
-//! high lateral rigity is not required.
+//! high lateral rigidity is not required.
 //
 include <../core.scad>
 use <../vitamins/insert.scad>

printed/knob.scad

@@ -20,7 +20,7 @@
 //
 //! Parametric knobs for potentiometers and encoders.
 //!
-//! A knob can be constructed by specififying all the parameters or the potentiometer can be specified to customise it for its shaft with a recess to clear the nut, washer and thread.
+//! A knob can be constructed by specifying all the parameters or the potentiometer can be specified to customise it for its shaft with a recess to clear the nut, washer and thread.
 //! An optional skirt and / or a pointer can be specified.
 //!
 //! The STL includes a support membrane that needs to be cut out and a thread needs to be tapped for the grub screw.

printed/ribbon_clamp.scad

@@ -20,7 +20,7 @@
 //
 //! Clamp for ribbon cable and polypropylene strip or one or more ribbon cables.
 //!
-//! * When `ways` is a scalar number the slot is sized for one rubbon cable and a PP strip.
+//! * When `ways` is a scalar number the slot is sized for one ribbon cable and a PP strip.
 //! * When `ways` is a two element vector the second element indicates the number of cables and the slot is size for just the cables.
 //
 include <../core.scad>

readme.md

@@ -4890,7 +4890,7 @@ This allows the block and one set of fasteners to be on one assembly and the oth
 Star washers can be omitted by setting `star_washers` to false.
 
 A 2screw_block is a thinner version with two screws and two mating surfaces. It can be used as an alternative to fixing blocks when
-high lateral rigity is not required.
+high lateral rigidity is not required.
 
 [printed/corner_block.scad](printed/corner_block.scad) Implementation.
 
@@ -5449,7 +5449,7 @@ Printed handle that can be printed without needing support material due to its t
 ## Knob
 Parametric knobs for potentiometers and encoders.
 
-A knob can be constructed by specififying all the parameters or the potentiometer can be specified to customise it for its shaft with a recess to clear the nut, washer and thread.
+A knob can be constructed by specifying all the parameters or the potentiometer can be specified to customise it for its shaft with a recess to clear the nut, washer and thread.
 An optional skirt and / or a pointer can be specified.
 
 The STL includes a support membrane that needs to be cut out and a thread needs to be tapped for the grub screw.
@@ -5847,7 +5847,7 @@ The stl and assembly must be given a name and parameterless wrappers for the stl
 ## Ribbon_clamp
 Clamp for ribbon cable and polypropylene strip or one or more ribbon cables.
 
-* When `ways` is a scalar number the slot is sized for one rubbon cable and a PP strip.
+* When `ways` is a scalar number the slot is sized for one ribbon cable and a PP strip.
 * When `ways` is a two element vector the second element indicates the number of cables and the slot is size for just the cables.
 
 [printed/ribbon_clamp.scad](printed/ribbon_clamp.scad) Implementation.
@@ -6787,7 +6787,7 @@ The `pose()` module allows assembly views in the readme to be posed differently
 |:--- |:--- |
 | `assembly(name, big = undef, ngb = false)` | Name an assembly that will appear on the BOM, there needs to a module named `<name>_assembly` to make it. `big` can force big or small assembly diagrams. |
 | `dxf(name)` | Name a dxf that will appear on the BOM, there needs to a module named `<name>_dxf` to make it |
-| `explode(d, explode_children = false, offset = [0,0,0])` | Explode children by specified Z distance or vector `d`, option to explode grand children |
+| `explode(d, explode_children = false, offset = [0,0,0], show_line = true)` | Explode children by specified Z distance or vector `d`, option to explode grand children |
 | `hidden()` | Make item invisible, except on the BOM |
 | `no_explode()` | Prevent children being exploded |
 | `no_pose()` | Force children not to be posed even if parent is |
@@ -6807,7 +6807,7 @@ The `pose()` module allows assembly views in the readme to be posed differently
 | Qty | Module call | BOM entry |
 | ---:|:--- |:---|
 |   1 | `insert(F1BM3)` |  Heatfit insert M3 |
-|   1 | `widget(3)` |  Rivit like thing for 3mm sheets |
+|   1 | `widget(3)` |  Rivet like thing for 3mm sheets |
 |   1 | `screw(M3_cap_screw, 8)` |  Screw M3 cap x  8mm |
 |   1 | `sheet(PMMA3, 20, 20, 1)` |  Sheet acrylic 20mm x 20mm x 3mm |
 |   1 | `washer(M3_washer)` |  Washer  M3 x 7mm x 0.5mm |

scripts/views.py

@@ -422,7 +422,7 @@ def views(target, do_assemblies = None):
     times.add_time(html_name, t)
     times.print_times(pngs + [html_name])
     #
-    # Make the printme.html by replacing empty spans that invisbly mark the page breaks by page break divs.
+    # Make the printme.html by replacing empty spans that invisibly mark the page breaks by page break divs.
     #
     with open(html_name, 'rt') as src:
         lines = src.readlines()

tests/BOM.scad

@@ -32,7 +32,7 @@ height = 10;
 insert = screw_insert(screw);
 
 module widget(thickness) {
-    vitamin(str("widget(", thickness, "): Rivit like thing for ", thickness, "mm sheets"));
+    vitamin(str("widget(", thickness, "): Rivet like thing for ", thickness, "mm sheets"));
     t = 1;
     color("silver") {
         cylinder(d = 3, h = thickness + 2 * eps, center = true);
@@ -85,7 +85,7 @@ assembly("widget_top") {
 module widget_assembly()
 assembly("widget") {
 
-    widget_base_assembly();                 // Note this is not exloded because it is sub-assembly
+    widget_base_assembly();                 // Note this is not exploded because it is sub-assembly
 
     translate_z(height) {
         translate_z(sheet_thickness(sheet))

tests/zipties.scad

@@ -16,14 +16,23 @@
 // You should have received a copy of the GNU General Public License along with NopSCADlib.
 // If not, see <https://www.gnu.org/licenses/>.
 //
+wire_r = 5; // [1 : 20]
+t = 0; // [0 : 3]
+
 include <../utils/core/core.scad>
 use <../utils/layout.scad>
 
 include <../vitamins/zipties.scad>
 
 module zipties()
-    layout([for(z = zipties) 9], 10)
-        ziptie(zipties[$i], 5);
+    layout([for(z = zipties) 9], 2 * wire_r) {
+        ziptie(zipties[$i], wire_r, t);
+
+        if(t)
+            color(grey(20))
+                cylinder(r = wire_r, h = 10, center = true);
+
+    }
 
 if($preview)
     zipties();

utils/core/bom.scad

@@ -49,17 +49,18 @@ function show_supports() = !$preview || exploded();                 //! True if
 module no_explode()                                                 //! Prevent children being exploded
     let($exploded_parent = true) children();
 
-module explode(d, explode_children = false, offset = [0,0,0]) {     //! Explode children by specified Z distance or vector `d`, option to explode grand children
+module explode(d, explode_children = false, offset = [0,0,0], show_line = true) {     //! Explode children by specified Z distance or vector `d`, option to explode grand children
     v = is_list(d) ? d : [0, 0, d];
     o = is_list(offset) ? offset : [0, 0, offset];
     if(exploded() && norm(v)) {
-        translate(o)                                                // Draw the line first in case the child is transparent
-            color("yellow") hull() {
-                sphere(0.2);
-
-                translate(v * exploded())
+        if(show_line)
+            translate(o)                                                // Draw the line first in case the child is transparent
+                color("yellow") hull() {
                     sphere(0.2);
-            }
+
+                    translate(v * exploded())
+                        sphere(0.2);
+                }
 
         translate(v * exploded())
             let($exploded_parent = explode_children ? undef : true)

utils/sweep.scad

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

vitamins/sheet.scad

@@ -52,7 +52,7 @@ module corner(r) {
         if(r < 0)
             translate([-r, r])
                 rotate(45)
-                    square(-r * sqrt(2), -r * sqrt(2), center = true);
+                    square([-r * sqrt(2), -r * sqrt(2)], center = true);
         else
             translate([0.5, -0.5])
                 square(1, center = true);

vitamins/washer.scad

@@ -26,7 +26,7 @@ include <../utils/core/core.scad>
 include <../utils/sweep.scad>
 
 soft_washer_colour = grey(20);
-hard_washer_colour = grey(80);
+hard_washer_colour = grey(85);
 star_washer_colour = brass;
 
 function washer_size(type)            = type[1]; //! Nominal size

vitamins/ziptie.scad

@@ -33,17 +33,16 @@ function ziptie_tail(type)      = type[5]; //! The length without teeth
 module ziptie(type, r = 5, t = 0) //! Draw specified ziptie wrapped around radius `r` and optionally through panel thickness `t`
 {
     latch = ziptie_latch(type);
-    lx = latch.x / 2;
     zt = ziptie_thickness(type);
-    cr = zt;                        // sharp corner radius
+    lx = min(latch.x / 2, r + zt / 2);
+    right_bulge = (r > lx - zt / 2) || !t;
+    cr = zt / 2;                        // sharp corner radius
     z = r + t - cr;
     x = r - cr;
-    inside_corners  = t ? [ [0, 0, r],      [-x, z, cr],      [x, z, cr]      ] : [];
     outside_corners = t ? [ [0, 0, r + zt], [-x, z, cr + zt], [x, z, cr + zt] ] : [];
     x1 = lx - zt / 2;
     x2 = x1 + x1 * zt / r;
-    inside_path  = concat([ [0, 0, r],      [x1, -r,      eps] ], inside_corners);
-    outside_path = concat([ [0, 0, r + zt], [x2, -r - zt, eps] ], outside_corners);
+    outside_path = concat([ if(right_bulge) [0, 0, r + zt], [x2, -r - zt, eps] ], outside_corners);
 
     tangents = rounded_polygon_tangents(outside_path);
     length = ceil(rounded_polygon_length(outside_path, tangents) + ziptie_tail(type) + latch.z + 1);
@@ -56,7 +55,9 @@ module ziptie(type, r = 5, t = 0) //! Draw specified ziptie wrapped around radiu
         linear_extrude(width, center = true)
             difference() {
                 rounded_polygon(outside_path, tangents);
-                rounded_polygon(inside_path);
+
+                offset(-zt)
+                    rounded_polygon(outside_path, tangents);
              }
 
         translate([lx, -r])