Added SMT resistors and 0603 LED.

Done to reduced the number of global constants.

global_defs.scad

@@ -52,14 +52,7 @@ $fs = extrusion_width / 2;
 
 function round_to_layer(z) = ceil(z / layer_height) * layer_height;
 // Some additional named colours
-grey20                          = [0.2, 0.2, 0.2];
-grey30                          = [0.3, 0.3, 0.3];
-grey40                          = [0.4, 0.4, 0.4];
-grey50                          = [0.5, 0.5, 0.5];
-grey60                          = [0.6, 0.6, 0.6];
-grey70                          = [0.7, 0.7, 0.7];
-grey80                          = [0.8, 0.8, 0.8];
-grey90                          = [0.9, 0.9, 0.9];
+function grey(n) = [0.01, 0.01, 0.01] * n;                                          //! Generate a shade of grey to pass to color().
 gold                            = [255/255, 215/255, 0/255];
 brass                           = [255/255, 220/255, 100/255];
 silver                          = [0.75, 0.75, 0.75];

printed/box.scad

@@ -31,29 +31,29 @@
 //!
 //! Normally the side sheets are the same type but they can be overridden individually as long as the substitute has the same thickness.
 //
-include <../utils/core/core.scad>
+include <../core.scad>
 use <../vitamins/sheet.scad>
-use <../vitamins/screw.scad>
-use <../vitamins/washer.scad>
 use <../vitamins/insert.scad>
 use <../utils/quadrant.scad>
+use <../utils/round.scad>
 
 bezel_clearance = 0.2;
 sheet_end_clearance = 1;
 sheet_slot_clearance = 0.2;
 
-function box_screw(type)     = type[0]; //! Screw type to be used at the corners
-function box_wall(type)      = type[1]; //! Wall thickness of 3D parts
-function box_sheets(type)    = type[2]; //! Sheet type used for the sides
-function box_top_sheet(type) = type[3]; //! Sheet type for the top
-function box_base_sheet(type)= type[4]; //! Sheet type for the bottom
-function box_feet(type)      = type[5]; //! True to enable feet on the bottom bezel
-function box_width(type)     = type[6]; //! Internal width
-function box_depth(type)     = type[7]; //! Internal depth
-function box_height(type)    = type[8]; //! Internal height
+function box_screw(type)       = type[0]; //! Screw type to be used at the corners
+function box_shelf_screw(type) = type[1]; //! Screw type to hold a shelf
+function box_wall(type)        = type[2]; //! Wall thickness of 3D parts
+function box_sheets(type)      = type[3]; //! Sheet type used for the sides
+function box_top_sheet(type)   = type[4]; //! Sheet type for the top
+function box_base_sheet(type)  = type[5]; //! Sheet type for the bottom
+function box_feet(type)        = type[6]; //! True to enable feet on the bottom bezel
+function box_width(type)       = type[7]; //! Internal width
+function box_depth(type)       = type[8]; //! Internal depth
+function box_height(type)      = type[9]; //! Internal height
 
-function box(screw, wall, sheets, top_sheet, base_sheet, size, feet = false) = //! Construct a property list for a box.
- concat([screw, wall, sheets, top_sheet, base_sheet, feet], size);
+function box(screw, wall, sheets, top_sheet, base_sheet, size, feet = false, shelf_screw = M3_dome_screw) = //! Construct a property list for a box.
+ concat([screw, shelf_screw, wall, sheets, top_sheet, base_sheet, feet], size);
 
 function box_bezel_clearance(type) = bezel_clearance;
 
@@ -62,6 +62,7 @@ function box_profile_overlap(type) = 3 + sheet_end_clearance / 2;
 
 function box_washer(type) = screw_washer(box_screw(type));
 function box_insert(type) = screw_insert(box_screw(type));
+function box_shelf_insert(type) = screw_insert(box_shelf_screw(type));
 
 function box_hole_inset(type) = washer_radius(box_washer(type)) + 1;
 function box_insert_r(type) = insert_hole_radius(box_insert(type));
@@ -90,23 +91,32 @@ function box_bezel_height(type, bottom) = //! Bezel height for top or bottom
 
 grill_hole = 5;
 grill_gap = 1.9;
