Merge branch 'martinbudden-pulley_colour'

Prints a newline after test runs rather than before.

docs/usage.md

@@ -182,7 +182,7 @@ This is achieved by having a pair of modules: -
     }
 
     module handle_fastened_assembly(thickness) { //! Assembly with fasteners in place
-        screw_length = screw_longer_than(thickness + insert_length(insert) + 2 * washer_thickness(screw_washer(screw)));
+        screw_length = screw_length(screw, thickness, 2, true, longer = true);
 
         handle_assembly();
 

lib.scad

@@ -35,7 +35,6 @@ include <vitamins/displays.scad>
 include <vitamins/extrusions.scad>
 include <vitamins/extrusion_brackets.scad>
 include <vitamins/geared_steppers.scad>
-include <vitamins/green_terminals.scad>
 include <vitamins/hot_ends.scad>
 include <vitamins/inserts.scad>
 include <vitamins/kp_pillow_blocks.scad>

printed/box.scad

@@ -75,9 +75,9 @@ function box_corner_overlap(type) = box_wall(type);
 function box_corner_rad(type) = box_sheet_slot(type) - sheet_slot_clearance / 2 + box_corner_gap(type) + box_corner_overlap(type);
 function box_sheet_r(type) = box_corner_rad(type) - box_sheet_slot(type) - box_corner_overlap(type);
 
-function box_screw_length(type, top) = screw_longer_than(2 * washer_thickness(box_washer(type))
-                                                    + sheet_thickness(top ? box_top_sheet(type) : box_base_sheet(type))
-                                                    + box_corner_gap(type) + box_profile_overlap(type) + box_insert_l(type) - 1);
+function box_screw_length(type, top) =
+    let(s = top ? box_top_sheet(type) : box_base_sheet(type))
+        screw_length(box_screw(type), sheet_thickness(s) + box_corner_gap(type) + box_profile_overlap(type) - 1, washers = 2, insert = true, longer = true);
 
 function box_wall_clearance(type) = box_sheet_slot(type) / 2 - sheet_thickness(box_sheets(type)) / 2;
 function box_margin(type) = box_profile_overlap(type) + box_corner_gap(type); //! How much the bezel intrudes on the specified height

printed/camera_housing.scad

@@ -68,7 +68,7 @@ function cam_screw_length(cam) = let(
     front = cam_front_size(cam),
     screw = pcb_screw(camera_pcb(cam)),
     nut = screw_nut(screw)
-    ) screw_longer_than(front.z + washer_thickness(screw_washer(screw)) - nut_trap_depth(nut) + nut_thickness(nut, true));
+    ) screw_length(screw, front.z - nut_trap_depth(nut), 1, nyloc = true);
 
 function hinge_z(cam) = cam_screw_length(cam) - hinge_r;
 
