Merge branch 'MorrieG-master'

Top row of cable bundles reversed to match a twisted cable.

CHANGELOG.md

@@ -3,6 +3,17 @@
 This changelog is generated by `changelog.py` using manually added semantic version tags to classify commits as breaking changes, additions or fixes.
 
 
+### [v20.2.0](https://github.com/nophead/NopSCADlib/releases/tag/v20.2.0 "show release") Additions [...](https://github.com/nophead/NopSCADlib/compare/v20.1.2...v20.2.0 "diff with v20.1.2")
+*   2022-03-17 [`744ebc2`](https://github.com/nophead/NopSCADlib/commit/744ebc293594e2d049220bba7325f3a22f40a71a "show commit") [C.P.](# "Chris Palmer") Added functions for generating twisted cable paths and calculating its radius.
+Top row of cable bundles reversed to match a twisted cable.
+
+#### [v20.1.2](https://github.com/nophead/NopSCADlib/releases/tag/v20.1.2 "show release") Fixes [...](https://github.com/nophead/NopSCADlib/compare/v20.1.1...v20.1.2 "diff with v20.1.1")
+*   2022-03-17 [`99a5570`](https://github.com/nophead/NopSCADlib/commit/99a5570e248be32747bead61e17feaa3bde13f9b "show commit") [C.P.](# "Chris Palmer") Fixed ziptie bug for small wires and corners made sharper.
+
+*   2022-03-17 [`b70911d`](https://github.com/nophead/NopSCADlib/commit/b70911dc132727f24798e92be06a87ab37f2917e "show commit") [C.P.](# "Chris Palmer") Image odd pixel changes due to move to summer computer.
+
+*   2022-03-01 [`2d20fb1`](https://github.com/nophead/NopSCADlib/commit/2d20fb130a260b1f7358ea9fbb9fca2b5a18a65b "show commit") [C.P.](# "Chris Palmer") Removed dead code in `spiral_paths()`.
+
 #### [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.
 
@@ -392,8 +403,6 @@ Fixed `M6_cs_cap_screw` and `M4_grub_screw` socket sizes.
 #### [v15.21.1](https://github.com/nophead/NopSCADlib/releases/tag/v15.21.1 "show release") Fixes [...](https://github.com/nophead/NopSCADlib/compare/v15.21.0...v15.21.1 "diff with v15.21.0")
 *   2021-08-09 [`be53547`](https://github.com/nophead/NopSCADlib/commit/be53547728834d8e786ad4cb5637c768320a3105 "show commit") [M.B.](# "Martin Budden") Fixed display of BLDC prop shaft when thread length `=` 0.
 
-*   2021-07-04 [`ba7d7d3`](https://github.com/nophead/NopSCADlib/commit/ba7d7d32adf554d163143c0ae1707565340bb35b "show commit") [C.P.](# "Chris Palmer") Updated chnagelog.
-
 ### [v15.21.0](https://github.com/nophead/NopSCADlib/releases/tag/v15.21.0 "show release") Additions [...](https://github.com/nophead/NopSCADlib/compare/v15.20.0...v15.21.0 "diff with v15.20.0")
 *   2021-07-01 [`df35e14`](https://github.com/nophead/NopSCADlib/commit/df35e14fc71794c3826d6c99ce3cab93a4cfa5fe "show commit") [M.B.](# "Martin Budden") Improved handling of pcb plating colour.
 

readme.md

@@ -234,8 +234,9 @@ exposing enough information to make a battery box.
 ### Vitamins
 | Qty | Module call | BOM entry |
 | ---:|:--- |:---|
-|   6 | `battery_contact(bcontact, false)` |  Battery negative contact |
-|   6 | `battery_contact(bcontact, true)` |  Battery positive contact |
+|   7 | `battery_contact(bcontact, false)` |  Battery negative contact |
+|   7 | `battery_contact(bcontact, true)` |  Battery positive contact |
+|   1 | `battery(A23CELL)` |  Cell A23 12v |
 |   1 | `battery(AACELL)` |  Cell AA |
 |   1 | `battery(AAACELL)` |  Cell AAA |
 |   1 | `battery(CCELL)` |  Cell C |
@@ -4382,7 +4383,7 @@ If a washer is given a child, usually a screw or a nut, then it is placed on its
 ---
 <a name="Wire"></a>
 ## Wire
-Just a BOM entry at the moment and cable bundle size functions for holes, plus cable ties.
+Utilities for adding wires to the BOM and optionally drawing them and cable bundle size functions for holes, plus cable ties.
 
 [vitamins/wire.scad](vitamins/wire.scad) Implementation.
 
@@ -4391,21 +4392,25 @@ Just a BOM entry at the moment and cable bundle size functions for holes, plus c
 ### Functions
 | Function | Description |
 |:--- |:--- |
-| `cable(wires, size, colours, ribbon = false)` | Cable constructor |
-| `cable_bundle(cable)` | Arrangement of a bundle in a flat cable clip |
+| `cable(wires, size, colours, ribbon = false, tlen = 25)` | Cable constructor |
+| `cable_bundle(cable)` | Dimensions of the bounding rectangle of a bundle of wires in a flat cable clip |
 | `cable_bundle_positions(cable)` | Positions of wires in a bundle to go through a cable strip |
 | `cable_height(cable)` | Height in flat clip |
 | `cable_is_ribbon(cable)` | Is a ribbon cable? |
 | `cable_radius(cable)` | Radius of a bundle of wires, see <http://mathworld.wolfram.com/CirclePacking.html>. |
+| `cable_tlen(cable)` | Twisted cable twist length |
+| `cable_twisted_radius(cable)` | Approximate radius of a cable when twisted |
 | `cable_width(cable)` | Width in flat clip |
 | `cable_wire_colours(cable)` | Individual wire colours |
 | `cable_wire_size(cable)` | Size of each wire in a bundle |
 | `cable_wires(cable)` | Number of wires in a bundle |
+| `twisted_cable(cable, path, irot = 0, frot = 0)` | Return the paths for a twisted cable, `irot` is the initial rotation and frot the final rotation |
 | `wire_hole_radius(cable)` | Radius of a hole to accept a bundle of wires, rounded up to standard metric drill size |
 
 ### Modules
 | Module | Description |
 |:--- |:--- |
+| `cable(cable, paths)` | Draw a cable, given a list of paths |
 | `cable_tie(cable_r, thickness)` | A ziptie threaded around cable radius `cable_r` and through a panel with specified `thickness`. |
 | `cable_tie_holes(cable_r, h = 100)` | Holes to thread a ziptie through a panel to make a cable tie. |
 | `mouse_hole(cable, h = 100, teardrop = false)` | A mouse hole to allow a panel to go over a wire bundle. |
@@ -4417,13 +4422,13 @@ Just a BOM entry at the moment and cable bundle size functions for holes, plus c
 ### Vitamins
 | Qty | Module call | BOM entry |
 | ---:|:--- |:---|
-|   1 |  |  Wire black 7/0.2mm strands, length 90mm |
-|   1 |  |  Wire blue 7/0.2mm strands, length 90mm |
-|   1 |  |  Wire brown 7/0.2mm strands, length 90mm |
-|   1 |  |  Wire green 7/0.2mm strands, length 90mm |
-|   1 |  |  Wire orange 7/0.2mm strands, length 90mm |
-|   1 |  |  Wire red 7/0.2mm strands, length 90mm |
-|   1 |  |  Wire yellow 7/0.2mm strands, length 90mm |
+|   1 |  |  Wire black 7/0.2mm strands, length 60mm |
+|   1 |  |  Wire blue 7/0.2mm strands, length 60mm |
+|   1 |  |  Wire brown 7/0.2mm strands, length 60mm |
+|   1 |  |  Wire green 7/0.2mm strands, length 60mm |
+|   1 |  |  Wire orange 7/0.2mm strands, length 60mm |
+|   1 |  |  Wire red 7/0.2mm strands, length 60mm |
+|   1 |  |  Wire yellow 7/0.2mm strands, length 60mm |
 |   1 | `ziptie(small_ziptie)` |  Ziptie 2.5mm x 100mm min length |
 
 

scripts/changelog.py

@@ -162,6 +162,6 @@ if __name__ == '__main__':
 
             # Print commits excluding merges
 
-            if not c.comment.startswith('Merge branch') and not c.comment.startswith('Merge pull') and not re.match(r'U..ated chang.*log.*', c.comment):
+            if not c.comment.startswith('Merge branch') and not c.comment.startswith('Merge pull') and not re.match(r'U..ated ch.*log.*', c.comment):
                 print('* %s [`%s`](%s "show commit") %s %s\n' % (c.date, c.hash[:7], url + '/commit/' + c.hash, initials(c.author), fixup_comment(c.comment, url)), file = file)
     do_cmd(('codespell -w -L od ' + filename).split())

tests/wire.scad

@@ -17,18 +17,25 @@
 // If not, see <https://www.gnu.org/licenses/>.
 //
 include <../utils/core/core.scad>
+use <../utils/sweep.scad>
+use <../utils/bezier.scad>
 
 use <../vitamins/wire.scad>
 
-bundle = [7, 1.4];
+twist_len = 25; // [5 : 50]
+wires = 7; // [1 : 7]
+irot = -60; // [-90 : 0]
 
+/* [Hidden] */
+wire_d = 1.4;
+bundle = cable(wires, wire_d);
 bundle_r = cable_radius(bundle);
 
 thickness = 2;
 w = 60;
 d = 20;
-h = 40;
-wire_l = 90;
+h = 10;
+wire_l = 60;
 mouse_y = 10;
 cable_pitch = 7;
 
@@ -49,6 +56,7 @@ module wires() {
                     translate([bundle_r - d / 2, 0]) {
                         colour = ["black", "brown", "red", "orange", "yellow", "blue", "purple"][i];
                         wire(colour, 7, wire_l);
+
                         color(colour)
                             cylinder(d = d, h = wire_l, center = true);
                    }
@@ -66,7 +74,7 @@ module wires() {
                         mouse_hole(bundle, 0, true);
 
                     for(i = [1 : 6])
-                        let(cable = [i, 1.4], bundle = cable_bundle(cable))
+                        let(cable = cable(i, wire_d), bundle = cable_bundle(cable))
                             translate([mouse_y + cable_pitch * i - bundle.x / 2, -eps])
                                 square([bundle.x, bundle.y]);
                 }
@@ -81,18 +89,28 @@ module wires() {
                         cable_tie_holes(bundle_r, 0);
                 }
     }
+
     translate([-15, mouse_y])
         cable_tie(bundle_r, thickness);
 
-    for(i = [1 : 6]) let(cable = [i, 1.4])
-        translate([0, mouse_y + cable_pitch * i])
-            let(positions = cable_bundle_positions(cable))
-                for(i = [0 : len(positions) - 1])
-                    let(p = positions[i])
-                        translate([0, p.x, p.y])
-                            rotate([0, 90, 0])
-                                color([grey(10), "blue", "red", "orange", "yellow", "green"][i])
-                                    cylinder(d = cable_wire_size(cable), h = 60, center = true);
+    for(i = [1 : 6]) let(cable = cable(i, wire_d, [grey(10), "blue", "red", "orange", "yellow", "green"], tlen = twist_len))
+        translate([0, mouse_y + cable_pitch * i]) {
+            tr = cable_twisted_radius(cable);
+            bend_r = 5;
+            x = -d + thickness - bend_r;
+            path = [
+                        [-5, 0, tr],
+                        [x,  0, tr],
+                bend_r, [x,  0, -25]
+            ];
+            rpath = rounded_path(path);
+            tpaths = twisted_cable(cable, rpath, irot = irot, frot = -irot);
+            positions = cable_bundle_positions(cable);
+
+            ends = [for(p = positions) [[30, p.x, p.y], [0, p.x, p.y]]];
+            paths = [for(i = [0 : len(tpaths) - 1]) bezier_join(ends[i], tpaths[i], 1.3, 3)];
+            cable(cable, paths, $fn = 32);
+        }
 }
 
 if($preview)

vitamins/batteries.scad

@@ -44,7 +44,8 @@ AACELL    = ["AACELL",    "Cell AA",                                  50.5, 14.5
 AAACELL   = ["AAACELL",   "Cell AAA",                                 44.5, 10.5,  8, 3.8, 0.8, "grey",           [],                      0, bcontact];
 CCELL     = ["CCELL",     "Cell C",                                   50,   26.2, 20, 7.5, 1.5, "brown",          [],                      0, bcontact];
 DCELL     = ["DCELL",     "Cell D",                                   61.5, 34.2, 22, 8.2, 2.4, "brown",          [],                      0, bcontact];
+A23CELL   = ["A23CELL",   "Cell A23 12v",                             28.5, 10.3, 5.2,5.2, 1.0, "silver",         [],                      0, bcontact];
 
-batteries = [AAACELL, AACELL, CCELL, DCELL, LUMINTOP, S25R18650];
+batteries = [AAACELL, AACELL, CCELL, DCELL, LUMINTOP, S25R18650, A23CELL];
 
 use <battery.scad>

vitamins/wire.scad

@@ -18,9 +18,11 @@
 //
 
 //
-//! Just a BOM entry at the moment and cable bundle size functions for holes, plus cable ties.
+//! Utilities for adding wires to the BOM and optionally drawing them and cable bundle size functions for holes, plus cable ties.
 //
 include <../utils/core/core.scad>
+use <../utils/sweep.scad>
+use <../utils/maths.scad>
 include <zipties.scad>
 
 module wire(colour, strands, length, strand = 0.2)   //! Add stranded wire to the BOM
@@ -35,15 +37,16 @@ module ribbon_cable(ways, length)                   //! Add ribbon cable to the
 function cable_wires(cable)     = cable[0]; //! Number of wires in a bundle
 function cable_wire_size(cable) = cable[1]; //! Size of each wire in a bundle
 function cable_is_ribbon(cable) = len(cable) > 2 && cable[2]; //! Is a ribbon cable?
-function cable_wire_colours(cable) = assert(len(cable[3]) == cable_wires(cable)) cable[3]; //! Individual wire colours
-function cable(wires, size, colours, ribbon = false) = [wires, size, ribbon, colours]; //! Cable constructor
+function cable_wire_colours(cable) = assert(len(cable[3]) >= cable_wires(cable)) cable[3]; //! Individual wire colours
+function cable_tlen(cable)      = cable[4]; //! Twisted cable twist length
+function cable(wires, size, colours, ribbon = false, tlen = 25) = [wires, size, ribbon, colours, tlen]; //! Cable constructor
 
 // numbers from http://mathworld.wolfram.com/CirclePacking.html
 function cable_radius(cable) = [0, 1, 2, 2.15, 2.41, 2.7, 3, 3, 3.3][cable_wires(cable)] * cable_wire_size(cable) / 2; //! Radius of a bundle of wires, see <http://mathworld.wolfram.com/CirclePacking.html>.
 
 function wire_hole_radius(cable) = ceil(4 * cable_radius(cable) + 1) / 4; //! Radius of a hole to accept a bundle of wires, rounded up to standard metric drill size
 
-function cable_bundle(cable) = //! Arrangement of a bundle in a flat cable clip
+function cable_bundle(cable) = //! Dimensions of the bounding rectangle of a bundle of wires in a flat cable clip
     (cable_is_ribbon(cable) ? [cable_wires(cable), 1] :
     [[0,0], [1,1], [2,1], [2, 1 + sin(60)], [2,2], [3, 1 + sin(60)], [3,2]][cable_wires(cable)]) * cable_wire_size(cable);
 
@@ -53,12 +56,42 @@ function cable_bundle_positions(cable) = let( //! Positions of wires in a bundle
         top = wires - bottom
     )
     [for(i = [0 : 1 : bottom - 1]) [i - (bottom - 1) / 2, 0.5],
-     for(i = [0 : 1 : top - 1])    [i - (top - 1) / 2, top == bottom ? 1.5 : 0.5 + sin(60)]
+     for(i = [top - 1 : -1 : 0])   [i - (top - 1) / 2, top == bottom ? 1.5 : 0.5 + sin(60)]
     ] * cable_wire_size(cable);
 
 function cable_width(cable)  = cable_bundle(cable).x; //! Width in flat clip
 function cable_height(cable) = cable_bundle(cable).y; //! Height in flat clip
 
+function cable_twisted_radius(cable) = let( //! Approximate radius of a cable when twisted
+        tlen = cable_tlen(cable),               // Twist length
+        a = cable_wire_size(cable) / 2,         // Ellipse minor axis
+        R = cable_radius(cable) - a,            // Radius of wire centres when not twisted
+        angle = atan2(tlen, 2 * PI * R),        // Slope angle of the spiral
+        b = a / sin(angle),                     // Ellipse major axis
+        grad = tan(180 / cable_wires(cable)),   // Gradient at contact point between elipses
+        x = a^2 / sqrt(a^2 + (b / grad)^2),     // Contact point of the ellipse tangent
+        y = b * sqrt(1 - x^2 / a^2)
+    ) R ? x + y / grad + a : a;                 // Where the tangent meets the X axis plus radius
+
+function twisted_cable(cable, path, irot = 0, frot = 0) = let(      //! Return the paths for a twisted cable, `irot` is the initial rotation and frot the final rotation
+        tlen = cable_tlen(cable),               // Twist length
+        r = cable_wire_size(cable) / 2,
+        pitch = cable_twisted_radius(cable) - r,
+        wires = cable_wires(cable),
+        bottom = wires > 4 ? 3 : 2,
+        irot = irot + 90 - 180 * (bottom - 1) / wires
+    )
+    spiral_paths(path, wires, pitch, round(path_length(path) / tlen) - frot / 360, irot);
+
+module cable(cable, paths) {                    //! Draw a cable, given a list of paths
+    wires = cable_wires(cable);
+    assert(len(paths) == wires);
+    r = cable_wire_size(cable) / 2;
+    for(i = [0 : wires - 1])
+        color(cable_wire_colours(cable)[i])
+            sweep(paths[i], circle_points(r), convexity = 5);
+}
+
 module mouse_hole(cable, h = 100, teardrop = false) { //! A mouse hole to allow a panel to go over a wire bundle.
     r = wire_hole_radius(cable);