Made small idler pulley 6.5mm by default and added a 7mm one.

Made connector position based on encap height and added PCB.

readme.md

@@ -2465,12 +2465,17 @@ Pin headers and sockets, etc.
 | Function | Description |
 |:--- |:--- |
 | ```hdr_base_colour(type)``` | Header insulator colour |
+| ```hdr_box_size(type)``` | Box header outside dimensions |
+| ```hdr_box_wall(type)``` | Box header wall thickness |
 | ```hdr_pin_below(type)``` | Header pin length underneath |
 | ```hdr_pin_colour(type)``` | Header pin colour |
 | ```hdr_pin_length(type)``` | Header pin length |
 | ```hdr_pin_width(type)``` | Header pin size |
 | ```hdr_pitch(type)``` | Header pitch |
+| ```hdr_ra_box_offset(type)``` | Offset between back of the box and the pins |
+| ```hdr_ra_height(type)``` | Height of right angle connector |
 | ```hdr_socket_depth(type)``` | Socket depth for female housing |
+| ```hdr_y_offset(type)``` | Y offset of pins from center of the box |
 
 ### Modules
 | Module | Description |
@@ -2637,6 +2642,7 @@ Timing belt pulleys, both toothed and plain with internal bearings for idlers.
 |   1 | ```pulley(GT2x20_toothed_idler)``` |  Pulley GT2 idler 20 teeth |
 |   1 | ```pulley(GT2x20_plain_idler)``` |  Pulley GT2 idler smooth 12mm |
 |   1 | ```pulley(GT2x16_plain_idler)``` |  Pulley GT2 idler smooth 9.63mm |
+|   1 | ```pulley(GT2x16x7_plain_idler)``` |  Pulley GT2 idler smooth 9.63mm |
 |   1 | ```pulley(GT2x20ob_pulley)``` |  Pulley GT2OB 20 teeth |
 |   1 | ```pulley(GT2x12_pulley)``` |  Pulley GT2RD 12 teeth |
 |   1 | ```pulley(GT2x20um_pulley)``` |  Pulley GT2UM 20 teeth |
@@ -3408,6 +3414,7 @@ NEMA stepper motor model.
 | ```NEMA_body_radius(type)``` | Body radius |
 | ```NEMA_boss_height(type)``` | Boss height |
 | ```NEMA_boss_radius(type)``` | Boss around the spindle radius |
+| ```NEMA_cap_heights(type)``` | Height of the end cap at the corner and the side |
 | ```NEMA_hole_pitch(type)``` | Screw hole pitch |
 | ```NEMA_length(type)``` | Body length |
 | ```NEMA_radius(type)``` | End cap radius |
@@ -3646,6 +3653,7 @@ Tubing and sleeving. The internal diameter can be forced to stretch it over some
 ### Vitamins
 | Qty | Module call | BOM entry |
 | ---:|:--- |:---|
+|   1 | ```tubing(CBNFIB10)``` |  Carbon fiber OD 10mm ID 8mm x 15mm |
 |   1 | ```tubing(HSHRNK16)``` |  Heatshrink sleeving ID 1.6mm x 15mm |
 |   1 | ```tubing(HSHRNK100)``` |  Heatshrink sleeving ID 10mm x 15mm |
 |   1 | ```tubing(HSHRNK24)``` |  Heatshrink sleeving ID 2.4mm x 15mm |
@@ -5734,6 +5742,7 @@ Simple tube or ring
 |:--- |:--- |
 | ```ring(or, ir)``` | Create a ring with specified external and internal radii |
 | ```tube(or, ir, h, center = true)``` | Create a tube with specified external and internal radii and height ```h``` |
+| ```woven_tube(or, ir, h, center= true, colour = grey(30)``` | Create a woven tube with specified external and internal radii, height ```h```, colours, warp and weft |
 
 ![tube](tests/png/tube.png)
 

tests/pin_headers.scad

@@ -64,11 +64,14 @@ module pin_headers() {
             pin_socket(pin_headers[$i], 3, 3, right_angle = true);
     }
 
-    translate([-20, 0])
-        jst_xh_header(jst_xh_header, 5);
+    for(i = [0, 1], p = [5, 2][i], j = [0 , 1]) {
+        h = [jst_ph_header, jst_xh_header][j];
+        translate([-20 * (i + 1), 0 + j * 40])
+            jst_xh_header(h, p);
 
-    translate([-20, 20])
-        jst_xh_header(jst_xh_header, 5, true);
+        translate([-20 * (i + 1), 20 + j * 40])
+            jst_xh_header(h, p, true);
+    }
 }
 
 if($preview)