-module grill(width, height, r = 1000, poly = false, h = 0) { //! A staggered array of 5mm holes to make grills in sheets. Can be constrained to be circular. Set ```poly``` ```true``` for printing, ```false``` for milling.
+
+function box_grill_hole_r() = grill_hole / 2;
+
+module grill_hole_positions(width, height, r = 1000) {
     nx = floor(width / (grill_hole + grill_gap));
     xpitch = width / nx;
     ny = floor(height / ((grill_hole + grill_gap) * cos(30)));
     ypitch = height / ny;
 
+    for(y = [0 : ny - 1], x = [0 : nx - 1 - (y % 2)]) {
+        $x = -width / 2 + (x + 0.5 + (y % 2) / 2) * xpitch;
+        $y = -height / 2 + (y + 0.5) * ypitch;
+        if(sqrt(sqr($x) + sqr($y)) + grill_hole / 2 <= r)
+            translate([$x, $y])
+                children();
+    }
+}
+
+module grill(width, height, r = 1000, poly = false, h = 0) { //! A staggered array of 5mm holes to make grills in sheets. Can be constrained to be circular. Set ```poly``` ```true``` for printing, ```false``` for milling.
     extrude_if(h)
-        for(y = [0 : ny - 1], x = [0 : nx - 1 - (y % 2)]) {
-            x = -width / 2 + (x + 0.5 + (y % 2) / 2) * xpitch;
-            y = -height / 2 + (y + 0.5) * ypitch;
-            if(sqrt(sqr(x) + sqr(y)) + grill_hole / 2 <= r)
-                translate([x, y])
-                    if(poly)
-                        poly_circle(r = grill_hole / 2);
-                    else
-                        circle(d = grill_hole);
-        }
+        if(poly)
+            grill_hole_positions(width, height, r)
+                poly_circle(r = grill_hole / 2);
+        else
+            grill_hole_positions(width, height, r)
+                circle(d = grill_hole);
 }
 
 module box_corner_profile_2D(type) { //! The 2D shape of the corner profile.
@@ -178,6 +188,15 @@ module box_corner_profile_section(type, section, sections) { //! Generates inter
     }
 }
 
+module box_corner_profile_sections(type, section, sections) { //! Generate four copies of a corner profile section
+    stl("box_corner_profile");
+    offset = box_boss_r(type) + 1;
+    for(i = [0 : 3])
+        rotate(i * 90)
+            translate([offset, offset])
+                box_corner_profile_section(type, section, sections);
+}
+
 module box_corner_quadrants(type, width, depth)
     for(corner = [0:3]) {
         x = [-1,1,1,-1][corner];
@@ -261,10 +280,11 @@ dowel_length = 20;
 dowel_wall = extrusion_width * 3;
 dowel_h_wall = layer_height * 6;
 
-
 module box_bezel_section(type, bottom, rows, cols, x, y) { //! Generates interlocking sections of the bezel to allow it to be bigger than the printer
-    w = (box_width(type) + 2 * box_outset(type)) / cols;
-    h = (box_depth(type) + 2 * box_outset(type)) / rows;
+    tw = box_width(type) + 2 * box_outset(type);
+    w = tw / cols;
+    th = box_depth(type) + 2 * box_outset(type);
+    h = th / rows;
     bw = box_outset(type) - bezel_clearance / 2;
     bw2 = box_outset(type) + box_inset(type);
 
@@ -339,7 +359,7 @@ module box_bezel_section(type, bottom, rows, cols, x, y) { //! Generates interlo
         render() difference() {
             union() {
                 clip(xmin = 0, xmax = w, ymin = 0, ymax = h)
-                    translate([box_width(type) / 2 + box_outset(type) - x * w, box_depth(type) / 2 + box_outset(type) - y * h, box_profile_overlap(type)])
+                    translate([tw / 2 - x * w, th / 2 - y * h, box_profile_overlap(type)])
                         box_bezel(type, bottom);
 
                 if(x < cols - 1 && y == 0)
@@ -399,7 +419,6 @@ module box_bezel_section(type, bottom, rows, cols, x, y) { //! Generates interlo
     }
 }
 
-
 module box_screw_hole_positions(type)
     for(x = [-1, 1], y = [-1, 1])
         translate([x * (box_width(type) / 2 - box_hole_inset(type)), y * (box_depth(type) / 2 - box_hole_inset(type))])
@@ -442,6 +461,96 @@ module box_shelf_blank(type, sheet = false) { //! Generates a 2D template for a
     }
 }
 
+module box_shelf_screw_positions(type, screw_positions, thickness = 0, wall = undef) { //! Place children at the shelf screw positions
+    w = is_undef(wall) ? box_wall(type) : wall;
+    insert = box_shelf_insert(type);
+    translate_z(-insert_boss_radius(insert, w))
+        for(p = screw_positions)
+            multmatrix(p)
+                translate_z(thickness)
+                    children();
+}
+
+module box_shelf_bracket(type, screw_positions, wall = undef) { //! Generates a shelf bracket, the first optional child is a 2D cutout and the second 3D cutouts
+    stl("shelf_bracket");
+    w = is_undef(wall) ? box_wall(type) : wall;
+    insert = box_shelf_insert(type);
+    lip = 2 * insert_boss_radius(insert, w);
+    width = insert_length(insert) + w;
+
+    module shape()
+        difference() {
+            square([box_width(type), box_depth(type)], center = true);
+
+            offset(bezel_clearance / 2)
+                box_corner_quadrants(type, box_width(type), box_depth(type));
+
+            if($children)
+                hflip()
+                    children();
+        }
+
+    module boss()
+        translate_z(-width + eps)
+            linear_extrude(width - 2 * eps)
+                hull() {
+                    circle4n(r = lip / 2 - eps);
+
+                    translate([-lip / 2, -lip / 2 + eps])
+                        square([lip, eps]);
+                }
+
+    difference() {
+        union() {
+            linear_extrude(w)
+                difference() {
+                    shape()
+                        if($children)
+                            children(0);
+
+                    round(2) offset(-width)
+                        shape()
+                            if($children)
+                                children(0);
+                }
+
+            linear_extrude(lip)
+                difference() {
+                    shape()
+                        if($children)
+                            children(0);
+
+                    offset(-w)
+                        shape()
+                            if($children)
+                                children(0);
+                }
+
+            hflip()
+                box_shelf_screw_positions(type, screw_positions, 0, w)
+                    boss();
+        }
+        if($children > 1)
+            hflip()
+                children(1);
+
+        hflip()
+            box_shelf_screw_positions(type, screw_positions, 0, w)
+                insert_hole(insert, counterbore = 1, horizontal = true);
+    }
+}
+
+module box_shelf_bracket_section(type, rows, cols, x, y) { //! Generates sections of the shelf bracket to allow it to be bigger than the printer
+    tw = box_width(type);
+    w = tw / cols;
+    th = box_depth(type);
+    h = th / rows;
+
+    clip(xmin = 0, xmax = w, ymin = 0, ymax = h)
+        translate([tw / 2 - x * w, th / 2 - y * h])
+            children();
+}
+
 module box_left_blank(type, sheet = false) { //! Generates a 2D template for the left sheet, ```sheet``` can be set to override the type
     dxf("box_left");
 

printed/butt_box.scad

@@ -110,12 +110,9 @@ function fixing_block_positions(type) = let(
 
 function side_holes(type) = [for(p = fixing_block_positions(type), q = fixing_block_holes(bbox_screw(type))) p * q];
 
-module drill_holes(type, t)
-    for(list = [corner_holes(type), side_holes(type)], p = list)
-        let(q = t * p)
-            if(abs(transform([0, 0, 0], q).z) < eps)
-                multmatrix(q)
-                    drill(screw_clearance_radius(bbox_screw(type)), 0);
+module bbox_drill_holes(type, t)
+    position_children(concat(corner_holes(type), side_holes(type)), t)
+        drill(screw_clearance_radius(bbox_screw(type)), 0);
 
 module bbox_base_blank(type) { //! 2D template for the base
     dxf(str(bbox_name(type), "_base"));
@@ -123,7 +120,7 @@ module bbox_base_blank(type) { //! 2D template for the base
     difference() {
         sheet_2D(bbox_base_sheet(type), bbox_width(type), bbox_depth(type), 1);
 
-        drill_holes(type, translate(bbox_height(type) / 2));
+        bbox_drill_holes(type, translate(bbox_height(type) / 2));
     }
 }
 
@@ -136,7 +133,7 @@ module bbox_top_blank(type) { //! 2D template for the top
         translate([0, t / 2])
             sheet_2D(bbox_top_sheet(type), bbox_width(type) + 2 * t, bbox_depth(type) + t);
 
-        drill_holes(type, translate(-bbox_height(type) / 2));
+        bbox_drill_holes(type, translate(-bbox_height(type) / 2));
     }
 }
 
@@ -154,7 +151,7 @@ module bbox_left_blank(type, sheet = false) { //! 2D template for the left side
         translate([-t / 2, -bb / 2])
             sheet_2D(subst_sheet(type, sheet), bbox_depth(type) + t, bbox_height(type) + bb);
 
-        drill_holes(type, rotate([0, 90, 90]) * translate([bbox_width(type) / 2, 0]));
+        bbox_drill_holes(type, rotate([0, 90, 90]) * translate([bbox_width(type) / 2, 0]));
     }
 }
 
@@ -168,7 +165,7 @@ module bbox_right_blank(type, sheet = false) { //! 2D template for the right sid
         translate([t / 2, -bb / 2])
             sheet_2D(subst_sheet(type, sheet), bbox_depth(type) + t, bbox_height(type) + bb);
 
-        drill_holes(type, rotate([0, 90, 90]) * translate([-bbox_width(type) / 2, 0]));
+        bbox_drill_holes(type, rotate([0, 90, 90]) * translate([-bbox_width(type) / 2, 0]));
     }
 }
 
@@ -183,7 +180,7 @@ module bbox_front_blank(type, sheet = false, width = 0) { //! 2D template for th
         translate([0, (bt - bb) / 2])
             sheet_2D(subst_sheet(type, sheet), max(bbox_width(type) + 2 * t, width), bbox_height(type) + bb + bt);
 
-        drill_holes(type, rotate([-90, 0, 0]) * translate([0, bbox_depth(type) / 2]));
+        bbox_drill_holes(type, rotate([-90, 0, 0]) * translate([0, bbox_depth(type) / 2]));
     }
 }
 
@@ -197,7 +194,7 @@ module bbox_back_blank(type, sheet = false) { //! 2D template for the back
         translate([0, -bb / 2])
             sheet_2D(subst_sheet(type, sheet), bbox_width(type), bbox_height(type) + bb);
 
-        drill_holes(type, rotate([-90, 0, 0]) * translate([0, -bbox_depth(type) / 2]));
+        bbox_drill_holes(type, rotate([-90, 0, 0]) * translate([0, -bbox_depth(type) / 2]));
     }
 }
 

printed/ribbon_clamp.scad

@@ -31,7 +31,7 @@ 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) + 2); //! Width
+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
 

printed/ssr_shroud.scad

@@ -135,7 +135,7 @@ module ssr_shroud_fastened_assembly(type, cable_d, thickness, name) //! Assembly
 
             *translate_z(cable_d / 2)
                 rotate([90, 0, 0])
-                    stl_colour(grey20)
+                    stl_colour(grey(20))
                         cylinder(d = cable_d, h = 20, center = true);
         }
 }

readme.md

@@ -235,7 +235,7 @@ Individual teeth are not drawn, instead they are represented by a lighter colour
 ### Modules
 | Module | Description |
 |:--- |:--- |
-| ```belt(type, points, gap = 0, gap_pt = undef, belt_colour = grey20, tooth_colour = grey50)``` | Draw a belt path given a set of points and pitch radii where the pulleys are. Closed loop unless a gap is specified |
+| ```belt(type, points, gap = 0, gap_pt = undef, belt_colour = grey(20)``` | Draw a belt path given a set of points and pitch radii where the pulleys are. Closed loop unless a gap is specified |
 
 ![belts](tests/png/belts.png)
 
@@ -1554,9 +1554,10 @@ The `light_strip_clip()` module makes a clip to go around the light that can be
 | Function | Description |
 |:--- |:--- |
 | ```light_strip_clip_depth(light)``` | Depth of the clip |
-| ```light_strip_clip_length(light)``` | Outside length |
+| ```light_strip_clip_length(light)``` | Outside length of clip |
 | ```light_strip_clip_slot(light)``` | Clip slot size |
-| ```light_strip_clip_width(light)``` | Outside width |
+| ```light_strip_clip_wall()``` | Clip wall thickness |
+| ```light_strip_clip_width(light)``` | Outside width of clip |
 | ```light_strip_cut_length(type, segs)``` | Calculate cut length given segments |
 | ```light_strip_segments(type, max_length)``` | Calculate the maximum number of segments that fit in max_length |
 
@@ -2125,7 +2126,11 @@ PCBs and perfboard with optional components. The shape can be a rectangle with o
 |   1 | ```ax_res(res1_4, 10000)``` |  Resistor 10000 Ohms 5% 0.25W |
 |   1 | ```ax_res(res1_2, 100000)``` |  Resistor 100000 Ohms 5% 0.5W |
 |   1 | ```ax_res(res1_8, 1e+6, tol = 1)``` |  Resistor 1e+6 Ohms 1% 0.125W |
+|   1 | ```smd_led(LED0603, orange)``` |  SMD LED 0603 orange |
 |   1 | ```smd_led(LED0805, red)``` |  SMD LED 0805 red |
