Fixes for additional warnings in OpenSCAD 2020.09.12.ci5914

libtest.scad

@@ -117,17 +117,17 @@ cable_grommets_y = 0;
 translate([x5, cable_grommets_y])
     cable_grommets();
 
-translate([x5, cable_grommets_y + 50])
-    feet();
+translate([x5 + 80, cable_grommets_y])
+    ribbon_clamps();
 
-translate([x5, cable_grommets_y + 75])
+translate([x5, cable_grommets_y + 60])
     fixing_blocks();
 
-translate([x5, cable_grommets_y + 100])
+translate([x5, cable_grommets_y + 90])
     corner_blocks();
 
 translate([x5, cable_grommets_y + 150])
-    ribbon_clamps();
+    feet();
 
 translate([x5 + 70, cable_grommets_y + 150])
     screw_knobs();

printed/ribbon_clamp.scad

@@ -24,69 +24,72 @@ include <../core.scad>
 use <../vitamins/insert.scad>
 use <../vitamins/cable_strip.scad>
 
-wall = 2;
+wall = 1.6;
 min_wall = 2 * extrusion_width;
 screw = M3_cap_screw;
-insert = screw_insert(screw);
-screw_depth = insert_length(insert) + 1;
 
-function ribbon_clamp_hole_pitch(ways) = ribbon_clamp_slot(ways) + 2 * min_wall + 2 * corrected_radius(insert_hole_radius(insert)); //! Hole pitch
-function ribbon_clamp_width() = 2 * (insert_hole_radius(insert) + wall); //! Width
-function ribbon_clamp_length(ways) = ribbon_clamp_hole_pitch(ways) + ribbon_clamp_width(); //! Length given ways
-function ribbon_clamp_height() = screw_depth + 1; //! Height
+function ribbon_clamp_screw_depth(screw = screw) = insert_length(screw_insert(screw)) + 1;
+function ribbon_clamp_hole_pitch(ways, screw = screw) =
+    ribbon_clamp_slot(ways) + 2 * min_wall + 2 * corrected_radius(insert_hole_radius(screw_insert(screw))); //! Hole pitch
 
-module ribbon_clamp_hole_positions(ways, side = undef) //! Place children at hole positions
+function ribbon_clamp_width(screw = screw) = 2 * (insert_hole_radius(screw_insert(screw)) + wall); //! Width
+function ribbon_clamp_length(ways, screw = screw) = ribbon_clamp_hole_pitch(ways, screw) + ribbon_clamp_width(screw); //! Length given ways
+function ribbon_clamp_height(screw = screw) = ribbon_clamp_screw_depth(screw) + 1; //! Height
+
+module ribbon_clamp_hole_positions(ways, screw = screw, side = undef) //! Place children at hole positions
     for(x = is_undef(side) ? [-1, 1] : side)
-        translate([x * ribbon_clamp_hole_pitch(ways) / 2, 0])
+        translate([x * ribbon_clamp_hole_pitch(ways, screw) / 2, 0])
             children();
 
-module ribbon_clamp_holes(ways, h = 20) //! Drill screw holes
-    ribbon_clamp_hole_positions(ways)
+module ribbon_clamp_holes(ways, h = 20, screw = screw) //! Drill screw holes
+    ribbon_clamp_hole_positions(ways, screw)
         drill(screw_clearance_radius(screw), h);
 