@@ -344,9 +344,8 @@ module camera_fastened_assembly(cam, thickness, angle = 0) {
     camera_bracket_position(cam)
         camera_bracket_screw_positions(cam) {
             nut = screw_nut(bracket_screw);
-            washer = screw_washer(bracket_screw);
             t = bracket_thickness(cam);
-            screw_length = screw_longer_than(thickness + t + nut_thickness(nut, true) + 2 * washer_thickness(washer));
+            screw_length = screw_length(bracket_screw, thickness + t, 2, nyloc = true);
             vflip()
                 translate_z(thickness)
                     screw_and_washer(bracket_screw, screw_length);

printed/corner_block.scad

@@ -133,12 +133,10 @@ assembly(str("corner_block_M", 20 * screw_radius(screw))) {
 module fastened_corner_block_assembly(thickness, screw = def_screw, thickness_below = undef, thickness_side2 = undef, name = false, show_block = true, star_washers = true) { //! Printed block with all fasteners
     thickness2 = !is_undef(thickness_below) ? thickness_below : thickness;
     thickness3 = !is_undef(thickness_side2) ? thickness_side2 : thickness;
-    washer = screw_washer(screw);
-    insert = screw_insert(screw);
-    function screw_length(t) = screw_shorter_than((star_washers ? 2 : 1) * washer_thickness(washer) + t + insert_length(insert) + overshoot);
-    screw_length = screw_length(thickness);
-    screw_length2 = screw_length(thickness2);
-    screw_length3 = screw_length(thickness3);
+    function screw_len(t) = screw_length(screw, t + overshoot, star_washers ? 2 : 1, true);
+    screw_length = screw_len(thickness);
+    screw_length2 = screw_len(thickness2);
+    screw_length3 = screw_len(thickness3);
 
     if(show_block)
         corner_block_assembly(screw, name) children();

printed/door_hinge.scad

@@ -136,8 +136,7 @@ module door_hinge_assembly(top, door_thickness = 6) { //! The moving assembly th
     dir = top ? -1 : 1;
     pin_x = door_hinge_pin_x();
     pin_y = door_hinge_pin_y();
-    washer = screw_washer(screw);
-    screw_length = screw_shorter_than(thickness + door_thickness +  washer_thickness(washer));
+    screw_length = screw_length(screw, thickness + door_thickness, 1);
 
     translate([0, pin_y - (thickness + door_thickness / 2), dir * width / 2]) {
         rotate([90, 0, 180])
@@ -148,20 +147,20 @@ module door_hinge_assembly(top, door_thickness = 6) { //! The moving assembly th
                 screw_and_washer(screw, screw_length);
     }
 
-    translate([pin_x, pin_y, top ? 0 : -washer_thickness(screw_washer(pin_screw))])
-        washer(screw_washer(pin_screw));
+    washer = screw_washer(pin_screw);
+    wt = washer_thickness(washer);
+    translate([pin_x, pin_y, top ? 0 : -wt])
+        washer(washer);
 
-    translate([pin_x, pin_y, top ? washer_thickness(screw_washer(pin_screw)) + stat_width : width])
-        screw_and_washer(pin_screw, screw_longer_than(2 * washer_thickness(screw_washer(pin_screw)) + width + stat_width));
+    translate([pin_x, pin_y, top ? wt + stat_width : width])
+        screw_and_washer(pin_screw, screw_length(pin_screw, width + stat_width, 2, longer = true));
 }
 
 module door_hinge_static_assembly(top, sheet_thickness = 3) { //! The stationary assembly
     dir = top ? -1 : 1;
     pin_x = door_hinge_pin_x();
 
-    stat_washer = screw_washer(stat_screw);
-    stat_nut = screw_nut(stat_screw);
-    stat_screw_length = screw_longer_than(thickness + sheet_thickness + 2 * washer_thickness(stat_washer) + nut_thickness(stat_nut, true));
+    stat_screw_length = screw_length(stat_screw, thickness + sheet_thickness, 2, nyloc = true);
 
     translate([pin_x, 0, -dir * (stat_width / 2 + washer_thickness(screw_washer(pin_screw)))])
         rotate([90, 0, 0]) {
@@ -169,9 +168,10 @@ module door_hinge_static_assembly(top, sheet_thickness = 3) { //! The stationary
 
             door_hinge_stat_hole_positions() {
                 screw_and_washer(stat_screw, stat_screw_length);
+
                 translate_z(-thickness - sheet_thickness)
                     vflip()
-                        nut_and_washer(stat_nut, true);
+                        nut_and_washer(screw_nut(stat_screw), true);
             }
         }
 }

printed/door_latch.scad

@@ -61,7 +61,7 @@ module door_latch_assembly(sheet_thickness = 3) { //! The assembly for a specifi
     washer = screw_washer(screw);
     nut = screw_nut(screw);
 
-    screw_length = screw_longer_than(height - nut_trap_depth + sheet_thickness + 2 * washer_thickness(washer) + nut_thickness(nut, true));
+    screw_length = screw_length(screw, height - nut_trap_depth + sheet_thickness, 2, nyloc = true);
 
     translate([0, -height - washer_thickness(washer)])
         rotate([-90, 0, 0]) {

printed/fixing_block.scad

@@ -122,9 +122,7 @@ assembly(str("fixing_block_M", 20 * screw_radius(screw))) {
 
 module fastened_fixing_block_assembly(thickness, screw = def_screw, screw2 = undef, thickness2 = undef, show_block = true, star_washers = true) { //! Assembly with fasteners in place
     module fb_screw(screw, thickness) {
-        washer = screw_washer(screw);
-        insert = screw_insert(screw);
-        screw_length = screw_longer_than((star_washers ? 2 : 1) * washer_thickness(washer) + thickness + insert_length(insert));
+        screw_length = screw_length(screw, thickness, star_washers ? 2 : 1, true, longer = true);
 
         if(thickness)
             translate_z(thickness)

printed/flat_hinge.scad

@@ -155,9 +155,7 @@ module hinge_fastened_assembly(type, thickness1, thickness2, angle, show_hinge =
         hinge_assembly(type, angle);
 
     screw = hinge_screw(type);
-    washer_t = 2 * washer_thickness(screw_washer(screw));
     nut = screw_nut(screw);
-    nut_t = nut_thickness(nut, true);
     t = hinge_thickness(type);
     kr = hinge_knuckle_dia(type) / 2;
 
@@ -165,7 +163,7 @@ module hinge_fastened_assembly(type, thickness1, thickness2, angle, show_hinge =
         if(thickness)
             hinge_screw_positions(type) {
                 translate_z(t)
-                    screw_and_washer(screw, screw_longer_than(t + thickness + washer_t + nut_t));
+                    screw_and_washer(screw, screw_length(screw, t + thickness, 2, nyloc = true));
 
                 translate_z(-thickness)
                     vflip()

printed/foot.scad

@@ -69,10 +69,9 @@ module foot(type = foot) { //! Generate STL
 
 module foot_assembly(t = 0, type = foot, flip = false) { //! Assembly with fasteners in place for specified sheet thickness
     screw = foot_screw(type);
-    washer = screw_washer(screw);
     nut = screw_nut(screw);
     squeeze = 0.5;
-    screw_length = screw_longer_than(foot_thickness(type) + t + 2 * washer_thickness(washer) + nut_thickness(nut, true) - squeeze);
+    screw_length = screw_length(screw, foot_thickness(type) + t - squeeze, 2, nyloc = true);
 
     vflip() explode(15, true) {
         stl_colour(pp4_colour) foot(type);
@@ -146,9 +145,7 @@ assembly("insert_foot") {
 
 module fastened_insert_foot_assembly(t = 3, type = insert_foot) { //! Assembly with fasteners in place for specified sheet thickness
     screw = foot_screw(type);
-    washer = screw_washer(screw);
-    insert = screw_insert(screw);
-    screw_length = screw_shorter_than(insert_length(insert) + t + 2 * washer_thickness(washer));
+    screw_length = screw_length(screw, t, 2, insert = true);
 
     explode(-10) insert_foot_assembly(type);
 

printed/handle.scad

@@ -91,7 +91,7 @@ assembly("handle") {
 }
 
 module handle_fastened_assembly(thickness) { //! Assembly with fasteners in place
-    screw_length = screw_longer_than(thickness + insert_length(insert) + 2 * washer_thickness(screw_washer(screw)));
+    screw_length = screw_length(screw, thickness, 2, true, longer = true);
 
     handle_assembly();
 

printed/pcb_mount.scad

@@ -103,10 +103,9 @@ module pcb_mount_assembly(pcb, thickness, height = 5) { //! A PCB mount assembly
 
     stl_colour(pp1_colour) pcb_mount(pcb, washers = false);
 
-    washer = screw_washer(screw);
     nut = screw_nut(screw);
     t = pcb_thickness(pcb);
-    screw_length = screw_longer_than(height + t + washer_thickness + thickness + washer_thickness(washer) + nut_thickness(nut, true));
+    screw_length = screw_length(screw, height + t + washer_thickness + thickness, 1, nyloc = true);
 
     pcb_mount_screw_positions(pcb) {
         translate_z(height + t) {

printed/printed_box.scad

@@ -65,10 +65,8 @@ function pbox_insert(type) = screw_insert(pbox_screw(type)); //! The insert for
 function pbox_washer(type) = screw_washer(pbox_screw(type)); //! The washer for the base screws
 
 function pbox_screw_length(type, panel_thickness = 0) =  //! Length of the base screw
-    let(foot = pbox_foot(type))
-        screw_shorter_than(pbox_base(type) + washer_thickness(pbox_washer(type))
-                            + insert_length(pbox_insert(type))
-                            + (foot ? foot_thickness(foot) : panel_thickness));
+    let(foot = pbox_foot(type), screw = pbox_screw(type))
+        screw_length(screw, pbox_base(type) + (foot ? foot_thickness(foot) : panel_thickness), 1, true);
 
 function pbox_mid_offset(type) = pbox_ridges(type).y + pbox_wall(type) / 2; // Offset to wall midpoint
 

printed/printed_pulleys.scad

@@ -21,8 +21,8 @@
 //! Creative Commons - Attribution - Share Alike license (see <https://creativecommons.org/licenses/by-sa/3.0/>)
 //
 
-include <NopSCADlib/core.scad>
-include <NopSCADlib/vitamins/pulleys.scad>
+include <../core.scad>
+include <../vitamins/pulleys.scad>
 
 printed_pulley_GT2_profile = [[0.747183,-0.5],[0.747183,0],[0.647876,0.037218],[0.598311,0.130528],[0.578556,0.238423],[0.547158,0.343077],[0.504649,0.443762],[0.451556,0.53975],[0.358229,0.636924],[0.2484,0.707276],[0.127259,0.750044],[0,0.76447],[-0.127259,0.750044],[-0.2484,0.707276],[-0.358229,0.636924],[-0.451556,0.53975],[-0.504797,0.443762],[-0.547291,0.343077],[-0.578605,0.238423],[-0.598311,0.130528],[-0.648009,0.037218],[-0.747183,0],[-0.747183,-0.5]];
 

printed/psu_shroud.scad

@@ -156,8 +156,7 @@ assembly(str("PSU_shroud_", name)) {
 
 module psu_shroud_fastened_assembly(type, cable_d, thickness, name, cables = 1) //! Assembly with screws in place
 {
-    washer = screw_washer(screw);
-    screw_length = screw_shorter_than(2 * washer_thickness(washer) + thickness + insert_length(insert) + counter_bore);
+    screw_length = screw_length(screw,thickness + counter_bore, 2, true);
 
     psu_shroud_assembly(type, cable_d, name, cables);
 

printed/ribbon_clamp.scad

@@ -101,8 +101,7 @@ module ribbon_clamp_fastened_assembly(ways, thickness, screw = screw) { //! Clam
 
     vitamin(str(": Tape self amalgamating silicone ",tape_l," x 25mm"));
 
-    washer = screw_washer(screw);
-    screw_length = screw_shorter_than(2 * washer_thickness(washer) + thickness + ribbon_clamp_screw_depth(screw));
+    screw_length = screw_length(screw, thickness + ribbon_clamp_screw_depth(screw), 2);
 
     ribbon_clamp_assembly(ways, screw);
 

printed/socket_box.scad

@@ -105,8 +105,7 @@ module socket_box_MKLOGIC_assembly() socket_box_assembly(MKLOGIC);
 
 module socket_box_fastened_assembly(type, thickness) { //! The socket and backbox on each side of the specified panel thickness
     screw = mains_socket_screw(type);
-    insert = screw_insert(screw);
-    screw_length = screw_longer_than(mains_socket_height(type) + thickness + insert_length(insert));
+    screw_length = screw_length(screw, mains_socket_height(type) + thickness, 0, true, longer = true);
 
     explode(-50)
         translate_z(-height - thickness)

printed/ssr_shroud.scad

@@ -119,8 +119,7 @@ assembly(str("SSR_shroud_", name)) {
 
 module ssr_shroud_fastened_assembly(type, cable_d, thickness, name) //! Assembly with screws in place
 {
-    washer = screw_washer(screw);
-    screw_length = screw_shorter_than(2 * washer_thickness(washer) + thickness + insert_length(insert) + counter_bore);
+    screw_length = screw_length(screw, thickness + counter_bore, 2, true);
 
     ssr_shroud_assembly(type, cable_d, name);
 

printed/strap_handle.scad

@@ -172,11 +172,9 @@ assembly("strap_end") {
 
 module strap_assembly(length, type = strap) { //! Assembly with screws in place
     screw = strap_screw(type);
-    washer = screw_washer(screw);
-    penny = penny_washer(washer);
-    insert = strap_insert(type);
+    penny = penny_washer(screw_washer(screw));
 
-    screw_length = screw_shorter_than(washer_thickness(washer) + washer_thickness(penny) + insert_length(insert) + panel_clearance + counterbore);
+    screw_length = screw_length(screw, washer_thickness(penny) + panel_clearance + counterbore, 1, true);
 
     stl_colour(pp4_colour) strap(length, type);
 

readme.md

@@ -1750,7 +1750,11 @@ UK 13A sockets at the moment.
 ---
 <a name="Microswitches"></a>
 ## Microswitches
-Used for limit switches.
+Used for limit switches. Currently only the button type is supported as the lever and roller types are less accurate.
+
+The switch is drawn with the button at the nominal operation point. This can be plus or minus `microswitch_op_tol(type)`.
+
+When the button is released it comes out by a maximum of `microswitch_fp_max(type)` from the nominal operating point.
 
 [vitamins/microswitches.scad](vitamins/microswitches.scad) Object definitions.
 
@@ -1763,14 +1767,16 @@ Used for limit switches.
 |:--- |:--- |
 | `microswitch_body_clr(type)` | Body colour |
 | `microswitch_button_clr(type)` | Button colour |
-| `microswitch_button_pos(type)` | Button position |
+| `microswitch_button_pos(type)` | Button position at operating point |
 | `microswitch_button_t(type)` | Button thickness |
 | `microswitch_button_w(type)` | Button width |
+| `microswitch_fp_max(type)` | Free position maximum |
 | `microswitch_hole_d(type)` | Screw hole diameter |
 | `microswitch_holes(type)` | Hole positions |
 | `microswitch_leg(type)` | Leg types |
 | `microswitch_legs(type)` | Leg positions |
 | `microswitch_length(type)` | Body length |
+| `microswitch_op_tol(type)` | Operating position +/- tolerance |
 | `microswitch_radius(type)` | Body corner radius |
 | `microswitch_thickness(type)` | Body thickness |
 | `microswitch_width(type)` | Body width |
@@ -2305,10 +2311,12 @@ PCBs and perfboard with optional components. The shape can be a rectangle with o
 | ---:|:--- |:---|
 |   1 | `pcb(ArduinoLeonardo)` |  Arduino Leonardo |
 |   1 | `pcb(ArduinoUno3)` |  Arduino Uno R3 |
+|   1 | `pcb(BTT_SKR_MINI_E3_V2_0)` |  BigTreeTech SKR Mini E3 v2.0 |
+|   1 | `pcb(BTT_SKR_V1_4_TURBO)` |  BigTreeTech SKR v1.4 Turbo |
 |   1 |  |  Cat 5 patch cable 300mm |
 |   1 | `d_plug(DCONN15, pcb = true)` |  D-type 15 way PCB mount plug |
 |   1 | `pcb(DuetE)` |  Duet 2 Ethernet electronics |
-|   1 | `pcb(Duex2)` |  Duex2 expansion board |
+|   1 | `pcb(Duex2)` |  Duex2 expansion board - not shown |
 |   1 | `pcb(Duex5)` |  Duex5 expansion board |
 |   1 | `pcb(ESP-01)` |  ESP-01 |
 |   1 | `pcb(EnviroPlus)` |  Enviro+ |
@@ -2316,15 +2324,17 @@ PCBs and perfboard with optional components. The shape can be a rectangle with o
 |   1 | `pcb(Keyes5p1)` |  Keyes5.1 Arduino Uno expansion board |
 |   1 | `pcb(MP1584EN)` |  MP1584EN 3A buck converter |
 |   1 | `pcb(MT3608)` |  MT3608 boost converter module |
+|   1 | `pcb(Melzi)` |  Melzi electronics - not shown |
 |   4 |  |  Micro SD card |
+|   1 |  |  Micro SD card - not shown |
 |   1 | `molex_254(2)` |  Molex KK header 2 way |
 |   1 | `molex_254(3)` |  Molex KK header 3 way |
 |  16 | `nut(M2_nut, nyloc = true)` |  Nut M2 x 1.6mm nyloc |
 |  34 | `nut(M2p5_nut, nyloc = true)` |  Nut M2.5 x 2.2mm nyloc |
-|  12 | `nut(M3_nut, nyloc = true)` |  Nut M3 x 2.4mm nyloc |
-|  12 | `nut(M4_nut, nyloc = true)` |  Nut M4 x 3.2mm nyloc |
+|  17 | `nut(M3_nut, nyloc = true)` |  Nut M3 x 2.4mm nyloc |
+|   8 | `nut(M4_nut, nyloc = true)` |  Nut M4 x 3.2mm nyloc |
 |   1 | `pcb(PI_IO)` |  PI_IO V2 |
-|   1 | `pcb(PSU12V1A)` |  PSU 12V 1A |
+|   1 | `pcb(PSU12V1A)` |  PSU 12V 1A - not shown |
 |   1 | `pcb(PERF60x40)` |  Perfboard 60 x 40mm |
 |   1 | `pcb(PERF70x30)` |  Perfboard 70 x 30mm |
 |   1 | `pcb(PERF70x50)` |  Perfboard 70 x 50mm |
@@ -2343,16 +2353,18 @@ PCBs and perfboard with optional components. The shape can be a rectangle with o
 |  12 | `screw(M2p5_pan_screw, 25)` |  Screw M2.5 pan x 25mm |
 |   4 | `screw(M2p5_pan_screw, 30)` |  Screw M2.5 pan x 30mm |
 |   4 | `screw(M3_cap_screw, 16)` |  Screw M3 cap x 16mm |
-|   8 | `screw(M3_cap_screw, 30)` |  Screw M3 cap x 30mm |
-|  12 | `screw(M4_cap_screw, 35)` |  Screw M4 cap x 35mm |
+|   4 | `screw(M3_cap_screw, 30)` |  Screw M3 cap x 30mm |
+|   9 | `screw(M3_cap_screw, 35)` |  Screw M3 cap x 35mm |
+|   8 | `screw(M4_cap_screw, 35)` |  Screw M4 cap x 35mm |
 |   1 | `pcb(TP4056)` |  TP4056 Li-lon Battery charger module |
 |   3 | `terminal_35(2)` |  Terminal block 2 way 3.5mm |
 |   2 | `green_terminal(gt_2p54, 4)` |  Terminal block 4 way 0.1" |
+|   1 |  |  USB A to Mini B lead - not shown |
 |   1 | `pcb(WD2002SJ)` |  WD2002SJ Buck Boost DC-DC converter |
 |  16 | `washer(M2_washer)` |  Washer  M2 x 5mm x 0.3mm |
 |  34 | `washer(M2p5_washer)` |  Washer  M2.5 x 5.9mm x 0.5mm |
-|  12 | `washer(M3_washer)` |  Washer  M3 x 7mm x 0.5mm |
-|  12 | `washer(M4_washer)` |  Washer  M4 x 9mm x 0.8mm |
+|  17 | `washer(M3_washer)` |  Washer  M3 x 7mm x 0.5mm |
+|   8 | `washer(M4_washer)` |  Washer  M4 x 9mm x 0.8mm |
 |   1 | `pcb(ZC_A0591)` |  ZC-A0591 ULN2003 driver PCB |
 
 ### Printed
@@ -2368,13 +2380,13 @@ PCBs and perfboard with optional components. The shape can be a rectangle with o
 |   4 | pcb_spacer25150_2.stl |
 |   4 | pcb_spacer25160_2.stl |
 |   4 | pcb_spacer25170_2.stl |
+|   4 | pcb_spacer25190.stl |
 |   4 | pcb_spacer25200.stl |
-|   4 | pcb_spacer25210.stl |
-|   2 | pcb_spacer2590.stl |
+|   2 | pcb_spacer2580.stl |
 |   4 | pcb_spacer30180.stl |
-|   4 | pcb_spacer30190.stl |
+|   5 | pcb_spacer30210.stl |
+|   4 | pcb_spacer30220.stl |
 |   4 | pcb_spacer3050.stl |
-|   4 | pcb_spacer40220.stl |
 |   4 | pcb_spacer40230.stl |
 |   4 | pcb_spacer40240.stl |
 
@@ -2606,8 +2618,8 @@ Timing belt pulleys, both toothed and plain with internal bearings for idlers.
 ### Modules
 | Module | Description |
 |:--- |:--- |
-| `pulley(type)` | Draw a pulley |
-| `pulley_assembly(type)` | Draw a pulley with its grub screws in place |
+| `pulley(type, colour = silver)` | Draw a pulley |
+| `pulley_assembly(type, colour = silver)` | Draw a pulley with its grub screws in place |
 
 ![pulleys](tests/png/pulleys.png)
 
@@ -2902,10 +2914,11 @@ For an explanation of `screw_polysink()` see <https://hydraraptor.blogspot.com/2
 |:--- |:--- |
 | `screw_boss_diameter(type)` | Boss big enough for nut trap and washer |
 | `screw_head_depth(type, d = 0)` | How far a counter sink head will go into a straight hole diameter d |
-| `screw_longer_than(x)` | Returns shortest screw length longer or equal to x |
+| `screw_length(screw, thickness, washers, insert = false, nyloc = false, nut = false, longer = false)` | Returns the length of the longest or shortest screw that will got through `thickness` and `washers` and possibly an `insert`, `nut` or `nyloc` |
+| `screw_longer_than(x)` | Returns the length of the shortest screw length longer or equal to x |
 | `screw_nut_radius(type)` | Radius of matching nut |
 | `screw_polysink_r(type, z)` | Countersink hole profile corrected for rounded staircase extrusions. |
-| `screw_shorter_than(x)` | Returns longest screw length shorter than or equal to x |
+| `screw_shorter_than(x)` | Returns the length of the longest screw shorter than or equal to x |
 
 ### Modules
 | Module | Description |
@@ -2941,6 +2954,7 @@ For an explanation of `screw_polysink()` see <https://hydraraptor.blogspot.com/2
 |   1 | `screw(M4_pan_screw, 30)` |  Screw M4 pan x 30mm |
 |   1 | `screw(M5_cap_screw, 30)` |  Screw M5 cap x 30mm |
 |   1 | `screw(M5_cs_cap_screw, 30)` |  Screw M5 cs cap x 30mm |
+|   1 | `screw(M5_dome_screw, 30)` |  Screw M5 dome x 30mm |
 |   1 | `screw(M5_hex_screw, 30)` |  Screw M5 hex x 30mm |
 |   1 | `screw(M5_pan_screw, 30)` |  Screw M5 pan x 30mm |
 |   1 | `screw(M6_cap_screw, 30)` |  Screw M6 cap x 30mm |
@@ -5969,6 +5983,7 @@ Simple tube or ring
 ### Modules
 | Module | Description |
 |:--- |:--- |
+| `rectangular_tube(size, center = true, thickness = 1, fillet = 0.5)` | Create a retangular tube with filleted corners |
 | `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 |

scripts/bom.py

@@ -249,7 +249,7 @@ def boms(target = None, assembly = None):
         #
         # Run openscad
         #
-        openscad.run("-D", "$bom=2", "-D", "$preview=true", "--hardwarnings", "-o", "openscad.echo", "-d", bom_dir + "/bom.deps", bom_maker_name)
+        openscad.run("-D", "$bom=2", "-D", "$preview=true", "-o", "openscad.echo", "-d", bom_dir + "/bom.deps", bom_maker_name)
         os.remove(bom_maker_name)
         print("Generating bom ...", end=" ")
 

scripts/openscad.py

@@ -25,7 +25,7 @@ from __future__ import print_function
 import subprocess, sys
 
 def run_list(args, silent = False, verbose = False):
-    cmd = ["openscad"] + args
+    cmd = ["openscad", "--hardwarnings"] + args
     if not silent:
         for arg in cmd:
             print(arg, end=" ")

scripts/tests.py

@@ -50,6 +50,9 @@ def do_cmd(cmd, output = sys.stdout):
     return subprocess.call(cmd, stdout = output, stderr = output)
 
 def compare_images(a, b, c):
+    if not os.path.isfile(b):
+        print(Fore.MAGENTA + "Failed to generate %s while making %s" % (b, a), Fore.WHITE)
+        sys.exit(1)
     if not os.path.isfile(a):
         return -1
     log_name = 'magick.log'
@@ -126,14 +129,13 @@ def tests(tests):
     #
     # List of individual part files
     #
-
     scads = [i for i in sorted(os.listdir(scad_dir), key = lambda s: s.lower()) if i[-5:] == ".scad"]
     types = []
     for scad in scads:
         base_name = scad[:-5]
         if not tests or base_name in tests:
             done.append(base_name)
-            print('\n'+base_name)
+            print(base_name)
             cap_name = base_name[0].capitalize() + base_name[1:]
             base_name = base_name.lower()
             scad_name = scad_dir + '/' + scad
@@ -240,6 +242,7 @@ def tests(tests):
                 BOM = bom.parse_bom()
                 with open(bom_name, 'wt') as outfile:
                     json.dump(BOM.flat_data(), outfile, indent = 4)
+                print()
 
             with open(bom_name, "rt") as bom_file:
                 BOM = json.load(bom_file)

tests/BOM.scad

@@ -30,7 +30,6 @@ sheet = PMMA3;
 height = 10;
 
 insert = screw_insert(screw);
-washer = screw_washer(screw);
 
 module widget(thickness) {
     vitamin(str("widget(", thickness, "): Rivit like thing for ", thickness, "mm sheets"));
@@ -92,7 +91,7 @@ assembly("wigdit") {
 
     translate_z(height) {
         translate_z(sheet_thickness(sheet))
-            screw_and_washer(screw, screw_longer_than(sheet_thickness(sheet) + 2 * washer_thickness(washer) + 3), true);
+            screw_and_washer(screw, screw_length(screw, sheet_thickness(sheet) + 3, 2, longer = true), true);
 
         explode(5)
             translate_z(sheet_thickness(sheet) / 2 + eps)

tests/PCBs.scad

@@ -21,8 +21,10 @@ include <../vitamins/pcbs.scad>
 
 use <../utils/layout.scad>
 
+function spacing(p) = let(w = pcb_width(p)) w < 22 ? w + 3 : w + 10;
+
 module pcbs() {
-    layout([for(p = pcbs) pcb_width(p)], 10)
+    layout([for(p = pcbs) spacing(p)], 0)
         translate([0, pcb_length(pcbs[$i]) / 2])
             rotate(90)
                 pcb_assembly(pcbs[$i], 5 + $i, 3);
@@ -31,6 +33,10 @@ module pcbs() {
         layout([for(p = perfboards) pcb_length(p)], 10)
             translate([0, -pcb_width(perfboards[$i]) / 2])
                 pcb_assembly(perfboards[$i], 5 + $i, 3);
+
+    for(p = pcbs_not_shown)
+        hidden()
+            pcb(p);
 }
 if($preview)
     pcbs();

tests/blowers.scad

@@ -24,16 +24,13 @@ include <../vitamins/blowers.scad>
 module blowers()
     layout([for(b = blowers) blower_width(b)], 10, true) let(b = blowers[$i]){
         screw = blower_screw(b);
-        washer = screw_washer(screw);
         h = blower_lug(b);
 
         blower(b);
 
         blower_hole_positions(b)
             translate_z(h)
-                screw_and_washer(screw, screw_longer_than(h + washer_thickness(washer) + 5));
-
-
+                screw_and_washer(screw, screw_length(screw, h + 5, 1, longer = true));
     }
 
 if($preview)

tests/tube.scad

@@ -27,6 +27,9 @@ module tubes() {
 
     translate([50, 10])
         tube(10, 8, 30);
+
+    translate([100, 10])
+        rectangular_tube([10, 20, 30]);
 }
 
 tubes();

utils/rounded_right_triangle.scad

@@ -21,7 +21,7 @@
 //! Draw a 3D right triangle with rounded edges. Intended to be embedded in other parts. Can be optionally offset by the filleted amount.
 //
 include <../utils/core/core.scad>
-include <NopSCADlib/utils/core/rounded_rectangle.scad>
+include <..//utils/core/rounded_rectangle.scad>
 
 module rounded_right_triangle(x, y, z, fillet, center = true, offset = false) { //! Draw a 3D right triangle with rounded edges.
     fillet = max(fillet, eps);
@@ -43,4 +43,3 @@ module rounded_right_triangle(x, y, z, fillet, center = true, offset = false) {
                     rounded_rectangle([size.z, 2 * fillet, eps], fillet - eps, center = false, xy_center = false);
         }
 }
-

utils/tube.scad

@@ -68,3 +68,11 @@ module woven_tube(or, ir, h, center= true, colour = grey(30), colour2, warp = 2,
         }
     }
 }
+
+module rectangular_tube(size, center = true, thickness = 1, fillet = 0.5) { //! Create a retangular tube with filleted corners
+    extrude_if(size.z, center = center)
+        difference() {
+            rounded_square([size.x, size.y], fillet);
+            rounded_square([size.x - 2 * thickness, size.y - 2 * thickness], fillet);
+        }
+}

vitamins/fan.scad

@@ -151,10 +151,8 @@ function fan_screw_depth(type, full_depth = false) = fan_boss_d(type) || full_de
 
 function fan_screw_length(type, thickness, full_depth = false) =
     let(depth = fan_screw_depth(type, full_depth),
-        washers = depth == fan_depth(type) ? 2 : 1,
-        washer = screw_washer(fan_screw(type)),
-        nut = screw_nut(fan_screw(type)))
-            screw_longer_than(thickness + depth + washer_thickness(washer) * washers + nut_thickness(nut, true)); //! Screw length required
+        washers = depth == fan_depth(type) ? 2 : 1)
+            screw_length(fan_screw(type), thickness + depth, washers, nyloc = true); //! Screw length required
 
 module fan_assembly(type, thickness, include_fan = true, screw = false, full_depth = false) { //! Fan with its fasteners
     translate_z(-fan_depth(type) / 2) {

vitamins/iec.scad

@@ -247,10 +247,7 @@ module iec_inserts(type) {              //! Place the inserts
 
 module iec_assembly(type, thickness) {  //! Assembly with fasteners given panel thickness
     screw = iec_screw(type);
-    washer = screw_washer(screw);
-    nut = screw_nut(screw);
-    insert = screw_insert(screw);
-    screw_length = thickness ? screw_longer_than(iec_flange_t(type) + thickness + washer_thickness(washer) + nut_thickness(nut, true))
+    screw_length = thickness ? screw_length(screw, iec_flange_t(type) + thickness, 1, nyloc = true)
                              : insert_screw_length;
 
     iec(type);
@@ -262,6 +259,6 @@ module iec_assembly(type, thickness) {  //! Assembly with fasteners given panel
         if(thickness)
             translate_z(-thickness)
                 vflip()
-                    nut_and_washer(nut, true);
+                    nut_and_washer(screw_nut(screw), true);
     }
 }

vitamins/microswitch.scad

@@ -18,7 +18,11 @@
 //
 
 //
-//! Used for limit switches.
+//! Used for limit switches. Currently only the button type is supported as the lever and roller types are less accurate.
+//!
+//! The switch is drawn with the button at the nominal operation point. This can be plus or minus `microswitch_op_tol(type)`.
+//!
+//! When the button is released it comes out by a maximum of `microswitch_fp_max(type)` from the nominal operating point.
 //
 include <../utils/core/core.scad>
 
@@ -32,11 +36,13 @@ function microswitch_hole_d(type)    = type[6];     //! Screw hole diameter
 function microswitch_holes(type)     = type[7];     //! Hole positions
 function microswitch_button_w(type)  = type[8];     //! Button width
 function microswitch_button_t(type)  = type[9];     //! Button thickness
-function microswitch_button_pos(type)= type[10];    //! Button position
-function microswitch_legs(type)      = type[11];    //! Leg positions
-function microswitch_leg(type)       = type[12];    //! Leg types
-function microswitch_body_clr(type)  = type[13];    //! Body colour
-function microswitch_button_clr(type)= type[14];    //! Button colour
+function microswitch_button_pos(type)= type[10];    //! Button position at operating point
+function microswitch_op_tol(type)    = type[11];    //! Operating position +/- tolerance
+function microswitch_fp_max(type)    = type[12];    //! Free position maximum
+function microswitch_legs(type)      = type[13];    //! Leg positions
+function microswitch_leg(type)       = type[14];    //! Leg types
+function microswitch_body_clr(type)  = type[15];    //! Body colour
+function microswitch_button_clr(type)= type[16];    //! Button colour
 
 function microswitch_lower_extent(type) = let(leg = microswitch_leg(type)) min([for(pos = microswitch_legs(type)) pos.y - leg.y / 2]); //! How far legs extend downwards
 function microswitch_right_extent(type) = let(leg = microswitch_leg(type)) max([microswitch_length(type) / 2, for(pos = microswitch_legs(type)) pos.x + leg.x / 2]); //! How far legs extend right

vitamins/microswitches.scad

@@ -23,10 +23,19 @@
 small_leg  = [0.9,  3.3, 0.4, 0];
 medium_leg = [0.5,  3.9, 3.2, 1.6, [0, -0.5]];
 large_leg  = [11.4, 0.8, 6.3, 1.8, [1.7, 0]];
-
-small_microswitch  = ["small_microswitch", "DM1-00P-110-3",      5.8, 6.5,  12.8, 0, 2,    [[-3.25, -1.65], [3.25, -1.65]], 2.9, 1.2, [-1.95, 3.75], [[-5.08, -4.95], [0,    -4.9],  [5.08, -4.9]  ], small_leg,  grey(20), "white"  ];
-medium_microswitch = ["medium_microswitch","SS-01 or SS-5GL",    6.4, 10.2, 19.8, 1, 2.35, [[-4.8,  -2.6 ], [4.7,  -2.6 ]], 3.2, 2,   [-2.8,  5.8 ], [[-8.05, -7.05], [0.75, -7.05], [8.05, -7.05] ], medium_leg, grey(20), "burlywood" ];
-large_microswitch  = ["large_microswitch", "Saia G3 low force", 10.4, 15.9, 28.0, 2, 3.1,  [[-11.1, -5.15], [11.2,  5.15]], 4,   2.75,[-9.1,  9.55], [[19.7,   2.19], [19.7, -3.45],  [8.3, -10.45] ], large_leg,  "ivory", "white" ];
+//                                                               t    w     l     r  h     h                               b     b    b             o     f     l                                                l           b         b
+//                                                               h    i     e     a  o     o                               u     u    u             p     p     e                                                e           o         u
+//                                                               i    d     n     d  l     l                               t     t    t                         g                                                g           d         t
+//                                                               c    t     g     i  e     e                               t     t    t             t     m                                                                  y         t
+//                                                               k    h     t     u                                        o     o    o             o     a     p                                                t                     o
+//                                                               n          h     s  d     p                               n     n    n             l     x     o                                                y           c         n
+//                                                               e                   i     o                                                                    s                                                p           l
+//                                                               s                   a     s                               w     t    p                         n                                                e           r         c
+//                                                               n                         n                                          o                         s                                                                      l
+//                                                                                         s                                          s                                                                                                r
+small_microswitch  = ["small_microswitch", "DM1-00P-110-3",      5.8, 6.5,  12.8, 0, 2,    [[-3.25, -1.65], [3.25, -1.65]], 2.9, 1.2, [-1.95, 3.75], 0.2, 0.55, [[-5.08, -4.95], [0,    -4.9],  [5.08, -4.9]  ], small_leg,  grey(20), "white"  ];
+medium_microswitch = ["medium_microswitch","SS-01 or SS-5GL",    6.4, 10.2, 19.8, 1, 2.35, [[-4.8,  -2.6 ], [4.7,  -2.6 ]], 3.2, 2,   [-2.8,  5.8 ], 0.5, 1.00, [[-8.05, -7.05], [0.75, -7.05], [8.05, -7.05] ], medium_leg, grey(20), "burlywood" ];
+large_microswitch  = ["large_microswitch", "Saia G3 low force", 10.4, 15.9, 28.0, 2, 3.1,  [[-11.1, -5.15], [11.2,  5.15]], 4,   2.75,[-9.1,  9.55], 0.3, 1.2,  [[19.7,   2.19], [19.7, -3.45], [8.3, -10.45] ], large_leg,  "ivory",  "white" ]; //G3M1T1PUL
 
 microswitches = [small_microswitch, medium_microswitch, large_microswitch];
 

vitamins/module.scad

@@ -129,15 +129,13 @@ module mod_screw_positions(type) //! Position children at the screw positions
 
 module module_assembly(type, thickness) { //! Module with its fasteners in place
     screw = mod_screw(type);
-    washer = screw_washer(screw);
-    nut = screw_nut(screw);
-    screw_length = screw_longer_than(thickness + mod_screw_z(type) + 2 * washer_thickness(washer) + nut_thickness(nut, true));
+    screw_length = screw_length(screw, thickness + mod_screw_z(type), 2, nyloc = true);
 
     mod(type);
 
     mod_screw_positions(type) {
         translate_z(mod_screw_z(type))
-            nut_and_washer(nut, true);
+            nut_and_washer(screw_nut(screw), true);
 
         translate_z(-thickness)
             vflip()

vitamins/pcb.scad

@@ -1121,9 +1121,7 @@ module pcb_assembly(type, height, thickness) { //! Draw PCB assembly with spaces
 
     screw = pcb_screw(type);
     if(!is_undef(screw)) {
-        washer = screw_washer(screw);
-        nut = screw_nut(screw);
-        screw_length = screw_longer_than(height + thickness + pcb_thickness(type) + washer_thickness(washer) + nut_thickness(nut, true));
+        screw_length = screw_length(screw, height + thickness + pcb_thickness(type), 1, nyloc = true);
 
         taper = screw_smaller_than(pcb_hole_d(type)) > 2 * screw_radius(screw); // Arduino?
         pcb_screw_positions(type) {
@@ -1138,7 +1136,7 @@ module pcb_assembly(type, height, thickness) { //! Draw PCB assembly with spaces
 
             translate_z(-thickness)
                 vflip()
-                    nut_and_washer(nut, true);
+                    nut_and_washer(screw_nut(screw), true);
         }
     }
 }

vitamins/pcbs.scad

@@ -21,6 +21,7 @@ include <d_connectors.scad>
 include <leds.scad>
 include <axials.scad>
 include <smds.scad>
+include <green_terminals.scad>
 
 //
 //                                   l      w      t    r     h     l  c        b     h
@@ -195,6 +196,222 @@ Duex5 = ["Duex5", "Duex5 expansion board",
                                                                     ]),
                                                                     []];
 
+BTT_SKR_MINI_E3_V2_0 = [
+    "BTT_SKR_MINI_E3_V2_0", "BigTreeTech SKR Mini E3 v2.0",
+    100.75, 70.25, 1.6, // size
+    1, // corner radius
+    3, // mounting hole diameter
+    5, // pad around mounting hole
+    grey(30), // color
+    false, // true if parts should be separate BOM items
+    [ // hole positions
+        [ 19.3,              -2.89 ],
+        [ 19.3   + 62.15,    -2.89 ],
+        [  2.535,            -2.89 - 34.98 ],
+        [  2.535 + 31.80,    -2.89 - 37.63 ],
+        [  2.535 + 95.68,    -2.89 - 64.47 ]
+    ],
+    [ // components
+        // cpu
+        [ 55,   33,     0, "chip", 10, 10,   1,   grey(15) ],
+        // hotend and heated bed
+        [ 26,   16,     0, "chip", 9.5, 8.5, 4,   grey(15) ],
+        [ 37,   14,     0, "chip", 6,   6,   2.5, grey(15) ],
+        // driver chips
+        [ 10.5,-17.5,   0, "chip",  5,  5, 1, grey(15) ],
+        [ 30.5,-17.5,   0, "chip",  5,  5, 1, grey(15) ],
+        [ 50.5,-17.5,   0, "chip",  5,  5, 1, grey(15) ],
+        [ 70.5,-17.5,   0, "chip",  5,  5, 1, grey(15) ],
+        // heat dissipation under board
+        [ 43,  -17.5,   0, "-block", 85, 8, 0.1, gold ],
+        [ 40,   16,     0, "-block", 10, 8, 0.1, gold ],
+        [ 27,   19,     0, "-block", 13,14, 0.1, gold ],
+        [ 12,   28.5,   0, "-block", 11, 7, 0.1, gold ],
+        // mock up heat sinks over the chips
+        [  10.5,  -17.5,  0, "chip",  9, 8.5,  2, "DeepSkyBlue" ],
+        for(x = [10.5], y = [-4,-2,0,2,4]) [ x, -17.5 + y,  0, "chip",  9, 0.75, 11, "DeepSkyBlue" ],
+        [  30.5,  -17.5,  0, "chip",  9, 8.5,  2, "DeepSkyBlue" ],
+        for(x = [30.5], y = [-4,-2,0,2,4]) [ x, -17.5 + y,  0, "chip",  9, 0.75, 11, "DeepSkyBlue" ],
+        [  50.5,  -17.5,  0, "chip",  9, 8.5,  2, "DeepSkyBlue" ],
+        for(x = [50.5], y = [-4,-2,0,2,4]) [ x, -17.5 + y,  0, "chip",  9, 0.75, 11, "DeepSkyBlue" ],
+        [  70.5,  -17.5,  0, "chip",  9, 8.5,  2, "DeepSkyBlue" ],
+        for(x = [70.5], y = [-4,-2,0,2,4]) [ x, -17.5 + y,  0, "chip",  9, 0.75, 11, "DeepSkyBlue" ],
+
+        // terminals
+        [  5.25, 5.3, 180, "gterm", gt_5x17, 2, undef, grey(20) ],
+        [ 18.1,  5.1, -90, "gterm", gt_5x17, 2, undef, grey(20) ],
+        [ 29.3,  5.1, -90, "gterm", gt_5x17, 2, undef, grey(20) ],
+        [ 40.5,  5.1, -90, "gterm", gt_5x11, 2, undef, grey(20) ],
+        // SD and USB
+        [  -3, -(22.27 + 29.92)/2, 0, "usb_uA" ],
+        [  -8, -( 2.13 + 17.17)/2, 0, "uSD", [17.17 - 2.13, 16, 2] ],
+        // EXP
+        [  -4.5, 17,   -90, "2p54boxhdr", 5, 2 ],
+        // TFT
+        [  66.1,  21.7,  0, "2p54header", 5, 1 ],
+        // FAN0
+        [  50.25,  3.8,  0, "jst_xh", 2, false, grey(20) ],
+        // FAN1
+        [  49.9,  16.1,  0, "jst_xh", 2, false, grey(20) ],
+        // PS-ON
+        [  58.1,  16.1,  0, "jst_xh", 2, false, grey(20) ],
+        // PWR-DET
+        [  67.5,  16.0,  0, "jst_xh", 3, false, grey(20) ],
+        // E0-STOP
+        [  78.2,  16.0,  0, "jst_xh", 3, false, grey(20) ],
+        // Z-PROBE
+        [  87.2,  20.5, -90,"jst_xh", 5, false, grey(20) ],
+        // NEO Pixel
+        [  78.2,  27.1,  0, "jst_xh", 3, false, grey(20) ],
+        // end stops
+        [  58.60,  3.8,  0, "jst_xh", 2, false, grey(20) ],
+        [  66.70,  3.8,  0, "jst_xh", 2, false, grey(20) ],
+        [  74.90,  3.8,  0, "jst_xh", 2, false, grey(20) ],
+        // thermistors
+        [  83.00,  3.8,  0, "jst_xh", 2, false, grey(20) ],
+        [  91.10,  3.8,  0, "jst_xh", 2, false, grey(20) ],
+        // motor connections
+        [  10.15, -4.2,  0, "jst_xh", 4, false, grey(20) ],
+        [  30.35, -4.2,  0, "jst_xh", 4, false, grey(20) ],
+        [  43.90, -4.2,  0, "jst_xh", 4, false, grey(20) ],
+        [  57.25, -4.2,  0, "jst_xh", 4, false, grey(20) ],
+        [  70.75, -4.2,  0, "jst_xh", 4, false, grey(20) ],
+        // motor jumpers
+        [  20.6,  44.1,  0, "2p54header", 2, 1 ],
+        [  39.6,  44.2,  0, "2p54header", 2, 1 ],
+        [  60.1,  44.1,  0, "2p54header", 2, 1 ],
+        [  80.3,  44.1,  0, "2p54header", 2, 1 ],
+        // SWD
+        [  43.9,  39.2,  0, "2p54header", 1, 5 ],
+        // SPI
+        [  -3.1,  31.9,  0, "2p54header", 2, 3 ],
+        // PWR-1
+        [  -12.8, 30.3,  0, "2p54header", 3, 1 ],
+        // VOUT
+        [  -14.0, 34.4,  0, "2p54header", 2, 2 ],
+        // VIN
+        [  17.3,  19.6,  0, "2p54header", 2, 2 ],
+    ],
+    [] // accessories
+];
+
+TMC2130 = [
+    "TMC2130", "TMC2130",
+    20, 14, 1.6, // size
+    0, 0, 0, // corner radius, mounting hole diameter, pad around mounting hole
+    grey(95), // colour
+    false, // true if parts should be separate BOM items
+    [], // hole positions
+    [
+        [  10,  1,  0, "-2p54header", 8, 1 ],
+        [  10, 13,  0, "-2p54header", 8, 1 ],
+        [  12,  7,  0, "-chip", 6, 4, 1, grey(20) ],
+        // mock up a heat sink
+        [  10,  7,  0, "block", 9, 8.5, 2, "DeepSkyBlue" ],
+        for (y = [-4,-2,0,2,4]) [ 10, 7 + y,  0, "block", 9, 0.75, 11, "DeepSkyBlue" ],
+    ],
+    []
+];
+
+BTT_SKR_V1_4_TURBO = [
+    "BTT_SKR_V1_4_TURBO", "BigTreeTech SKR v1.4 Turbo",
+    110, 85, 1.6, // size
+    1, // corner radius
+    3, // mounting hole diameter
+    4, // pad around mounting hole
+    grey(30), // colour
+    false, // true if parts should be separate BOM items
+    [ // hole positions
+        [-4, 4], [-4, -4], [4, -4], [4, 4]
+    ],
+    [ // components
+        [  (29.15+31.5)/2,  8, -90, "usb_B" ],
+        [  (46.9+51.55)/2,  7, -90, "uSD", [14, 14, 2] ],
+        [ 105,   13,     0, "button_6mm" ],
+        [  58,   43,     0, "chip", 15, 15, 1, grey(20) ],
+        // ESP-01 socket
+        [  69.8,  4,     0, "2p54socket", 4, 2 ],
+        // terminals
+        [   5.3, 13.2, 180, "gterm", gt_5x17, 2, undef, grey(20)],
+        [   5.3, 25.8, 180, "gterm", gt_5x17, 2, undef, grey(20)],
+        [   5.3, 37.2, 180, "gterm", gt_5x11, 2, undef, grey(20)],
+        [   5.3, 47.2, 180, "gterm", gt_5x11, 2, undef, grey(20)],
+
+        [   2.8, 56.7, -90, "jst_xh", 2, false, grey(20) ],
+        [  10.9, 56.7,  90, "jst_xh", 2, false, grey(20) ],
+        [  82,    4,     0, "jst_xh", 2, false, grey(20) ],
+        [  90,    4,     0, "jst_xh", 2, false, grey(20) ],
+        [  98,    4,     0, "jst_xh", 2, false, grey(20) ],
+
+        [  87.7, 29.0, -90, "jst_xh", 3, false, grey(20) ],
+        [  87.7, 39.5, -90, "jst_xh", 3, false, grey(20) ],
+        [  87.7, 50.1, -90, "jst_xh", 3, false, grey(20) ],
+        [  95.3, 29.0, -90, "jst_xh", 3, false, grey(20) ],
+        [  95.3, 39.5, -90, "jst_xh", 3, false, grey(20) ],
+        [  95.3, 50.1, -90, "jst_xh", 3, false, grey(20) ],
+
+        [  85.7, 18.2, 180, "jst_xh", 3, false, grey(20) ],
+        [  94.9, 18.2, 180, "jst_xh", 2, false, grey(20) ],
+        [  77.2, 19.6, -90, "jst_xh", 3, false, grey(20) ],
+        [  69.8, 11.0,   0, "jst_xh", 5, false, grey(20) ],
+
+        [  69.0, 19.2,   0,  "2p54header", 4, 1 ],
+        [  57.8, 18.0,   0,  "2p54header", 3, 2 ],
+        [  28.0, 19.7,   0,  "2p54header", 2, 2 ],
+
+        [  37.6, 28.8,   0,  "2p54header", 1, 3, undef, "red" ],
+        [  77.8, 27.5,   0,  "2p54header", 2, 2 ],
+        [  81.8, 26.4,   0,  "2p54header", 1, 3, undef, "red" ],
+        [  43.8, 42.8,   0,  "2p54header", 1, 5 ],
+
+        // EXP1 & EXP2
+        [  -6.6, 29.4,  90, "2p54boxhdr", 5, 2 ],
+        [  -6.6, 50.4,  90, "2p54boxhdr", 5, 2 ],
+
+        // motor axes connections
+        [  11.2, -3.75, 180, "jst_xh", 2, false, grey(20) ],
+        [  21.8, -3.75, 180, "jst_xh", 4, false, grey(20) ],
+        [  35.0, -3.75, 180, "jst_xh", 4, false, grey(20) ],
+        [  48.2, -3.75, 180, "jst_xh", 4, false, grey(20) ],
+        [  61.4, -3.75, 180, "jst_xh", 4, false, grey(20) ],
+        [  74.7, -3.75, 180, "jst_xh", 4, false, grey(20) ],
+        [  87.9, -3.75, 180, "jst_xh", 4, false, grey(20) ],
+        [  98.5, -3.75, 180, "jst_xh", 2, false, grey(20) ],
+
+        // stepper drivers
+        [  11.5, 62.5,  0, "2p54socket", 8, 1, undef, undef, undef, "red" ],
+        [  11.5, 75.2,  0, "2p54socket", 8, 1 ],
+        [   2.6, 66.3, 90, "2p54socket", 2, 1, undef, undef, undef, "red" ],
+        [  11.5, 68.85, 0, "pcb", 11, TMC2130 ],
+
+        [  33.1, 62.5,  0, "2p54socket", 8, 1, undef, undef, undef, "red" ],
+        [  33.1, 75.2,  0, "2p54socket", 8, 1 ],
+        [  24.2, 66.3, 90, "2p54socket", 2, 1, undef, undef, undef, "red" ],
+        [  33.1, 68.85, 0, "pcb", 11, TMC2130 ],
+
+        [  54.8, 62.5,  0, "2p54socket", 8, 1, undef, undef, undef, "red" ],
+        [  54.8, 75.2,  0, "2p54socket", 8, 1 ],
+        [  45.9, 66.3, 90, "2p54socket", 2, 1, undef, undef, undef, "red" ],
+        [  54.8, 68.85, 0, "pcb", 11, TMC2130 ],
+
+        [  76.4, 62.5,  0, "2p54socket", 8, 1, undef, undef, undef, "red" ],
+        [  76.4, 75.2,  0, "2p54socket", 8, 1 ],
+        [  67.5, 66.3, 90, "2p54socket", 2, 1, undef, undef, undef, "red" ],
+        [  76.4, 68.85, 0, "pcb", 11, TMC2130 ],
+
+        [  98.1, 62.5,  0, "2p54socket", 8, 1, undef, undef, undef, "red" ],
+        [  98.1, 75.2,  0, "2p54socket", 8, 1 ],
+        [  89.2, 66.3, 90, "2p54socket", 2, 1, undef, undef, undef, "red" ],
+
+        // closed loop pins
+        [  24.4, 57.5,  0, "2p54header", 6, 1 ],
+        [  40.6, 57.5,  0, "2p54header", 6, 1 ],
+        [  56.7, 57.5,  0, "2p54header", 6, 1 ],
+        [  72.9, 57.5,  0, "2p54header", 6, 1 ],
+        [  89.1, 57.5,  0, "2p54header", 6, 1 ],
+    ],
+    [] // accessories
+];
 
 Melzi = ["Melzi", "Melzi electronics", 203.2, 49.53, 1.6, 3.81, 3.1,  6, "green", false, [[3.81,  3.81], [-3.81, 3.81], [-3.81, -3.81], [3.81, -3.81]],
                                                                     [],
@@ -440,7 +657,9 @@ ESP_01 = [
     [] // accessories
 ];
 
-pcbs = [MP1584EN, TP4056, ESP_01, MT3608, RAMPSEndstop, ExtruderPCB, PI_IO, ZC_A0591, RPI0, EnviroPlus, ArduinoUno3, ArduinoLeonardo, Keyes5p1, PSU12V1A, WD2002SJ, RPI3, RPI4, DuetE, Duex2, Duex5];
+pcbs = [MP1584EN, TP4056, ESP_01, RAMPSEndstop, MT3608, PI_IO, ExtruderPCB, ZC_A0591, RPI0, EnviroPlus, ArduinoUno3, ArduinoLeonardo, Keyes5p1, WD2002SJ, RPI3, RPI4, BTT_SKR_MINI_E3_V2_0, BTT_SKR_V1_4_TURBO, DuetE, Duex5];
+
+pcbs_not_shown = [Melzi, Duex2, PSU12V1A];
 
 perfboards = [PERF74x51, PERF70x50, PERF60x40, PERF70x30, PERF80x20];
 

vitamins/pulley.scad

@@ -53,7 +53,7 @@ function pulley_extent(type) = max(pulley_flange_dia(type), pulley_hub_dia(type)
 T_angle = 40;
 GT_r = 0.555;
 
-module pulley(type) { //! Draw a pulley
+module pulley(type, colour = silver) { //! Draw a pulley
     teeth = pulley_teeth(type);
     od = pulley_od(type);
 
@@ -117,7 +117,7 @@ module pulley(type) { //! Draw a pulley
                 rotate([-90, 0, i * -90])
                     cylinder(r = screw_radius(pulley_screw(type)), h = 100);
 
-    color(silver) {
+    color(colour) {
         if(screw_z && screw_z < hl)
             render()
                 difference() {
@@ -140,9 +140,9 @@ module pulley(type) { //! Draw a pulley
     }
 }
 
-module pulley_assembly(type) { //! Draw a pulley with its grub screws in place
+module pulley_assembly(type, colour = silver) { //! Draw a pulley with its grub screws in place
     translate_z(pulley_offset(type)) {
-        pulley(type);
+        pulley(type, colour);
 
         if(pulley_screws(type))
             translate_z(pulley_screw_z(type))

vitamins/ring_terminal.scad

@@ -128,7 +128,7 @@ module ring_terminal_assembly(type, thickness, top = false) { //! Earthing assem
     screw = ringterm_screw(type);
     washer = screw_washer(screw);
     nut = screw_nut(screw);
-    screw_length = screw_longer_than(thickness + 2 * washer_thickness(washer) + nut_thickness(nut, true) + ringterm_thickness(type));
+    screw_length = screw_length(screw, thickness + ringterm_thickness(type), 2, nyloc = true);
 
     explode(10, true) star_washer(washer)
         if(top)

vitamins/screw.scad

@@ -48,7 +48,7 @@ function screw_head_depth(type, d = 0) =             //! How far a counter sink
         ? 0
         : let(r = screw_radius(type)) screw_head_radius(type) - max(r, d / 2) + r / 5;
 
-function screw_longer_than(x) = x <=  5 ?  5 : //! Returns shortest screw length longer or equal to x
+function screw_longer_than(x) = x <=  5 ?  5 : //! Returns the length of the shortest screw length longer or equal to x
                                 x <=  6 ?  6 :
                                 x <=  8 ?  8 :
                                 x <= 10 ? 10 :
@@ -56,7 +56,7 @@ function screw_longer_than(x) = x <=  5 ?  5 : //! Returns shortest screw length
                                 x <= 16 ? 16 :
                                 ceil(x / 5) * 5;
 
-function screw_shorter_than(x) = x >= 20 ? floor(x / 5) * 5 : //! Returns longest screw length shorter than or equal to x
+function screw_shorter_than(x) = x >= 20 ? floor(x / 5) * 5 : //! Returns the length of the longest screw shorter than or equal to x
                                  x >= 16 ? 16 :
                                  x >= 12 ? 12 :
                                  x >= 10 ? 10 :
@@ -64,6 +64,14 @@ function screw_shorter_than(x) = x >= 20 ? floor(x / 5) * 5 : //! Returns longes
                                  x >=  6 ?  6 :
                                  5;
 
+function screw_length(screw, thickness, washers, insert = false, nyloc = false, nut = false, longer = false) = //! Returns the length of the longest or shortest screw that will got through `thickness` and `washers` and possibly an `insert`, `nut` or `nyloc`
+    let(washer = washers ? washers * washer_thickness(screw_washer(screw)) : 0,
+        insert = insert ? insert_length(screw_insert(screw)) : 0,
+        nut = nut || nyloc ? nut_thickness(screw_nut(screw), nyloc)  : 0,
+        total = thickness + washer + insert + nut
+       )
+        longer || nut || nyloc ? screw_longer_than(total) : screw_shorter_than(total);
+
 function screw_smaller_than(d) = d >= 2.5 && d < 3 ? 2.5 : floor(d); // Largest diameter screw less than or equal to specified diameter
 
 function screw_insert(screw, i = 0) = let(d = screw_radius(screw) * 2)

vitamins/screws.scad

@@ -83,6 +83,7 @@ M5_cs_cap_screw  = ["M5_cs_cap","M5 cs cap",    hs_cs_cap,5,10.0, 0,    3.00,3.0
 M2_dome_screw    = ["M2_dome", "M2 dome",       hs_dome,  2, 3.5, 1.3,  0.6, 1.3, 16,  M2_washer, M2_nut,   M2_tap_radius,    M2_clearance_radius];
 M3_dome_screw    = ["M3_dome", "M3 dome",       hs_dome,  3, 5.7, 1.65, 1.04,2.0, 18,  M3_washer, M3_nut,   M3_tap_radius,    M3_clearance_radius];
 M4_dome_screw    = ["M4_dome", "M4 dome",       hs_dome,  4, 7.6, 2.2,  1.3, 2.5, 20,  M4_washer, M4_nut,   M4_tap_radius,    M4_clearance_radius];
+M5_dome_screw    = ["M5_dome", "M5 dome",       hs_dome,  5, 9.5, 2.75, 1.56,3.0, 22,  M5_washer, M5_nut,   M5_tap_radius,    M5_clearance_radius];
 
 M2p5_pan_screw   = ["M2p5_pan", "M2.5 pan",     hs_pan, 2.5, 4.7, 1.7,    0,   0, 0, M2p5_washer, M2p5_nut, M2p5_tap_radius,  M2p5_clearance_radius];
 M3_pan_screw     = ["M3_pan", "M3 pan",         hs_pan,   3, 5.4, 2.0,    0,   0, 0,   M3_washer, M3_nut,   M3_tap_radius,    M3_clearance_radius];
@@ -111,7 +112,7 @@ screw_lists = [
 [ M2_cap_screw,    M2p5_cap_screw, M3_cap_screw,    M4_cap_screw,    M5_cap_screw, M6_cap_screw, M8_cap_screw],
 [ 0,               0,              M3_low_cap_screw],
 [ M2_cs_cap_screw, 0,              M3_cs_cap_screw, M4_cs_cap_screw, M5_cs_cap_screw],
-[ M2_dome_screw,   0,              M3_dome_screw,   M4_dome_screw],
+[ M2_dome_screw,   0,              M3_dome_screw,   M4_dome_screw,   M5_dome_screw],
 [ 0,               0,              M3_hex_screw,    M4_hex_screw,    M5_hex_screw, M6_hex_screw, M8_hex_screw],
 [ 0,               M2p5_pan_screw, M3_pan_screw,    M4_pan_screw,    M5_pan_screw, M6_pan_screw, No632_pan_screw],
 [ No2_screw,       0,              No4_screw,       No6_screw,       No6_cs_screw],

vitamins/ssr.scad

@@ -71,15 +71,13 @@ use <nut.scad>
 use <washer.scad>
 
 module ssr_assembly(type, screw, thickness) { //! Assembly with fasteners in place
-    nut = screw_nut(screw);
-    washer = screw_washer(screw);
-    screw_length = screw_longer_than(2 * washer_thickness(washer) + thickness + ssr_base_t(type) + nut_thickness(nut, true));
+    screw_length = screw_length(screw, thickness + ssr_base_t(type), 2, nyloc = true);
 
     ssr(type);
 
     ssr_hole_positions(type) {
         translate_z(ssr_base_t(type))
-            nut_and_washer(nut, true);
+            nut_and_washer(screw_nut(screw), true);
 
         translate_z(-thickness)
             vflip()

vitamins/veroboard.scad

@@ -146,9 +146,8 @@ module vero_cutouts(type, angle = undef) vero_components(type, true, angle); //!
 module veroboard_assembly(type, height, thickness, flip = false) //! Draw the assembly with components and fasteners in place
 assembly(vero_assembly(type)) {
     screw = vero_screw(type);
-    washer = screw_washer(screw);
     nut = screw_nut(screw);
-    screw_length = screw_longer_than(height + thickness + vero_thickness(type) + 2 * washer_thickness(washer) + nut_thickness(nut, true));
+    screw_length = screw_length(screw, height + thickness + vero_thickness(type), 2, nyloc = true);
 
     translate_z(height) {
         veroboard(type);