+|   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_6mm)``` |  Square button 6mm |
 |   1 | ```pcb(TMC2130)``` |  TMC2130 |
 |   1 | ```green_terminal(gt_5p08, 2)``` |  Terminal block 2 way 0.2" |
@@ -2591,10 +2596,10 @@ Linear rails with carriages.
 ### Modules
 | Module | Description |
 |:--- |:--- |
-| ```carriage(type, rail, end_colour = grey20, wiper_colour = grey20)``` | Draw the specified carriage |
+| ```carriage(type, rail, end_colour = grey(20)``` | Draw the specified carriage |
 | ```carriage_hole_positions(type)``` | Position children over screw holes |
 | ```rail(type, length)``` | Draw the specified rail |
-| ```rail_assembly(type, length, pos, carriage_end_colour = grey20, carriage_wiper_colour = grey20)``` | Rail and carriage assembly |
+| ```rail_assembly(type, length, pos, carriage_end_colour = grey(20)``` | Rail and carriage assembly |
 | ```rail_hole_positions(type, length, first = 0, screws = 100, both_ends = true)``` | Position children over screw holes |
 | ```rail_screws(type, length, thickness, screws = 100)``` | Place screws in the rail |
 
@@ -3080,11 +3085,14 @@ Surface mount components for PCBs.
 |:--- |:--- |
 | ```smd_led_lens(type)``` | Lens length width and height |
 | ```smd_led_size(type)``` | Body length, width and height |
+| ```smd_res_end_cap(type)``` | End cap width |
+| ```smd_res_power(type)``` | Power rating in Watts |
+| ```smd_res_size(type)``` | Body length, width and height |
 
 ### Functions
 | Function | Description |
 |:--- |:--- |
-| ```smd_100th(x)``` | Convert dimesion to 1/100" notation |
+| ```smd_100th(x)``` | Convert dimension to 1/100" notation |
 | ```smd_led_height(type)``` | Total height |
 | ```smd_size(size)``` | Convert size to 1/100" notation |
 
@@ -3092,13 +3100,18 @@ Surface mount components for PCBs.
 | Module | Description |
 |:--- |:--- |
 | ```smd_led(type, colour, cutout)``` | Draw an SMD LED with specified ```colour``` |
+| ```smd_resistor(type, value)``` | Draw an SMD resistor with specified value |
 
 ![smds](tests/png/smds.png)
 
 ### Vitamins
 | Qty | Module call | BOM entry |
 | ---:|:--- |:---|
-|   1 | ```smd_led(LED0805, green)``` |  SMD LED 0805 green |
+|   1 | ```smd_led(LED0603, green)``` |  SMD LED 0603 green |
+|   1 | ```smd_led(LED0805, blue)``` |  SMD LED 0805 blue |
+|   1 | ```smd_resistor(RES0603, 1R0)``` |  SMD resistor 0603 1R0 0.1W |
+|   1 | ```smd_resistor(RES0805, 10M)``` |  SMD resistor 0805 10M 0.125W |
+|   1 | ```smd_resistor(RES1206, 100K)``` |  SMD resistor 1206 100K 0.25W |
 
 
 <a href="#top">Top</a>
@@ -3872,6 +3885,7 @@ Normally the side sheets are the same type but they can be overridden individual
 | ```box_height(type)``` | Internal height |
 | ```box_screw(type)``` | Screw type to be used at the corners |
 | ```box_sheets(type)``` | Sheet type used for the sides |
+| ```box_shelf_screw(type)``` | Screw type to hold a shelf |
 | ```box_top_sheet(type)``` | Sheet type for the top |
 | ```box_wall(type)``` | Wall thickness of 3D parts |
 | ```box_width(type)``` | Internal width |
@@ -3879,7 +3893,7 @@ Normally the side sheets are the same type but they can be overridden individual
 ### Functions
 | Function | Description |
 |:--- |:--- |
-| ```box(screw, wall, sheets, top_sheet, base_sheet, size, feet = false)``` | Construct a property list for a box. |
+| ```box(screw, wall, sheets, top_sheet, base_sheet, size, feet = false, shelf_screw = M3_dome_screw)``` | Construct a property list for a box. |
 | ```box_bezel_height(type, bottom)``` | Bezel height for top or bottom |
 | ```box_corner_gap(type)``` | Gap between box_sheets at the corners to connect inside and outside profiles |
 | ```box_inset(type)``` | How much the bezel intrudes on the specified width and length, away from the corners |
@@ -3899,6 +3913,7 @@ Normally the side sheets are the same type but they can be overridden individual
 | ```box_corner_profile(type)``` | Generates the corner profile STL for 3D printing. |
 | ```box_corner_profile_2D(type)``` | The 2D shape of the corner profile. |
 | ```box_corner_profile_section(type, section, sections)``` | Generates interlocking sections of the corner profile to allow it to be taller than the printer |
+| ```box_corner_profile_sections(type, section, sections)``` | Generate four copies of a corner profile section |
 | ```box_front(type)``` | Default front, can be overridden to customise |
 | ```box_front_blank(type, sheet = false)``` | Generates a 2D template for the front sheet, ```sheet``` can be set to override the type |
 | ```box_left(type)``` | Default left side, can be overridden to customise |
@@ -3906,6 +3921,9 @@ Normally the side sheets are the same type but they can be overridden individual
 | ```box_right(type)``` | Default right side, can be overridden to customise |
 | ```box_right_blank(type, sheet = false)``` | Generates a 2D template for the right sheet, ```sheet``` can be set to override the type |
 | ```box_shelf_blank(type, sheet = false)``` | Generates a 2D template for a shelf sheet |
+| ```box_shelf_bracket(type, screw_positions, wall = undef)``` | Generates a shelf bracket, the first optional child is a 2D cutout and the second 3D cutouts |
+| ```box_shelf_bracket_section(type, rows, cols, x, y)``` | Generates sections of the shelf bracket to allow it to be bigger than the printer |
+| ```box_shelf_screw_positions(type, screw_positions, thickness = 0, wall = undef)``` | Place children at the shelf screw positions |
 | ```box_top(type)``` | Default top, can be overridden to customise |
 | ```box_top_blank(type)``` | Generates a 2D template for the top sheet |
 | ```grill(width, height, r = 1000, poly = false, h = 0)``` | A staggered array of 5mm holes to make grills in sheets. Can be constrained to be circular. Set ```poly``` ```true``` for printing, ```false``` for milling. |
@@ -5211,12 +5229,18 @@ Maths utilities for manipulating vectors and matrices.
 | Function | Description |
 |:--- |:--- |
 | ```angle_between(v1, v2)``` | Return the angle between two vectors |
+| ```augment(m)``` | Augment a matrix by adding an identity matrix to the right |
 | ```euler(R)``` | Convert a rotation matrix to a Euler rotation vector. |
 | ```identity(n, x = 1)``` | Construct an arbitrary size identity matrix |
+| ```invert(m)``` | Invert a matrix |
+| ```nearly_zero(x)``` | True if x is close to zero |
 | ```reverse(v)``` | Reverse a vector |
 | ```rot3_z(a)``` | Generate a 3x3 matrix to rotate around z |
 | ```rotate(a, v)``` | Generate a 4x4 rotation matrix, ```a``` can be a vector of three angles or a single angle around ```z```, or around axis ```v``` |
+| ```rowswap(m, i, j)``` | Swap two rows of a matrix |
 | ```scale(v)``` |  Generate a 4x4 matrix that scales by ```v```, which can be a vector of xyz factors or a scalar to scale all axes equally |
+| ```solve(m, i = 0, j = 0)``` | Solve each row ensuring diagonal is not zero |
+| ```solve_row(m, i)``` | Make diagonal one by dividing the row by it and subtract from other rows to make column zero |
 | ```transform(v, m)``` | Apply 4x4 transform to a 3 vector by extending it and cropping it again |
 | ```transform_points(path, m)``` | Apply transform to a path |
 | ```translate(v)``` | Generate a 4x4 translation matrix, ```v``` can be ```[x, y]```, ```[x, y, z]``` or ```z``` |
@@ -5225,6 +5249,11 @@ Maths utilities for manipulating vectors and matrices.
 | ```vec3(v)``` | Return a 3 vector with the first three elements of ```v``` |
 | ```vec4(v)``` | Return a 4 vector with the first three elements of ```v``` |
 
+### Modules
+| Module | Description |
+|:--- |:--- |
+| ```position_children(list, t)``` | Position children if they are on the Z = 0 plane when transformed by t |
+
 ![maths](tests/png/maths.png)
 
 

scripts/plateup.py

@@ -27,6 +27,7 @@ import c14n_stl
 from set_config import *
 from deps import *
 from shutil import copyfile
+import re
 
 source_dirs = { "stl" : "platters", "dxf" : "panels" }
 target_dirs = { "stl" : "printed",  "dxf" : "routed" }
@@ -38,43 +39,54 @@ def plateup(target, part_type, usage = None):
     top_dir = set_config(target, usage)
     parts_dir = top_dir + part_type + 's'
     target_dir = parts_dir + '/' + target_dirs[part_type]
-    source_dir = top_dir + source_dirs[part_type]
-    deps_dir = source_dir + "/deps"
-    if not os.path.isdir(source_dir):
-        return
-    if not os.path.isdir(target_dir):
-        os.makedirs(target_dir)
-    if not os.path.isdir(deps_dir):
-        os.makedirs(deps_dir)
+    source_dir1 = source_dirs[part_type]
+    source_dir2 = top_dir + source_dirs[part_type]
     #
-    # Decide which files to make
-    #
-    sources = [file for file in os.listdir(source_dir) if file.endswith('.scad')]
-    #
-    # Run OpenSCAD on the source files to make the targets
+    # Loop through source directories
     #
     used = []
-    for src in sources:
-        src_file = source_dir + '/' + src
-        part_file = target_dir + '/' + src[:-4] + part_type
-        dname = deps_name(deps_dir, src)
-        changed = check_deps(part_file, dname)
-        if changed:
-            print(changed)
-            openscad.run("-D$bom=1", "-d", dname, "-o", part_file, src_file)
-            if part_type == 'stl':
-                c14n_stl.canonicalise(part_file)
-            log_name = 'openscad.log'
-        else:
-            log_name = 'openscad.echo'
-            openscad.run_silent("-D$bom=1", "-o", log_name, src_file)
+    all_sources = []
+    for dir in [source_dir1, source_dir2]:
+        if not os.path.isdir(dir):
+            continue
+        if not os.path.isdir(target_dir):
+            os.makedirs(target_dir)
         #
-        # Add the files on the BOM to the used list
+        # Make the deps dir
         #
-        with open(log_name) as file:
-            for line in file.readlines():
-                if line.startswith('ECHO: "~') and line.endswith('.' + part_type + '"\n'):
-                    used.append(line[8:-2])
+        deps_dir = dir + "/deps"
+        if not os.path.isdir(deps_dir):
+            os.makedirs(deps_dir)
+        #
+        # Decide which files to make
+        #
+        sources = [file for file in os.listdir(dir) if file.endswith('.scad')]
+        all_sources += sources
+        #
+        # Run OpenSCAD on the source files to make the targets
+        #
+        for src in sources:
+            src_file = dir + '/' + src
+            part_file = target_dir + '/' + src[:-4] + part_type
+            dname = deps_name(deps_dir, src)
+            changed = check_deps(part_file, dname)
+            if changed:
+                print(changed)
+                openscad.run("-D$bom=1", "-d", dname, "-o", part_file, src_file)
+                if part_type == 'stl':
+                    c14n_stl.canonicalise(part_file)
+                log_name = 'openscad.log'
+            else:
+                log_name = 'openscad.echo'
+                openscad.run_silent("-D$bom=1", "-o", log_name, src_file)
+            #
+            # Add the files on the BOM to the used list
+            #
+            with open(log_name) as file:
+                for line in file.readlines():
+                    match = re.match(r'^ECHO: "~(.*?\.' + part_type + r').*"$', line)
+                    if match:
+                        used.append(match.group(1))
     #
     # Copy file that are not included
     #
@@ -90,7 +102,7 @@ def plateup(target, part_type, usage = None):
     #
     # Remove any cruft
     #
-    targets = [file[:-4] + part_type for file in sources]
+    targets = [file[:-4] + part_type for file in all_sources]
     for file in os.listdir(target_dir):
         if file.endswith('.' + part_type):
             if not file in targets and not file in copied:

tests/PCB.scad

@@ -34,7 +34,7 @@ TMC2130 = ["TMC2130", "TMC2130",
     [
         [  10,  1,  0, "-2p54header", 8, 1 ,undef, "blue" ],
         [  10, 13,  0, "-2p54header", 8, 1],
-        [  12,  7,  0, "-chip", 6, 4, 1, grey20 ],
+        [  12,  7,  0, "-chip", 6, 4, 1, grey(20) ],
         // mock up a heat sink
         [  10,  7,  0, "block", 9, 9,  2, TMC2130HeatSinkColor ],
         [  10, 11,  0, "block", 9, 1, 11, TMC2130HeatSinkColor ],
@@ -58,14 +58,18 @@ test_pcb = ["TestPCB", "Test PCB",
     // components
     [
         [ 20, -5, 180, "trimpot10"],
-        [ 20, -15,  0, "trimpot10", true],
-        [ 10,  2,   0, "smd_led", LED0805, "red"],
+        [ 20, -15,  90, "trimpot10", true],
+        [ 10,  2,   90, "smd_led", LED0805, "red"],
+        [ 13,  2,   90, "smd_led", LED0603, "orange"],
+        [ 16,  2,   90, "smd_res", RES1206, "1K"],
+        [ 19,  2,   90, "smd_res", RES0805, "1K"],
+        [ 22,  2,   90, "smd_res", RES0603, "1K"],
         [ 10,  10,   0, "2p54header", 4, 1],
         [ 25,  10,   0, "2p54header", 5, 1, false, "blue" ],
         [ 10,  20,   0, "2p54boxhdr", 4, 2],
         [ 10,  30,   0, "2p54socket", 6, 1],
         [ 25,  30,   0, "2p54socket", 4, 1, false, 0, false, "red" ],
-        [ 10,  40,   0, "chip", 10, 5, 1, grey20],
+        [ 10,  40,   0, "chip", 10, 5, 1, grey(20)],
         [  5,  50,   0, "led", LED3mm, "red"],
         [ 12,  50,   0, "led", LED5mm, "orange"],
         [ 25,  50,   0, "led", LED10mm, "yellow"],
@@ -97,7 +101,7 @@ test_pcb = ["TestPCB", "Test PCB",
         [ 50,  50,   0, "molex_hdr", 2],
         [ 50,  60,   0, "jst_xh", 2],
         [ 50,  70, 180, "term254", 3],
-        [ 63,  70, 180, "term254", 3, undef, grey20],
+        [ 63,  70, 180, "term254", 3, undef, grey(20)],
         [ 75,  70, 180, "gterm508",2, undef, "blue"],
 
         [ 50,  90, 180, "gterm35", 4, [1,2]],
@@ -107,7 +111,7 @@ test_pcb = ["TestPCB", "Test PCB",
 
         [ 55, 110, 180, "gterm635", 2],
         [ 75, 110, 180, "gterm635", 2, undef, "blue"],
-        [ 90, 110, 180, "gterm", gt_5x17, 2, undef, grey20],
+        [ 90, 110, 180, "gterm", gt_5x17, 2, undef, grey(20)],
 
         [ 50, 130, 180, "term35", 4],
         [ 70, 130, 180, "term35", 3, "lime"],

tests/SMDs.scad

@@ -21,9 +21,14 @@ use <../utils/layout.scad>
 
 include <../vitamins/smds.scad>
 
-module smds()
-    layout([for(l = smd_leds) smd_led_size(l).x], 1)
-        smd_led(smd_leds[$i], ["green", "blue", "red"][$i % 3]);
+module smds() {
+    layout([for(r = smd_resistors) smd_res_size(r).x], 1)
+        smd_resistor(smd_resistors[$i], ["1R0", "10M", "100K"][$i % 3]);
+
+    translate([0, 3])
+        layout([for(l = smd_leds) smd_led_size(l).x], 1)
+            smd_led(smd_leds[$i], ["green", "blue", "red"][$i % 3]);
+}
 
 if($preview)
     smds();

tests/belts.scad

@@ -65,7 +65,7 @@ module belt_test() {
     translate([-25, 0])
         layout([for(b = belts) belt_width(b)], 10)
             rotate([0, 90, 0])
-                belt(belts[$i], [[0, 0, 20], [0, 1, 20]], belt_colour = $i%2==0 ? grey90 : grey20, tooth_colour = $i%2==0 ? grey70 : grey50);
+                belt(belts[$i], [[0, 0, 20], [0, 1, 20]], belt_colour = $i%2==0 ? grey(90) : grey(20), tooth_colour = $i%2==0 ? grey(70) : grey(50));
 }
 
 if($preview)

tests/rails.scad

@@ -33,7 +33,7 @@ module rails()
             nut = screw_nut(screw);
             washer = screw_washer(screw);
 
-            rail_assembly(rail, length, rail_travel(rail, length) / 2, $i<2 ? grey20 : "green", $i<2 ? grey20 : "red");
+            rail_assembly(rail, length, rail_travel(rail, length) / 2, $i<2 ? grey(20) : "green", $i<2 ? grey(20) : "red");
 
             rail_screws(rail, length, sheet + nut_thickness(nut, true) + washer_thickness(washer));
 

utils/core/core.scad

@@ -28,12 +28,12 @@ use <global.scad>
 
 module use_stl(name) {               //! Import an STL to make a build platter
     stl(name);
-
-    import(str("../stls/", name, ".stl"));
+    path = is_undef($target) ? "../stls/" : str("../", $target, "/stls/");
+    import(str(path, name, ".stl"));
 }
 
 module use_dxf(name) {               //! Import a DXF to make a build panel
     dxf(name);
-
-    import(str("../dxfs/", name, ".dxf"));
+    path = is_undef($target) ? "../dxfs/" : str("../", $target, "/dxfs/");
+    import(str(path, name, ".dxf"));
 }

utils/maths.scad

@@ -90,3 +90,42 @@ function euler(R) = let(ay = asin(-R[2][0]), cy = cos(ay)) //! Convert a rotatio
     cy ? [ atan2(R[2][1] / cy, R[2][2] / cy), ay, atan2(R[1][0] / cy, R[0][0] / cy) ]
        : R[2][0] < 0 ? [atan2( R[0][1],  R[0][2]),  180, 0]
                      : [atan2(-R[0][1], -R[0][2]), -180, 0];
+
+module position_children(list, t) //! Position children if they are on the Z = 0 plane when transformed by t
+    for(p = list)
+        let(q = t * p)
+            if(abs(transform([0, 0, 0], q).z) < 0.01)
+                multmatrix(q)
+                    children();
+
+// Matrix inversion: https://www.mathsisfun.com/algebra/matrix-inverse-row-operations-gauss-jordan.html
+
+function augment(m) = let(l = len(m), n = identity(l)) [ //! Augment a matrix by adding an identity matrix to the right
+    for(i = [0 : l - 1])
+        concat(m[i], n[i])
+];
+
+function rowswap(m, i, j) = [ //! Swap two rows of a matrix
+    for(k = [0 : len(m) - 1])
+        k == i ? m[j] : k == j ? m[i] : m[k]
+];
+
+function solve_row(m, i) = let(diag = m[i][i]) [ //! Make diagonal one by dividing the row by it and subtract from other rows to make column zero
+    for(j = [0 : len(m) - 1])
+        i == j ? m[j] / diag : m[j] - m[i] * m[j][i] / diag
+];
+
+function nearly_zero(x) = abs(x) < 1e-5; //! True if x is close to zero
+
+function solve(m, i = 0, j = 0) = //! Solve each row ensuring diagonal is not zero
+    i < len(m) ?
+        assert(i + j < len(m), "matrix is singular")
+         solve(!nearly_zero(m[i + j][i]) ? solve_row(j ? rowswap(m, i, i + j) : m, i) : solve(m, i, j + 1), i + 1)
+        : m;
+
+function invert(m) = let(n =len(m), m = solve(augment(m))) [ //! Invert a matrix
+    for(i = [0 : n - 1]) [
+        for(j = [n : 2 * n - 1])
+             each m[i][j]
+    ]
+];

vitamins/belt.scad

@@ -41,7 +41,7 @@ function no_point(str) = chr([for(c = str) if(c == ".") ord("p") else ord(c)]);
 // We model the belt path at the pitch radius of the pulleys and the pitch line of the belt to get an accurate length.
 // The belt is then drawn by offseting each side from the pitch line.
 //
-module belt(type, points, gap = 0, gap_pt = undef, belt_colour = grey20, tooth_colour = grey50) { //! Draw a belt path given a set of points and pitch radii where the pulleys are. Closed loop unless a gap is specified
+module belt(type, points, gap = 0, gap_pt = undef, belt_colour = grey(20), tooth_colour = grey(50)) { //! Draw a belt path given a set of points and pitch radii where the pulleys are. Closed loop unless a gap is specified
     width = belt_width(type);
     pitch = belt_pitch(type);
     thickness = belt_thickness(type);

vitamins/blower.scad

@@ -39,7 +39,7 @@ function blower_top(type)         = type[14]; //! Thickness of the top
 function blower_wall(type)        = type[15]; //! Side wall thickness
 function blower_lug(type)         = type[16]; //! Height of the lugs
 
-fan_colour = grey20;
+fan_colour = grey(20);
 
 module blower(type) { //! Draw specified blower
     length = blower_length(type);

vitamins/button.scad

@@ -46,7 +46,7 @@ module square_button(type, colour = "yellow") { //! Draw square button with spec
     pitch = (w/ 2 - wall - rivit * 0.75);
     stem = square_button_cap_stem(type);
 
-    color(grey20) {
+    color(grey(20)) {
         rounded_rectangle([w, w, h - 0.5], r = wall, center = false);
 
         for(x = [-1, 1], y = [-1, 1])

vitamins/circlip.scad

@@ -33,7 +33,7 @@ function circlip_a(type)         = type[5];     //! Size of the lugs
 function circlip_b(type)         = type[6];     //! Widest part of the taper
 function circlip_d5(type)        = type[7];     //! Plier hole diameter
 
-circlip_colour = grey20;
+circlip_colour = grey(20);
 closed_angle = 25;
 
 module internal_circlip(type, open = 0) { //! Draw specified internal circlip, open = 0, for nominal size installed, 1 for relaxed uninstalled, -1 for squeezed to install

vitamins/d_connector.scad

@@ -23,9 +23,9 @@
 include <../utils/core/core.scad>
 use <../utils/thread.scad>
 
-d_pillar_colour                   = grey90;
-d_plug_shell_colour               = grey80;
-d_plug_insulator_colour           = grey20;
+d_pillar_colour                   = grey(90);
+d_plug_shell_colour               = grey(80);
+d_plug_insulator_colour           = grey(20);
 
 function  d_flange_length(type)    = type[1];   //! Length of the flange
 function  d_lengths(type)          = type[2];   //! Lengths of the D for plug and socket

vitamins/dip.scad

@@ -91,7 +91,7 @@ module dil_socket(rows, w, pitch = inch(0.1)) {
     hole = [0.8, 0.5];
     pin_l = 3;
 
-    color(grey20) {
+    color(grey(20)) {
         linear_extrude(h)
             difference() {
                 square([width, length], center = true);
@@ -129,7 +129,7 @@ module dip(n, part, size, w, pitch, pin) { //! Draw DIP package
     D = [3, 0.6];
 
     translate_z(pdip_pin_s(pin)) {
-        color(grey20) {
+        color(grey(20)) {
             rotate([90, 0, 0])
                 linear_extrude(size.x, center = true)
                     difference() {

vitamins/extrusion.scad

@@ -122,7 +122,7 @@ module extrusion(type, length, center = true, cornerHole = false) { //! Draw the
 
     vitamin(str("extrusion(", type[0], ", ", length, arg(cornerHole, false, "cornerHole"), "): Extrusion ", type[0], " x ", length, "mm"));
 
-    color(grey90)
+    color(grey(90))
         linear_extrude(length, center = center)
             extrusion_cross_section(type, cornerHole);
 }

vitamins/fan.scad

@@ -28,7 +28,7 @@ use <nut.scad>
 use <washer.scad>
 use <../utils/tube.scad>
 
-fan_colour = grey20;
+fan_colour = grey(20);
 
 function fan_width(type)          = type[0];    //! Width of square
 function fan_depth(type)          = type[1];    //! Depth of fan

vitamins/fuseholder.scad

@@ -61,7 +61,7 @@ module fuseholder(thickness) { //! Fuseholder with nut in place for specified pa
     //
     // Nut
     //
-    colour = grey40;
+    colour = grey(40);
     vflip()
         translate_z(thickness)
             explode(height) {

vitamins/hot_ends.scad

@@ -33,8 +33,8 @@
 //                                                                                       h      t     s   t              t     t
 //                                                                                              h
 //
-JHeadMk4  = ["JHeadMk4",  jhead, "JHead MK4",           64,  5.1, 16,    50, grey20,     12,    4.64, 14, [0, 2.94, -5], 20,   20];
-JHeadMk5  = ["JHeadMk5",  jhead, "JHead MK5",         51.2,  5.1, 16,    40, grey20,     12,    4.64, 13, [0, 2.38, -5], 20,   20];
+JHeadMk4  = ["JHeadMk4",  jhead, "JHead MK4",           64,  5.1, 16,    50, grey(20),     12,    4.64, 14, [0, 2.94, -5], 20,   20];
+JHeadMk5  = ["JHeadMk5",  jhead, "JHead MK5",         51.2,  5.1, 16,    40, grey(20),     12,    4.64, 13, [0, 2.38, -5], 20,   20];
 E3Dv5     = ["E3Dv5",     e3d,   "E3D V5 direct",       70,  3.7, 16,  50.1, "silver",   12,    6,    15, [1, 5,  -4.5], 14.5, 28];
 E3Dv6     = ["E3Dv6",     e3d,   "E3D V6 direct",       62,  3.7, 16,  42.7, "silver",   12,    6,    15, [1, 5,  -4.5], 14,   21];
 E3D_clone = ["E3D_clone", e3d,   "E3D clone aliexpress",66,  6.8, 16,    46, "silver",   12,    5.6,  15, [1, 5,  -4.5], 14.5, 21];

vitamins/hygrometer.scad

@@ -51,7 +51,7 @@ module hygrometer() { //! Draw a hygrometer
     vitamin("hygrometer(): Mini LCD Digital Thermometer / Hygrometer");
 
     explode(40) {
-        color(grey30)
+        color(grey(30))
             rotate_extrude()
                 polygon([
                     [0, 0],

vitamins/iec.scad

@@ -134,7 +134,7 @@ module iec(type) { //! Draw specified IEC connector
         }
     }
 
-    color(grey20) {
+    color(grey(20)) {
         // Flange
         flange_t = iec_flange_t(type);
         linear_extrude(flange_t)

vitamins/kp_pillow_block.scad

@@ -25,7 +25,7 @@ use <../utils/tube.scad>
 use <washer.scad>
 use <ball_bearing.scad>
 
-kp_pillow_block_colour = grey70;
+kp_pillow_block_colour = grey(70);
 
 function kp_diameter(type)        = type[1]; //! Rod hole diameter
 function kp_hole_offset(type)     = type[2]; //! Rod hole offset

vitamins/light_strip.scad

@@ -137,7 +137,6 @@ module light_strip(type, segs = undef) { //! Draw specified light strip, segs ca
             linear_extrude(0.55 + eps)
                 resistor_positions()
                     square([2.1, 1.5 + 2 * eps], center = true);
-
     }
 
     if(show_rays)
@@ -148,8 +147,9 @@ wall = 1.8;
 clearance = 0.2;
 function light_strip_clip_slot(light) = light_strip_width(light) + clearance;       //! Clip slot size
 function light_strip_clip_depth(light) = 10;                                        //! Depth of the clip
-function light_strip_clip_length(light) = light_strip_clip_slot(light) + 2 * wall;  //! Outside length
-function light_strip_clip_width(light) = light_strip_depth(light) + 2 * wall;       //! Outside width
+function light_strip_clip_length(light) = light_strip_clip_slot(light) + 2 * wall;  //! Outside length of clip
+function light_strip_clip_width(light) = light_strip_depth(light) + 2 * wall;       //! Outside width of clip
+function light_strip_clip_wall() = wall;                                            //! Clip wall thickness
 
 module light_strip_clip(light) { //! Make a clip to go over the strip to be incorporated into a bracket
     linear_extrude(light_strip_clip_depth(light), convexity = 2)

vitamins/light_strips.scad

@@ -26,7 +26,7 @@
 //                                                                                         e     s    c
 //                                                                                               s    k
 Rigid5050 = ["Rigid5050", "rigid SMD5050 low profile",              500, 36, 3, 14.4,   7, 10.4, 0.9, 1.2];
-RIGID5050 = ["RIGID5050", "rigid SMD5050"            ,              500, 36, 3, 14.4, 8.6, 10.4, 0.9, 1.6];
+RIGID5050 = ["RIGID5050", "rigid SMD5050"            ,              500, 36, 3, 14.4, 8.6,  9.8, 0.8, 1.6];
 
 light_strips = [Rigid5050,  RIGID5050,];
 

vitamins/linear_bearing.scad

@@ -24,9 +24,9 @@ include <../utils/core/core.scad>
 
 use <../utils/tube.scad>
 
-bearing_colour = grey70;
-groove_colour = grey60;
-seal_colour = grey30;
+bearing_colour = grey(70);
+groove_colour = grey(60);
+seal_colour = grey(30);
 
 
 function bearing_length(type)           = type[1];   //! Total length

vitamins/microswitches.scad

@@ -24,8 +24,8 @@ small_leg  = [0.9,  3.3, 0.4, 0];
 medium_leg = [0.5,  3.9, 3.2, 1.6, [0, -0.5]];
 large_leg  = [11.4, 0.8, 6.3, 1.8, [1.7, 0]];
 
-small_microswitch  = ["small_microswitch", "DM1-00P-110-3",      5.8, 6.5,  12.8, 0, 2,    [[-3.25, -1.65], [3.25, -1.65]], 2.9, 1.2, [-1.95, 3.75], [[-5.08, -4.95], [0,    -4.9],  [5.08, -4.9]  ], small_leg,  grey20, "white"  ];
-medium_microswitch = ["medium_microswitch","SS-01 or SS-5GL",    6.4, 10.2, 19.8, 1, 2.35, [[-4.8,  -2.6 ], [4.7,  -2.6 ]], 3.2, 2,   [-2.8,  5.8 ], [[-8.05, -7.05], [0.75, -7.05], [8.05, -7.05] ], medium_leg, grey20, "burlywood" ];
+small_microswitch  = ["small_microswitch", "DM1-00P-110-3",      5.8, 6.5,  12.8, 0, 2,    [[-3.25, -1.65], [3.25, -1.65]], 2.9, 1.2, [-1.95, 3.75], [[-5.08, -4.95], [0,    -4.9],  [5.08, -4.9]  ], small_leg,  grey(20), "white"  ];
+medium_microswitch = ["medium_microswitch","SS-01 or SS-5GL",    6.4, 10.2, 19.8, 1, 2.35, [[-4.8,  -2.6 ], [4.7,  -2.6 ]], 3.2, 2,   [-2.8,  5.8 ], [[-8.05, -7.05], [0.75, -7.05], [8.05, -7.05] ], medium_leg, grey(20), "burlywood" ];
 large_microswitch  = ["large_microswitch", "Saia G3 low force", 10.4, 15.9, 28.0, 2, 3.1,  [[-11.1, -5.15], [11.2,  5.15]], 4,   2.75,[-9.1,  9.55], [[19.7,   2.19], [19.7, -3.45],  [8.3, -10.45] ], large_leg,  "ivory", "white" ];
 
 microswitches = [small_microswitch, medium_microswitch, large_microswitch];

vitamins/module.scad

@@ -87,7 +87,7 @@ module mod(type) {  //! Draw specified module
                 linear_extrude(body_l, center = true)
                     profile();
 
-        color(grey20)
+        color(grey(20))
             for(end = [-1, 1])
                 translate([end * body_l / 2, 0, 0])
                     rotate([90, 0, end * 90])

vitamins/nut.scad

@@ -55,7 +55,7 @@ module nut(type, nyloc = false, brass = false, nylon = false) { //! Draw specifi
     vitamin(str("nut(", type[0], arg(nyloc, false, "nyloc"), arg(brass, false, "brass"), arg(nylon, false, "nylon"),
                    "): Nut M", nut_size(type), " x ", thickness, "mm ", desc));
 
-    colour = brass ? brass_colour : nylon ? grey30: grey70;
+    colour = brass ? brass_colour : nylon ? grey(30): grey(70);
     explode(nyloc ? 10 : 0) {
         color(colour) {
             linear_extrude(thickness)
@@ -147,7 +147,7 @@ module sliding_t_nut(type) {
     tabSizeZ = nut_thickness(type);
     holeRadius  = nut_size(type) / 2;
 
-    color(grey80)
+    color(grey(80))
         extrusionSlidingNut(size, tabSizeY1, tabSizeY2, tabSizeZ, holeRadius, 0, hammerNut);
 }
 
@@ -204,7 +204,7 @@ module nut_square(type, brass = false, nylon = false) { //! Draw specified squar
     vitamin(str("nut(", type[0], arg(brass, false, "brass"), arg(nylon, false, "nylon"),
                    "): Nut M", nut_size(type), "nS ", width, " x ", thickness, "mm ", desc));
 
-    colour = brass ? brass_colour : nylon ? grey30 : grey70;
+    colour = brass ? brass_colour : nylon ? grey(30) : grey(70);
     color(colour)
         difference() {
             linear_extrude(thickness) {

vitamins/opengrab.scad

@@ -53,7 +53,7 @@ module opengrab() { //! Draw OpenGrab module
         translate_z(magnet / 2 + eps)
             cube([width, width, magnet - eps], center = true);
 
-    color(grey80) {
+    color(grey(80)) {
         gap = (width - poles * pole_w + 3 * eps) / (poles - 1);
         pitch = pole_w + gap;
         for(i = [0 : poles - 1])
@@ -84,7 +84,7 @@ module opengrab() { //! Draw OpenGrab module
 module opengrab_target() { //! Draw OpenGrab target
     vitamin("opengrab_target(): OpenGrab  silicon steel target plate");
 
-     color(grey80)
+     color(grey(80))
         linear_extrude(target)
             difference() {
                 square([width, width], center = true);

vitamins/panel_meter.scad

@@ -87,7 +87,7 @@ module panel_meter(type) { //! Draw panel mounted LCD meter module
         translate([x * (bezel.x / 2 - bevel), y * (bezel.y / 2 - bevel)])
             rounded_cylinder(r = r, r2 = bevel, h = bezel.z);
 
-    color(grey30) union() {
+    color(grey(30)) union() {
         //
         // Bezel and aperture
         //

vitamins/panel_meters.scad

@@ -25,8 +25,8 @@
 PZEM021   = ["PZEM021", "Peacefair PZEM-021 AC digital multi-function meter", [84.6, 44.7, 24.4], [89.6, 49.6, 2.3], 1.5, [1, 1], [51, 30, 5], [1.3, 10, 6], 15.5, 0];
 PZEM001   = ["PZEM001", "Peacefair PZEM-001 AC digital multi-function meter", [62  , 52.5, 24.4], [67,   57.5, 2.0], 2.0, [1, 1], [61, 46,-3], [1.2, 10, 6], 15.5, 0,
              [36, 36, 1.9], [0, 0], false, 0, 0, [
-                [[25,  8, 0], [0, 0, 2], 4, grey90],
-                [[25, -8, 0], [0, 0, 2], 4, grey90],
+                [[25,  8, 0], [0, 0, 2], 4, grey(90)],
+                [[25, -8, 0], [0, 0, 2], 4, grey(90)],
 
             ]];
 

vitamins/pcb.scad

@@ -248,7 +248,7 @@ module rj45(cutout = false) { //! Draw RJ45 Ethernet connector
                         cube([h, w, eps], center = true);
                 }
 
-                color(grey30) {
+                color(grey(30)) {
                     linear_extrude(l - 0.2, center = true)
                         difference() {
                             square([h - 0.1, w - 0.1], center = true);
@@ -279,7 +279,7 @@ module jack(cutout = false) { //! Draw 3.5mm jack
             rotate([0, 90, 0])
                 cylinder(d = d + 2 * panel_clearance, h = 100);
         else
-            color(grey20)
+            color(grey(20))
                 rotate([0, 90, 0]) {
                     linear_extrude(l / 2)
                         difference() {
@@ -508,7 +508,7 @@ module barrel_jack(cutout = false) { //! Draw barrel power jack
     if(cutout)
         ;
     else {
-        color(grey20) rotate([0, 90, 0]) {
+        color(grey(20)) rotate([0, 90, 0]) {
             linear_extrude(l, center = true) {
                 difference() {
                     translate([-h / 2, 0])
@@ -580,7 +580,7 @@ module uSD(size, cutout = false) { //! Draw uSD socket
                         cube([size.x, size.z, t], center = true);
                 }
             if(w > 0)
-                color(grey20)
+                color(grey(20))
                     rotate([90, 0, 90])
                         translate_z(t)
                             linear_extrude(size.y - t, center = true)
@@ -608,7 +608,7 @@ module flex(cutout = false) { //! Draw flexistrip connector
     if(cutout)
         ;
     else {
-        color(grey30) {
+        color(grey(30)) {
             translate_z(0.5)
                 cube([l, w, 1], center = true);
 
@@ -664,7 +664,7 @@ module flat_flex(cutout = false) { //! Draw flat flexistrip connector as used on
     if(cutout)
         ;
     else {
-        color(grey30) {
+        color(grey(30)) {
             translate([w / 2 - w1, 0, h1 / 2])
                 rotate([90, 0, 90])
                     linear_extrude(w1)
@@ -676,7 +676,7 @@ module flat_flex(cutout = false) { //! Draw flat flexistrip connector as used on
                         }
 
         }
-        color(grey90) {
+        color(grey(90)) {
             translate([-w / 2 + w3 / 2, 0, h3 / 2])
                 cube([w3, l3, h3], center = true);
 
@@ -886,7 +886,7 @@ module pcb_component(comp, cutouts = false, angle = undef) { //! Draw pcb compon
         if(show(comp, "2p54header"))    pin_header(2p54header, comp[4], comp[5], param(6, false), false, cutouts, colour = param(7, undef));
         if(show(comp, "2p54boxhdr"))    box_header(2p54header, comp[4], comp[5], param(6, false), cutouts);
         if(show(comp, "2p54socket"))    pin_socket(2p54header, comp[4], comp[5], param(6, false), param(7, 0), param(8, false), cutouts, param(9, undef));
-        if(show(comp, "chip"))          chip(comp[4], comp[5], comp[6], param(7, grey30), cutouts);
+        if(show(comp, "chip"))          chip(comp[4], comp[5], comp[6], param(7, grey(30)), cutouts);
         if(show(comp, "rj45"))          rj45(cutouts);
         if(show(comp, "usb_A"))         usb_Ax1(cutouts);
         if(show(comp, "usb_Ax2"))       usb_Ax2(cutouts);
@@ -923,7 +923,8 @@ module pcb_component(comp, cutouts = false, angle = undef) { //! Draw pcb compon
             if(show(comp, "molex_hdr"))     molex_254(comp[4]);
             if(show(comp, "jst_xh"))        jst_xh_header(jst_xh_header, comp[4], param(5, false), param(6, "white"), param(7, undef));
             if(show(comp, "potentiometer")) potentiometer(param(4, 5), param(5, 9));
-            if(show(comp, "buzzer"))        buzzer(param(4, 9), param(5, 12), param(6, grey20));
+            if(show(comp, "buzzer"))        buzzer(param(4, 9), param(5, 12), param(6, grey(20)));
+            if(show(comp, "smd_res"))       smd_resistor(comp[4], comp[5]);
         }
     }
 }

vitamins/pcbs.scad

@@ -112,7 +112,7 @@ DuetE = ["DuetE", "Duet 2 Ethernet electronics",
                                                                      [109.8, -58.8,   0, "chip", inch(0.03), inch(0.06), 1, "red"],             // Bed heater
 
                                                                      [ 2.3,  -37.2,   0, "chip", 3.6, 4.8, 2.0, "silver"],  // Reset switch
-                                                                     [ 0.0,  -37.2,   0, "chip", 2.0, 2.6, 1.4, grey20],    // Reset button
+                                                                     [ 0.0,  -37.2,   0, "chip", 2.0, 2.6, 1.4, grey(20)],    // Reset button
                                                                     ],
                                                                     [": Micro SD card", ": Cat 5 patch cable 300mm"]];
 

vitamins/pillars.scad

@@ -34,8 +34,8 @@ M3x13_hex_pillar       = ["M3x13_hex_pillar",       "hex",       3, 13, 5/cos(30
 M3x20_hex_pillar       = ["M3x20_hex_pillar",       "hex",       3, 20, 5/cos(30), 5/cos(30),  6, 6, "silver",  silver,  -8, 8];
 M3x20_nylon_pillar     = ["M3x20_nylon_pillar",     "nylon",     3, 20, 8,         5/cos(30),  0, 6, "white",   brass,   -6, 6];
 M4x17_nylon_pillar     = ["M4x17_nylon_pillar",     "nylon",     4, 20, 8,         5/cos(30),  0, 6, "white",   brass,   -6, 6];
-M3x20_nylon_hex_pillar = ["M3x20_nylon_hex_pillar", "hex nylon", 3, 20, 8/cos(30), 8/cos(30),  6, 6,  grey20,   grey20,  -6, 6];
-M3x10_nylon_hex_pillar = ["M3x10_nylon_hex_pillar", "hex nylon", 3, 10,5.5/cos(30),5.5/cos(30),6, 6,  grey20,   grey20,  -6, 6];
+M3x20_nylon_hex_pillar = ["M3x20_nylon_hex_pillar", "hex nylon", 3, 20, 8/cos(30), 8/cos(30),  6, 6,  grey(20),   grey(20),  -6, 6];
+M3x10_nylon_hex_pillar = ["M3x10_nylon_hex_pillar", "hex nylon", 3, 10,5.5/cos(30),5.5/cos(30),6, 6,  grey(20),   grey(20),  -6, 6];
 
 
 pillars = [M2x16_brass_pillar, M3x13_hex_pillar, M3x20_hex_pillar, M3x20_nylon_pillar, M4x17_nylon_pillar, M3x10_nylon_hex_pillar, M3x20_nylon_hex_pillar];

vitamins/pin_headers.scad

@@ -24,8 +24,8 @@
 //                          h     l     w    w     c
 //                                                         c
 //
-2p54header = ["2p54header", 2.54, 11.6, 3.2, 0.66, "gold", grey20, 8.5];
-jst_xh_header = ["JST XH header",2.5,10,3.4, 0.64, "gold", grey90, 7];
+2p54header = ["2p54header", 2.54, 11.6, 3.2, 0.66, "gold", grey(20), 8.5];
+jst_xh_header = ["JST XH header",2.5,10,3.4, 0.64, "gold", grey(90), 7];
 
 pin_headers = [ 2p54header ];
 

vitamins/psu.scad

@@ -76,7 +76,7 @@ module terminal_block(type, ways) { //! Draw a power supply terminal block
     contact_h = 0.4;
     washer_t = 1.2;
     translate([0, -tl]) {
-        color(grey20) {
+        color(grey(20)) {
             cube([depth, tl, h2]);
 
             translate([depth2, 0])

vitamins/rail.scad

@@ -65,7 +65,7 @@ module carriage_hole_positions(type) { //! Position children over screw holes
                 children();
 }
 
-module carriage(type, rail, end_colour = grey20, wiper_colour = grey20) { //! Draw the specified carriage
+module carriage(type, rail, end_colour = grey(20), wiper_colour = grey(20)) { //! Draw the specified carriage
     total_l = carriage_length(type);
     block_l = carriage_block_length(type);
     block_w = carriage_width(type);
@@ -82,7 +82,7 @@ module carriage(type, rail, end_colour = grey20, wiper_colour = grey20) { //! Dr
             square([w , rail_height(rail) + 0.2]);
     }
 
-    color(grey90) {
+    color(grey(90)) {
         rotate([90, 0, 90])
             linear_extrude(block_l, center = true)
                  difference() {
@@ -132,7 +132,7 @@ module rail(type, length) { //! Draw the specified rail
 
     vitamin(str("rail(", type[0], ", ", length, "): Linear rail ", type[0], " x ", length, "mm"));
 
-    color(grey90) {
+    color(grey(90)) {
         linear_extrude(height - rail_bore_depth(type)) difference() {
             square([length, width], center = true);
             rail_hole_positions(type, length)
@@ -166,7 +166,7 @@ module rail(type, length) { //! Draw the specified rail
     }
 }
 
-module rail_assembly(type, length, pos, carriage_end_colour = grey20, carriage_wiper_colour = grey20) { //! Rail and carriage assembly
+module rail_assembly(type, length, pos, carriage_end_colour = grey(20), carriage_wiper_colour = grey(20)) { //! Rail and carriage assembly
     rail(type, length);
 
     translate([pos, 0])

vitamins/rocker.scad

@@ -53,7 +53,7 @@ module rocker(type, colour) { //! Draw the specified rocker switch
     rocker_r2 = (sqr(x2) + sqr(y2)) / (2 * y2);
 
     explode(30) {
-        color(grey20) {
+        color(grey(20)) {
             linear_extrude(rocker_flange_t(type))
                 difference() {
                     rounded_square([rocker_flange_w(type), rocker_flange_h(type)], 0.5);
@@ -65,7 +65,7 @@ module rocker(type, colour) { //! Draw the specified rocker switch
                 rounded_rectangle([rocker_width(type), rocker_height(type), rocker_depth(type) + eps], 0.5, center = false);
         }
         if(rocker_pivot(type))
-            color(colour ? colour : grey30)
+            color(colour ? colour : grey(30))
                 translate_z(rocker_pivot(type))
                     rotate([90, 0, 90])
                         linear_extrude(rocker_w, center = true)

vitamins/rod.scad

@@ -25,9 +25,9 @@
 include <../utils/core/core.scad>
 use <../utils/thread.scad>
 
-rod_colour = grey80;
-studding_colour = grey70;
-leadscrew_colour = grey70;
+rod_colour = grey(80);
+studding_colour = grey(70);
+leadscrew_colour = grey(70);
 
 module rod(d , l, center = true) { //! Draw a smooth rod with specified diameter and length
     vitamin(str("rod(", d, ", ", l, "): Smooth rod ", d, "mm x ", l, "mm"));

vitamins/screw.scad

@@ -82,7 +82,7 @@ module screw(type, length, hob_point = 0, nylon = false) { //! Draw specified sc
                         : length;
     d = 2 * screw_radius(type);
     pitch = metric_coarse_pitch(d);
-    colour = nylon || head_type == hs_grub ? grey40 : grey80;
+    colour = nylon || head_type == hs_grub ? grey(40) : grey(80);
 
     module shaft(socket = 0, headless = false) {
         point = screw_nut(type) ? 0 : 3 * rad;

vitamins/scs_bearing_block.scad

@@ -41,7 +41,7 @@ function scs_circlip(type)              = type[15]; //! Circlip used
 function scs_spacer(type)               = type[16]; //! Spacer used in long bearings
 
 
-sks_bearing_block_colour = grey90;
+sks_bearing_block_colour = grey(90);
 
 module scs_bearing_block(type) { //! Draw the specified SCS bearing block
     vitamin(str("scs_bearing_block(", type[0], "): ", type[0], " bearing block"));

vitamins/sk_bracket.scad

@@ -24,7 +24,7 @@ include <../utils/fillet.scad>
 
 use <washer.scad>
 
-sk_bracket_colour = grey70;
+sk_bracket_colour = grey(70);
 
 function sk_diameter(type)        = type[1]; //! Rod hole diameter
 function sk_hole_offset(type)     = type[2]; //! Rod hole offset
@@ -85,7 +85,7 @@ module sk_bracket(type) { //! SK shaft support bracket
             }
     }
     // Add the retaining bolt. No hole was cut, since it is only for display.
-    color(grey20)
+    color(grey(20))
         translate([P / 2 - screw_head_height(M3_cap_screw) / 2, (F - h + d / 2) / 2, 0])
             rotate([0,90,0])
                 not_on_bom() no_explode()

vitamins/smd.scad

@@ -29,7 +29,7 @@ function smd_led_lens(type) = type[2]; //! Lens length width and height
 function smd_led_height(type) =        //! Total height
     smd_led_size(type).z + smd_led_lens(type).z;
 
-function smd_100th(x) = //! Convert dimesion to 1/100" notation
+function smd_100th(x) = //! Convert dimension to 1/100" notation
     let(s = str(round(x / inch(0.01))))
         len(s) < 2 ? str("0", s) : s;
 
@@ -78,3 +78,33 @@ module smd_led(type, colour, cutout) { //! Draw an SMD LED with specified ```col
                 }
     }
 }