-module ribbon_clamp(ways) { //! Generate STL for given number of ways
-    stl(str("ribbon_clamp_", ways));
+module ribbon_clamp(ways, screw = screw) { //! Generate STL for given number of ways
+    screw_d = screw_radius(screw) * 2;
+    stl(str("ribbon_clamp_", ways, screw_d != 3 ? str("_", screw_d) : ""));
 
-    pitch = ribbon_clamp_hole_pitch(ways);
-    d = ribbon_clamp_width();
-    h = ribbon_clamp_height();
-    t = h - ribbon_clamp_slot_depth() - wall;
+    pitch = ribbon_clamp_hole_pitch(ways, screw);
+    d = ribbon_clamp_width(screw);
+    h = ribbon_clamp_height(screw);
+    t = round_to_layer(ribbon_clamp_slot_depth() + wall);
+    insert = screw_insert(screw);
 
     difference() {
         union() {
             hull() {
                 translate_z(h - t / 2)
-                    cube([ribbon_clamp_hole_pitch(ways), d, t], center = true);
+                    cube([ribbon_clamp_hole_pitch(ways, screw), d, t], center = true);
 
                 translate_z(1)
                     cube([pitch, max(wall, d - 2 * (h - t)), 2], center = true);
             }
-            ribbon_clamp_hole_positions(ways, -1)
+            ribbon_clamp_hole_positions(ways, screw, -1)
                 cylinder(d = d, h = h);
 
-            ribbon_clamp_hole_positions(ways,  1)
+            ribbon_clamp_hole_positions(ways, screw, 1)
                 cylinder(d = d, h = h);
-
         }
 
         translate_z(h)
             cube([ribbon_clamp_slot(ways), d + 1, ribbon_clamp_slot_depth() * 2], center = true);
 
-        ribbon_clamp_hole_positions(ways)
+        ribbon_clamp_hole_positions(ways, screw)
             translate_z(h)
                 rotate(22.5)
-                    insert_hole(insert, screw_depth - insert_length(insert));
+                    insert_hole(insert, ribbon_clamp_screw_depth(screw) - insert_length(insert));
     }
 }
 
-module ribbon_clamp_assembly(ways) pose([55, 180, 25])  //! Printed part with inserts in place
-    assembly(str("ribbon_clamp_", ways)) {
-    h = ribbon_clamp_height();
+module ribbon_clamp_assembly(ways, screw) pose([55, 180, 25])  //! Printed part with inserts in place
+    assembly(let(screw_d = screw_radius(screw) * 2)str("ribbon_clamp_", ways, screw_d != 3 ? str("_", screw_d) : "")) {
+    h = ribbon_clamp_height(screw);
+    insert = screw_insert(screw);
 
     stl_colour(pp1_colour) render()
-        translate_z(h) vflip() ribbon_clamp(ways);
+        translate_z(h) vflip() ribbon_clamp(ways, screw);
 
-    ribbon_clamp_hole_positions(ways)
+    ribbon_clamp_hole_positions(ways, screw)
         vflip()
             insert(insert);
 }
@@ -99,20 +102,24 @@ 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 + screw_depth);
+    screw_length = screw_shorter_than(2 * washer_thickness(washer) + thickness + ribbon_clamp_screw_depth(screw));
 
-    ribbon_clamp_assembly(ways);
+    ribbon_clamp_assembly(ways, screw);
 
     color("red") translate_z(tape_thickness / 2)
         cube([tape_l, tape_width, tape_thickness], center = true);
 
-    ribbon_clamp_hole_positions(ways)
+    ribbon_clamp_hole_positions(ways, screw)
         vflip()
            translate_z(thickness)
                 screw_and_washer(screw, screw_length, true);
 }
 
 module ribbon_clamp_20_stl() ribbon_clamp(20);
+module ribbon_clamp_8_2_stl() ribbon_clamp(8, M2_dome_screw);
 
 //! * Place inserts into the holes and press home with a soldering iron with a conical bit heated to 200&deg;C.
 module ribbon_clamp_20_assembly() ribbon_clamp_assembly(20);
+
+//! * Place inserts into the holes and press home with a soldering iron with a conical bit heated to 200&deg;C.
+module ribbon_clamp_8_2_assembly() ribbon_clamp_assembly(8, M2_dome_screw);

readme.md

@@ -2010,6 +2010,8 @@ A permanent magnet that can be magnatized and de-magnatized electronically.
 | Function | Description |
 |:--- |:--- |
 | ```opengrab_depth()``` | Module height |
