Merge branch 'martinbudden-extrusion1515_dimensions'

Fixed missing space in veroboard vitamin decription.

CHANGELOG.md

@@ -3,6 +3,44 @@
 This changelog is generated by `changelog.py` using manually added semantic version tags to classify commits as breaking changes, additions or fixes.
 
 
+### [v20.5.0](https://github.com/nophead/NopSCADlib/releases/tag/v20.5.0 "show release") Additions [...](https://github.com/nophead/NopSCADlib/compare/v20.4.0...v20.5.0 "diff with v20.4.0")
+*   2022-05-31 [`cc5654d`](https://github.com/nophead/NopSCADlib/commit/cc5654d7d756287f5311e35104003f38a4a94475 "show commit") [C.](# "Chris") Added `usb_miniA()`.
+
+### [v20.4.0](https://github.com/nophead/NopSCADlib/releases/tag/v20.4.0 "show release") Additions [...](https://github.com/nophead/NopSCADlib/compare/v20.3.1...v20.4.0 "diff with v20.3.1")
+*   2022-04-01 [`d46913c`](https://github.com/nophead/NopSCADlib/commit/d46913ce4f64656889fd29dccc0709d84d4d9c49 "show commit") [C.P.](# "Chris Palmer") Printed `screw_knob()` is now fully customisable by passing a parameter
+list, constructed by `screw_knob(),` in place of the screw.
+
+ * Screws can still be passed for backwards compatibility.
+
+#### [v20.3.1](https://github.com/nophead/NopSCADlib/releases/tag/v20.3.1 "show release") Fixes [...](https://github.com/nophead/NopSCADlib/compare/v20.3.0...v20.3.1 "diff with v20.3.0")
+*   2022-04-01 [`b9f676a`](https://github.com/nophead/NopSCADlib/commit/b9f676a75369d666540f79abe0392e209e20d0f0 "show commit") [C.P.](# "Chris Palmer") Documented `insert_hole_length()`.
+
+### [v20.3.0](https://github.com/nophead/NopSCADlib/releases/tag/v20.3.0 "show release") Additions [...](https://github.com/nophead/NopSCADlib/compare/v20.2.0...v20.3.0 "diff with v20.2.0")
+*   2022-03-17 [`ddc4150`](https://github.com/nophead/NopSCADlib/commit/ddc4150ed73c8300bc3ef4326a91cd4ec54ed9e3 "show commit") [C.P.](# "Chris Palmer") Updated images and readme.
+
+*   2022-03-16 [`7e126c9`](https://github.com/nophead/NopSCADlib/commit/7e126c94cadd120d686eaad8459723e0c1dfc0b2 "show commit") [M.](# "Mozza") Add A23 cell
+
+### [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.
+
+*   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.
 
@@ -382,8 +420,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.
 

libtest.scad

@@ -163,14 +163,11 @@ corner_blocks_y = fixing_blocks_y + 30;
 translate([x5, corner_blocks_y])
     corner_blocks();
 
-feet_y = corner_blocks_y + 70;
-translate([x5, feet_y])
-    feet();
-
-translate([x5 + 70, feet_y])
+screw_knobs_y = corner_blocks_y + 70;
+translate([x5, screw_knobs_y])
     screw_knobs();
 
-knobs_y = feet_y + 40;
+knobs_y = screw_knobs_y + 40;
 translate([640, knobs_y])
     printed_pulley_test();
 
@@ -185,6 +182,9 @@ strap_y = clips_y + 50;
 translate([x5 + 60, strap_y])
     strap_handles();
 
+translate([x6, strap_y])
+   feet();
+
 handle_y = strap_y + 50;
 translate([x5, handle_y])
     handle();

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>

printed/screw_knob.scad

@@ -19,53 +19,102 @@
 
 //
 //! Knob with embedded hex head screw.
+//!
+//! Most aspects can be customised, e.g. the flange thickness and radius. It can also be solid or just a wall and be wavey edged or fluted.
 //
 include <../core.scad>
 use <../utils/hanging_hole.scad>
 
-knob_wall = 2;
+function screw_knob_screw(type)    = type[0]; //! The hex screw
+function screw_knob_wall(type)     = type[1]; //! Wall thickness
+function screw_knob_stem_h(type)   = type[2]; //! The stem height below the flange
+function screw_knob_flange_t(type) = type[3]; //! The thickness of the flange
+function screw_knob_flange_r(type) = type[4]; //! The flange outside radius
+function screw_knob_solid(type)    = type[5]; //! Is the flange solid or just a wall
+function screw_knob_waves(type)    = type[6]; //! Number of waves around the flange edge
+function screw_knob_wave_amp(type) = type[7]; //! Wave amplitude
+function screw_knob_fluted(type)   = type[8]; //! Fluted instead of sine wave
+
+function screw_knob(screw, wall = 2, stem_h = 6, flange_t = 4, flange_r = 9, solid = true, waves = 5, wave_amp = 2, fluted = false) = //! Constructor
+    [screw, wall, stem_h, flange_t, flange_r, solid, waves, wave_amp, fluted];
+
 function knob_nut_trap_depth(screw) = round_to_layer(screw_head_height(screw));
-knob_stem_h = 6;
-knob_thickness = 4;
-knob_r = 8;
-knob_wave = 1;
-knob_waves = 5;
-knob_height = knob_stem_h + knob_thickness;
-function knob_height() = knob_height;
+function knob_height(type) = //! Total height of the knob
+    let(type = !is_list(type[0]) ? screw_knob(type) : type)
+        screw_knob_stem_h(type) + screw_knob_flange_t(type);
 
-module screw_knob(screw) { //! Generate the STL for a knob to fit the specified hex screw
-    knob_stem_r = nut_trap_radius(screw_nut(screw)) + knob_wall;
+module screw_knob(type) { //! Generate the STL for a knob to fit the specified hex screw
+    type = !is_list(type[0]) ? screw_knob(type) : type;         // Allow just the screw to be specified for backwards compatability
+    screw = screw_knob_screw(type);
+    wall = screw_knob_wall(type);
+    trap_r = nut_trap_radius(screw_nut(screw));
+    stem_r = trap_r + wall;
+    amp = screw_knob_wave_amp(type);
+    flange_r = max(screw_knob_flange_r(type), stem_r + amp);
+    flange_t = screw_knob_flange_t(type);
+    knob_h = knob_height(type);
+    waves = screw_knob_waves(type);
 
-    function wave(a) = knob_r + sin(a * knob_waves) * knob_wave;
+    function wave(a) = flange_r - amp / 2 + sin(a * waves) * amp / 2;
+    fn = r2sides(flange_r);
+    points = [for(i = [0 : fn - 1], a = i * 360 / fn) wave(a) * [sin(a), cos(a)]];
+    solid = screw_knob_solid(type);
+
+    module shape()
+        if(screw_knob_fluted(type))
+            difference() {
+                circle4n(flange_r);
+
+                c = flange_r * sin(90 / waves);            // Flute half chord
+                d = flange_r - flange_r * cos(90 / waves); // Distance from chord to perimeter
+                b = amp - d;                               // Distance from chord to flute bottom
+                flute_r = (b^2 + c^2) / b / 2;
+                for(i = [0 : waves - 1])
+                    rotate(360 * i / waves)
+                        translate([0, flange_r - amp + flute_r])
+                            circle4n(flute_r);
+            }
+        else
+            polygon(points);
 
     stl(str("screw_knob_M", screw_radius(screw) * 20))
         union() {
             render() difference() {
-                cylinder(r = knob_stem_r, h = knob_thickness + knob_stem_h);
+                cylinder(r = stem_r, h = knob_h);
 
                 hanging_hole(knob_nut_trap_depth(screw), screw_clearance_radius(screw))
                     rotate(45)
-                        circle(r = nut_trap_radius(screw_nut(screw)), $fn = 6);
+                        circle(r = trap_r, $fn = 6);
             }
-            linear_extrude(knob_thickness, convexity = 3)
-                difference() {
-                    polygon(points = [for(a = [0 : 359]) [wave(a) * sin(a), wave(a) * cos(a)]]);
+            for(i = [0 : 1])
+                linear_extrude(i ? flange_t : round_to_layer(wall), convexity = 3)
+                    difference() {
+                        shape();
 
-                    circle(knob_stem_r - eps);
-                }
+                        if(i && ! solid)
+                            offset(-wall)
+                                shape();
+
+                        circle(stem_r - eps);
+                    }
         }
 }
 
 //! Place the screw through the printed part
-module screw_knob_assembly(screw, length) //! Assembly with the screw in place
-assembly(str("screw_knob_M", 20 * screw_radius(screw), "_", length), ngb = true) {
-    translate_z(knob_height)
-        vflip()
-            stl_colour(pp1_colour) screw_knob(screw);
+module screw_knob_assembly(type, length) { //! Assembly with the screw in place
+    type = !is_list(type[0]) ? screw_knob(type) : type;
+    screw = screw_knob_screw(type);
+    knob_h = knob_height(type);
 
-    translate_z(knob_height - knob_nut_trap_depth(screw))
-        rotate(-45)
-            screw(screw, length);
+    assembly(str("screw_knob_M", 20 * screw_radius(screw), "_", length), ngb = true) {
+        translate_z(knob_h)
+            vflip()
+                stl_colour(pp1_colour) screw_knob(type);
+
+        translate_z(knob_h - knob_nut_trap_depth(screw))
+            rotate(-45)
+                screw(screw, length);
+    }
 }
 
 module screw_knob_M30_stl() screw_knob(M3_hex_screw);

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 |
@@ -1511,6 +1512,7 @@ Heatfit threaded inserts. Can be pushed into thermoplastics using a soldering ir
 | Function | Description |
 |:--- |:--- |
 | `insert_boss_radius(type, wall)` | Compute the outer radius of an insert boss |
+| `insert_hole_length(type)` | Length of the insert rounded to layer height |
 | `insert_nose_length(type, d)` | The length before the second ring. |
 
 ### Modules
@@ -2401,6 +2403,7 @@ PCBs and perfboard with optional components. The shape can be a rectangle with o
 | `usb_Ax2(cutout = false)` | Draw USB type A dual socket |
 | `usb_B(cutout = false)` | Draw USB B connector |
 | `usb_C(cutout = false)` | Draw USB C connector |
+| `usb_miniA(cutout = false)` | Draw USB mini A connector |
 | `usb_uA(cutout = false)` | Draw USB micro A connector |
 | `vero_pin(cropped = false)` | Draw a vero pin |
 
@@ -2551,6 +2554,7 @@ PCBs and perfboard with optional components. The shape can be a rectangle with o
 | `usb_Ax2(cutout = false)` | Draw USB type A dual socket |
 | `usb_B(cutout = false)` | Draw USB B connector |
 | `usb_C(cutout = false)` | Draw USB C connector |
+| `usb_miniA(cutout = false)` | Draw USB mini A connector |
 | `usb_uA(cutout = false)` | Draw USB micro A connector |
 | `vero_pin(cropped = false)` | Draw a vero pin |
 
@@ -4242,7 +4246,7 @@ Veroboard with mounting holes, track breaks, removed tracks, solder points and c
 ### Functions
 | Function | Description |
 |:--- |:--- |
-| `vero(name, assembly, holes, strips, pitch = inch(0.1)` | Constructor |
+| `vero(name, assembly, holes, strips, pitch = 2.54, fr4 = false, screw = M3_cap_screw, mounting_holes = [], breaks = [], no_tracks = [], components = [], joints = [])` | Constructor |
 | `vero_length(type)` | Length of the board |
 | `vero_size(type)` | Board size |
 | `vero_thickness(type)` | Thickness of the substrate |
@@ -4270,7 +4274,7 @@ Veroboard with mounting holes, track breaks, removed tracks, solder points and c
 |   4 | `nut(M3_nut, nyloc = true)` |  Nut M3 x 2.4mm nyloc |
 |   4 | `screw(M3_dome_screw, 25)` |  Screw M3 dome x 25mm |
 |   2 | `green_terminal(gt_2p54, 10)` |  Terminal block 10 way 0.1" |
-|   2 | `veroboard(z_vb)` |  Veroboard 5 holes x 22strips |
+|   2 | `veroboard(z_vb)` |  Veroboard 5 holes x 22 strips |
 |   8 | `washer(M3_washer)` |  Washer  M3 x 7mm x 0.5mm |
 
 ### Printed
@@ -4382,7 +4386,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 +4395,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 +4425,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 |
 
 
@@ -4890,7 +4898,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 +5457,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 +5855,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.
@@ -5908,15 +5916,36 @@ Clamp for ribbon cable and polypropylene strip or one or more ribbon cables.
 ## Screw_knob
 Knob with embedded hex head screw.
 
+Most aspects can be customised, e.g. the flange thickness and radius. It can also be solid or just a wall and be wavey edged or fluted.
+
 [printed/screw_knob.scad](printed/screw_knob.scad) Implementation.
 
 [tests/screw_knob.scad](tests/screw_knob.scad) Code for this example.
 
+### Properties
+| Function | Description |
+|:--- |:--- |
+| `screw_knob_flange_r(type)` | The flange outside radius |
+| `screw_knob_flange_t(type)` | The thickness of the flange |
+| `screw_knob_fluted(type)` | Fluted instead of sine wave |
+| `screw_knob_screw(type)` | The hex screw |
+| `screw_knob_solid(type)` | Is the flange solid or just a wall |
+| `screw_knob_stem_h(type)` | The stem height below the flange |
+| `screw_knob_wall(type)` | Wall thickness |
+| `screw_knob_wave_amp(type)` | Wave amplitude |
+| `screw_knob_waves(type)` | Number of waves around the flange edge |
+
+### Functions
+| Function | Description |
+|:--- |:--- |
+| `knob_height(type)` | Total height of the knob |
+| `screw_knob(screw, wall = 2, stem_h = 6, flange_t = 4, flange_r = 9, solid = true, waves = 5, wave_amp = 2, fluted = false)` | Constructor |
+
 ### Modules
 | Module | Description |
 |:--- |:--- |
-| `screw_knob(screw)` | Generate the STL for a knob to fit the specified hex screw |
-| `screw_knob_assembly(screw, length)` | Assembly with the screw in place |
+| `screw_knob(type)` | Generate the STL for a knob to fit the specified hex screw |
+| `screw_knob_assembly(type, length)` | Assembly with the screw in place |
 
 ![screw_knob](tests/png/screw_knob.png)
 
@@ -5925,18 +5954,24 @@ Knob with embedded hex head screw.
 | ---:|:--- |:---|
 |   1 | `screw(M3_hex_screw, 16)` |  Screw M3 hex x 16mm |
 |   1 | `screw(M4_hex_screw, 16)` |  Screw M4 hex x 16mm |
+|   1 | `screw(M5_hex_screw, 16)` |  Screw M5 hex x 16mm |
+|   1 | `screw(M6_hex_screw, 16)` |  Screw M6 hex x 16mm |
 
 ### Printed
 | Qty | Filename |
 | ---:|:--- |
 |   1 | screw_knob_M30.stl |
 |   1 | screw_knob_M40.stl |
+|   1 | screw_knob_M50.stl |
+|   1 | screw_knob_M60.stl |
 
 ### Assemblies
 | Qty | Name |
 | ---:|:--- |
 |   1 | screw_knob_M30_16_assembly |
 |   1 | screw_knob_M40_16_assembly |
+|   1 | screw_knob_M50_16_assembly |
+|   1 | screw_knob_M60_16_assembly |
 
 
 <a href="#top">Top</a>
@@ -6807,7 +6842,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 |
@@ -6848,7 +6883,7 @@ Original version by Doug Moen on the OpenSCAD forum
 | Module | Description |
 |:--- |:--- |
 | `box(xmin, ymin, zmin, xmax, ymax, zmax)` | Construct a box given its bounds |
-| `clip(xmin = -inf, ymin = -inf, zmin = -inf, xmax = inf, ymax = inf, zmax = inf)` | Clip child to specified boundaries |
+| `clip(xmin = -inf, ymin = -inf, zmin = -inf, xmax = inf, ymax = inf, zmax = inf, convexity = 1)` | Clip child to specified boundaries |
 
 ![clip](tests/png/clip.png)
 

scripts/changelog.py

@@ -157,11 +157,11 @@ if __name__ == '__main__':
                         break
                     j += 1
 
-                # Print verson info
+                # Print version info
                 print('%s [%s](%s "show release") %s %s' % ('#' * (level + 1), ver, url + '/releases/tag/' + ver, type, diff), file = file)
 
             # 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())

scripts/render.py

@@ -26,7 +26,7 @@ from set_config import *
 from exports import bom_to_parts
 import os
 import openscad
-from tests import do_cmd, update_image, colour_scheme, background
+from tests import do_cmd, update_image, colour_scheme, background, image_size
 from deps import mtime
 from colorama import init
 import json
@@ -95,7 +95,7 @@ def render(target, type):
             render = "--preview" if type == 'stl' or colour != pp1 else "--render"
             tmp_name = tmp_dir + '/' + part[:-4] + '.png'
             dummy_deps_name = tmp_dir + '/tmp.deps' # work around for OpenSCAD issue #3879
-            openscad.run("-o", tmp_name, png_maker_name, colour_scheme, "--projection=p", "--imgsize=4096,4096", cam, render, "--autocenter", "--viewall", "-d", dummy_deps_name)
+            openscad.run("-o", tmp_name, png_maker_name, colour_scheme, "--projection=p", image_size, cam, render, "--autocenter", "--viewall", "-d", dummy_deps_name)
             do_cmd(("magick "+ tmp_name + " -trim -resize 280x280 -background %s -gravity Center -extent 280x280 -bordercolor %s -border 10 %s"
                     % (background, background, tmp_name)).split())
             update_image(tmp_name, png_name)

scripts/set_config.py

@@ -57,13 +57,13 @@ def set_config(target, usage = None):
         sys.exit(1)
 
     if not targets:
-        print("Not a muli-configuration project (no config_<target>.scad files found)")
+        print("Not a multi-configuration project (no config_<target>.scad files found)")
         if usage:
             usage()
         sys.exit(1)
 
     if not target in targets:
-        print(target + " is not a configuration, avaliable configurations are: " + valid_targets_string())
+        print(target + " is not a configuration, available configurations are: " + valid_targets_string())
         if usage:
             usage()
         sys.exit(1)

scripts/tests.py

@@ -36,8 +36,7 @@ from blurb import *
 from colorama import Fore
 from tmpdir import *
 
-w = 4096
-h = w
+image_size = "--imgsize=4096,4096"
 threshold = 20  # Image comparison allowed number of different pixels
 fuzz = 5       # Image comparison allowed percentage error in pixel value
 
@@ -119,7 +118,7 @@ def tests(tests):
         libtest = True
         lib_blurb = scrape_blurb(scad_name)
         if not os.path.isfile(png_name):
-            openscad.run(scad_name, "-o", png_name, colour_scheme, "--projection=p", "--imgsize=%d,%d" % (w, h), "--camera=0,0,0,50,0,340,500", "--autocenter", "--viewall");
+            openscad.run(scad_name, "-o", png_name, colour_scheme, "--projection=p", image_size, "--camera=0,0,0,50,0,340,500", "--autocenter", "--viewall");
             do_cmd(["magick", png_name, "-trim", "-resize", "1280", "-bordercolor", background, "-border", "10", png_name])
     else:
         #
@@ -240,7 +239,7 @@ def tests(tests):
                 print(changed)
                 t = time.time()
                 tmp_name = tmp_dir + '/tmp.png'
-                openscad.run_list([scad_name, "-o", tmp_name] + options.list() + ["-D$bom=2", colour_scheme, "--projection=p", "--imgsize=%d,%d" % (w, h), "--camera=0,0,0,70,0,315,500", "--autocenter", "--viewall", "-d", dname]);
+                openscad.run_list([scad_name, "-o", tmp_name] + options.list() + ["-D$bom=2", colour_scheme, "--projection=p", image_size, "--camera=0,0,0,70,0,315,500", "--autocenter", "--viewall", "-d", dname]);
                 times.add_time(scad_name, t)
                 do_cmd(["magick", tmp_name, "-trim", "-resize", "1000x600", "-bordercolor", background, "-border", "10", tmp_name])
                 update_image(tmp_name, png_name)

scripts/views.py

@@ -25,7 +25,7 @@
 from __future__ import print_function
 from set_config import *
 import openscad
-from tests import do_cmd, update_image, colour_scheme, background
+from tests import do_cmd, update_image, colour_scheme, background, image_size
 import time
 import times
 import options
@@ -223,7 +223,7 @@ def views(target, do_assemblies = None):
                                                 target_def = ['-D$target="%s"' % target] if target else []
                                                 cwd_def = ['-D$cwd="%s"' % os.getcwd().replace('\\', '/')]
                                                 view_def = ['--viewall', '--autocenter'] if not (zoomed & (1 << explode)) else ['--camera=0,0,0,55,0,25,140']
-                                                openscad.run_list(["-o", tmp_name, png_maker_name] + options.list() + target_def + cwd_def + view_def + ["-D$pose=1", "-D$explode=%d" % explode, colour_scheme, "--projection=p", "--imgsize=4096,4096", "-d", dname]);
+                                                openscad.run_list(["-o", tmp_name, png_maker_name] + options.list() + target_def + cwd_def + view_def + ["-D$pose=1", "-D$explode=%d" % explode, colour_scheme, "--projection=p", image_size, "-d", dname]);
                                                 times.add_time(png_name, t)
                                                 do_cmd(["magick", tmp_name, "-trim", "-resize", "1004x1004", "-bordercolor", background, "-border", "10", tmp_name])
                                                 update_image(tmp_name, png_name)
@@ -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/PCB.scad

@@ -85,16 +85,18 @@ test_pcb = ["test_pcb", "Test PCB",
         [  8, 105, 180, "usb_Ax2"],
         [  7,  85, 180, "molex_usb_Ax1"],
         [ 8.5,125, 180, "molex_usb_Ax2"],
-        [  3, 140, 180, "usb_uA"],
-        [  8, 155, 180, "usb_B"],
+        [  3, 138, 180, "usb_uA"],
+        [ 4.6,148, 180, "usb_miniA"],
+        [ 3.7,158, 180, "usb_C"],
+        [  8, 170, 180, "usb_B"],
+        [  6, 184, 180, "uSD", [12, 11.5, 1.4]],
+        [  8, 196, 180, "jack"],
+        [  6, 206, 180, "barrel_jack"],
+        [  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"],
-        [ 38, 190, -90, "text", 25, 4, "Silkscreen", "Liberation Sans:style=Bold"],
-        [  8, 190, 180, "jack"],
-        [  6, 200, 180, "barrel_jack"],
-        [  5, 218, 180, "hdmi"],
-        [  3, 235, 180, "mini_hdmi"],
-        [  6, 175, 180, "uSD", [12, 11.5, 1.4]],
 
         [ 65,   9,   0, "link", inch(0.4)],
         [ 65,  12,   0, "ax_res", res1_8, 1000],

tests/screw_knob.scad

@@ -17,20 +17,26 @@
 // If not, see <https://www.gnu.org/licenses/>.
 //
 include <../core.scad>
+use <../utils/layout.scad>
 
 use <../printed/screw_knob.scad>
 
-screws = [M3_hex_screw, M4_hex_screw];
+knobs = [
+    M3_hex_screw,
+    M4_hex_screw,
+    screw_knob(M5_hex_screw, flange_r = 12, flange_t = 6, stem_h = 2, waves = 6),
+    screw_knob(M6_hex_screw, flange_r = 15, flange_t = 6, solid = false, stem_h = 2, waves = 6, wall = 1.6, fluted = true),
+];
 
-module do_screw_knob(screw)
+module do_screw_knob(knob) {
     if($preview)
-        screw_knob_assembly(screw, 16);
+        screw_knob_assembly(knob, 16);
     else
-        screw_knob(screw);
+        screw_knob(knob);
+}
 
 module screw_knobs()
-    for(i = [0 : len(screws) - 1])
-        translate([i * 30, 0])
-            do_screw_knob(screws[i]);
+    layout([for(k = knobs) 2 * screw_knob_flange_r(k)], 10)
+        do_screw_knob(knobs[$i]);
 
 screw_knobs();

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)

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

@@ -41,8 +41,8 @@ module box(xmin, ymin, zmin, xmax, ymax, zmax) //! Construct a box given its bou
          [0,2,3,1]]  // left
     );
 
-module clip(xmin = -inf, ymin = -inf, zmin = -inf, xmax = inf, ymax = inf, zmax = inf) //! Clip child to specified boundaries
-    render() intersection() {
+module clip(xmin = -inf, ymin = -inf, zmin = -inf, xmax = inf, ymax = inf, zmax = inf, convexity = 1) //! Clip child to specified boundaries
+    render(convexity = convexity) intersection() {
         children();
 
         box(xmin, ymin, zmin, xmax, ymax, zmax);

utils/sweep.scad

@@ -127,8 +127,8 @@ function sweep_transforms(path, loop = false, twist = 0) =
                          i = i + 1,
                          rot = i < len ? rotate_from_to(tangents[i - 1], tangents[i]) * rot : undef) rot],
 
-        missmatch = loop ? calculate_twist(rotations[0], rotations[last]) : 0,
-        rotation = missmatch + twist
+        mismatch = loop ? calculate_twist(rotations[0], rotations[last]) : 0,
+        rotation = mismatch + twist
     )
     [for(i = [0 : last])
         let(za = rotation * lengths[i] / length)
@@ -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/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/extrusions.scad

@@ -20,7 +20,7 @@
 // Extrusion
 //
 //                  W   H     d1     d2  sq    cw   cwi   t    st   f    recess
-E1515  = [ "E1515", 15, 15,  -2.5,    0, 5.7,  3.4,  5.7, 1.1, 1.1, 0.5, false ];
+E1515  = [ "E1515", 15, 15,  -3.3,    0, 5.5,  6.2,  9.5, 1.0, 0.9, 0.5, false ];
 E2020  = [ "E2020", 20, 20,  -4.2,   -3,   8,    6, 12.0,   2,   2, 1,   false ];
 E2020t = [ "E2020t",20, 20,  -5.0,   -3, 7.8,  6.2, 11.0, 1.8, 1.5, 1.5, [7.2, 0.5] ];
 E2040  = [ "E2040", 20, 40,  -4.2,   -3,   8,    6, 12.0,   2,   2, 1,   false ];

vitamins/insert.scad

@@ -33,7 +33,7 @@ function insert_ring1_h(type)        = type[6];     //! Height of the top and mi
 function insert_ring2_d(type)        = type[7];     //! Diameter of the middle ring
 function insert_ring3_d(type)        = type[8];     //! Diameter of the bottom ring
 
-function insert_hole_length(type) = round_to_layer(insert_length(type));
+function insert_hole_length(type) = round_to_layer(insert_length(type)); //! Length of the insert rounded to layer height
 
 function insert_nose_length(type, d) = let( //! The length before the second ring.
         length = insert_length(type),

vitamins/pcb.scad

@@ -485,6 +485,50 @@ module usb_uA(cutout = false) { //! Draw USB micro A connector
         }
 }
 
+module usb_miniA(cutout = false) { //! Draw USB mini A connector
+    l = 9.2;
+    iw1 = 7.0;
+    iw2 = 6.0;
+    ih1 = 1.05;
+    ih2 = 1.0;
+    h = 4.0;
+    t = 0.4;
+
+    module D() {
+        hull() {
+            translate([-iw1 / 2, h - t - ih1])
+                square([iw1, ih1]);
+
+            translate([-iw2 / 2, t + ih2])
+                square([iw2, eps]);
+
+        }
+        translate([-iw2 / 2, t])
+            square([iw2, ih2]);
+    }
+
+    if(cutout)
+        rotate([90, 0, 90])
+            linear_extrude(100)
+                offset(2 * panel_clearance)
+                    D();
+    else
+        color("silver") rotate([90, 0, 90]) {
+            linear_extrude(l, center = true)
+                difference() {
+                    offset(t)
+                        D();
+
+                    D();
+                }
+
+            translate_z(-l / 2)
+                linear_extrude(1)
+                    offset(t)
+                        D();
+        }
+}
+
 module usb_C(cutout = false) { //! Draw USB C connector
     l = 7.35;
     w = 8.94;
@@ -1046,6 +1090,7 @@ module pcb_component(comp, cutouts = false, angle = undef) { //! Draw pcb compon
         if(show(comp, "usb_A"))         usb_Ax1(cutouts);
         if(show(comp, "usb_Ax2"))       usb_Ax2(cutouts);
         if(show(comp, "usb_uA"))        usb_uA(cutouts);
+        if(show(comp, "usb_miniA"))     usb_miniA(cutouts);
         if(show(comp, "usb_B"))         usb_B(cutouts);
         if(show(comp, "usb_C"))         usb_C(cutouts);
         if(show(comp, "jack"))          jack(cutouts);

vitamins/pcbs.scad

@@ -885,7 +885,7 @@ ArduinoNano = let(l = 43.18, w = 17.78, pitch = inch(0.6), pins = 15, poffset =
       [l / 2 + poffset, w / 2 - pitch / 2,  0, "-2p54joiner", pins, 1],
       [l / 2 + poffset, w / 2 + pitch / 2,  0, "-2p54joiner", pins, 1],
       [l / 2 + poffset + inch(0.75), w / 2, 0, "2p54header",  2,    3, false, undef, false, false],
-      [1.75, w / 2, 180, "usb_uA" ],
+      [3.1, w / 2, 180, "usb_miniA" ],
       [l / 2 - inch(0.25), w / 2, 45, "chip", 7, 7, 1.3],
       [l / 2 + poffset + inch(0.15), w / 2,    0, "chip", 3.5, 6,   1.8, silver ], // mock button
       [l / 2 + poffset + inch(0.15), w / 2,    0, "chip", 1.3, 2.6, 2.6, grey(90) ], // mock button

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

@@ -41,7 +41,7 @@ function vero_track_width(type)    = vero_pitch(type) * 0.8; //! The width of th
 function vero_length(type) = vero_holes(type) * vero_pitch(type); //! Length of the board
 function vero_width(type) = vero_strips(type) * vero_pitch(type); //! Width of the board
 
-function vero(name, assembly, holes, strips, pitch = inch(0.1), fr4 = false, screw = M3_cap_screw, mounting_holes = [], breaks = [], no_tracks = [], components = [], joints = []) = //! Constructor
+function vero(name, assembly, holes, strips, pitch = 2.54, fr4 = false, screw = M3_cap_screw, mounting_holes = [], breaks = [], no_tracks = [], components = [], joints = []) = //! Constructor
     [ name, assembly, holes, strips, pitch, fr4, screw, mounting_holes, breaks, no_tracks, components, joints ];
 
 function vero_size(type) = [vero_length(type), vero_width(type), vero_thickness(type)]; //! Board size
@@ -89,7 +89,7 @@ module veroboard(type) { //! Draw specified veroboard with missing tracks and tr
     tc = vero_fr4(type) ? "silver" : copper;
     no_track = vero_no_track(type);
 
-    vitamin(str("veroboard(", type[0], "): Veroboard ", holes, " holes x ", strips, "strips"));
+    vitamin(str("veroboard(", type[0], "): Veroboard ", holes, " holes x ", strips, " strips"));
 
     color(colour) linear_extrude(vero_thickness(type))
         difference() {

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

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