+
+function smd_res_size(type)    = type[1]; //! Body length, width and height
+function smd_res_end_cap(type) = type[2]; //! End cap width
+function smd_res_power(type)   = type[3]; //! Power rating in Watts
+
+module smd_resistor(type, value) { //! Draw an SMD resistor with specified value
+    size = smd_res_size(type);
+    vitamin(str("smd_resistor(", type[0], ", ", value, "): SMD resistor ", smd_size(size), " ", value, " ", smd_res_power(type), "W"));
+
+    t = 0.04;
+    cap = smd_res_end_cap(type);
+    color("white")
+        translate_z(size.z / 2)
+            cube([size.x - 2 * t, size.y, size.z - 2 * t], center = true);
+
+    color(grey(20))
+        translate_z(size.z - t)
+            cube([size.x - 2 * cap, size.y, eps], center = true);
+
+    color(silver)
+        for(end = [-1, 1])
+            translate([end * (size.x / 2 - cap / 2), 0, size.z / 2])
+                cube([cap, size.y - 2 * eps, size.z], center = true);
+
+    color("white")
+        translate([0, 0, size.z])
+            linear_extrude(eps)
+                resize([(size.x - 2 * cap) * 0.75, size.y / 2])
+                    text(value, halign = "center", valign = "center");
+}