+| ```opengrab_pcb()``` | The PCB |
+| ```opengrab_pcb_z()``` | PCB offset from the front |
 | ```opengrab_target_thickness()``` | Target sheet thickness |
 | ```opengrab_width()``` | Module width |
 
@@ -2212,6 +2214,7 @@ PCBs and perfboard with optional components. The shape can be a rectangle with o
 |   1 | ```smd_resistor(RES0603, 1K)``` |  SMD resistor 0603 1K 0.1W |
 |   1 | ```smd_resistor(RES0805, 1K)``` |  SMD resistor 0805 1K 0.125W |
 |   1 | ```smd_resistor(RES1206, 1K)``` |  SMD resistor 1206 1K 0.25W |
+|   1 | ```square_button(button_4p5mm)``` |  Square button 4.5mm |
 |   1 | ```square_button(button_6mm)``` |  Square button 6mm |
 |   1 | ```pcb(TMC2130)``` |  TMC2130 |
 |   1 | ```green_terminal(gt_5p08, 2)``` |  Terminal block 2 way 0.2" |
@@ -2476,7 +2479,7 @@ Pin headers and sockets, etc.
 |:--- |:--- |
 | ```box_header(type, cols = 1, rows = 1, smt = false, cutout = false)``` | Draw box header |
 | ```idc_transition(type, cols = 5, skip = [], cutout = false)``` | Draw IDC transition header |
-| ```jst_xh_header(type, pin_count, right_angle=false, colour = false, pin_colour = false)``` | Draw JST XH connector |
+| ```jst_xh_header(type, pin_count, right_angle = false, colour = false, pin_colour = false)``` | Draw JST XH connector |
 | ```pin(type, length = undef)``` | Draw a header pin |
 | ```pin_header(type, cols = 1, rows = 1, smt = false, right_angle = false, cutout = false, colour)``` | Draw pin header |
 | ```pin_socket(type, cols = 1, rows = 1, right_angle = false, height = 0, smt = false, cutout = false, colour)``` | Draw pin socket |
@@ -4946,41 +4949,48 @@ Clamp for ribbon cable and polypropylene strip.
 ### Functions
 | Function | Description |
 |:--- |:--- |
-| ```ribbon_clamp_height()``` | Height |
-| ```ribbon_clamp_hole_pitch(ways)``` | Hole pitch |
-| ```ribbon_clamp_length(ways)``` | Length given ways |
-| ```ribbon_clamp_width()``` | Width |
+| ```ribbon_clamp_height(screw = screw)``` | Height |
+| ```ribbon_clamp_length(ways, screw = screw)``` | Length given ways |
+| ```ribbon_clamp_width(screw = screw)``` | Width |
 
 ### Modules
 | Module | Description |
 |:--- |:--- |
-| ```ribbon_clamp(ways)``` | Generate STL for given number of ways |
-| ```ribbon_clamp_assembly(ways)``` | Printed part with inserts in place |
+| ```ribbon_clamp(ways, screw = screw)``` | Generate STL for given number of ways |
+| ```ribbon_clamp_assembly(ways, screw)``` | Printed part with inserts in place |
 | ```ribbon_clamp_fastened_assembly(ways, thickness, screw = screw)``` | Clamp with fasteners in place |
-| ```ribbon_clamp_hole_positions(ways, side = undef)``` | Place children at hole positions |
-| ```ribbon_clamp_holes(ways, h = 20)``` | Drill screw holes |
+| ```ribbon_clamp_hole_positions(ways, screw = screw, side = undef)``` | Place children at hole positions |
+| ```ribbon_clamp_holes(ways, h = 20, screw = screw)``` | Drill screw holes |
 
 ![ribbon_clamp](tests/png/ribbon_clamp.png)
 
 ### Vitamins
 | Qty | Module call | BOM entry |
 | ---:|:--- |:---|
+|   2 | ```insert(F1BM2)``` |  Heatfit insert M2 |
 |   2 | ```insert(F1BM3)``` |  Heatfit insert M3 |
 |   1 |  |  Ribbon cable 20 way 100mm |
