Merge branch 'martinbudden-BTT_SKR_MINI_E3_V2_0'

Prints a newline after test runs rather than before.

docs/usage.md

@@ -119,6 +119,16 @@ A more optimised approach for large projects is to include [NopSCADlib/core.scad
 That only has the a small set of utilities and the global settings in [global_defs.scad](../global_defs.scad) plus screws, nuts and washers that are required by a lot of other vitamins.
 Any other vitamins used need to be included explicitly. One can copy the includes or use a line from [NopSCADlib/lib.scad](../lib.scad).
 
+### Project Description
+
+A description of the project can be placed in comments in Markdown format before the first include file.
+By default this is followed by a picture of the main assembly unless the description contains any pictures.
+
+The description can be divided into two or three sections using //! ***, which is a Markdown horizontal rule in a comment.
+If there is a second section it is placed after the table of contents and a third section will be placed after the parts list.
+
+If an actual horizontal rule is desired the alternative Markdown markup //! --- can be used.
+
 ### Parametric parts.
 
 Modules that generate parts and assemblies need to take no parameters so that they can be called from the framework to make the STL files and assembly views, etc.
@@ -172,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();
 

gallery/readme.md

@@ -43,11 +43,11 @@ Bench power supply built around an ATX PSU.
 * The green LED shows the power good signal.
 * Dummy loads keep the outputs in range.
 
-
-
 ![](Lab_ATX_PSU.png)
 
 
+
+
 <a name="TOP"></a>
 ## Laser Load
 15kV dummy load for testing CO2 laser PSUs
@@ -77,11 +77,11 @@ Earth leakage can be measured Canadian CSA style by disconnected the neutral lin
 ## Mains Box
 Mains isolated and variable supply with metering.
 
-
-
 ![](Mains_Box.png)
 
 
+
+
 <a name="TOP"></a>
 ## SunBot
 A solar tracker to keep a solar panel pointing at the sun.
@@ -95,13 +95,15 @@ WiFi enabled remote control turntable for photography
 
 ![](Turntable.png)
 
+Was actually made from DiBond but shown made with carbon fibre here.
+
 
 <a name="TOP"></a>
 ## Variac
 Motorised variac with WiFi control, see [hydraraptor.blogspot.com/2018/04/esp8266-spi-spy](https://hydraraptor.blogspot.com/2018/04/esp8266-spi-spy.html)
 
-
-
 ![](Variac.png)
 
 
+
+

global_defs.scad

@@ -26,7 +26,7 @@
 //  Setting $bom after including lib overrides bom in the libs but not in the local file.
 //  Setting $_bom in the local file overrides it in the local file but not in the libs.
 //
-//function is_undef(x) = x == undef;
+rr_green = [0, 146/255, 0];                                               // RepRap logo colour
 
 $_bom           = is_undef($bom)             ? 0      : $bom;             // 0 no bom, 1 assemblies and stls, 2 vitamins as well
 $exploded       = is_undef($explode)         ? 0      : $explode;         // 1 for exploded view
@@ -34,7 +34,7 @@ layer_height    = is_undef($layer_height)    ? 0.25   : $layer_height;    // lay
 extrusion_width = is_undef($extrusion_width) ? 0.5    : $extrusion_width; // filament width when printing
 nozzle          = is_undef($nozzle)          ? 0.45   : $nozzle;          // 3D printer nozzle
 cnc_bit_r       = is_undef($cnc_bit_r)       ? 1.2    : $cnc_bit_r;       // minimum tool radius when milling 2D objects
-pp1_colour      = is_undef($pp1_colour)      ? [0, 146/255, 0] : $pp1_colour; // printed part colour 1, RepRap logo colour
+pp1_colour      = is_undef($pp1_colour)      ? rr_green : $pp1_colour;    // printed part colour 1, RepRap logo colour
 pp2_colour      = is_undef($pp2_colour)      ? "Crimson"  : $pp2_colour;  // printed part colour 2
 pp3_colour      = is_undef($pp3_colour)      ? "SteelBlue" : $pp3_colour; // printed part colour 3
 pp4_colour      = is_undef($pp4_colour)      ? "darkorange" : $pp4_colour;// printed part colour 4

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>

libtest.scad

@@ -118,6 +118,7 @@ use <tests/foot.scad>
 use <tests/handle.scad>
 use <tests/PCB_mount.scad>
 use <tests/printed_box.scad>
+use <tests/printed_pulleys.scad>
 use <tests/ribbon_clamp.scad>
 use <tests/screw_knob.scad>
 use <tests/socket_box.scad>
@@ -170,6 +171,9 @@ translate([x5, cable_grommets_y + 370])
 translate([x5 + 60, cable_grommets_y + 200])
     strap_handles();
 
+translate([640, cable_grommets_y + 200])
+    printed_pulley_test();
+
 translate([x5, cable_grommets_y + 250])
     handle();
 
@@ -351,7 +355,7 @@ modules_y = iecs_y + 60;
 ssrs_y = modules_y + 80;
 blowers_y = ssrs_y + 60;
 batteries_y = blowers_y + 100;
-steppers_y = batteries_y + 70;
+steppers_y = batteries_y + 55;
 panel_meters_y = steppers_y + 70;
 extrusions_y = panel_meters_y + 80;
 

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

@@ -251,7 +251,7 @@ module drag_chain_link(type, start = false, end = false, check_kids = true) { //
 }
 
 // Need to use a wrapper because can't define nested modules in an assembly
-module _drag_chain_assembly(type, pos = 0) {
+module _drag_chain_assembly(type, pos = 0, render = false) {
     s = drag_chain_size(type);
     x = (1 + exploded()) * s.x;
     r = drag_chain_radius(type) * x / s.x;
@@ -278,8 +278,11 @@ module _drag_chain_assembly(type, pos = 0) {
     module link(n)                                  // Position and colour link with origin at the hinge hole
         translate([-z / 2, 0, -z / 2]) {
             stl_colour(n < 0 || n == npoints - 1 ? pp3_colour : n % 2 ? pp1_colour : pp2_colour)
-                drag_chain_link(type, start = n == -1, end = n == npoints - 1, check_kids = false)
-                    let($fasteners = 0) children();
+                render_if(render)
+                    drag_chain_link(type, start = n == -1, end = n == npoints - 1, check_kids = false)
+                        let($fasteners = 0)
+                            children();
+
             let($fasteners = 1) children();
         }
 
@@ -307,15 +310,15 @@ module _drag_chain_assembly(type, pos = 0) {
 
 //! 1. Remove the support material from the links with side cutters.
 //! 1. Clip the links together with the special ones at the ends.
-module drag_chain_assembly(type, pos = 0)  //! Drag chain assembly
+module drag_chain_assembly(type, pos = 0, render = false)  //! Drag chain assembly
     assembly(str(drag_chain_name(type), "_drag_chain"), big = true)
         if($children == 2)
-            _drag_chain_assembly(type, pos) {
+            _drag_chain_assembly(type, pos, render) {
                 children(0);
                 children(1);
             }
         else if($children == 1)
-            _drag_chain_assembly(type, pos)
+            _drag_chain_assembly(type, pos, render)
                 children(0);
         else
-            _drag_chain_assembly(type, pos);
+            _drag_chain_assembly(type, pos, render);

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

@@ -0,0 +1,200 @@
+//
+// NopSCADlib Copyright Chris Palmer 2020
+// nop.head@gmail.com
+// hydraraptor.blogspot.com
+//
+// This file is part of NopSCADlib.
+//
+// NopSCADlib is free software: you can redistribute it and/or modify it under the terms of the
+// GNU General Public License as published by the Free Software Foundation, either version 3 of
+// the License, or (at your option) any later version.
+//
+// NopSCADlib is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+// without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+// See the GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License along with NopSCADlib.
+// If not, see <https://www.gnu.org/licenses/>.
+//
+//! Printed pulleys are a remix of droftarts's (see <https://www.thingiverse.com/droftarts/designs>) Parametric Pulleys
+//! on Thingiverse (see <https://www.thingiverse.com/thing:16627>) and are licensed under the
+//! Creative Commons - Attribution - Share Alike license (see <https://creativecommons.org/licenses/by-sa/3.0/>)
+//
+
+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]];
+
+function printed_pulley_inverted(type) = pulley_hub_dia(type) < pulley_flange_dia(type); //! Need to print upside down to prevent overhang
+
+function printed_pulley_od(tooth_count, tooth_pitch, pitch_line_offset)
+    = tooth_count * tooth_pitch / PI - 2 * pitch_line_offset;
+
+module printed_pulley_teeth_from_profile(tooth_count, tooth_depth, tooth_width, tooth_profile) {
+    pulley_od = printed_pulley_od(tooth_count, 2, 0.254);
+
+    difference() {
+        rotate (90 / tooth_count)
+            circle(r = pulley_od / 2, $fn = tooth_count * 4);
+        tooth_distance_from_centre = sqrt(pulley_od * pulley_od - (tooth_width + 0.2) * (tooth_width + 0.2)) / 2;
+        for(i = [1 : tooth_count])
+            rotate(i * 360 / tooth_count)
+                translate([0, -tooth_distance_from_centre])
+                    scale([(tooth_width + 0.2) / tooth_width, 1])
+                        polygon(tooth_profile);
+    }
+}
+
+module printed_pulley_GT2_teeth(type) {
+    tooth_count = pulley_teeth(type);
+    if (tooth_count == 0)
+        circle(r = pulley_od(type) / 2);
+    else
+        printed_pulley_teeth_from_profile(tooth_count, 0.764, 1.494, printed_pulley_GT2_profile);
+}
+
+
+module printed_pulley_teeth(type) { //! Draw the pulley's teeth
+    tooth_count = pulley_teeth(type);
+    tw = pulley_od(type) * PI / (tooth_count * 2);
+    ir = pulley_ir(type);
+    or = pulley_od(type) / 2;
+
+    T_angle = 40;
+    GT_r = 0.555;
+    for (i = [0 : 1 : tooth_count - 1])
+        rotate(i * 360 / tooth_count)
+            if (pulley_type(type)[0] == "G")
+                translate([0, ir + GT_r])
+                    hull() {
+                        circle(GT_r);
+                        translate([0, GT_r])
+                            square(2 * GT_r, center = true);
+                    }
+            else
+                translate([0, (ir + or) / 2])
+                    hull() {
+                        for(side = [-1, 1])
+                            translate([side * tw / 2, 0])
+                                rotate(-side * T_angle / 2)
+                                    square([eps, (or - ir)], center = true);
+
+                        translate([0, 1])
+                            square([tw, eps], center = true);
+                    }
+}
+
+module printed_pulley(type) { //! Draw a printable pulley
+    ft = pulley_flange_thickness(type);
+    hl = pulley_hub_length(type);
+    w = pulley_width(type);
+    r1 = pulley_bore(type) / 2;
+    or = pulley_od(type) / 2;
+    screw_z = pulley_screw_z(type);
+
+    stl(str("printed_pulley_", type[0]));
+
+    module core() {
+        translate_z(pulley_hub_length(type) + ft)
+            linear_extrude(w + 1) let($fa  = 1, $fs = 0.1)
+                if ("GT2" == str(pulley_type(type)[0], pulley_type(type)[1], pulley_type(type)[2]))
+                    difference() {
+                        printed_pulley_GT2_teeth(type);
+                        circle(d = pulley_bore(type));
+                    }
+                else
+                    difference() {
+                        circle(or);
+                        printed_pulley_teeth(type);
+                        circle(d = pulley_bore(type));
+                    }
+    }
+
+    module screw_holes() {
+        if(pulley_screws(type))
+            translate_z(screw_z)
+                for(i = [0 : pulley_screws(type) - 1])
+                    rotate([-90, 180, i * -90])
+                        if(show_supports())
+                            teardrop(r = screw_pilot_hole(pulley_screw(type)), h = pulley_flange_dia(type) / 2 + 1, center = false);
+                        else
+                            cylinder(r = screw_radius(pulley_screw(type)), h = pulley_flange_dia(type) / 2 + 1);
+    }
+
+    module hub()
+        linear_extrude(hl)
+            difference() {
+                circle(d= pulley_hub_dia(type));
+                circle(d = pulley_bore(type));
+            }
+
+    translate_z(printed_pulley_inverted(type) ? - hl : 0) {
+        // hub
+        if(hl)
+            translate_z(printed_pulley_inverted(type) ? hl + w + 2 * ft : 0)
+                if(screw_z && screw_z < hl)
+                    render()
+                        difference() {
+                            hub();
+
+                            screw_holes();
+                        }
+                else
+                    hub();
+
+        // bottom flange
+        translate_z(hl)
+            linear_extrude(ft)
+                difference() {
+                    circle(d = pulley_flange_dia(type));
+                    circle(d = pulley_bore(type));
+                }
+
+        // top flange
+        translate_z(hl + ft + w) {
+            // inner part, supported by core
+            linear_extrude(ft)
+                difference() {
+                    circle(r = or);
+                    circle(d = pulley_bore(type));
+                }
+            // outer part at 45 degrees for printing
+            rotate_extrude()
+                translate([or - eps, ft])
+                    vflip()
+                        right_triangle(ft, ft);
+        }
+
+        if(screw_z && screw_z > hl)
+            render()
+                difference() { // T5 pulleys have screws through the teeth
+                    core();
+
+                    translate_z(printed_pulley_inverted(type) ? pulley_height(type) + hl - 2 * screw_z : 0)
+                        screw_holes();
+                }
+            else
+                core();
+    }
+}
+
+module printed_pulley_assembly(type, colour = pp1_colour) //! Draw a printed pulley with its grub screws in place
+assembly(str("printed_pulley_", type[0])) {
+    translate_z(pulley_offset(type)) {
+        stl_colour(colour)
+            if(printed_pulley_inverted(type))
+                translate_z(pulley_height(type))
+                    hflip()
+                        printed_pulley(type);
+            else
+                printed_pulley(type);
+
+        if(pulley_screws(type))
+            translate_z(pulley_screw_z(type))
+                for(i = [0 : pulley_screws(type) - 1])
+                    rotate([-90, 0, i * -90])
+                        translate_z(pulley_bore(type) / 2 + pulley_screw_length(type))
+                            screw(pulley_screw(type), pulley_screw_length(type));
+    }
+}

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

scripts/blurb.py

@@ -39,8 +39,6 @@ def _scrape_blurb(lines):
         if b:
             break
         text += t
-    if len(text):
-        text += '\n'
     return text
 
 def scrape_blurb(scad_file):
@@ -49,6 +47,16 @@ def scrape_blurb(scad_file):
         lines = file.readlines()
     return _scrape_blurb(lines)
 
+def split_blurb(lines):
+    """ Split blurb on horizontal rules."""
+    blurbs = [""]
+    for line in lines.split('\n')[:-1]:
+        if re.match(r'\*{3,}',line):
+            blurbs.append("")
+        else:
+            blurbs[-1] += line + '\n'
+    return blurbs
+
 def scrape_module_blurb(lines):
     """ Find the Markup lines before the last function or module. """
     text = ""

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/doc_scripts.py

@@ -60,7 +60,8 @@ They should work with both Python 2 and Python 3.
                         break
                 if not blurb:
                     print("Missing description for", file)
-                print("| `%s` | %s |" % (file, blurb), file = doc_file)
+                else:
+                    print("| `%s` | %s |" % (file, blurb), file = doc_file)
 
     with open(dir + "/readme.html", "wt") as html_file:
         do_cmd(("python -m markdown -x tables " + doc_name).split(), html_file)

scripts/gallery.py

@@ -52,7 +52,7 @@ def gallery(force):
             if os.path.isfile(document):
                 with open(document, 'rt') as readme:
                     for line in readme.readlines():
-                        match = re.match(r"^.*!(\[.*\]\(.*\)).*$", line)
+                        match = re.search(r"!(\[.*\]\(.*\))", line)
                         if match:
                             image = match.group(0)
                             if image.startswith('![Main Assembly](assemblies/'):

scripts/openscad.py

@@ -18,14 +18,14 @@
 #
 
 #
-# Run openscad
+#! Run `openscad.exe` and capture `stdout` and `stderr` in `openscad.log` as well as printing to the console.
 #
 from __future__ import print_function
 
 import subprocess, sys
 
 def run_list(args, silent = False, verbose = False):
-    cmd = ["openscad.exe"] + args
+    cmd = ["openscad", "--hardwarnings"] + args
     if not silent:
         for arg in cmd:
             print(arg, end=" ")

scripts/readme.md

@@ -9,11 +9,10 @@ They should work with both Python 2 and Python 3.
 | `bom.py` | Generates BOM files for the project. |
 | `c14n_stl.py` | OpenSCAD produces randomly ordered STL files. This script re-orders them consistently so that GIT can tell if they have changed or not. |
 | `doc_scripts.py` | Makes this document and doc/usage.md. |
-| `dxf.py` |  |
-| `dxf2pdf.py` |  |
 | `dxfs.py` | Generates DXF files for all the routed parts listed on the BOM or a specified list. |
 | `gallery.py` | Finds projects and adds them to the gallery. |
 | `make_all.py` | Generates all the files for a project by running `bom.py`, `stls.py`, `dxfs.py`, `render.py` and `views.py`. |
+| `openscad.py` | Run `openscad.exe` and capture `stdout` and `stderr` in `openscad.log` as well as printing to the console. |
 | `panels.py` | Panelises DXF files so they can be routed together by running scad files found in the `panels` directory. |
 | `platters.py` | Generates build plates of STL files for efficient printing by running scad files found in the `platters` directory. |
 | `render.py` | Renders STL and DXF files to PNG for inclusion in the build instructions. |

scripts/tests.py

@@ -50,13 +50,16 @@ 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'
     with open(log_name, 'w') as output:
         do_cmd(("magick compare -metric AE -fuzz %d%% %s %s %s" % (fuzz, a, b, c)).split(), output = output)
     with open(log_name, 'r') as f:
-        pixels = int(f.read().strip())
+        pixels = int(float(f.read().strip()))
     os.remove(log_name)
     return pixels
 
@@ -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)

scripts/views.py

@@ -35,6 +35,7 @@ import json
 import blurb
 import bom
 import shutil
+import re
 from colorama import Fore
 
 def is_assembly(s):
@@ -217,12 +218,17 @@ def views(target, do_assemblies = None):
             if not main_file:
                 raise Exception("can't find source for main_assembly")
             text = blurb.scrape_blurb(source_dir + '/' + main_file)
+            blurbs = blurb.split_blurb(text)
             if len(text):
-                print(text, file = doc_file, end = '')
+                print(blurbs[0], file = doc_file)
             else:
                 if print_mode:
                     print(Fore.MAGENTA + "Missing project description" + Fore.WHITE)
-            print('![Main Assembly](assemblies/%s.png)\n' % flat_bom[-1]["name"].replace('_assembly', '_assembled'), file = doc_file)
+            #
+            # Only add the image if the first blurb section doesn't contain one.
+            #
+            if not re.search(r'\!\[.*\]\(.*\)', blurbs[0], re.MULTILINE):
+                print('![Main Assembly](assemblies/%s.png)\n' % flat_bom[-1]["name"].replace('_assembly', '_assembled'), file = doc_file)
             eop(print_mode, doc_file, first = True)
             #
             # Build TOC
@@ -234,6 +240,8 @@ def views(target, do_assemblies = None):
                 cap_name = titalise(name)
                 print('1. [%s](#%s)' % (cap_name, name), file = doc_file)
             print(file = doc_file)
+            if len(blurbs) > 1:
+                print(blurbs[1], file = doc_file)
             eop(print_mode, doc_file)
             #
             # Global BOM
@@ -283,6 +291,8 @@ def views(target, do_assemblies = None):
                     print("| %s | %s |" % (pad(grand_total, 2, 1), pad('Total %s count' % headings[t], 2)), file = doc_file)
 
             print(file = doc_file)
+            if len(blurbs) > 2:
+                print(blurbs[2], file = doc_file)
             eop(print_mode, doc_file)
             #
             # Assembly instructions

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

@@ -107,7 +107,7 @@ assembly("box1") {
                 screw_and_washer(foot_screw(foot), 6);
     }
 
-    translate_z(height + top_thickness + base_thickness + eps) vflip()
+    translate_z(height + top_thickness + base_thickness + 2 * eps) vflip()
          %render() box1_base_stl();
 }
 

tests/printed_pulleys.scad

@@ -0,0 +1,45 @@
+//
+// NopSCADlib Copyright Chris Palmer 2020
+// nop.head@gmail.com
+// hydraraptor.blogspot.com
+//
+// This file is part of NopSCADlib.
+//
+// NopSCADlib is free software: you can redistribute it and/or modify it under the terms of the
+// GNU General Public License as published by the Free Software Foundation, either version 3 of
+// the License, or (at your option) any later version.
+//
+// NopSCADlib is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+// without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+// See the GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License along with NopSCADlib.
+// If not, see <https://www.gnu.org/licenses/>.
+//
+
+include <../core.scad>
+include <../vitamins/pulleys.scad>
+include <../printed/printed_pulleys.scad>
+use <../utils/layout.scad>
+
+
+module printed_pulley_test(show_metal = false) {
+    layout([for (p = pulleys) pulley_flange_dia(p)]) let(p = pulleys[$i]) {
+        rotate(-145)
+            if($preview)
+                printed_pulley_assembly(p);
+            else
+                printed_pulley(p);
+
+        if(show_metal)
+            not_on_bom()
+                translate([0, 20])
+                    rotate(-145)
+                        pulley_assembly(p);
+    }
+}
+
+if($preview)
+    printed_pulley_test(true);
+else
+    printed_pulley_test();

tests/pulleys.scad

@@ -23,7 +23,7 @@ include <../vitamins/pulleys.scad>
 
 module pulleys()
     layout([for(p = pulleys) pulley_flange_dia(p)])
-        rotate(-45)
+        rotate(-145)
             pulley_assembly(pulleys[$i]);
 
 if($preview)

tests/screws.scad

@@ -52,7 +52,7 @@ module screws() {
                     screw(screw, length);
             }
         }
-        translate([80, 20])
+        translate([20, 40, -15])
             polysink_stl();
 }
 

tests/stepper_motors.scad

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

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/core/teardrops.scad

@@ -24,7 +24,7 @@
 //! Using teardrop_plus() or setting the plus option on other modules will elongate the teardrop vertically by the layer height, so when sliced the staircase tips
 //! do not intrude into the circle. See <https://hydraraptor.blogspot.com/2020/07/horiholes-2.html>
 //
-module teardrop(h, r, center = true, truncate = true, chamfer = 0, plus = false) { //! For making horizontal holes that don't need support material, set `truncate = false` to make traditional RepRap teardrops that don't even need bridging
+module teardrop(h, r, center = true, truncate = true, chamfer = 0, chamfer_both_ends = true, plus = false) { //! For making horizontal holes that don't need support material, set `truncate = false` to make traditional RepRap teardrops that don't even need bridging
     module teardrop_2d(r, truncate) {
         er = layer_height / 2 - eps;    // Extrustion edge radius
         R = plus ? r + er : r;          // Corrected radius
@@ -52,7 +52,7 @@ module teardrop(h, r, center = true, truncate = true, chamfer = 0, plus = false)
         extrude_if(h, center)
             teardrop_2d(r, truncate);
 
-    teardrop_chamfer(h, center, chamfer) {
+    teardrop_chamfer(h, center, chamfer, chamfer_both_ends) {
         linear_extrude(eps, center = true)
             teardrop_2d(r + chamfer / 2, truncate);
 
@@ -62,7 +62,7 @@ module teardrop(h, r, center = true, truncate = true, chamfer = 0, plus = false)
     }
 }
 
-module semi_teardrop(h, r, d = undef, center = true, chamfer = 0, plus = false) { //! A semi teardrop in the positive Y domain
+module semi_teardrop(h, r, d = undef, center = true, chamfer = 0, chamfer_both_ends = true, plus = false) { //! A semi teardrop in the positive Y domain
     module semi_teardrop_2d(r, d)
         intersection() {
             R = is_undef(d) ? r : d / 2;
@@ -77,7 +77,7 @@ module semi_teardrop(h, r, d = undef, center = true, chamfer = 0, plus = false)
         extrude_if(h, center)
             semi_teardrop_2d(r, d);
 
-    teardrop_chamfer(h, center, chamfer) {
+    teardrop_chamfer(h, center, chamfer, chamfer_both_ends) {
         linear_extrude(eps, center = true)
             semi_teardrop_2d(r + chamfer / 2, d);
 
@@ -87,10 +87,10 @@ module semi_teardrop(h, r, d = undef, center = true, chamfer = 0, plus = false)
     }
 }
 
-module teardrop_plus(h, r, center = true, truncate = true, chamfer = 0) //! Slightly elongated teardrop to allow for the 3D printing staircase effect
-    teardrop(h, r, center, truncate, chamfer, plus = true);
+module teardrop_plus(h, r, center = true, truncate = true, chamfer = 0, chamfer_both_ends = true) //! Slightly elongated teardrop to allow for the 3D printing staircase effect
+    teardrop(h, r, center, truncate, chamfer, chamfer_both_ends, plus = true);
 
-module tearslot(h, r, w, center = true, chamfer = 0, plus = false) { //! A horizontal slot that doesn't need support material
+module tearslot(h, r, w, center = true, chamfer = 0, chamfer_both_ends = true, plus = false) { //! A horizontal slot that doesn't need support material
     module tearslot_2d(r, w)
         hull()
             for(x = [-1, 1])
@@ -99,7 +99,7 @@ module tearslot(h, r, w, center = true, chamfer = 0, plus = false) { //! A horiz
     extrude_if(h, center)
         tearslot_2d(r, w);
 
-    teardrop_chamfer(h, center, chamfer) {
+    teardrop_chamfer(h, center, chamfer, chamfer_both_ends) {
         linear_extrude(eps, center = true)
             tearslot_2d(r + chamfer / 2, w);
 
@@ -109,7 +109,7 @@ module tearslot(h, r, w, center = true, chamfer = 0, plus = false) { //! A horiz
     }
 }
 
-module vertical_tearslot(h, r, l, center = true, chamfer = 0, plus = false) { //! A vertical slot that doesn't need support material
+module vertical_tearslot(h, r, l, center = true, chamfer = 0, chamfer_both_ends = true, plus = false) { //! A vertical slot that doesn't need support material
     module vertical_tearslot_2d(r, l)
         hull()
             for(y = [-1, 1])
@@ -119,7 +119,7 @@ module vertical_tearslot(h, r, l, center = true, chamfer = 0, plus = false) { //
     extrude_if(h, center)
         vertical_tearslot_2d(r, l);
 
-    teardrop_chamfer(h, center, chamfer) {
+    teardrop_chamfer(h, center, chamfer, chamfer_both_ends) {
         linear_extrude(eps, center = true)
             vertical_tearslot_2d(r + chamfer / 2, l);
 
@@ -129,10 +129,10 @@ module vertical_tearslot(h, r, l, center = true, chamfer = 0, plus = false) { //
     }
 }
 
-module teardrop_chamfer(h, center, chamfer) { //! Helper module for adding chamfer to a teardrop
+module teardrop_chamfer(h, center, chamfer, chamfer_both_ends) { //! Helper module for adding chamfer to a teardrop
     if(h && chamfer)
         translate_z(center ? 0 : h / 2)
-            for(m = [0, 1])
+            for(m = chamfer_both_ends ? [0, 1] : [1])
                 mirror([0, 0, m])
                     translate_z((h - eps ) / 2)
                         hull()

utils/rounded_polygon.scad

@@ -18,13 +18,14 @@
 //
 
 //
-//! Draw a polygon with rounded corners. Each element of the vector is the XY coordinate and a radius. Radius can be negative for a concave corner.
+//! Draw a polygon with rounded corners. Each element of the vector is the XY coordinate and a radius in clockwise order.
+//! Radius can be negative for a concave corner.
 //!
 //! Because the tangents need to be calculated to find the length these can be calculated separately and re-used when drawing to save calculating them twice.
 //
 include <../utils/core/core.scad>
 
-function circle_tangent(p1, p2) =
+function circle_tangent(p1, p2) = //! Compute the clockwise tangent between two circles represented as [x,y,r]
     let(
         r1 = p1[2],
         r2 = p2[2],
@@ -32,11 +33,8 @@ function circle_tangent(p1, p2) =
         dy = p2.y - p1.y,
         d = sqrt(dx * dx + dy * dy),
         theta = atan2(dy, dx) + acos((r1 - r2) / d),
-        xa = p1.x +(cos(theta) * r1),
-        ya = p1.y +(sin(theta) * r1),
-        xb = p2.x +(cos(theta) * r2),
-        yb = p2.y +(sin(theta) * r2)
-    )[ [xa, ya], [xb, yb] ];
+        v = [cos(theta), sin(theta)]
+    )[ p1 + r1 * v, p2 + r2 * v ];
 
 function rounded_polygon_tangents(points) = //! Compute the straight sections needed to draw and to compute the lengths
     let(len = len(points))

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

@@ -24,7 +24,7 @@
 //                                                   h                                                   h    s                                         t         t
 RB5015 = ["RB5015", "Blower Runda RB5015",           51.3, 51, 15, 31.5, M4_cap_screw, 26, [27.3, 25.4], 4.5, [[4.3, 45.4], [47.3,7.4]],     20,   14,  1.5, 1.3, 1.2, 15];
 PE4020 = ["PE4020", "Blower Pengda Technology 4020", 40,   40, 20, 27.5, M3_cap_screw, 22, [21.5, 20  ], 3.2, [[37,3],[3,37],[37,37]],       29.3, 17,  1.7, 1.2, 1.3, 13];
-BL40x10 =["BL40x10","Square radial 4010",            40,   40,9.5, 27,   M2_cap_screw, 16, [24,   20  ], 2.4, [[2,2],[38,2],[2,38],[38,38]], 30  , 9.5, 1.5, 1.5, 1.1, 1.5];
+BL40x10 =["BL40x10","Square radial fan 4010",        40,   40,9.5, 27,   M2_cap_screw, 16, [24,   20  ], 2.4, [[2,2],[38,2],[2,38],[38,38]], 30  , 9.5, 1.5, 1.5, 1.1, 1.5];
 
 blowers = [BL40x10, PE4020, RB5015];
 

vitamins/displays.scad

@@ -73,39 +73,54 @@ SSD1963_4p3 = ["SSD1963_4p3", "LCD display SSD1963 4.3\"", 105.5, 67.2, 3.4, SSD
         [[0, -34.5], [12, -31.5]],
         ];
 
+
+/* Dimensions taken from:
+https://github.com/bigtreetech/BIGTREETECH-TFT35-V3.0/blob/master/Hardware/TFT35%20V3.0-SIZE-TOP.pdf
+and
+https://github.com/bigtreetech/BIGTREETECH-TFT35-V3.0/blob/master/Hardware/TFT35%20V3.0-SIZE-BOT.pdf
+*/
+
 BigTreeTech_TFT35v3_0_PCB = ["", "",
-    110, 55.77, 1.6, 0, 3, 0, "green",  false,
-    [ [-3.12, 3.17], [-3.12, -3.17], [3.12, -3.17], [3.12, 3.17] ],
-    [
-        [  10, 7.5,    0, "-button_6mm" ],
-        [   9,  43,    0, "-buzzer", 5, 9 ],
-        [   9,  27,    0, "-potentiometer" ],
-        [ 102,28.82,   0, "uSD", [26.5, 16, 3] ],
-        [16.5, 5.9,    0, "2p54boxhdr", 5, 2 ],
-        [36.5, 5.9,    0, "2p54boxhdr", 5, 2 ],
-        [56.5, 5.9,    0, "2p54boxhdr", 5, 2 ],
-        [82.5,   4,    0, "jst_xh", 5 ],
-        [26.5, 52.8, 180, "jst_xh", 2 ],
-        [39.5, 52.8, 180, "jst_xh", 3 ],
-        [52.5, 52.8, 180, "jst_xh", 3 ],
-        [65.5, 52.8, 180, "jst_xh", 3 ],
-        [78.5, 52.8, 180, "jst_xh", 3 ],
-        [94.5, 52.8, 180, "jst_xh", 5 ],
-        [   8,  43,  180, "usb_A" ],
-        [  97,   4,    0, "chip", 9, 3.5, 1, grey(20) ],
-        // ESP-8266
-        [  23,  28,   90, "2p54socket", 4, 2 ],
+    110, 55.77, 1.6, // size
+     0, // corner radius
+     3, // mounting hole diameter
+     0, // pad around mounting hole
+    "green", // color
+    false, // true if parts should be separate BOM items
+    [ // hole positions
+         [-3.12, 3.17], [-3.12, -3.17], [3.12, -3.17], [3.12, 3.17]
     ],
-    []
+    [ // components
+        [                 9, -( 8.46 + 17.45)/2,    0, "-buzzer", 5, 9 ],
+        [                 9, -(23.76 + 34.94)/2,    0, "-potentiometer" ],
+        [  (6.84 + 12.85)/2, -(45.73 + 51.73)/2,    0, "-button_6mm" ],
+        [               102,  (15.57 + 42.07)/2,    0, "uSD", [26.5, 16, 3] ],
+        [                 8, -( 6.76 + 18.76)/2,  180, "usb_A" ],
+        [                23,  (23.32 + 33.64)/2,   90, "2p54socket", 4, 2 ], // ESP-8266
+
+        [ 16.5, 5.9,    0, "2p54boxhdr", 5, 2 ],
+        [ 36.5, 5.9,    0, "2p54boxhdr", 5, 2 ],
+        [ 56.5, 5.9,    0, "2p54boxhdr", 5, 2 ],
+        [ 82.5,   4,    0, "jst_xh", 5 ],
+        [ 26.5, 52.8, 180, "jst_xh", 2 ],
+        [ 39.5, 52.8, 180, "jst_xh", 3 ],
+        [ 52.5, 52.8, 180, "jst_xh", 3 ],
+        [ 65.5, 52.8, 180, "jst_xh", 3 ],
+        [ 78.5, 52.8, 180, "jst_xh", 3 ],
+        [ 94.5, 52.8, 180, "jst_xh", 5 ],
+        [ 97,    4,     0, "chip", 9, 3.5, 1, grey(20) ],
+    ],
+    [] // accessories
 ];
 
 BigTreeTech_TFT35v3_0 = ["BigTreeTech_TFT35v3_0", "BigTreeTech TFT35 v3.0",
-    84.5, 54.5, 4, BigTreeTech_TFT35v3_0_PCB,
-    [-6, 0, 0],                         // pcb offset
+    84.5, 54.5, 4,                      // size
+    BigTreeTech_TFT35v3_0_PCB,          // pcb
+    [7 - (110 - 84.5)/2, 0, 0],         // pcb offset from center
     [[-40, -26.5], [41.5, 26.5, 0.5]],  // aperture
-    [],                                 // touch screen
-    0,                                  // thread length
-    [],                                 // clearance need for the ts ribbon
+    [],                                 // touch screen position and size
+    0,                                  // length that studs protrude from the PCB holes
+    [],                                 // keep out region for ribbon cable
 ];
 
 

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

@@ -31,7 +31,9 @@ gt_2p54 = ["gt_2p54", 2.54,  6.6,   10, 3,    6, 0.4,  6.4, 1,    1,    0.2, 2,
 gt_3p5  = ["gt_3p5",  3.5,   7.3,  8.5, 4,    5, 0.4,  4,   0,    1.35, 0.4, 1.8, 2,   2,   0,   0,    0];
 gt_5p08 = ["gt_5p08", 5.08,  7.9,   10, 5.0,  7, 0.0,  6.8, 1.45, 1.95, 0.5, 4.0, 5.4, 0.5, 0,   0,    0];
 gt_6p35 = ["gt_6p35", 6.35, 12.6, 17.4, 6.8, 12, 0.4, 11,   2,    2.7,  0.8, 3.4, 4.2, 2,   1.8, 1.1, 21.4];
+gt_5x11 = ["gt_5x11",    5,    8,   11, 5,    7, 0.4,  7,   1.5,  1.5,  1,   2.5, 6,   0,   0,   0,    0];
+gt_5x17 = ["gt_5x17",    5,   10,   17, 5,   11, 0.4,  9,   2,    1.5,  1,   3,   6,   0,   0,   0,    0];
 
-green_terminals = [gt_2p54, gt_3p5, gt_5p08, gt_6p35];
+green_terminals = [gt_2p54, gt_3p5, gt_5p08, gt_6p35, gt_5x11, gt_5x17];
 
 use <green_terminal.scad>

vitamins/hygrometer.scad

@@ -34,15 +34,16 @@ hygrometer_hole_r = 21.3;
 slot_w = 5.5;
 
 module hygrometer_hole(h = 0) { //! Drill the hole for a hygrometer
-    round(cnc_bit_r) {
-        intersection() {
-            drill(hygrometer_hole_r, h);
+    extrude_if(h)
+        round(cnc_bit_r) {
+            intersection() {
+                drill(hygrometer_hole_r, 0);
 
-            rotate(30)
-                square([slot_w + 2 * cnc_bit_r, 100], center = true);
+                rotate(30)
+                    square([slot_w + 2 * cnc_bit_r, 100], center = true);
+            }
+            drill((od + 0.2) / 2, 0);
         }
-        drill((od + 0.2) / 2, h);
-    }
 }
 
 function hygrometer_or() = flange_d / 2; //! The outside radius of a hygrometer
@@ -54,13 +55,13 @@ module hygrometer() { //! Draw a hygrometer
         color(grey(30))
             rotate_extrude()
                 polygon([
-                    [0, 0],
-                    [aperture_d / 2, 0],
-                    [aperture_d / 2, flange_t],
-                    [flange_d2 / 2,   flange_t2],
-                    [flange_d / 2,    flange_t],
-                    [flange_d / 2,    0],
-                    [od / 2,          0],
+                    [0,                0],
+                    [aperture_d / 2,   0],
+                    [aperture_d / 2,   flange_t],
+                    [flange_d2 / 2,    flange_t2],
+                    [flange_d / 2,     flange_t],
+                    [flange_d / 2,     0],
+                    [od / 2,           0],
                     [od / 2,          -h],
                     [0,               -h]
                 ]);

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

@@ -194,12 +194,14 @@ module jhead_hot_end_assembly(type, filament, naked = false) { //! Assembly with
             if(exploded())
                 heater_components();
             else
-                intersection() {
-                    heater_components();
+                if(naked)                       // hide the wires when not exploded
+                    intersection() {
+                        heater_components();
 
-                    if(naked)
-                        color("grey") cylinder(r = 12, h = 100, center = true);
-                    else
-                        cube(1, true);             // hide the wires when not exploded
-                }
+                        color("grey")
+                            cylinder(r = 12, h = 100, center = true);
+                    }
+                else
+                    hidden()                    // hidden by the tape
+                        heater_components();
 }

vitamins/magnet.scad

@@ -33,7 +33,7 @@ module magnet(type) { //! Draw specified magnet
     h = magnet_h(type);
     r = magnet_r(type);
 
-    //vitamin(str("magnet(", type[0], "): Magnet ", od, "mm diameter, ", h, "mm high", id ? str(", ", id, "mm bore") : "" ));
+    vitamin(str("magnet(", type[0], "): Magnet ", od, "mm diameter, ", h, "mm high", id ? str(", ", id, "mm bore") : "" ));
 
     or = od / 2;
     ir = id / 2;

vitamins/magnets.scad

@@ -23,7 +23,7 @@
 //                          od,        id,        h,         r
 MAG8x4x4p2 = ["MAG8x4x4p2", 8,         4.2,       4,         0.5];
 MAG484     = ["MAG484",     inch(1/4), inch(1/8), inch(1/4), 0.5];
-MAG5x8     = ["MAG484",     8,         0,         5,         0.5];
+MAG5x8     = ["MAG5x8",     8,         0,         5,         0.5];
 
 magnets = [MAG8x4x4p2, MAG484, MAG5x8];
 

vitamins/microswitch.scad

@@ -41,6 +41,8 @@ function microswitch_button_clr(type)= type[14];    //! 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
 
+function microswitch_size(type) = [microswitch_length(type), microswitch_width(type), microswitch_thickness(type)]; //! Body size
+
 module microswitch_hole_positions(type) //! Place children at the hole positions
 {
     for(hole = microswitch_holes(type))

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]],
                                                                     [],
@@ -414,8 +631,35 @@ RAMPSEndstop = ["RAMPSEndstop", "RAMPS Endstop Switch",
     ],
     []];
 
+ESP_01 = [
+    "ESP-01", "ESP-01",
+    24.8, 14.6, 1, // size
+    0, // corner radius
+    0, // mounting hole diameter
+    0, // pad around mounting hole
+    grey(25), // color
+    false, // true if parts should be separate BOM items
+    [], // hole positions
+    [ // components
+        [   2.8,   -7.25, 0, "-2p54header", 2, 4 ],
+        [ -14.55, -11.3,  0, "chip", 5.25, 5.25, 2.25, grey(15) ],
+        [ -14,     -5.2,  0, "chip", 4.5,  4.75, 1.1,  grey(15) ],
+        // antenna
+        for (y = [ 2.8  : 2.3 : 7.4  ]) [ -0.7, -y,  0, "block", 0.7, 1.75, 0.1,  gold ],
+        for (y = [ 4    : 2.3 : 10.6 ]) [ -4.3, -y,  0, "block", 0.7, 1.75, 0.1,  gold ],
+        for (y = [ 3.4  : 2.3 : 10.1 ]) [ -2.5, -y,  0, "block", 4.3, 0.7,  0.1,  gold ],
+        for (y = [ 4.55 : 2.3 : 11.2 ]) [ -2.5, -y,  0, "block", 4.3, 0.7,  0.1,  gold ],
 
-pcbs = [MP1584EN, TP4056, MT3608, RAMPSEndstop, ExtruderPCB, PI_IO, ZC_A0591, RPI0, EnviroPlus, ArduinoUno3, ArduinoLeonardo, Keyes5p1, PSU12V1A, WD2002SJ, RPI3, RPI4, DuetE, Duex2, Duex5];
+        [ -0.7, -10.85,  0, "block", 0.7,3.75,  0.1,  gold ],
+        [ -6.6,  -5.8,   0, "block", 0.7, 7.5,  0.1,  gold ],
+        [ -4.8,  -2.3,   0, "block", 8.8, 0.7,  0.1,  gold ],
+    ],
+    [] // accessories
+];
+
+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

@@ -64,6 +64,7 @@ module pulley(type) { //! Draw a pulley
     hl = pulley_hub_length(type);
     w = pulley_width(type);
     r1 = pulley_bore(type) / 2;
+    screw_z = pulley_screw_z(type);
 
     or =  od / 2;
     ir =  pulley_ir(type);
@@ -100,33 +101,42 @@ module pulley(type) { //! Draw a pulley
                 }
     }
 
-    module screw_holes() {
-        if(pulley_screws(type))
-            translate_z(pulley_screw_z(type))
-                for(i = [0 : pulley_screws(type) - 1])
-                    rotate([-90, 0, i * -90])
-                        cylinder(r = screw_radius(pulley_screw(type)), h = 100);
-    }
+    module hub()
+        rotate_extrude() translate([r1, 0]) {
+            if(hl)
+                square([pulley_hub_dia(type) / 2 - r1,  hl]);
 
-    color("silver") {
-        render() difference() {
-            rotate_extrude() translate([r1, 0]) {
-                if(hl)
-                    square([pulley_hub_dia(type) / 2 - r1,  hl]);
-
-                for(z = [pulley_hub_length(type), hl + ft + w])
-                    translate([0, z])
-                        square([pulley_flange_dia(type) / 2 - r1, ft]);
-            }
-            if(pulley_screw_z(type) < hl)
-                screw_holes();
+            for(z = [pulley_hub_length(type), hl + ft + w])
+                translate([0, z])
+                    square([pulley_flange_dia(type) / 2 - r1, ft]);
         }
-        render() difference() { // T5 pulleys have screw through the teeth
+
+    module screw_holes()
+        translate_z(screw_z)
+            for(i = [0 : pulley_screws(type) - 1])
+                rotate([-90, 0, i * -90])
+                    cylinder(r = screw_radius(pulley_screw(type)), h = 100);
+
+    color(silver) {
+        if(screw_z && screw_z < hl)
+            render()
+                difference() {
+                    hub();
+
+                    screw_holes();
+                }
+        else
+            hub();
+
+        if(screw_z && screw_z > hl) // T5 pulleys have screw through the teeth
+            render()
+                difference() {
+                    core();
+
+                    screw_holes();
+                }
+        else
             core();
-
-            if(pulley_screw_z(type) > hl)
-                screw_holes();
-        }
     }
 }
 

vitamins/pulleys.scad

@@ -29,9 +29,10 @@ include <belts.scad>
 //
 T5x10_pulley         = ["T5x10_pulley",         "T5",    10, 15,    T5x6,  11.6, 7.9, 7,   5, 19.3, 1.7, 3, 10.7, M3_grub_screw, 1];
 T2p5x16_pulley       = ["T2p5x16_pulley",       "T2.5",  16, 12.16, T2p5x6,   8,  16, 5.7, 5, 16.0, 1.0, 6, 3.75, M4_grub_screw, 1];
-GT2x20um_pulley      = ["GT2x20um_pulley",      "GT2UM", 20, 12.22, GT2x6,  7.5,  18, 6.5, 5, 18.0, 1.0, 6, 3.75, M3_grub_screw, 2];
-GT2x20ob_pulley      = ["GT2x20ob_pulley",      "GT2OB", 20, 12.22, GT2x6,  7.5,  16, 5.5, 5, 16.0, 1.0, 6, 3.25, M3_grub_screw, 2];
-GT2x12_pulley        = ["GT2x12_pulley",        "GT2RD", 12,  7.15, GT2x6,  6.5,  12, 5.5, 4, 12.0, 1.0, 4, 3.0,  M3_grub_screw, 2];
+GT2x20um_pulley      = ["GT2x20um_pulley",      "GT2UM", 20, 12.22, GT2x6,  7.5,  18, 6.5, 5, 18.0, 1.0, 6, 3.75, M3_grub_screw, 2]; //Ultimaker
+GT2x20ob_pulley      = ["GT2x20ob_pulley",      "GT2OB", 20, 12.22, GT2x6,  7.5,  16, 5.5, 5, 16.0, 1.0, 6, 3.25, M3_grub_screw, 2]; //Openbuilds
+GT2x16_pulley        = ["GT2x16_pulley",        "GT2",   16,  9.75, GT2x6,  7.0,  13, 5,   5, 13.0, 1.0,4.5,3.0,  M3_grub_screw, 2];
+GT2x12_pulley        = ["GT2x12_pulley",        "GT2RD", 12,  7.15, GT2x6,  6.5,  12, 5.5, 4, 12.0, 1.0, 4, 3.0,  M3_grub_screw, 2]; //Robotdigg
 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];
@@ -42,6 +43,7 @@ pulleys = [T5x10_pulley,
            T2p5x16_pulley,
            GT2x20um_pulley,
            GT2x20ob_pulley,
+           GT2x16_pulley,
            GT2x12_pulley,
            GT2x20_toothed_idler,
            GT2x20_plain_idler,

vitamins/rail.scad

@@ -33,6 +33,9 @@ function rail_bore_depth(type) = type[7];   //! Counter bore depth
 function rail_screw(type)      = type[8];   //! Screw type
 function rail_carriage(type)   = type[9];   //! Carriage type
 function rail_end_screw(type)  = type[10];  //! Screw used for ends only (Countersink used for better location)
+function rail_groove_offset(type)=type[11]; //! Offset of centre of groove from top of rail
+function rail_groove_width(type)=type[12];  //! Groove width
+
 function rail_screw_height(type, screw) = rail_height(type) - rail_bore_depth(type) + screw_head_depth(screw, rail_hole(type)); //! Position screw taking into account countersink into counterbored hole
 function rail_travel(type, length) = length - carriage_length(rail_carriage(type)); //! How far the carriage can travel
 
@@ -53,7 +56,7 @@ function rail_holes(type, length) = //! Number of holes in a rail given its `len
 module rail_hole_positions(type, length, first = 0, screws = 100, both_ends = true) { //! Position children over screw holes
     pitch = rail_pitch(type);
     holes = rail_holes(type, length);
-    last = first + screws;
+    last = first + min(screws, both_ends ? ceil(holes / 2) : holes);
     for(i = [first : holes - 1], j = holes - 1 - i)
         if(i < last || both_ends && (j >= first && j < last))
             translate([i * pitch - length / 2 + (length - (holes - 1) * pitch) / 2, 0])
@@ -134,43 +137,45 @@ module carriage(type, rail, end_colour = grey(20), wiper_colour = grey(20)) { //
             carriage_end(type, end_w, end_h, end_l);
 }
 
-module rail(type, length) { //! Draw the specified rail
+module rail(type, length, colour = grey(90), use_polycircles = false) { //! Draw the specified rail
     width = rail_width(type);
     height = rail_height(type);
 
     vitamin(str("rail(", type[0], ", ", length, "): Linear rail ", type[0], " x ", length, "mm"));
 
-    color(grey(90)) {
+    color(colour) {
+        rbr = rail_bore(type) / 2;
+        w = corrected_radius(rbr) * 2 + 2 * eps; // width of core big enough for the holes
         linear_extrude(height - rail_bore_depth(type)) difference() {
-            square([length, width], center = true);
+            square([length, w], center = true);
+
             rail_hole_positions(type, length)
-                 circle(d = rail_hole(type));
+                if (use_polycircles)
+                    poly_circle(rail_hole(type) / 2);
+                else
+                    circle(d = rail_hole(type));
         }
+        translate_z(rail_height(type) - rail_bore_depth(type))
+            linear_extrude(rail_bore_depth(type)) difference() {
+                square([length, w], center = true);
 
-        translate_z(rail_height(type) - rail_bore_depth(type)) {
-            h1 = rail_bore_depth(type) > 2 ? rail_bore_depth(type) / 3 : rail_bore_depth(type) / 2;
-            h0 = rail_bore_depth(type) > 2 ? (rail_bore_depth(type) - h1) / 2 : 0;
-            h2 = rail_bore_depth(type) - h1 - h0;
-
-            linear_extrude(h0) difference() {
-                square([length, width], center = true);
                 rail_hole_positions(type, length)
-                     circle(d = rail_bore(type));
+                    if (use_polycircles)
+                        poly_circle(rbr);
+                    else
+                        circle(rbr);
             }
-            translate_z(h0)
-                linear_extrude(h1) difference() {
-                    w1 = max(width - 2, rail_bore(type));
-                    square([length, w1], center = true);
-                    rail_hole_positions(type, length)
-                        circle(d = rail_bore(type));
-                }
-            translate_z(h0 + h1)
-                linear_extrude(h2) difference() {
-                    square([length, width], center = true);
-                    rail_hole_positions(type, length)
-                        circle(d = rail_bore(type));
-                }
-        }
+
+        go = height - rail_groove_offset(type);
+        gw = rail_groove_width(type);
+        gd = gw / 2;
+        sw = (width - w) / 2;
+        for (m = [0, 1])
+            mirror([0, m, 0])
+                translate([0, -width / 2])
+                    rotate([0, -90, 0])
+                        linear_extrude(length, center = true)
+                            polygon([ [0, 0], [0, sw], [height, sw], [height, 0], [go + gw/2, 0], [go, gd], [go - gw/2, 0] ]);
     }
 }
 
@@ -181,19 +186,19 @@ module rail_assembly(type, length, pos, carriage_end_colour = grey(20), carriage
         carriage(rail_carriage(type), type,  carriage_end_colour, carriage_wiper_colour);
 }
 
-module rail_screws(type, length, thickness, screws = 100) { //! Place screws in the rail
+module rail_screws(type, length, thickness, screws = 100, index_screws = undef) { //! Place screws in the rail
     screw = rail_screw(type);
     end_screw = rail_end_screw(type);
     screw_len = screw_longer_than(rail_screw_height(type, screw) + thickness);
     end_screw_len = screw_longer_than(rail_screw_height(type, end_screw) + thickness);
 
-    index_screws = screws > 2 ? 1 : 2;
+    index_screws = is_undef(index_screws) ? screws > 2 ? 1 : 2 : index_screws;
 
     translate_z(rail_screw_height(type, end_screw))
         rail_hole_positions(type, length, 0, index_screws)
             screw(end_screw, end_screw_len);
 
     translate_z(rail_screw_height(type, screw))
-        rail_hole_positions(type, length, index_screws, min(screws, rail_holes(type, length)) - 2 * index_screws)
+        rail_hole_positions(type, length, index_screws, screws - index_screws)
             screw(screw, screw_len);
 }

vitamins/rails.scad

@@ -32,14 +32,14 @@ SSR15_carriage = [ 40.3, 23.3, 34, 24, 4.5, 0,  26, M4_cap_screw ];
 // Rails
 //
 //
-//                Wr  Hr   E    P   D    d    h
-MGN5 = [ "MGN5",  5,  3.6, 5,   15, 3.6, 2.4, 0.8, M2_cs_cap_screw, MGN5_carriage, M2_cs_cap_screw ]; // Screw holes too small for M2 heads
-MGN7 = [ "MGN7",  7,  5,   5,   15, 4.3, 2.4, 2.6, M2_cap_screw,    MGN7_carriage, M2_cs_cap_screw ];
-MGN9 = [ "MGN9",  9,  6,   7.5, 20, 6.0, 3.5, 3.5, M3_cap_screw,    MGN9_carriage, M3_cs_cap_screw ];
-MGN12= [ "MGN12", 12, 8,   10,  25, 6.0, 3.5, 4.5, M3_cap_screw,   MGN12_carriage, M3_cs_cap_screw ];
-MGN12H=[ "MGN12H",12, 8,   10,  25, 6.0, 3.5, 4.5, M3_cap_screw,   MGN12H_carriage,M3_cs_cap_screw ];
-MGN15= [ "MGN15", 15, 10,  10,  40, 6.0, 3.5, 5.0, M3_cap_screw,   MGN15_carriage, M3_cs_cap_screw ];
-SSR15= [ "SSR15", 15, 12.5,10,  60, 7.5, 4.5, 5.3, M4_cap_screw,   SSR15_carriage, M4_cs_cap_screw ];
+//                Wr  Hr   E    P   D    d    h                                                      go    gw
+MGN5 = [ "MGN5",  5,  3.6, 5,   15, 3.6, 2.4, 0.8, M2_cs_cap_screw, MGN5_carriage, M2_cs_cap_screw,  1,    1 ]; // Screw holes too small for M2 heads
+MGN7 = [ "MGN7",  7,  5,   5,   15, 4.3, 2.4, 2.6, M2_cap_screw,    MGN7_carriage, M2_cs_cap_screw,  1.5,  1.5 ];
+MGN9 = [ "MGN9",  9,  6,   7.5, 20, 6.0, 3.5, 3.5, M3_cap_screw,    MGN9_carriage, M3_cs_cap_screw,  1.5,  1.5 ];
+MGN12= [ "MGN12", 12, 8,   10,  25, 6.0, 3.5, 4.5, M3_cap_screw,   MGN12_carriage, M3_cs_cap_screw,  2.25, 2.75 ];
+MGN12H=[ "MGN12H",12, 8,   10,  25, 6.0, 3.5, 4.5, M3_cap_screw,   MGN12H_carriage,M3_cs_cap_screw,  2.25, 2.75];
+MGN15= [ "MGN15", 15, 10,  10,  40, 6.0, 3.5, 5.0, M3_cap_screw,   MGN15_carriage, M3_cs_cap_screw,  2.5,  2.75 ];
+SSR15= [ "SSR15", 15, 12.5,10,  60, 7.5, 4.5, 5.3, M4_cap_screw,   SSR15_carriage, M4_cs_cap_screw,  2.5,  2.75 ];
 
 rails = [MGN5, MGN7, MGN9, MGN12, MGN12H, MGN15, SSR15];
 

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

@@ -36,6 +36,8 @@ function rocker_bezel(type)    = type[10];  //! Bezel width
 function rocker_pivot(type)    = type[11];  //! Pivot distance from the back of the flange
 function rocker_button(type)   = type[12];  //! How far the button extends from the bezel
 function rocker_spades(type)   = type[13];  //! Spade types and positions
+function rocker_size(type)     = [rocker_width(type), rocker_height(type), rocker_depth(type)]; //! Width, height, and depth in a vector
+function rocker_slot(type)     = [rocker_slot_w(type), rocker_slot_h(type)]; //! Rocker slot in a vector
 
 module rocker(type, colour) { //! Draw the specified rocker switch
     vitamin(str("rocker(", type[0], "): ", rocker_part(type)));
@@ -87,6 +89,6 @@ module rocker(type, colour) { //! Draw the specified rocker switch
     }
 }
 
-module rocker_hole(type, h = 0) //! Make a hole to accept a rocker switch, by default 2D, set h for 3D
+module rocker_hole(type, h = 0, rounded = true) //! Make a hole to accept a rocker switch, by default 2D, set h for 3D
     extrude_if(h)
-        rounded_square([rocker_slot_w(type), rocker_slot_h(type)], 1, center = true);
+        rounded_square([rocker_slot_w(type), rocker_slot_h(type)], rounded ? 1 : 0, center = true);

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)
@@ -262,7 +270,7 @@ module screw_countersink(type, drilled = true) { //! Countersink shape
             if(drilled)
                 cylinder(h = head_height + eps, r1 = 0, r2 = head_rad + head_t);
             else
-                intersection() {
+                render() intersection() {
                     cylinder(h = head_height + eps, r1 = 0, r2 = head_rad + head_t);
 
                     cylinder(h = head_height + eps, r = head_rad + eps);
@@ -295,8 +303,10 @@ module screw_polysink(type, h = 100, alt = false) { //! A countersink hole made
                         poly_cylinder(r = r, h = lh, center = false);
                 }
 
-            translate_z(layers * layer_height)
-                poly_cylinder(r = rmin, h = h / 2 - layers * layer_height, center = false);
+            remainder = h / 2 - layers * layer_height;
+            if(remainder > 0)
+                translate_z(layers * layer_height)
+                    poly_cylinder(r = rmin, h = remainder, center = false);
         }
 }