vitamins/smds.scad

@@ -18,11 +18,18 @@
 //
 
 //
-//! Axial components
+//! SMD components
 //
 
-LED0805 = ["LED0805", [2, 1.25, 0.46], [1.4, 1.25, 0.54]];
+LED0603 = ["LED0603", [1.6, 0.8,  0.18], [1.0, 0.8,  0.42]];
+LED0805 = ["LED0805", [2.0, 1.25, 0.46], [1.4, 1.25, 0.54]];
 
-smd_leds = [LED0805];
+smd_leds = [LED0603, LED0805];
+
+RES0603 = ["RES0603", [1.6, 0.8, 0.45], 0.3, 1/10];
+RES0805 = ["RES0805", [2.0, 1.2, 0.45], 0.4, 1/8];
+RES1206 = ["RES1206", [3.1, 1.6, 0.6],  0.5, 1/4];
+
+smd_resistors = [RES0603, RES0805, RES1206];
 
 use <smd.scad>

vitamins/stepper_motor.scad

@@ -41,8 +41,8 @@ function NEMA_holes(type)       = [-NEMA_hole_pitch(type) / 2, NEMA_hole_pitch(t
 function NEMA_big_hole(type)    = NEMA_boss_radius(type) + 0.2; //! Clearance hole for the big boss
 
 stepper_body_colour = "black";
-stepper_cap_colour  = grey50;
-stepper_machined_colour = grey90;
+stepper_cap_colour  = grey(50);
+stepper_machined_colour = grey(90);
 
 module NEMA_outline(type) //! 2D outline
     intersection() {

vitamins/washer.scad

@@ -25,8 +25,8 @@
 include <../utils/core/core.scad>
 include <../utils/sweep.scad>
 
-soft_washer_colour = grey20;
-hard_washer_colour = grey80;
+soft_washer_colour = grey(20);
+hard_washer_colour = grey(80);
 star_washer_colour = brass;
 
 function washer_size(type)            = type[1]; //! Noiminal size