+|   1 |  |  Ribbon cable 8 way 100mm |
+|   2 | ```screw(M2_dome_screw, 8)``` |  Screw M2 dome x  8mm |
 |   2 | ```screw(M3_cap_screw, 10)``` |  Screw M3 cap x 10mm |
+|   1 |  |  Tape self amalgamating silicone 11 x 25mm |
 |   1 |  |  Tape self amalgamating silicone 26 x 25mm |
+|   2 | ```washer(M2_washer)``` |  Washer  M2 x 5mm x 0.3mm |
 |   2 | ```washer(M3_washer)``` |  Washer  M3 x 7mm x 0.5mm |
+|   2 | ```star_washer(M2_washer)``` |  Washer star M2 x 0.3mm |
 |   2 | ```star_washer(M3_washer)``` |  Washer star M3 x 0.5mm |
 
 ### Printed
 | Qty | Filename |
 | ---:|:--- |
 |   1 | ribbon_clamp_20.stl |
+|   1 | ribbon_clamp_8_2.stl |
 
 ### Assemblies
 | Qty | Name |
 | ---:|:--- |
 |   1 | ribbon_clamp_20_assembly |
+|   1 | ribbon_clamp_8_2_assembly |
 
 
 <a href="#top">Top</a>
@@ -5857,7 +5867,7 @@ The module provides `poly_circle()`, `poly_cylinder()` and `poly_ring()` that is
 |:--- |:--- |
 | ```drill(r, h = 100, center = true)``` | Make a cylinder for drilling holes suitable for CNC routing, set h = 0 for circle |
 | ```poly_circle(r, sides = 0)``` | Make a circle adjusted to print the correct size |
-| ```poly_cylinder(r, h, center = false, sides = 0)``` | Make a cylinder adjusted to print the correct size |
+| ```poly_cylinder(r, h, center = false, sides = 0, chamfer = false)``` | Make a cylinder adjusted to print the correct size |
 | ```poly_drill(r, h = 100, center = true)``` | Make a cylinder for drilling holes suitable for CNC routing if cnc_bit_r is non zero, otherwise a poly_cylinder. |
 | ```poly_ring(or, ir, sides = 0)``` | Make a 2D ring adjusted to have the correct internal radius |
 | ```poly_tube(or, ir, h, center = false)``` | Make a tube adjusted to have the correct internal radius |

tests/PCB.scad