tests/stepper_motors.scad

@@ -22,12 +22,12 @@ include <../vitamins/stepper_motors.scad>
 use <../utils/layout.scad>
 
 module stepper_motors()
-    layout([for(s = stepper_motors) NEMA_width(s)], 5) {
+    layout([for(s = stepper_motors) NEMA_width(s)], 5) let(m = stepper_motors[$i]) {
         rotate(180)
-            NEMA(stepper_motors[$i], 0, $i > 1 && $i < 5);
+            NEMA(m, 0, m == NEMA17M || m == NEMA17M8);
 
         translate_z(4)
-            NEMA_screws(stepper_motors[$i], M3_pan_screw, n = $i, earth = $i > 4 ? undef : $i - 1);
+            NEMA_screws(m, M3_pan_screw, n = $i, earth = $i > 4 ? undef : $i - 1);
     }
 
 if($preview)

tests/tubings.scad

@@ -22,7 +22,7 @@ use <../utils/layout.scad>
 include <../vitamins/tubings.scad>
 
 module tubings()
-    layout([for(t = tubings) tubing_od(t)], 10)
+    layout([for(t = tubings) tubing_od(t)], 8)
         tubing(tubings[$i]);
 
 if($preview)

utils/tube.scad

@@ -31,3 +31,41 @@ module ring(or, ir) //! Create a ring with specified external and internal radii
 module tube(or, ir, h, center = true) //! Create a tube with specified external and internal radii and height ```h```
     linear_extrude(h, center = center, convexity = 5)
         ring(or, ir);
+
+module woven_tube(or, ir, h, center= true, colour = grey(30), colour2, warp = 2, weft) {//! Create a woven tube with specified external and internal radii, height ```h```, colours, warp and weft
+    colour2 = colour2 ? colour2 : colour * 0.8;
+    weft = weft ? weft : warp;
+    warp_count = max(floor(PI * or / warp), 0.5);
+    angle = 360 / (2 * warp_count);
+
+    module layer(weft) {
+        points = [[ir, weft / 2], [or, weft / 2], [or, -weft / 2], [ir, -weft / 2]];
+        color(colour)
+            for (i = [0 : warp_count])
+                rotate(2 * i * angle)
+                    rotate_extrude(angle = angle)
+                        polygon(points);
+        color(colour2)
+            for (i = [0 : warp_count])
+                rotate((2 * i + 1) * angle)
+                    rotate_extrude(angle = angle)
+                        polygon(points);
+    }
+
+    translate_z(center ? -h / 2 : 0) {
+        weft_count = floor(h / weft);
+        if (weft_count > 0)
+            for (i = [0 : weft_count - 1]) {
+                translate_z(i * weft + weft / 2)
+                    rotate(i * angle)
+                        layer(weft);
+        }
+        remainder = h - weft * weft_count;
+        if (remainder) {
+            translate_z(weft_count * weft + remainder / 2)
+                rotate(weft_count * angle)
+                    layer(remainder);
+        }
+    }
+}
+

vitamins/panel_meters.scad

@@ -41,7 +41,7 @@ DSP5005   = ["DSP5005", "Ruideng DSP5005 Power supply module",                [7
                 [[-25,  9, 0], [ 6.5, 4.5, 1], 0.5,  "yellow"],
                ]];
 
-DSN_VC288PCB = ["", "", 41, 21, 1, 0, 0, 0, "green", false, [], [[ 5,  -3,   0, "jst_xh", 3], ], []];
+DSN_VC288PCB = ["", "", 41, 21, 1, 0, 0, 0, "green", false, [], [[ 5,  -3.525,   0, "jst_xh", 3], ], []];
 
 DSN_VC288 = ["DSN_VC288","DSN-VC288 DC 100V 10A Voltmeter ammeter",            [45.3, 26,   17.4], [47.8, 28.8, 2.5], 0,   [1, 1.8], [36, 18, 2.5], [],            0, 2,
               [], 0, DSN_VC288PCB, 5, 0];

vitamins/pcb.scad

@@ -1021,8 +1021,6 @@ module pcb(type) { //! Draw specified PCB
     for(part = pcb_accessories(type))
         vitamin(part);
 
-    pcb_components(type);
-
     color(pcb_colour(type)) linear_extrude(t) difference() {
         if(Len(pcb_polygon(type)))
             polygon(pcb_polygon(type));
@@ -1076,6 +1074,8 @@ module pcb(type) { //! Draw specified PCB
                                             circle(d = 2);
                     }
                 }
+
+    pcb_components(type);
 }
 
 module pcb_spacer(screw, height, wall = 1.8, taper = 0) { //! Generate STL for PCB spacer

vitamins/pcbs.scad

@@ -348,7 +348,7 @@ PI_IO = ["PI_IO", "PI_IO V2",       35.56, 25.4, 1.6, 0,    0,   0, "green", tru
     ], []];
 
 ZC_A0591 = ["ZC_A0591", "ZC-A0591 ULN2003 driver PCB", 35, 32, 1.6, 0, 2.5, 0, "green", false, [[2.25, 3.25], [-2.25, 3.25], [2.25, -3.25], [-2.25, -3.25] ],
-    [ [ 12.25,  8.3,  -90, "jst_xh", 5],
+    [ [ 11.725, 8.3,  -90, "jst_xh", 5],
       [ -6.5,  10,      0, "2p54header", 1, 4],
       [ 20.4,  -4.5,    0, "2p54header", 4, 1],
       [ 20.4,  11,  180, "pdip", 16, "ULN2803AN", true],
@@ -408,7 +408,7 @@ RAMPSEndstop = ["RAMPSEndstop", "RAMPS Endstop Switch",
         [2, 2, false], [2, 13.5, false], [17, 13.5], [36, 13.5]
     ],
     [
-        [ 12,    8,   -90, "jst_xh", 3, true, "white", "silver"],
+        [ 11.6,  8,   -90, "jst_xh", 3, true, "white", "silver"],
         [ 26.5, 12.75,  0, "microswitch", small_microswitch],
         [ 27.5, 17.5,  15, "chip", 15, 0.5, 4.5, "silver"],
     ],

vitamins/pin_header.scad

@@ -29,13 +29,18 @@ function hdr_pin_width(type)    = type[4];  //! Header pin size
 function hdr_pin_colour(type)   = type[5];  //! Header pin colour
 function hdr_base_colour(type)  = type[6];  //! Header insulator colour
 function hdr_socket_depth(type) = type[7];  //! Socket depth for female housing
+function hdr_box_size(type)     = type[8];  //! Box header outside dimensions
+function hdr_box_wall(type)     = type[9];  //! Box header wall thickness
+function hdr_y_offset(type)     = type[10]; //! Y offset of pins from center of the box
+function hdr_ra_box_offset(type)= type[11]; //! Offset between back of the box and the pins
+function hdr_ra_height(type)    = type[12]; //! Height of right angle connector
 
 module pin(type, length = undef) { //! Draw a header pin
     w = hdr_pin_width(type);
     l = length == undef ? hdr_pin_length(type) : length;
     chamfer = w / 2;
     color(hdr_pin_colour(type))
-        translate_z(l / 2 -hdr_pin_below(type))
+        translate_z(l / 2 - hdr_pin_below(type))
             hull() {
                 cube([w, w, l - 2 * chamfer], center = true);
 
@@ -108,9 +113,11 @@ module pin_header(type, cols = 1, rows = 1, smt = false, right_angle = false, cu
 
 module box_header(type, cols = 1, rows = 1, smt = false, cutout = false) { //! Draw box header
     pitch =  hdr_pitch(type);
+    size = hdr_box_size(type);
     w = cols * pitch + 7.62;
     l = rows * pitch + 3.52;
-    h = 8.7;
+    h = size.z;
+    t = hdr_box_wall(type);
     base = h - 6.4;
 
     if(cutout)
@@ -131,7 +138,7 @@ module box_header(type, cols = 1, rows = 1, smt = false, cutout = false) { //! D
                     difference() {
                         square([w, l], center = true);
 
-                        square([w - 2.4, l - 2.4], center = true);
+                        square([w - t, l - t], center = true);
 
                         translate([0, -l / 2])
                             square([4.5, 4.5], center = true);
@@ -225,65 +232,95 @@ module pin_socket(type, cols = 1, rows = 1, right_angle = false, height = 0, smt
 module jst_xh_header(type, pin_count, right_angle = false, colour = false, pin_colour = false) { //! Draw JST XH connector
     colour = colour ? colour : hdr_base_colour(type);
     pin_colour = pin_colour ? pin_colour : hdr_pin_colour(type);
-    sizeY = 5.75;
     pitch = hdr_pitch(type);
+    size = hdr_box_size(type) + [(pin_count - 1) * pitch, 0, 0];
+    pinOffsetX = hdr_box_size(type).x / 2;                          // Offset from last pin to box edge
+    wallThickness = hdr_box_wall(type);
+    y_offset = hdr_y_offset(type);
+    ra_box_offset = hdr_ra_box_offset(type);
+    ra_h = hdr_ra_height(type);
+    ra_z = ra_h - size.y / 2;
+    ra_extra = ra_h - size.y;                                   // thicker base for right angle version
+    pinWidth = hdr_pin_width(type);
 
-    module jst_xh_socket(type, pin_count) {
-        socketSizeZ = hdr_socket_depth(type);
-        pinOffsetX = 2.45;
-        sizeY = 5.75;
-        wallThickness = 0.8;
-        size = [pinOffsetX * 2 + (pin_count - 1) * pitch, sizeY, socketSizeZ];
-        translate([-size[0] / 2, -size[1] / 2, 0]) {
-            // the base
-            cube([size[0], size[1], wallThickness]);
-            // the three full sides
-            translate([0, size[1] - wallThickness, 0])
-                cube([size[0], wallThickness, size[2]]);
-            cube([wallThickness, size[1], size[2]]);
-            translate([size[0] - wallThickness, 0, 0])
-                cube([wallThickness, size[1], size[2]]);
-            // the sides with cutouts
-            cube([size[0], wallThickness, 2]);
-            cutoutWidth = 1;
-            cutoutOffset = pinOffsetX - cutoutWidth / 2;
-            cube([cutoutOffset, wallThickness, size[2]]);
-            translate([size[0] - cutoutOffset, 0, 0])
-                cube([cutoutOffset, wallThickness, size[2]]);
-            cube([cutoutOffset, wallThickness, size[2]]);
-            translate([size[0]-cutoutOffset, 0, 0])
-                cube([cutoutOffset, wallThickness, size[2]]);
-            translate([cutoutOffset + cutoutWidth, 0, 0])
-                cube([size[0] - 2 * (cutoutWidth + cutoutOffset), wallThickness, size[2]]);
+    module jst_xh_socket(type, pin_count, ra = false) {
+        module wall() {
+            difference() {
+                square([size.x, size.y], center = true);
+
+                offset(-wallThickness)
+                    square([size.x, size.y], center = true);
+            }
+            if(right_angle)
+                translate([0, size.y / 2 + ra_extra / 2])
+                    square([size.x, ra_extra], center = true);
         }
-    } // end module
 
+        module slots() {
+            cutoutWidth = 1.3;
+            cutoutOffset = pinOffsetX + cutoutWidth / 2 - hdr_pin_width(type) / 2;
+            for(side = [-1, 1])
+                translate([side * (size.x / 2 - cutoutOffset), -size.y / 2 + wallThickness / 2])
+                    square([cutoutWidth, 2 * wallThickness], center = true);
+        }
+
+        linear_extrude(wallThickness)
+            square([size.x, size.y], center = true);                    // the base
+
+        linear_extrude(size.z / 2)                                      // full walls up to the slots
+            wall();
+
+        linear_extrude(size.z)                                          // slotted walls to the top
+            difference() {
+                wall();
+
+                if(type[0] == "jst_xh_header") {
+                    if(pin_count > 2)
+                        slots();
+                    else
+                        hull()
+                            slots();
+
+                    translate([0, -size.y / 2 + 3 * wallThickness / 2])
+                        square([size.x + 1, wallThickness], center = true);
+                }
+
+                if(type[0] == "jst_ph_header") {
+                    translate([0, -size.y / 2 + wallThickness / 2])
+                        square([max((pin_count - 2) * pitch, 1), 2 * wallThickness], center = true);
+
+                    translate([0, -y_offset / 2 - pinWidth / 4])
+                        square([size.x + 1, y_offset + pinWidth / 2], center = true);
+                }
+            }
+    } // end module
 
     color(colour)
         if(right_angle)
-            translate([0, -1, sizeY / 2])
+            translate([0, -ra_box_offset, ra_z])
                 rotate([-90, 0, 180])
-                    jst_xh_socket(type, pin_count);
+                    jst_xh_socket(type, pin_count, true);
         else
-            jst_xh_socket(type, pin_count);
+            translate([0, y_offset])
+                jst_xh_socket(type, pin_count);
 
     color(pin_colour)
         for(x = [0 : pin_count - 1]) {
-            pinWidth = hdr_pin_width(type);
-            verticalPinLength = right_angle ? hdr_pin_below(type) + sizeY / 2 : hdr_pin_length(type);
-            translate([pitch * (x - (pin_count - 1) / 2), 0, 0]) {
+            verticalPinLength = right_angle ? hdr_pin_below(type) + ra_z + y_offset : hdr_pin_length(type);
+            horizontalPinLength = hdr_pin_length(type) - hdr_pin_below(type) + ra_box_offset;
+            translate([pitch * (x - (pin_count - 1) / 2), 0]) {
                 pin(type, verticalPinLength);
 
                 if(right_angle) {
-                    translate([0, -pinWidth / 2,  sizeY / 2 - pinWidth / 2])
+                    translate([0, -pinWidth / 2, ra_z - pinWidth / 2 + y_offset])
                         rotate([0, -90, 0])
                             rotate_extrude(angle = 90, $fn = 32)
                                 translate([0, -pinWidth / 2])
                                     square(pinWidth);
 
-                    translate([0, -sizeY / 2 - 3 * pinWidth / 4, sizeY / 2])
-                        rotate([90,0,0])
-                            pin(type, hdr_pin_length(type) - hdr_pin_below(type));
+                    translate([0, -hdr_pin_below(type), ra_z + y_offset])
+                        rotate([90, 0, 0])
+                            pin(type, horizontalPinLength);
                 }
             }
         }

vitamins/pin_headers.scad

@@ -17,15 +17,16 @@
 // If not, see <https://www.gnu.org/licenses/>.
 //
 
-//                               p     p     b    p     p       b         Socket depth
-//                               i     i     e    i     i       a
-//                               t     n     l    n     n       s
-//                               c           o                  e
-//                               h     l     w    w     c
-//                                                              c
-//
-2p54header    = ["2p54header",   2.54, 11.6, 3.2, 0.66, "gold", grey(20), 8.5];
-jst_xh_header = ["JST XH header",2.5,  10,   3.4, 0.64, "gold", grey(90), 7];
+//                               p     p     b    p     p       b         s    b                 b    p      r     r
+//                               i     i     e    i     i       a         o    o                 o    i      a     a
+//                               t     n     l    n     n       s         c    x                 x    n
+//                               c           o                  e         k                                  b     h
+//                               h     l     w    w     c                      s                 t    y
+//                                                              c         h    z                             o
+//                                                                                                           f
+2p54header    = ["2p54header",   2.54, 11.6, 3.2, 0.66, "gold", grey(20), 8.5, [0,   0,    8.7], 2.4, 0,     0,    0  ];
+jst_xh_header = ["jst_xh_header",2.5,  10,   3.4, 0.64, "gold", grey(90), 0,   [4.9, 5.75, 7],   0.8, 0.525, 0.6,  6.1];
+jst_ph_header = ["jst_ph_header",2.0,   9,   3.4, 0.64, silver, grey(90), 0,   [3.9, 4.5,  6],   0.6, 0.55,  0.25, 4.8];
 
 pin_headers = [ 2p54header ];
 

vitamins/pulleys.scad

@@ -35,7 +35,8 @@ GT2x12_pulley        = ["GT2x12_pulley",        "GT2RD", 12,  7.15, GT2x6,  6.5,
 GT2x20_toothed_idler = ["GT2x20_toothed_idler", "GT2",   20, 12.22, GT2x6,  6.5,  18, 0,   4, 18.0, 1.0, 0, 0,    false,         0];
 GT2x20_plain_idler   = ["GT2x20_plain_idler",   "GT2",    0, 12.0,  GT2x6,  6.5,  18, 0,   4, 18.0, 1.0, 0, 0,    false,         0];
 GT2x16_toothed_idler = ["GT2x16_toothed_idler", "GT2",   16,  9.75, GT2x6,  6.5,  14, 0,   3, 14.0, 1.0, 0, 0,    false,         0];
-GT2x16_plain_idler   = ["GT2x16_plain_idler",   "GT2",    0,  9.63, GT2x6,  7.0,  13, 0,   3, 13.0, 1.0, 0, 0,    false,         0];
+GT2x16_plain_idler   = ["GT2x16_plain_idler",   "GT2",    0,  9.63, GT2x6,  6.5,  13, 0,   3, 13.0, 1.0, 0, 0,    false,         0];
+GT2x16x7_plain_idler = ["GT2x16x7_plain_idler", "GT2",    0,  9.63, GT2x6,  7.0,  13, 0,   3, 13.0, 1.0, 0, 0,    false,         0];
 
 pulleys = [T5x10_pulley,
            T2p5x16_pulley,
@@ -45,6 +46,7 @@ pulleys = [T5x10_pulley,
            GT2x20_toothed_idler,
            GT2x20_plain_idler,
            GT2x16_toothed_idler,
-           GT2x16_plain_idler];
+           GT2x16_plain_idler,
+           GT2x16x7_plain_idler];
 
 use <pulley.scad>

vitamins/stepper_motor.scad

@@ -26,6 +26,7 @@ include <ring_terminals.scad>
 include <../vitamins/pin_headers.scad>
 use <../utils/tube.scad>
 use <../utils/thread.scad>
+use <../utils/round.scad>
 use <washer.scad>
 use <rod.scad>
 
@@ -38,6 +39,8 @@ function NEMA_boss_height(type) = type[6]; //! Boss height
 function NEMA_shaft_dia(type)   = type[7]; //! Shaft diameter
 function NEMA_shaft_length(type)= type[8]; //! Shaft length above the face, if a list then a leadscrew: length, lead, starts
 function NEMA_hole_pitch(type)  = type[9]; //! Screw hole pitch
+function NEMA_cap_heights(type) = type[10]; //! Height of the end cap at the corner and the side
+
 function NEMA_holes(type)       = [-NEMA_hole_pitch(type) / 2, NEMA_hole_pitch(type) / 2]; //! Screw positions for for loop
 function NEMA_big_hole(type)    = NEMA_boss_radius(type) + 0.2; //! Clearance hole for the big boss
 stepper_body_colour = "black";
@@ -59,12 +62,13 @@ module NEMA(type, shaft_angle = 0, jst_connector = false) { //! Draw specified N
     boss_rad = NEMA_boss_radius(type);
     boss_height =NEMA_boss_height(type);
     shaft_rad = NEMA_shaft_dia(type) / 2;
-    cap = 8;
+    cap = NEMA_cap_heights(type)[1];
+    cap2 = NEMA_cap_heights(type)[0];
     vitamin(str("NEMA(", type[0], "): Stepper motor NEMA", round(NEMA_width(type) / 2.54), " x ", length, "mm"));
-    thread_d = 3;                                                           // Is this always the case?
+    thread_d = 3;                                                       // Is this always the case?
 
     module cap_shape(end)
-        difference() {
+        round(0.5, $fn = 32) difference() {
             intersection() {
                 square([side, side], center = true);
 
@@ -92,22 +96,40 @@ module NEMA(type, shaft_angle = 0, jst_connector = false) { //! Draw specified N
             cap_shape(1);
     }
 
-    tabSize = [16, 4, 2.5];
+    pcb_thickness = 1.6;
+    header = jst_ph_header;
+    socket_size = hdr_box_size(header);
+    tabSize = [16, 4, cap - hdr_ra_height(header) - pcb_thickness];
     color(stepper_cap_colour) {                                     // aluminium end caps
-        for(end = [-1, 1])
+        for(end = [-1, 1]) {
             translate_z(-length / 2 + end * (length - cap) / 2)
                 linear_extrude(cap, center = true)
                     cap_shape(end);
 
+            translate_z(-length / 2 + end * (length - cap2) / 2)
+                linear_extrude(cap2, center = true)
+                    difference() {
+                        cap_shape(end);
+
+                        circle(body_rad);
+                    }
+        }
+
         if(jst_connector)
             translate([-tabSize.x / 2, side / 2, -length])
                 cube(tabSize);
     }
 
     if(jst_connector)
-        translate([0, side / 2 - 2, -length + tabSize.z + 5.75 / 2])
-            rotate([-90, 0, 0])
-                jst_xh_header(jst_xh_header, 6);
+        translate([0, side / 2, -length + cap - hdr_ra_height(header)]) {
+            rotate(180)
+                not_on_bom()
+                    jst_xh_header(header, 6, true);
+
+            translate_z(-pcb_thickness / 2)
+                color("green")
+                    cube([socket_size.x + 5 * 2, tabSize.y * 2, pcb_thickness], true);
+        }
 
     if(show_threads)
         for(x = NEMA_holes(type), y = NEMA_holes(type))

vitamins/stepper_motors.scad

@@ -22,14 +22,14 @@
 //
 
 //                                   corner  body    boss    boss          shaft
-//                     side, length, radius, radius, radius, depth, shaft, length,      holes
-NEMA17  = ["NEMA17",   42.3, 47,     53.6/2, 25,     11,     2,     5,     24,          31];
-NEMA17M = ["NEMA17M",  42.3, 40,     53.6/2, 25,     11,     2,     5,     20,          31];
-NEMA17M8= ["NEMA17M8", 42.3, 40,     53.6/2, 25,     11,     2,     8,     [280, 8, 4], 31];
-NEMA17S = ["NEMA17S",  42.3, 34,     53.6/2, 25,     11,     2,     5,     24,          31];
-NEMA16  = ["NEMA16",   39.5, 19.2,   50.6/2, 50.6/2, 11,     2,     5,     12,          31];
-NEMA14  = ["NEMA14",   35.2, 36,     46.4/2, 21,     11,     2,     5,     21,          26];
-NEMA23  = ["NEMA23",   56.4, 51.2,   75.7/2, 35,   38.1/2, 1.6,   6.35,    24,        47.1];
+//                     side, length, radius, radius, radius, depth, shaft, length,      holes, cap heights
+NEMA17  = ["NEMA17",   42.3, 47,     53.6/2, 25,     11,     2,     5,     24,          31,    [11.5,  9]];
+NEMA17M = ["NEMA17M",  42.3, 40,     53.6/2, 25,     11,     2,     5,     20,          31,    [12.5, 11]];
+NEMA17M8= ["NEMA17M8", 42.3, 40,     53.6/2, 25,     11,     2,     8,     [280, 8, 4], 31,    [12.5, 11]];
+NEMA17S = ["NEMA17S",  42.3, 34,     53.6/2, 25,     11,     2,     5,     24,          31,    [8,     8]];
+NEMA16  = ["NEMA16",   39.5, 19.2,   50.6/2, 50.6/2, 11,     2,     5,     12,          31,    [8,     8]];
+NEMA14  = ["NEMA14",   35.2, 36,     46.4/2, 21,     11,     2,     5,     21,          26,    [8,     8]];
+NEMA23  = ["NEMA23",   56.4, 51.2,   75.7/2, 35,   38.1/2, 1.6,   6.35,    24,        47.1,    [8,     8]];
 
 stepper_motors = [NEMA14, NEMA16, NEMA17S, NEMA17M, NEMA17, NEMA23];
 

vitamins/tubing.scad

@@ -21,6 +21,7 @@
 //! Tubing and sleeving. The internal diameter can be forced to stretch it over something.
 //
 include <../utils/core/core.scad>
+include <../utils/tube.scad>
 
 function tubing_material(type) = type[1]; //! Material description
 function tubing_od(type)       = type[2]; //! Outside diameter
@@ -38,10 +39,15 @@ module tubing(type, length = 15, forced_id = 0, center = true) { //! Draw specif
         vitamin(str("tubing(", type[0], arg(length, 15), "): ", tubing_material(type), " ID ", original_id, "mm x ",length, "mm"));
     else
         vitamin(str("tubing(", type[0], arg(length, 15), "): ", tubing_material(type), " OD ", original_od, "mm ID ", original_id,"mm x ",length, "mm"));
-    color(tubing_colour(type))
-        linear_extrude(length, center = center, convexity = 4)
-            difference() {
-                circle(d = od);
-                circle(d = id);
-            }
+
+    if(tubing_material(type) == "Carbon fiber")
+        woven_tube(od / 2, id /2, length, colour = tubing_colour(type));
+    else
+        color(tubing_colour(type))
+            linear_extrude(length, center = center, convexity = 4)
+                difference() {
+                    circle(d = od);
+                    circle(d = id);
+                }
 }
+

vitamins/tubings.scad

@@ -19,22 +19,23 @@
 
 //
 // Tubing and sleeving
-//
-PVC64     = ["PVC64",     "PVC aquarium tubing", 6,        4, [0.8, 0.8, 0.8, 0.75 ]];
-PVC85     = ["PVC85",     "PVC aquarium tubing", 8,        5, [0.8, 0.8, 0.8, 0.75 ]];
-NEOP85    = ["NEOP85",    "Neoprene tubing",     8,        5, [0.2,0.2,0.2]];
-PTFE07    = ["PTFE07",    "PTFE sleeving",       1.2,   0.71, [0.95, 0.95, 0.95, 0.9]];
-PTFE20    = ["PTFE20",    "PTFE sleeving",       2.6,      2, [0.95, 0.95, 0.95, 0.9]];
-PTFE2_4   = ["PTFE2_4",   "PTFE tubing",         4,        2, [0.95, 0.95, 0.95, 0.9]];
-PTFE2_3   = ["PTFE2_3",   "PTFE tubing",         3,        2, [0.95, 0.95, 0.95, 0.9]];
-PTFE4_6   = ["PTFE4_6",   "PTFE tubing",         6,        4, [0.95, 0.95, 0.95, 0.9]];
-PF7       = ["PF7",       "PTFE tubing",         46/10, 3.84, [0.95, 0.95, 0.95, 0.9]];
-HSHRNK16  = ["HSHRNK16",  "Heatshrink sleeving", 2.0,    1.6, "grey"];
-HSHRNK24  = ["HSHRNK24",  "Heatshrink sleeving", 2.8,    2.4, "grey"];
-HSHRNK32  = ["HSHRNK32",  "Heatshrink sleeving", 3.6,    3.2, "grey"];
-HSHRNK64  = ["HSHRNK64",  "Heatshrink sleeving", 6.8,    6.4, "grey"];
-HSHRNK100 = ["HSHRNK100", "Heatshrink sleeving",10.4,   10.0,  [0.2,0.2,0.2]];
+//                            Description           OD        ID  Colour
+PVC64         = ["PVC64",     "PVC aquarium tubing", 6,        4, [0.8, 0.8, 0.8, 0.75 ]];
+PVC85         = ["PVC85",     "PVC aquarium tubing", 8,        5, [0.8, 0.8, 0.8, 0.75 ]];
+NEOP85        = ["NEOP85",    "Neoprene tubing",     8,        5, [0.2,0.2,0.2]];
+PTFE07        = ["PTFE07",    "PTFE sleeving",       1.2,   0.71, [0.95, 0.95, 0.95, 0.9]];
+PTFE20        = ["PTFE20",    "PTFE sleeving",       2.6,      2, [0.95, 0.95, 0.95, 0.9]];
+PTFE2_4       = ["PTFE2_4",   "PTFE tubing",         4,        2, [0.95, 0.95, 0.95, 0.9]];
+PTFE2_3       = ["PTFE2_3",   "PTFE tubing",         3,        2, [0.95, 0.95, 0.95, 0.9]];
+PTFE4_6       = ["PTFE4_6",   "PTFE tubing",         6,        4, [0.95, 0.95, 0.95, 0.9]];
+PF7           = ["PF7",       "PTFE tubing",         46/10, 3.84, [0.95, 0.95, 0.95, 0.9]];
+HSHRNK16      = ["HSHRNK16",  "Heatshrink sleeving", 2.0,    1.6, "grey"];
+HSHRNK24      = ["HSHRNK24",  "Heatshrink sleeving", 2.8,    2.4, "grey"];
+HSHRNK32      = ["HSHRNK32",  "Heatshrink sleeving", 3.6,    3.2, "grey"];
+HSHRNK64      = ["HSHRNK64",  "Heatshrink sleeving", 6.8,    6.4, "grey"];
+HSHRNK100     = ["HSHRNK100", "Heatshrink sleeving",10.4,   10.0,  [0.2,0.2,0.2]];
+CARBONFIBER10 = ["CBNFIB10",  "Carbon fiber",       10.0,    8.0,  [0.3,0.3,0.3]];
 
-tubings = [PVC64, PVC85, NEOP85, PTFE07, PTFE20, PF7, PTFE2_3, PTFE2_4, PTFE4_6, HSHRNK16, HSHRNK24, HSHRNK64, HSHRNK100];
+tubings = [PVC64, PVC85, NEOP85, PTFE07, PTFE20, PF7, PTFE2_3, PTFE2_4, PTFE4_6, HSHRNK16, HSHRNK24, HSHRNK64, HSHRNK100, CARBONFIBER10];
 
 use <tubing.scad>