Merge branch 'martinbudden-nema_name'

Moved path_length() from sweep.scad to maths.scad.

CHANGELOG.md

@@ -3,6 +3,19 @@
 This changelog is generated by `changelog.py` using manually added semantic version tags to classify commits as breaking changes, additions or fixes.
 
 
+### [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.
+
+*   2022-02-15 [`50e23e5`](https://github.com/nophead/NopSCADlib/commit/50e23e5f818077e3661e25852dc959c34e6c8b4a "show commit") [C.P.](# "Chris Palmer") Added silkscreen text to PCBs.
+
+#### [v19.9.1](https://github.com/nophead/NopSCADlib/releases/tag/v19.9.1 "show release") Fixes [...](https://github.com/nophead/NopSCADlib/compare/v19.9.0...v19.9.1 "diff with v19.9.0")
+*   2022-02-15 [`59eeb2c`](https://github.com/nophead/NopSCADlib/commit/59eeb2c5d4c7cf9da1f219c2b01fabcf450085f3 "show commit") [C.P.](# "Chris Palmer") Trimmed the ribbon clamp tape.
+
+*   2022-02-15 [`7ea4dbe`](https://github.com/nophead/NopSCADlib/commit/7ea4dbe6cbbc23256d23f7aea87e8aac8d1000a9 "show commit") [C.P.](# "Chris Palmer") Fixed double application of `r2sides()` in `rounded_path()`.
+Added check for radius too big for corner in `rounded_path()`.
+Spiral paths can now have 0 twists.
+
 ### [v19.9.0](https://github.com/nophead/NopSCADlib/releases/tag/v19.9.0 "show release") Additions [...](https://github.com/nophead/NopSCADlib/compare/v19.8.1...v19.9.0 "diff with v19.8.1")
 *   2022-02-11 [`95b6771`](https://github.com/nophead/NopSCADlib/commit/95b6771811fd48af46b5c2d426c42c04cd8e5af3 "show commit") [C.P.](# "Chris Palmer") Added printed cable clips.
 

readme.md

@@ -3900,15 +3900,15 @@ NEMA stepper motor model.
 | ---:|:--- |:---|
 |   4 | `ring_terminal(M3_ringterm)` |  Ring terminal 3mm |
 |  20 | `screw(M3_pan_screw, 8)` |  Screw M3 pan x  8mm |
-|   1 | `NEMA(NEMA14)` |  Stepper motor NEMA14 x 36mm |
-|   1 | `NEMA(NEMA16)` |  Stepper motor NEMA16 x 19.2mm |
-|   1 | `NEMA(NEMA17P)` |  Stepper motor NEMA17 x 26.5mm |
-|   1 | `NEMA(NEMA17S)` |  Stepper motor NEMA17 x 34mm |
-|   1 | `NEMA(NEMA17M)` |  Stepper motor NEMA17 x 40mm |
-|   1 | `NEMA(NEMA17)` |  Stepper motor NEMA17 x 47mm |
-|   1 | `NEMA(NEMA23)` |  Stepper motor NEMA22 x 51.2mm |
-|   1 | `NEMA(NEMA8)` |  Stepper motor NEMA8 x 30mm |
-|   1 | `NEMA(NEMA8BH)` |  Stepper motor NEMA8 x 30mm |
+|   1 | `NEMA(NEMA14_36)` |  Stepper motor NEMA14 x 36mm |
+|   1 | `NEMA(NEMA16_19)` |  Stepper motor NEMA16 x 19.2mm |
+|   1 | `NEMA(NEMA17_27)` |  Stepper motor NEMA17 x 26.5mm |
+|   1 | `NEMA(NEMA17_34)` |  Stepper motor NEMA17 x 34mm |
+|   1 | `NEMA(NEMA17_40)` |  Stepper motor NEMA17 x 40mm |
+|   1 | `NEMA(NEMA17_47)` |  Stepper motor NEMA17 x 47mm |
+|   1 | `NEMA(NEMA23_51)` |  Stepper motor NEMA22 x 51.2mm |
+|   1 | `NEMA(NEMA8_30)` |  Stepper motor NEMA8 x 30mm |
+|   1 | `NEMA(NEMA8_30BH)` |  Stepper motor NEMA8 x 30mm |
 |  16 | `washer(M3_washer)` |  Washer  M3 x 7mm x 0.5mm |
 |  20 | `star_washer(M3_washer)` |  Washer star M3 x 0.5mm |
 
@@ -6130,6 +6130,10 @@ Annotation used in this documentation
 ## Bezier
 Bezier curves and function to get and adjust the length or minimum z point.
 
+`bezier_join()` joins two paths with a Bezier curve that starts tangential to the end of `path1` and ends tangential to the end of `path2`.
+To do this the outer control points are the path ends and the inner two control points are along the tangents to the path ends.
+The only degree of freedom is how far along those tangents, which are the `d` and optional `d2` parameters.
+
 [utils/bezier.scad](utils/bezier.scad) Implementation.
 
 [tests/bezier.scad](tests/bezier.scad) Code for this example.
@@ -6140,6 +6144,7 @@ Bezier curves and function to get and adjust the length or minimum z point.
 | `adjust_bezier_length(v, l, eps = 0.001, r1 = 1.0, r2 = 1.5, l1, l2)` | Adjust Bezier control points `v` to get the required curve length `l` |
 | `adjust_bezier_z(v, z, eps = 0.001, r1 = 1, r2 = 1.5, z1, z2)` | Adjust Bezier control points `v` to get the required minimum `z` |
 | `bezier(t, v)` | Returns a point at distance `t` [0 - 1] along the curve with control points `v` |
+| `bezier_join(path1, path2, d, d2 = undef)` | Join two paths with a Bezier curve, control points are the path ends are `d` and `d2` from the ends in the same direction. |
 | `bezier_length(v, delta = 0.01, t = 0, length = 0)` | Calculate the length of a Bezier curve from control points `v` |
 | `bezier_min_z(v, steps = 100, z = inf, i = 0)` | Calculate the minimum z coordinate of a Bezier curve from control points `v` |
 | `bezier_path(v, steps = 100)` | Returns a Bezier path from control points `v` with `steps` segments |
@@ -6237,7 +6242,7 @@ allows flexible positioning of the motors.
 |   2 | `pulley(GT2x20ob_pulley)` |  Pulley GT2OB 20 teeth |
 |   8 | `screw(M3_cap_screw, 20)` |  Screw M3 cap x 20mm |
 |   4 | `screw(M3_grub_screw, 6)` |  Screw M3 grub x  6mm |
-|   2 | `NEMA(NEMA17M)` |  Stepper motor NEMA17 x 40mm |
+|   2 | `NEMA(NEMA17_40)` |  Stepper motor NEMA17 x 40mm |
 
 
 <a href="#top">Top</a>
@@ -6430,6 +6435,7 @@ Maths utilities for manipulating vectors and matrices.
 | `map(v, func)` | make a new vector where the func function argument is applied to each element of the vector v |
 | `mapi(v, func)` | make a new vector where the func function argument is applied to each element of the vector v. The func will get the index number as first argument, and the element as second argument. |
 | `nearly_zero(x)` | True if x is close to zero |
+| `path_length(path, i = 0, length = 0)` | Calculated the length along a path |
 | `quadratic_real_roots(a, b, c)` | Returns real roots of a quadratic equation, biggest first. Returns empty list if no real roots |
 | `radians(degrees)` | Convert radians to degrees |
 | `reduce(v, func, unity)` | reduce a vector v to a single entity by applying the func function recursively to the reduced value so far and the next element, starting with unity as the initial reduced value |
@@ -6650,7 +6656,6 @@ 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 |
-| `path_length(path, i = 0, length = 0)` | Calculated the length along a path |
 | `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 |

tests/bezier.scad

@@ -77,6 +77,17 @@ module beziers() {
 
     translate(control_points[1] - [0, 0, 2])
         label(str("bezier_length = ", length, ", bezier_min_z = ", bezier_min_z(curve)), valign = "top");
+
+    path1 = [[20, 20,  0], [40, 20, 0]];
+    path2 = [[70, 40, -5], [60, 40, 0]];
+
+    color("green")
+        for(p = concat(path1, path2))
+            translate(p)
+                sphere(1);
+
+    color("orange")
+        sweep(bezier_join(path1, path2, 10), circle_points(0.5, $fn = 64));
 }
 
 if($preview)

tests/core_xy.scad

@@ -55,7 +55,7 @@ module coreXY_belts_test() {
     translate([coreXYPosBL.x + separation.x/2, coreXYPosTR.y + upper_drive_pulley_offset.y, separation.z/2]) {
         // add the upper drive pulley stepper motor
         translate([coreXY_drive_pulley_x_alignment(coreXY_type) + upper_drive_pulley_offset.x, 0, -pulley_height(coreXY_drive_pulley(coreXY_type))])
-            NEMA(NEMA17M);
+            NEMA(NEMA17_40);
 
         // add the screws for the upper drive offset idler pulleys if required
         if (upper_drive_pulley_offset.x > 0) {
@@ -78,7 +78,7 @@ module coreXY_belts_test() {
     translate([coreXYPosTR.x - separation.x/2, coreXYPosTR.y + lower_drive_pulley_offset.y, -separation.z/2]) {
         // add the lower drive pulley stepper motor
         translate([-coreXY_drive_pulley_x_alignment(coreXY_type) + lower_drive_pulley_offset.x, 0, -pulley_height(coreXY_drive_pulley(coreXY_type))])
-            NEMA(NEMA17M);
+            NEMA(NEMA17_40);
 
         // add the screws for the lower drive offset idler pulleys if required
         if (lower_drive_pulley_offset.x < 0) {

tests/stepper_motors.scad

@@ -24,7 +24,7 @@ use <../utils/layout.scad>
 module stepper_motors()
     layout([for(s = stepper_motors) NEMA_width(s)], 5, no_offset = false) let(m = stepper_motors[$i]) {
         rotate(180)
-            NEMA(m, 0, in([NEMA17P, NEMA17M, NEMA17M8, NEMA8, NEMA8BH], m));
+            NEMA(m, 0, in([NEMA17_27, NEMA17_40, NEMA17_40L280, NEMA8_30, NEMA8_30BH], m));
 
         translate_z(4)
             NEMA_screws(m, M3_pan_screw, n = $i - 2, earth = $i > 6 ? undef : $i - 3);

utils/bezier.scad

@@ -19,8 +19,13 @@
 
 //
 //! Bezier curves and function to get and adjust the length or minimum z point.
+//!
+//! `bezier_join()` joins two paths with a Bezier curve that starts tangential to the end of `path1` and ends tangential to the end of `path2`.
+//! To do this the outer control points are the path ends and the inner two control points are along the tangents to the path ends.
+//! The only degree of freedom is how far along those tangents, which are the `d` and optional `d2` parameters.
 //
 include <../global_defs.scad>
+include <maths.scad>
 
 function bezier(t, v) = //! Returns a point at distance `t` [0 - 1] along the curve with control points `v`
     (len(v) > 2) ? bezier(t, [for (i = [0 : len(v) - 2]) v[i] * (1 - t) + v[i + 1] * (t)])
@@ -55,3 +60,16 @@ function adjust_bezier_z(v, z, eps = 0.001, r1 = 1, r2 = 1.5, z1, z2) = //! Adju
                            : let(r = r1 + (z - z1) * (r2 - r1) / (z2 - z1))
                                  abs(r - r1) < abs(r - r2) ? adjust_bezier_z(v, z, eps, r, r1, undef, z1)
                                                            : adjust_bezier_z(v, z, eps, r, r2, undef, z2);
+
+function bezier_join(path1, path2, d, d2 = undef) = let( //! Join two paths with a Bezier curve, control points are the path ends are `d` and `d2` from the ends in the same direction.
+        d2 = is_undef(d2) ? d : d2,
+        l = len(path1),
+        p0 = path1[l - 1],
+        p1 = p0 + unit(p0 - path1[l - 2]) * d,
+        p3 = path2[0],
+        p2 = p3 + unit(path2[0] - path2[1]) * d2,
+        v = [p0, p1, p2, p3],
+        segs = path_length(v) / $fs,
+        path = [for(i = [1 : segs - 1], t = i / segs) bezier(t, v)],
+        len = len(path)
+    ) concat(path1, path, path2);

utils/maths.scad

@@ -187,3 +187,7 @@ function cubic_real_roots(a, b, c, d) = //! Returns real roots of cubic equation
     ) roots == 1 ? [x] :
       roots == 2 ? [3 * q /p + inflection, -3 * q / p / 2 + inflection] :
       [for(i = [0 : roots - 1]) 2 * sqrt(-p / 3) * cos(acos(3 * q * sqrt(-3 / p) / p / 2) - i * 120) + inflection];
+
+function path_length(path, i = 0, length = 0) = //! Calculated the length along a path
+    i >= len(path) - 1 ? length
+                       : path_length(path, i + 1, length + norm(path[i + 1] - path[i]));

utils/sweep.scad

@@ -177,10 +177,6 @@ module sweep(path, profile, loop = false, twist = 0, convexity = 1) { //! Draw a
     polyhedron(points = mesh[0], faces = mesh[1], convexity = convexity);
 }
 
-function path_length(path, i = 0, length = 0) = //! Calculated the length along a path
-    i >= len(path) - 1 ? length
-                       : path_length(path, i + 1, length + norm(path[i + 1] - path[i]));
-
 function circle_points(r = 1, z = 0, dir = -1) = //! Generate the points of a circle, setting z makes a single turn spiral
     let(sides = r2sides(r))
         [for(i = [0 : sides - 1]) let(a = dir * i * 360 / sides) [r * cos(a), r * sin(a), z * i / sides]];

vitamins/stepper_motors.scad

@@ -21,20 +21,20 @@
 // NEMA stepper motor model
 //
 
-//                                   corner  body    boss    boss          shaft               cap         thread black  end    shaft    shaft
-//                     side, length, radius, radius, radius, depth, shaft, length,      holes, heights,    dia,   caps,  conn,  length2, bore
-NEMA8   = ["NEMA8",      20, 30,       30/2, 20,    7.5,   1.6,     4,      6,          16,    [8,     8], 2,     true,  true,  0,       0];
-NEMA8BH = ["NEMA8BH",    20, 30,       30/2, 20,    7.5,   1.6,     5,     12,          16,    [8,     8], 2,     true,  true,  7,       2.8];
-NEMA17  = ["NEMA17",   42.3, 47,     53.6/2, 25,     11,     2,     5,     24,          31,    [11.5,  9], 3,     false, false, 0,       0];
-NEMA17M = ["NEMA17M",  42.3, 40,     53.6/2, 25,     11,     2,     5,     20,          31,    [12.5, 11], 3,     false, false, 0,       0];
-NEMA17M8= ["NEMA17M8", 42.3, 40,     53.6/2, 25,     11,     2,     8,     [280, 8, 4], 31,    [12.5, 11], 3,     false, false, 0,       0];
-NEMA17S = ["NEMA17S",  42.3, 34,     53.6/2, 25,     11,     2,     5,     24,          31,    [8,     8], 3,     false, false, 0,       0];
-NEMA17P = ["NEMA17P",  42.3, 26.5,   53.6/2, 25,     11,     2,     5,     26.5,        31,    [10,    8], 3,     false, false, 0,       0];
-NEMA16  = ["NEMA16",   39.5, 19.2,   50.6/2, 50.6/2, 11,     2,     5,     12,          31,    [8,     8], 3,     false, false, 0,       0];
-NEMA14  = ["NEMA14",   35.2, 36,     46.4/2, 21,     11,     2,     5,     21,          26,    [8,     8], 3,     false, false, 0,       0];
-NEMA23  = ["NEMA23",   56.4, 51.2,   75.7/2, 35,   38.1/2, 1.6,   6.35,    24,        47.1,    [8,     8], 3,     false, false, 0,       0];
+//                                              corner  body    boss    boss          shaft               cap         thread black  end    shaft    shaft
+//                                side, length, radius, radius, radius, depth, shaft, length,      holes, heights,    dia,   caps,  conn,  length2, bore
+NEMA8_30      = ["NEMA8_30",        20, 30,       30/2, 20,    7.5,   1.6,     4,      6,          16,    [8,     8], 2,     true,  true,  0,       0];
+NEMA8_30BH    = ["NEMA8_30BH",      20, 30,       30/2, 20,    7.5,   1.6,     5,     12,          16,    [8,     8], 2,     true,  true,  7,       2.8];
+NEMA17_47     = ["NEMA17_47",     42.3, 47,     53.6/2, 25,     11,     2,     5,     24,          31,    [11.5,  9], 3,     false, false, 0,       0];
+NEMA17_40     = ["NEMA17_40",     42.3, 40,     53.6/2, 25,     11,     2,     5,     20,          31,    [12.5, 11], 3,     false, false, 0,       0];
+NEMA17_40L280 = ["NEMA17_40L280", 42.3, 40,     53.6/2, 25,     11,     2,     8,     [280, 8, 4], 31,    [12.5, 11], 3,     false, false, 0,       0];
+NEMA17_34     = ["NEMA17_34",     42.3, 34,     53.6/2, 25,     11,     2,     5,     24,          31,    [8,     8], 3,     false, false, 0,       0];
+NEMA17_27     = ["NEMA17_27",     42.3, 26.5,   53.6/2, 25,     11,     2,     5,     26.5,        31,    [10,    8], 3,     false, false, 0,       0];
+NEMA16_19     = ["NEMA16_19",     39.5, 19.2,   50.6/2, 50.6/2, 11,     2,     5,     12,          31,    [8,     8], 3,     false, false, 0,       0];
+NEMA14_36     = ["NEMA14_36",     35.2, 36,     46.4/2, 21,     11,     2,     5,     21,          26,    [8,     8], 3,     false, false, 0,       0];
+NEMA23_51     = ["NEMA23_51",     56.4, 51.2,   75.7/2, 35,   38.1/2, 1.6,   6.35,    24,        47.1,    [8,     8], 3,     false, false, 0,       0];
 
-stepper_motors = [NEMA8, NEMA8BH, NEMA14, NEMA16, NEMA17P, NEMA17S, NEMA17M, NEMA17, NEMA23];
+stepper_motors = [NEMA8_30, NEMA8_30BH, NEMA14_36, NEMA16_19, NEMA17_27, NEMA17_34, NEMA17_40, NEMA17_47, NEMA23_51];
 small_steppers = [];
 
 use <stepper_motor.scad>