@@ -121,7 +121,8 @@ test_pcb = ["TestPCB", "Test PCB",
         [ 70, 130, 180, "term35", 3, "lime"],
         [ 50, 150,   0, "transition", 5],
         [ 50, 160,   0, "block", 10, 5, 8, "orange"],
-        [ 50, 170,   0, "button_6mm"],
+        [ 45, 170,   0, "button_6mm"],
+        [ 55, 170,   0, "button_4p5mm"],
         [ 50, 185,   0, "microswitch", small_microswitch],
         [ 52, 200,   0, "pcb", 11, TMC2130 ],
         [ 80, 200,   0, "pdip", 24, "27C32", true, inch(0.6) ],

tests/foot.scad

@@ -21,14 +21,14 @@ use <../printed/foot.scad>
 
 module feet()
     if($preview) {
-        translate([50, 0])
+        translate([40, 0])
             foot_assembly(3);
 
         translate([foot_diameter(insert_foot()) / 2, 0])
             fastened_insert_foot_assembly(3);
     }
     else {
-        translate([50, 0])
+        translate([40, 0])
             foot();
 
         insert_foot();

tests/opengrab.scad

@@ -21,11 +21,11 @@ include <../utils/core/core.scad>
 use <../vitamins/opengrab.scad>
 
 module opengrab_test() {
-    opengrab_target();
-
     rotate(45)
-        translate_z(opengrab_target_thickness())
-            opengrab();
+        opengrab_target();
+
+    translate_z(opengrab_target_thickness())
+        opengrab();
 }
 
 if($preview)

tests/ribbon_clamp.scad

@@ -16,20 +16,22 @@
 // You should have received a copy of the GNU General Public License along with NopSCADlib.
 // If not, see <https://www.gnu.org/licenses/>.
 //
-include <../utils/core/core.scad>
+include <../core.scad>
 use <../printed/ribbon_clamp.scad>
 use <../vitamins/wire.scad>
 
-ways = 20;
+ways = [8, 20];
+screws = [M2_dome_screw, M3_cap_screw];
 
 module ribbon_clamps()
-    translate([ribbon_clamp_length(ways) / 2, 0])
-        if($preview) {
-            ribbon_clamp_fastened_assembly(ways, 3);
+    for(i = [0 : len(screws) - 1])
+        translate([ribbon_clamp_length(ways[i]) / 2, i * 30])
+            if($preview) {
+                ribbon_clamp_fastened_assembly(ways[i], 3, screws[i]);
 
-            ribbon_cable(ways, 100);
-        }
-        else
-            ribbon_clamp(ways);
+                ribbon_cable(ways[i], 100);
+            }
+            else
+                ribbon_clamp(ways[i], screws[i]);
 
 ribbon_clamps();

utils/core/polyholes.scad

@@ -32,10 +32,14 @@ module poly_circle(r, sides = 0) { //! Make a circle adjusted to print the corre
     circle(r = corrected_radius(r,n), $fn = n);
 }
 
-module poly_cylinder(r, h, center = false, sides = 0) //! Make a cylinder adjusted to print the correct size
+module poly_cylinder(r, h, center = false, sides = 0, chamfer = false) {//! Make a cylinder adjusted to print the correct size
     extrude_if(h, center)
         poly_circle(r, sides);
 
+    if(h && chamfer)
+        poly_cylinder(r + layer_height, center ? layer_height * 2 : layer_height, center, sides = sides ? sides : sides(r));
+}
+
 module poly_ring(or, ir, sides = 0) { //! Make a 2D ring adjusted to have the correct internal radius
     cir = corrected_radius(ir, sides);
     filaments = (or - cir) / extrusion_width;

vitamins/opengrab.scad

@@ -24,18 +24,27 @@
 //
 include <../utils/core/core.scad>
 use <../utils/thread.scad>
+use <pcb.scad>
+include <smds.scad>
 
 pitch = 33.8 / 2;
 width = 40;
 depth = 18;
 magnet = 4.3;
-pcb = 0.8;
 pillar = 6;
 target = 1;
 pole_w = 2;
 pole_l = 36;
 poles = 15;
 
+pcb = ["", "",        width, width, 0.8, 0, 3.5, 0, "darkgreen", false, [],
+    [     [ 3.45,   19,   0, "button_4p5mm"],
+          [ 2.75,   24.5, 0, "smd_led", LED0805, "green"],
+          [ 2.75,   28.0, 0, "smd_led", LED0805, "red"],
+          [ 28.5,   13,   0, "2p54header", 3, 1, false, undef, true],
+     ]];
+
+
 module opengrab_hole_positions()    //! Position children at the screw positions
     let($d = 3.2)
         for($x = [-pitch, pitch], $y = [-pitch, pitch])
@@ -48,9 +57,11 @@ module opengrab_side_hole_positions() //! Position children at the two 4mm hole
             translate([$x, 0])
                 children();
 
-function opengrab_width() = width;              //! Module width
-function opengrab_depth() = depth;              //! Module height
-function opengrab_target_thickness() = target;  //! Target sheet thickness
+function opengrab_width() = width;                               //! Module width
+function opengrab_depth() = depth;                               //! Module height
+function opengrab_target_thickness() = target;                   //! Target sheet thickness
+function opengrab_pcb() = pcb;                                   //! The PCB
+function opengrab_pcb_z() = depth - pillar - pcb_thickness(pcb); //! PCB offset from the front
 
 module opengrab() { //! Draw OpenGrab module
     vitamin("opengrab(): OpenGrab V3 electro permanent magnet");
@@ -67,10 +78,9 @@ module opengrab() { //! Draw OpenGrab module
                 cube([pole_w, pole_l, 1], center = true);
     }
 
-    color("darkgreen")
-        translate_z(depth - pillar - pcb / 2)
-            cube([width, width, pcb], center = true);
-
+    not_on_bom()
+        translate_z(opengrab_pcb_z())
+            pcb(pcb);
 
     translate_z(1)
         opengrab_hole_positions() {

vitamins/panel_meter.scad

@@ -77,7 +77,6 @@ module panel_meter(type) { //! Draw panel mounted LCD meter module
     tab_z = pmeter_tab_z(type);
     pcb = pmeter_pcb(type);
     ap2 = pmeter_inner_ap(type);
-    pcb_h = pmeter_pcb_h(type) - bezel.z;
     buttons = pmeter_buttons(type);
 
     color("#94A7AB")
@@ -146,15 +145,16 @@ module panel_meter(type) { //! Draw panel mounted LCD meter module
                     translate(pmeter_inner_ap_o(type))
                         square([ap2.x, ap2.y], center = true);
                 }
-    if(pcb)
+    if(pcb) {
         vflip()
             translate_z(h - pcb_thickness(pcb) - pmeter_pcb_z(type))
                 pcb(pcb);
 
-    if(pcb_h > 0)
-        %translate_z(-pcb_h / 2 - eps)
-            cube([size.x - 2 * t - eps, size.y - 2 * t - eps, pcb_h], center = true);
-
+        pcb_h = pmeter_pcb_h(type) - bezel.z;
+        if(pcb_h > 0)
+            %translate_z(-pcb_h / 2 - eps)
+                cube([size.x - 2 * t - eps, size.y - 2 * t - eps, pcb_h], center = true);
+    }
     if(buttons)
         for(b = buttons)
             panel_meter_button(b);

vitamins/panel_meters.scad

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

vitamins/pcb.scad

@@ -940,6 +940,7 @@ module pcb_component(comp, cutouts = false, angle = undef) { //! Draw pcb compon
         if(!cutouts) {
             // Components that don't have a cutout parameter go in this section
             if(show(comp, "button_6mm"))    square_button(button_6mm);
+            if(show(comp, "button_4p5mm"))  square_button(button_4p5mm);
             if(show(comp, "microswitch"))   translate_z(microswitch_thickness(comp[4])/2) microswitch(comp[4]);
             if(show(comp, "pcb"))           translate_z(comp[4]) pcb(comp[5]);
             if(show(comp, "standoff"))      standoff(comp[4], comp[5], comp[6], comp[7]);

vitamins/pin_header.scad

@@ -50,8 +50,17 @@ module pin_header(type, cols = 1, rows = 1, smt = false, right_angle = false, cu
     ra_offset = 2.4;
     width = pitch * rows;
 
-    if(cutout)
+    module cutout()
         dogbone_rectangle([cols * pitch + 2 * panel_clearance, rows * pitch + 2 * panel_clearance, 100], center = false);
+
+    if(cutout) {
+        if(right_angle)
+            translate_z(width / 2)
+                rotate([-90, 0, 180])
+                    cutout();
+        else
+            cutout();
+    }
     else {
         vitamin(str("pin_header(", type[0], ", ", cols, ", ", rows,
                     arg(smt, false, "smt"), arg(right_angle, false, "right_angle"), "): Pin header ", cols, " x ", rows, right_angle ? " right_angle" : ""));

vitamins/stepper_motor.scad

@@ -89,7 +89,7 @@ module NEMA(type, shaft_angle = 0) { //! Draw specified NEMA stepper motor
         tube(or = boss_rad, ir =  shaft_rad + 2, h = boss_height * 2); // raised boss
 
         linear_extrude(eps)
-            cap_shape(true);
+            cap_shape(1);
     }
 
     color(stepper_cap_colour)                                       // aluminium end caps