Fixed bug updating the times file when case changes.

First column split of vitamins now at J.

lib.scad

@@ -40,7 +40,6 @@ include <vitamins/inserts.scad>
 include <vitamins/kp_pillow_blocks.scad>
 include <vitamins/ldrs.scad>
 include <vitamins/leadnuts.scad>
-include <vitamins/leds.scad>
 include <vitamins/light_strips.scad>
 include <vitamins/mains_sockets.scad>
 include <vitamins/modules.scad>

libtest.scad

@@ -165,8 +165,8 @@ o_rings_y = springs_y;
 sealing_strip_y = springs_y + 20;
 tubings_y = sealing_strip_y + 20;
 pillars_y = tubings_y + 20;
-leadnuts_y = pillars_y + 40;
-pulleys_y = leadnuts_y +40;
+ball_bearings_y = pillars_y + 40;
+pulleys_y = ball_bearings_y +40;
 hot_ends_y = pulleys_y + 60;
 linear_bearings_y = hot_ends_y + 50;
 sheets_y = linear_bearings_y + 100;
@@ -209,10 +209,7 @@ translate([x0, tubings_y])
 translate([x0, pillars_y])
     pillars();
 
-translate([x0, leadnuts_y ])
-    leadnuts();
-
-translate([x0 + 60, leadnuts_y])
+translate([x0, ball_bearings_y])
     ball_bearings();
 
 translate([x0, pulleys_y])
@@ -252,7 +249,8 @@ translate([x0, psus_y]) {
 }
 
 zipties_y = 0;
-bulldogs_y = zipties_y + 40;
+bulldogs_y = zipties_y + 30;
+leadnuts_y = bulldogs_y + 50;
 
 translate([x1, zipties_y])
     zipties();
@@ -260,6 +258,10 @@ translate([x1, zipties_y])
 translate([x1, bulldogs_y])
     bulldogs();
 
+translate([x1, leadnuts_y])
+    leadnuts();
+
+
 leds_y = 0;
 carriers_y = leds_y + 40;
 spades_y = carriers_y + 40;

readme.md

@@ -65,14 +65,11 @@ Also single bearing balls are modelled as just a silver sphere and a BOM entry.
 | ```bb_bore(type)``` | Internal diameter |
 | ```bb_colour(type)``` | Shield colour, "silver" for metal |
 | ```bb_diameter(type)``` | External diameter |
+| ```bb_hub(type)``` | Inner rim thickness guesstimate |
 | ```bb_name(type)``` | Part code without shield type suffix |
+| ```bb_rim(type)``` | Outer rim thickness guesstimate |
 | ```bb_width(type)``` | Width |
 
-### Functions
-| Function | Description |
-|:--- |:--- |
-| ```bb_rim(type)``` | Inner and outer rim thickness |
-
 ### Modules
 | Module | Description |
 |:--- |:--- |
@@ -88,7 +85,8 @@ Also single bearing balls are modelled as just a silver sphere and a BOM entry.
 |   1 | ```ball_bearing(BB6200)``` |  Ball bearing 6200-2RS 10mm x 30mm x 9mm |
 |   1 | ```ball_bearing(BB6201)``` |  Ball bearing 6201-2RS 12mm x 32mm x 10mm |
 |   1 | ```ball_bearing(BB624)``` |  Ball bearing 624-2RS 4mm x 13mm x 5mm |
-|   4 | ``` bearing_ball(3)``` |  Steel ball 3mm |
+|   1 | ```ball_bearing(BB6808)``` |  Ball bearing 6808-2RS 40mm x 52mm x 7mm |
+|   5 | ``` bearing_ball(3)``` |  Steel ball 3mm |
 
 
 <a href="#top">Top</a>
@@ -892,6 +890,7 @@ Parametric green terminal blocks
 | ```gt_back_depth(type)``` | Back ledge depth |
 | ```gt_back_height(type)``` | Height at the back |
 | ```gt_box_h(type)``` | Height of the cable entry box |
+| ```gt_box_setback(type)``` | How far the contact box is set back from the front |
 | ```gt_box_w(type)``` | Width inside the cable entry box |
 | ```gt_depth(type)``` | Total front to back depth |
 | ```gt_front_depth(type)``` | Front ledge depth |
@@ -903,7 +902,7 @@ Parametric green terminal blocks
 | ```gt_top(type)``` | Depth at the top |
 | ```gt_tube_h(type)``` | Height of optional tubes around the screws |
 | ```gt_y_offset(type)``` | Offset of the pins from centre of the depth |
-| ```gt_y_offset2(type)``` | Offset of the pins screws from the screws |
+| ```gt_y_offset2(type)``` | Offset of the pins from the screws |
 
 ### Modules
 | Module | Description |
@@ -916,8 +915,9 @@ Parametric green terminal blocks
 | Qty | Module call | BOM entry |
 | ---:|:--- |:---|
 |   1 | ```green_terminal(gt_6p35, 2)``` |  Terminal block 2 way 0.25" |
-|   1 | ```green_terminal(gt_3p5, 3)``` |  Terminal block 3 way 3.5mm |
-|   1 | ```green_terminal(gt_2p54, 4)``` |  Terminal block 4 way 0.1" |
+|   1 | ```green_terminal(gt_5p08, 3)``` |  Terminal block 3 way 0.2" |
+|   1 | ```green_terminal(gt_3p5, 4)``` |  Terminal block 4 way 3.5mm |
+|   1 | ```green_terminal(gt_2p54, 5)``` |  Terminal block 5 way 0.1" |
 
 
 <a href="#top">Top</a>
@@ -1937,6 +1937,33 @@ PCBs and perfboard with optional components. The shape can be a rectangle with o
 ### Vitamins
 | Qty | Module call | BOM entry |
 | ---:|:--- |:---|
+|   1 | ```box_header(2p54header, 4, 2, smt = 0)``` |  Box header 4 x 2 |
+|   1 | ```d_plug(DCONN9, pcb = true)``` |  D-type 9 way PCB mount plug |
+|   1 | ```hdmi(hdmi_full)``` |  HDMI socket |
+|   1 | ```idc_transition(2p54header, 5)``` |  IDC transition header 5 x 2 |
+|   1 | ```led(LED10mm, "yellow")``` |  LED 10 mm yellow |
+|   1 | ```led(LED3mm)``` |  LED 3 mm red |
+|   1 | ```led(LED5mm, "orange")``` |  LED 5 mm orange |
+|   1 | ```microswitch(small_microswitch)``` |  Microswitch DM1-00P-110-3 |
+|   1 | ```hdmi(hdmi_mini)``` |  Mini HDMI socket |
+|   1 | ```molex_254(2)``` |  Molex KK header 2 way |
+|   1 | ```pin_header(2p54header, 4, 1, smt = 0)``` |  Pin header 4 x 1 |
+|   1 | ```pin_header(2p54header, 5, 1, smt = undef)``` |  Pin header 5 x 1 |
+|   1 | ```pin_socket(2p54header, 4, 1, right_angle = undef, height = undef, smt = undef)``` |  Pin socket 4 x 1 |
+|   1 | ```pin_socket(2p54header, 6, 1)``` |  Pin socket 6 x 1 |
+|   1 | ```pin_socket(2p54header, 8, 1)``` |  Pin socket 8 x 1 |
+|   1 | ```pin_socket(2p54header, 8, 1, right_angle = undef, height = undef, smt = undef)``` |  Pin socket 8 x 1 |
+|   1 | ```square_button(button_6mm)``` |  Square button 6mm |
+|   1 | ```pcb(TMC2130)``` |  TMC2130 |
+|   1 | ```green_terminal(gt_5p08, 2)``` |  Terminal block 2 way 0.2" |
+|   2 | ```green_terminal(gt_6p35, 2)``` |  Terminal block 2 way 0.25" |
+|   1 | ```green_terminal(gt_5x17, 2)``` |  Terminal block 2 way 5mm |
+|   2 | ```green_terminal(gt_2p54, 3)``` |  Terminal block 3 way 0.1" |
+|   1 | ```terminal_35(3)``` |  Terminal block 3 way 3.5mm |
+|   1 | ```green_terminal(gt_5x11, 3)``` |  Terminal block 3 way 5mm |
+|   1 | ```green_terminal(gt_5x17, 3)``` |  Terminal block 3 way 5mm |
+|   2 | ```green_terminal(gt_3p5, 4)``` |  Terminal block 4 way 3.5mm |
+|   1 | ```terminal_35(4)``` |  Terminal block 4 way 3.5mm |
 |   1 | ```pcb(TestPCB)``` |  Test PCB |
 
 
@@ -2029,7 +2056,7 @@ PCBs and perfboard with optional components. The shape can be a rectangle with o
 |   1 | ```d_plug(DCONN15, pcb = true)``` |  D-type 15 way PCB mount plug |
 |   1 | ```pcb(DuetE)``` |  Duet 2 Ethernet electronics |
 |   1 | ```pcb(Duex2)``` |  Duex2 expansion board |
-|   1 | ```pcb(Duex5)``` |  Duex5 expasnion board |
+|   1 | ```pcb(Duex5)``` |  Duex5 expansion board |
 |   1 | ```pcb(EnviroPlus)``` |  Enviro+ |
 |   1 | ```pcb(ExtruderPCB)``` |  Extruder connection PCB |
 |   1 | ```pcb(Keyes5p1)``` |  Keyes5.1 Arduino Uno expansion board |
@@ -2040,7 +2067,7 @@ PCBs and perfboard with optional components. The shape can be a rectangle with o
 |   1 | ```molex_254(3)``` |  Molex KK header 3 way |
 |  16 | ```nut(M2_nut, nyloc = true)``` |  Nut M2 x 1.6mm nyloc |
 |  30 | ```nut(M2p5_nut, nyloc = true)``` |  Nut M2.5 x 2.2mm nyloc |
-|  12 | ```nut(M3_nut, nyloc = true)``` |  Nut M3 x 2.4mm nyloc |
+|  16 | ```nut(M3_nut, nyloc = true)``` |  Nut M3 x 2.4mm nyloc |
 |  12 | ```nut(M4_nut, nyloc = true)``` |  Nut M4 x 3.2mm nyloc |
 |   1 | ```pcb(PI_IO)``` |  PI_IO V2 |
 |   1 | ```pcb(PSU12V1A)``` |  PSU 12V 1A |
@@ -2062,17 +2089,18 @@ PCBs and perfboard with optional components. The shape can be a rectangle with o
 |   4 | ```screw(M2p5_pan_screw, 20)``` |  Screw M2.5 pan x 20mm |
 |  12 | ```screw(M2p5_pan_screw, 25)``` |  Screw M2.5 pan x 25mm |
 |   4 | ```screw(M3_cap_screw, 16)``` |  Screw M3 cap x 16mm |
-|   4 | ```screw(M3_cap_screw, 30)``` |  Screw M3 cap x 30mm |
+|   8 | ```screw(M3_cap_screw, 30)``` |  Screw M3 cap x 30mm |
 |   4 | ```screw(M3_cap_screw, 35)``` |  Screw M3 cap x 35mm |
-|   8 | ```screw(M4_cap_screw, 30)``` |  Screw M4 cap x 30mm |
-|   4 | ```screw(M4_cap_screw, 35)``` |  Screw M4 cap x 35mm |
+|   4 | ```screw(M4_cap_screw, 30)``` |  Screw M4 cap x 30mm |
+|   8 | ```screw(M4_cap_screw, 35)``` |  Screw M4 cap x 35mm |
 |   1 | ```pcb(TP4056)``` |  TP4056 Li-lon Battery charger module |
 |   3 | ```terminal_35(2)``` |  Terminal block 2 way 3.5mm |
 |   2 | ```green_terminal(gt_2p54, 4)``` |  Terminal block 4 way 0.1" |
 |   1 |  |  USB A to Mini B lead |
+|   1 | ```pcb(WD2002SJ)``` |  WD2002SJ Buck Boost DC-DC converter |
 |  16 | ```washer(M2_washer)``` |  Washer  M2 x 5mm x 0.3mm |
 |  30 | ```washer(M2p5_washer)``` |  Washer  M2.5 x 5.9mm x 0.5mm |
-|  12 | ```washer(M3_washer)``` |  Washer  M3 x 7mm x 0.5mm |
+|  16 | ```washer(M3_washer)``` |  Washer  M3 x 7mm x 0.5mm |
 |  12 | ```washer(M4_washer)``` |  Washer  M4 x 9mm x 0.8mm |
 |   1 | ```pcb(ZC_A0591)``` |  ZC-A0591 ULN2003 driver PCB |
 
@@ -2089,14 +2117,15 @@ PCBs and perfboard with optional components. The shape can be a rectangle with o
 |   4 | pcb_spacer25130_2.stl |
 |   4 | pcb_spacer25140_2.stl |
 |   4 | pcb_spacer25150_2.stl |
-|   4 | pcb_spacer25170.stl |
+|   4 | pcb_spacer25180.stl |
 |   2 | pcb_spacer2570.stl |
 |   4 | pcb_spacer30160.stl |
-|   4 | pcb_spacer30210.stl |
+|   4 | pcb_spacer30170.stl |
+|   4 | pcb_spacer30220.stl |
 |   4 | pcb_spacer3050.stl |
-|   4 | pcb_spacer40180.stl |
 |   4 | pcb_spacer40190.stl |
 |   4 | pcb_spacer40200.stl |
+|   4 | pcb_spacer40210.stl |
 
 
 <a href="#top">Top</a>

scripts/bom.py

@@ -82,7 +82,7 @@ class BOM:
 
     def add_part(self, s):
         args = []
-        match = re.match(r'^(.*?\.stl)\((.*)\)$', s)                             #look for name.stl(...)
+        match = re.match(r'^(.*?\.stl|.*?\.dxf)\((.*)\)$', s)                             #look for name.stl(...) or name.dxf(...)
         if match:
             s = match.group(1)
             args = [match.group(2)]
@@ -248,7 +248,7 @@ def boms(target = None, assembly = None):
     #
     # Run openscad
     #
-    openscad.run("-D","$bom=2","-D","$preview=true","-o", "openscad.echo", "-d", bom_dir + "/bom.deps", bom_maker_name)
+    openscad.run("-D", "$bom=2", "-D", "$preview=true", "--hardwarnings", "-o", "openscad.echo", "-d", bom_dir + "/bom.deps", bom_maker_name)
     os.remove(bom_maker_name)
     print("Generating bom ...", end=" ")
 

scripts/render.py

@@ -81,7 +81,8 @@ def render(target, type):
         #
         if mtime(part_file) > mtime(png_name):
             png_maker_name = "png.scad"
-            colour = [0, 146/255, 0]
+            pp1 = [0, 146/255, 0]
+            colour = pp1
             if part in colours:
                 colour = colours[part]
                 if not '[' in colour:
@@ -89,7 +90,7 @@ def render(target, type):
             with open(png_maker_name, "w") as f:
                 f.write('color(%s) import("%s");\n' % (colour, part_file))
             cam = "--camera=0,0,0,70,0,315,500" if type == 'stl' else "--camera=0,0,0,0,0,0,500"
-            render = "--preview" if type == 'stl' else "--render"
+            render = "--preview" if type == 'stl' or colour != pp1 else "--render"
             tmp_name = 'tmp.png'
             openscad.run(colour_scheme, "--projection=p", "--imgsize=4096,4096", cam, render, "--autocenter", "--viewall", "-o", tmp_name, png_maker_name);
             do_cmd(("magick "+ tmp_name + " -trim -resize 280x280 -background %s -gravity Center -extent 280x280 -bordercolor %s -border 10 %s"

scripts/tests.py

@@ -147,7 +147,7 @@ def tests(tests):
                 print("Can't find implementation!")
                 continue
 
-            vsplit = "AKR" + chr(ord('Z') + 1)
+            vsplit = "AJR" + chr(ord('Z') + 1)
             vtype = locations[0][1]
             types = [vtype + ' ' + vsplit[i] + '-'  + chr(ord(vsplit[i + 1]) - 1) for i in range(len(vsplit) - 1)] + [loc[1] for loc in locations[1 :]]
             if type == vtype:
@@ -201,7 +201,7 @@ def tests(tests):
             dname = deps_name(deps_dir, scad.lower())
             oldest = png_name if mtime(png_name) < mtime(bom_name) else bom_name
             changed = check_deps(oldest, dname)
-            changed = times.check_have_time(changed, scad_name.lower())
+            changed = times.check_have_time(changed, scad_name)
             changed = options.have_changed(changed, oldest)
             if changed:
                 print(changed)

scripts/times.py

@@ -48,6 +48,8 @@ def check_have_time(changed, name):
     return changed
 
 def add_time(name, start):
+    if name.lower() in times:
+        del times[name.lower()]
     times[name] = round(time.time() - start, 3)
 
 def print_times():

tests/PCB.scad

@@ -19,11 +19,12 @@
 include <../core.scad>
 include <../vitamins/microswitches.scad>
 include <../vitamins/d_connectors.scad>
+include <../vitamins/leds.scad>
 
 use <../vitamins/pcb.scad>
 
-gt_5x17 = ["gt_5x17",    5,   10,   17, 5,   11, 0.4,  9,   2,1.5,     1,  3,   6,     0,  0,   0];
-gt_5x11 = ["gt_5x11",    5,    8,   11, 5,    7, 0.4,  7,   1.5,1.5,   1,2.5,   6,     0,  0,   0];
+gt_5x17 = ["gt_5x17",    5,   10,   17, 5,   11, 0.4,  9,   2,1.5,     1,  3,   6,    0.5, 0,  0,   0];
+gt_5x11 = ["gt_5x11",    5,    8,   11, 5,    7, 0.4,  7,   1.5,1.5,   1,2.5,   6,    0.5, 0,  0,   0];
 
 TMC2130HeatSinkColor = "DeepSkyBlue";
 TMC2130 = ["TMC2130", "TMC2130",
@@ -44,62 +45,72 @@ TMC2130 = ["TMC2130", "TMC2130",
 ];
 
 test_pcb = ["TestPCB", "Test PCB",
-    50, 500, 1.6, // length, width, thickness
+    100, 250, 1.6, // length, width, thickness
     3,      // Corner radius
     2.75,   // Mounting hole diameter
-    6,      // Pad around mounting hole
+    5.5,    // Pad around mounting hole
     "green",// Color
-    false,  // True if the parts should be separate BOM items
+    true,   // True if the parts should be separate BOM items
     // hole offsets
     [ [3, 3], [3, -3], [-3, 3], [-3, -3] ],
     // components
     [
+        [ 20, -5, 180, "trimpot10"],
+        [ 20, -15,  0, "trimpot10", true],
+
         [ 10,  10,   0, "2p54header", 4, 1],
         [ 25,  10,   0, "2p54header", 5, 1, undef, "blue" ],
         [ 10,  20,   0, "2p54boxhdr", 4, 2],
         [ 10,  30,   0, "2p54socket", 6, 1],
         [ 25,  30,   0, "2p54socket", 4, 1, undef, undef, undef, "red" ],
         [ 10,  40,   0, "chip", 10, 5, 1, grey20],
-        [ 10,  60, 180, "rj45"],
-        [  8,  80, 180, "usb_A"],
-        [  8, 100, 180, "usb_Ax2"],
-        [  3, 120, 180, "usb_uA"],
+        [  5,  50,   0, "led", LED3mm, "red"],
+        [ 12,  50,   0, "led", LED5mm, "orange"],
+        [ 25,  50,   0, "led", LED10mm, "yellow"],
+        [ 10,  65, 180, "rj45"],
+        [  8,  85, 180, "usb_A"],
+        [  8, 105, 180, "usb_Ax2"],
+        [  3, 125, 180, "usb_uA"],
         [  8, 140, 180, "usb_B"],
-        [ 10, 160,   0, "buzzer"],
-        [ 25, 160,   0, "buzzer", 4.5, 8.5],
-        [ 10, 175,   0, "potentiometer"],
-        [ 30, 175,   0, "potentiometer", 7, 8],
+        [  5, 160,   0, "buzzer", 4.5, 8.5],
+        [ 20, 160,   0, "buzzer"],
         [  8, 190, 180, "jack"],
         [  6, 200, 180, "barrel_jack"],
-        [  5, 220, 180, "hdmi"],
-        [  3, 240, 180, "mini_hdmi"],
-        [ 10, 250,   0, "flex"],
-        [ 10, 265,   0, "flat_flex"],
-        [ 10, 280,   0, "D_plug", DCONN9],
-        [ 10, 300,   0, "molex_hdr", 2],
-        [ 10, 310,   0, "jst_xh", 2],
-        [ 10, 320, 180, "term254", 3],
-        [ 20, 320, 180, "term254", 3, undef, grey20],
-        [ 10, 340, 180, "gterm35", 4, [1,2]],
-        [ 20, 340, 180, "gterm35", 4, [1,2], "red"],
-        [ 30, 340, 180, "gterm", gt_5x11, 3],
-        [ 10, 360, 180, "gterm635", 2],
-        [ 25, 360, 180, "gterm635", 2, undef, "blue"],
-        [ 40, 360, 180, "gterm", gt_5x17, 2, undef, grey20],
-        [ 40, 340, 180, "gterm", gt_5x17, 3, [1], "red"],
-        [ 10, 380, 180, "term35", 4],
-        [ 20, 380, 180, "term35", 3, "lime"],
-        [ 10, 400,   0, "transition", 5],
-        [ 10, 410,   0, "block", 10, 5, 8, "orange"],
-        [ 10, 420,   0, "button_6mm"],
-        [ 10, 435,   0, "microswitch", small_microswitch],
-        [ 12, 450,   0, "pcb", 11, TMC2130 ],
-        [ 12, 456,   0, "2p54socket", 8, 1 ],
-        [ 12, 444,   0, "2p54socket", 8, 1, undef, undef, undef, "red" ],
-        [ 10, 470,   0, "standoff",  5, 4.5, 12.5, 2.54],
-        [  6, 480, 180, "uSD", [12, 11.5, 1.4]],
-        [ 20, -5, 180, "trimpot10"],
-        [ 20, -15,  0, "trimpot10", true],
+        [  5, 218, 180, "hdmi"],
+        [  3, 235, 180, "mini_hdmi"],
+        [  6, 175, 180, "uSD", [12, 11.5, 1.4]],
+
+        [ 60,   3,   0, "flex"],
+        [ 50,  15,   0, "flat_flex"],
+        [ 60,  35,   0, "D_plug", DCONN9],
+
+        [ 50,  50,   0, "molex_hdr", 2],
+        [ 50,  60,   0, "jst_xh", 2],
+        [ 50,  70, 180, "term254", 3],
+        [ 63,  70, 180, "term254", 3, undef, grey20],
+        [ 75,  70, 180, "gterm508",2, undef, "blue"],
+
+        [ 50,  90, 180, "gterm35", 4, [1,2]],
+        [ 63,  90, 180, "gterm35", 4, [1,2], "red"],
+        [ 75,  90, 180, "gterm", gt_5x11, 3],
+        [ 90,  90, 180, "gterm", gt_5x17, 3, [1], "red"],
+
+        [ 55, 110, 180, "gterm635", 2],
+        [ 75, 110, 180, "gterm635", 2, undef, "blue"],
+        [ 90, 110, 180, "gterm", gt_5x17, 2, undef, grey20],
+
+        [ 50, 130, 180, "term35", 4],
+        [ 70, 130, 180, "term35", 3, "lime"],
+        [ 50, 150,   0, "transition", 5],
+        [ 50, 160,   0, "block", 10, 5, 8, "orange"],
+        [ 50, 170,   0, "button_6mm"],
+        [ 50, 185,   0, "microswitch", small_microswitch],
+        [ 52, 200,   0, "pcb", 11, TMC2130 ],
+        [ 52, 206,   0, "2p54socket", 8, 1 ],
+        [ 52, 194,   0, "2p54socket", 8, 1, undef, undef, undef, "red" ],
+        [ 50, 220,   0, "standoff",  5, 4.5, 12.5, 2.54],
+        [ 50, 240,   0, "potentiometer"],
+        [ 75, 240,   0, "potentiometer", 7, 8],
     ],
     // accessories
     []

utils/core/bom.scad

@@ -107,7 +107,7 @@ module stl_colour(colour = pp1_colour, alpha = 1) { //! Colour an stl where it i
         children();
 }
 
-module stl(name) { //! Name an stl that will appear on the BOM, there needs to a module named ```<name>_stl``` to make it
+module stl(name) {                      //! Name an stl that will appear on the BOM, there needs to a module named ```<name>_stl``` to make it
     if(bom_mode()) {
         colour = is_undef($stl_colour) ? pp1_colour : $stl_colour;
         echo(str("~", name, ".stl(colour='", colour, "')"));
@@ -115,8 +115,12 @@ module stl(name) { //! Name an stl that will appear on the BOM, there needs to a
 }
 
 module dxf(name) {                      //! Name a dxf that will appear on the BOM, there needs to a module named ```<name>_dxf``` to make it
-    if(bom_mode())
-        echo(str("~", name, ".dxf"));
+    if(bom_mode()) {
+        if(is_undef($dxf_colour))
+            echo(str("~", name, ".dxf"));
+        else
+            echo(str("~", name, ".dxf(colour='", $dxf_colour, "')"));
+    }
 }
 
 function value_string(value) = is_string(value) ? str("\"", value, "\"") : str(value); //! Convert ```value``` to a string or quote it if it is already a string

vitamins/ball_bearing.scad

@@ -26,36 +26,51 @@
 //! Also single bearing balls are modelled as just a silver sphere and a BOM entry.
 //
 include <../utils/core/core.scad>
+include <../utils/tube.scad>
 
 function bb_name(type)     = type[0]; //! Part code without shield type suffix
 function bb_bore(type)     = type[1]; //! Internal diameter
 function bb_diameter(type) = type[2]; //! External diameter
 function bb_width(type)    = type[3]; //! Width
 function bb_colour(type)   = type[4]; //! Shield colour, "silver" for metal
-function bb_rim(type)      = bb_diameter(type) / 10;  //! Inner and outer rim thickness
+function bb_rim(type)      = type[5]; //! Outer rim thickness guesstimate
+function bb_hub(type)      = type[6]; //! Inner rim thickness guesstimate
 
 module ball_bearing(type) { //! Draw a ball bearing
     shield = bb_colour(type);
     suffix = shield == "silver" ? "ZZ " : "-2RS ";
     vitamin(str("ball_bearing(BB", bb_name(type), "): Ball bearing ", bb_name(type), suffix, bb_bore(type), "mm x ", bb_diameter(type), "mm x ", bb_width(type), "mm"));
     rim = bb_rim(type);
+    hub = bb_hub(type);
     h = bb_width(type);
-    od = bb_diameter(type);
-    id = bb_bore(type);
-
-    module tube(od, id, h)
-        linear_extrude(h, center = true, convexity = 5)
-            difference() {
-                circle(d = od);
-                circle(d = id);
-            }
+    or = bb_diameter(type) / 2;
+    ir = bb_bore(type) / 2;
 
     color("silver") {
-        tube(od, od - rim, h);
-        tube(id + rim, id, h);
+        $fn = 360;
+
+        rim_chamfer = rim / 6;
+        rotate_extrude()
+            hull() {
+                translate([or - rim / 2, 0])
+                    square([rim, h - 2 * rim_chamfer], center = true);
+
+                translate([or - rim / 2 - rim_chamfer, 0])
+                    square([rim - rim_chamfer, h], center = true);
+            }
+
+        hub_chamfer = hub / 6;
+        rotate_extrude()
+            hull() {
+                translate([ir + hub / 2, 0])
+                    square([hub, h - 2 * hub_chamfer], center = true);
+
+                translate([ir + hub / 2 + hub_chamfer, 0])
+                    square([hub - hub_chamfer, h], center = true);
+            }
     }
 
-    color(shield) tube(od - rim, id + rim, h - 1);
+    color(shield) tube(or - rim - eps, ir + hub + eps, h - 1);
 
     if($children)
         translate_z(bb_width(type) / 2)

vitamins/ball_bearings.scad

@@ -16,11 +16,11 @@
 // You should have received a copy of the GNU General Public License along with NopSCADlib.
 // If not, see <https://www.gnu.org/licenses/>.
 //
-BB624 = ["624", 4, 13, 5, "blue"];      // 624 ball bearing for idlers
-BB608 = ["608", 8, 22, 7, "OrangeRed"]; // 608 bearings for wades
-BB6200 = ["6200", 10, 30, 9, "black"];  // 6200 bearings for KP pillow blocks
-BB6201 = ["6201", 12, 32, 10, "black"]; // 6201 bearings for KP pillow blocks
-
-ball_bearings = [BB624, BB608, BB6200, BB6201];
+BB624 =  ["624",  4,  13, 5, "blue",      1.2, 1.2];  // 624 ball bearing for idlers
+BB608 =  ["608",  8,  22, 7, "OrangeRed", 1.4, 2.0];  // 608 bearings for wades
+BB6200 = ["6200", 10, 30, 9, "black",     2.3, 3.6];  // 6200 bearings for KP pillow blocks
+BB6201 = ["6201", 12, 32, 10, "black",    2.4, 3.7];  // 6201 bearings for KP pillow blocks
+BB6808 = ["6808", 40, 52, 7, "black",     1.5, 1.6];
+ball_bearings = [BB624, BB608, BB6200, BB6201, BB6808];
 
 use <ball_bearing.scad>

vitamins/green_terminal.scad

@@ -35,9 +35,10 @@ function gt_screw_r(type)      = type[9];   //! Screw head radius
 function gt_front_t(type)      = type[10];  //! Thickness of frame around the front aperture
 function gt_box_w(type)        = type[11];  //! Width inside the cable entry box
 function gt_box_h(type)        = type[12];  //! Height of the cable entry box
-function gt_y_offset(type)     = type[13];  //! Offset of the pins from centre of the depth
-function gt_y_offset2(type)    = type[14];  //! Offset of the pins screws from the screws
-function gt_tube_h(type)       = type[15];  //! Height of optional tubes around the screws
+function gt_box_setback(type)  = type[13];  //! How far the contact box is set back from the front
+function gt_y_offset(type)     = type[14];  //! Offset of the pins from centre of the depth
+function gt_y_offset2(type)    = type[15];  //! Offset of the pins from the screws
+function gt_tube_h(type)       = type[16];  //! Height of optional tubes around the screws
 
 module green_terminal(type, ways, skip = [], colour = "lime") { //! Draw green terminal blocks, skip can be used to remove pins.
     pitch = gt_pitch(type);
@@ -60,7 +61,7 @@ module green_terminal(type, ways, skip = [], colour = "lime") { //! Draw green t
         box_h2 = gt_box_h(type);
         y = gt_y_offset(type);
         y2 = gt_y_offset2(type);
-        box_front = y + depth / 2 - 2;
+        box_front = y + depth / 2 - gt_box_setback(type);
         box_back = y - depth / 2 + 1;
 
         module horizontal_section()
@@ -141,37 +142,37 @@ module green_terminal(type, ways, skip = [], colour = "lime") { //! Draw green t
         }
         if(!skip)
             color("silver") {
-                    slot_depth = 1;
-                    screw_top = height - 0.5;
-                    pin_l = 3.3;
-                    translate([y2, 0]) {
-                        translate_z(screw_top - 2 * slot_depth)        // screw head
-                            cylinder(r = screw_r, h = slot_depth);
+                slot_depth = 1;
+                screw_top = height - 0.5;
+                pin_l = 3.3;
+                translate([y2, 0]) {
+                    translate_z(screw_top - 2 * slot_depth)        // screw head
+                        cylinder(r = screw_r, h = slot_depth);
 
-                        translate_z(screw_top - slot_depth)         // screw head
-                            linear_extrude(slot_depth)
-                                difference() {
-                                    circle(screw_r);
+                    translate_z(screw_top - slot_depth)         // screw head
+                        linear_extrude(slot_depth)
+                            difference() {
+                                circle(screw_r);
 
-                                    square([10, screw_r / 4], center = true);
-                                }
-                    }
-                    translate([box_back, 0, ledge_height / 2]) {
-                        rotate([0, 90, 0])
-                            linear_extrude(box_front - box_back)
-                                difference() {
-                                    square([box_h2, box_w2], center = true);
-
-                                    square([box_h2 - 0.1, box_w2 - 0.1], center = true);
-
-                                }
-
-                        cube([1, box_w2, box_h2], center = true); // terminal back
-                    }
-
-                    translate_z(-pin_l)
-                        cube([0.44, 0.75, pin_l]);     // pin
+                                square([10, screw_r / 4], center = true);
+                            }
                 }
+                translate([box_back, 0, ledge_height / 2]) {
+                    rotate([0, 90, 0])
+                        linear_extrude(box_front - box_back)
+                            difference() {
+                                square([box_h2, box_w2], center = true);
+
+                                square([box_h2 - 0.1, box_w2 - 0.1], center = true);
+
+                            }
+
+                    cube([1, box_w2, box_h2], center = true); // terminal back
+                }
+
+                translate_z(-pin_l / 2)
+                    cube([0.44, 0.75, pin_l], center = true);     // pin
+            }
     }
     for(i = [0: ways - 1])
         translate([0, i * pitch - width / 2 + pitch / 2])

vitamins/green_terminals.scad

@@ -19,17 +19,19 @@
 // Green terminal blocks
 //
 
-//                                            f        b                               y   y
-//                                   h        h    f   h    b   s      f               o   o
-//                       p     d     e        e    d   e    d   c      r               f   f    t
-//                       i     e     i        i    e   i    e   r      o   b    b      f   f    u
-//                       t     p     g  t     g    p   g    p   e      n   o    o      s   s    b
-//                       c     t     h  o     h    t   h    t   w      t   x    x      e   t    e
-//                       h     h     t  p     t    h   t    h   r      t   w    h      t   2    h
-gt_2p54 = ["gt_2p54", 2.54,  6.6,   10, 3,    6, 0.4,  6.4, 1,  1,    0.2, 2,   2,     0,  0,   0];
-gt_3p5  = ["gt_3p5",  3.5,   7.3,  8.5, 4,    5, 0.4,  4,   0,  1.35, 0.4, 1.8, 2,     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, 1.8,  1.1, 21.4];
+//                                            f        b                               b    y    y
+//                                   h        h    f   h    b     s      f             o    o    o
+//                       p     d     e        e    d   e    d     c      r             x    f    f     t
+//                       i     e     i        i    e   i    e     r      o   b    b         f    f     u
+//                       t     p     g  t     g    p   g    p     e      n   o    o    s    s    s     b
+//                       c     t     h  o     h    t   h    t     w      t   x    x    b    e    t     e
+//                       h     h     t  p     t    h   t    h     r      t   w    h         t    2     h
+//
+gt_2p54 = ["gt_2p54", 2.54,  6.6,   10, 3,    6, 0.4,  6.4, 1,    1,    0.2, 2,   2,   2,   0,   0,    0];
+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];
 
-green_terminals = [gt_2p54, gt_3p5, gt_6p35];
+green_terminals = [gt_2p54, gt_3p5, gt_5p08, gt_6p35];
 
 use <green_terminal.scad>

vitamins/led.scad

@@ -49,7 +49,7 @@ module led(type, colour = "red", lead = 5) { //! Draw specified LED with desired
             }
     }
     color("silver")
-        for(side = [-1, 1], len = lead - side)
+        for(side = [-1, 1], len = lead - (lead < 3 ? 0 : side))
             translate([side * led_pitch(type) / 2, 0, -len / 2])
                 vflip()
                     cube([led_lead_t(type), led_lead_t(type), len], center = true);

vitamins/pcb.scad

@@ -33,6 +33,7 @@ use <../utils/dogbones.scad>
 use <../utils/thread.scad>
 use <../utils/tube.scad>
 use <d_connector.scad>
+use <led.scad>
 
 function pcb_name(type)         = type[1];  //! Description
 function pcb_length(type)       = type[2];  //! Length
@@ -808,6 +809,7 @@ module pcb_component(comp, cutouts = false, angle = undef) { //! Draw pcb compon
         if(show(comp, "term254")) if(!cutouts) green_terminal(gt_2p54,comp[4], comp[5], param(6,"lime"));
         if(show(comp, "gterm")) if(!cutouts) green_terminal(comp[4], comp[5], comp[6], param(7,"lime"));
         if(show(comp, "gterm35")) if(!cutouts) green_terminal(gt_3p5, comp[4], comp[5], param(6,"lime"));
+        if(show(comp, "gterm508")) if(!cutouts) green_terminal(gt_5p08, comp[4], comp[5], param(6,"lime"));
         if(show(comp, "gterm635")) if(!cutouts) green_terminal(gt_6p35, comp[4], comp[5], param(6,"lime"));
         if(show(comp, "term35")) if(!cutouts) terminal_35(comp[4], param(5,"blue"));
         if(show(comp, "transition")) if(!cutouts) idc_transition(2p54header, comp[4], comp[5]);
@@ -820,6 +822,7 @@ module pcb_component(comp, cutouts = false, angle = undef) { //! Draw pcb compon
         if(show(comp, "standoff")) if(!cutouts) standoff(comp[4], comp[5], comp[6], comp[7]);
         if(show(comp, "uSD")) uSD(comp[4], cutouts);
         if(show(comp, "trimpot10")) trimpot10(param(4, false), cutouts);
+        if(show(comp, "led")) led(comp[4], comp[5], 2.6);
     }
 }
 

vitamins/pcbs.scad

@@ -18,6 +18,8 @@
 //
 include <microswitches.scad>
 include <d_connectors.scad>
+include <leds.scad>
+
 //
 //                                   l      w      t    r     h     l  c        b     h
 //                                   e      i      h    a     o     a  o        o     o
@@ -177,7 +179,7 @@ Duex2 = ["Duex2", "Duex2 expansion board",
                                                                     ],
                                                                     []];
 
-Duex5 = ["Duex5", "Duex5 expasnion board",
+Duex5 = ["Duex5", "Duex5 expansion board",
                                      123,   100,   1.6, 0,    4.2,  0, "#2140BE",  false, [[-4, 4], [-4, -4], [4, -4],[4, 4]],
                                                                    concat(Duex2[11], [
                                                                      [ 61.5, -81.2,   0, "chip", 10, 10, 2],
@@ -324,7 +326,15 @@ PI_IO = ["PI_IO", "PI_IO V2",       35.56, 25.4, 1.6, 0,    0,   0, "green", tru
     ], []];
 
 ZC_A0591 = ["ZC_A0591", "ZC-A0591 ULN2003 driver PCB", 35, 32, 1.6, 0, 2.5, 0, "green", false, [[2.25, 3.25], [-2.25, 3.25], [2.25, -3.25], [-2.25, -3.25] ],
-    [], [], [], [], M2p5_pan_screw];
+    [ [ 12.25,  8.3,  -90, "jst_xh", 5],
+      [ -6.5,  10,      0, "2p54header", 1, 4],
+      [-14,    -4.5,    0, "2p54header", 4, 1],
+      [  5.5,  6,       0, "led", LED3mm, [1,1,1, 0.5]],
+      [  5.5,  10.5,    0, "led", LED3mm, [1,1,1, 0.5]],
+      [  5.5,  15,      0, "led", LED3mm, [1,1,1, 0.5]],
+      [  5.5,  19.5,    0, "led", LED3mm, [1,1,1, 0.5]],
+
+    ], [], [], [], M2p5_pan_screw];
 
 
 MT3608 = ["MT3608", "MT3608 boost converter module",        37, 17, 1.2, 2, 1.5, [5, 3], "#2140BE", false, [[3.0725, 5.095], [3.0725, -5.095], [-3.0725, 5.095], [-3.0725, -5.095]],
@@ -337,6 +347,16 @@ TP4056 = ["TP4056", "TP4056 Li-lon Battery charger module", 26.2, 17.5, 1.0, 0,
 
     ]];
 
+WD2002SJ = ["WD2002SJ", "WD2002SJ Buck Boost DC-DC converter", 78, 47, 1.6, 0, 3.2, 0, "#2140BE", false, [[4,4], [-4,4], [-4,-4], [4,-4]],
+    [ [ 39,   -20.5,  0, "-chip", 63, 41, 4, "silver"],
+      [ -4,    12,    0, "gterm508", 2, [], "blue"],
+      [  4,    12,  180, "gterm508", 2, [], "blue"],
+      [ -25.5, 3.1,   0, "trimpot10", true],
+      [  30.5, 3.1,   0, "trimpot10", true],
+      [  41.5, 3.1,   0, "trimpot10", true],
+    ],
+    []];
+
 PERF80x20 = ["PERF80x20", "Perfboard 80 x 20mm", 80, 20, 1.6, 0, 2.3, 0, "green", true, [[2,2],[-2,2],[2,-2],[-2,-2]], [], [], [5.87, 3.49]];
 
 PERF70x50 = ["PERF70x50", "Perfboard 70 x 50mm", 70, 50, 1.6, 0, 2.3, 0, "green", true, [[2,2],[-2,2],[2,-2],[-2,-2]], [], [], [5.87, 3.49]];
@@ -362,7 +382,7 @@ RAMPSEndstop = ["RAMPSEndstop", "RAMPS Endstop Switch",
     []];
 
 
-pcbs = [TP4056, MT3608, RAMPSEndstop, ExtruderPCB, PI_IO, ZC_A0591, RPI0, EnviroPlus, ArduinoUno3, ArduinoLeonardo, Keyes5p1, PSU12V1A, RPI3, DuetE, Duex2, Duex5, Melzi];
+pcbs = [TP4056, MT3608, RAMPSEndstop, ExtruderPCB, PI_IO, ZC_A0591, RPI0, EnviroPlus, ArduinoUno3, ArduinoLeonardo, Keyes5p1, PSU12V1A, WD2002SJ, RPI3, DuetE, Duex2, Duex5, Melzi];
 
 perfboards = [PERF74x51, PERF70x50, PERF60x40, PERF70x30, PERF80x20];
 

vitamins/screw.scad

@@ -23,6 +23,7 @@
 include <../utils/core/core.scad>
 
 use <washer.scad>
+use <nut.scad>
 use <../utils/rounded_cylinder.scad>
 use <../utils/thread.scad>
 include <inserts.scad>

vitamins/sheet.scad

@@ -83,6 +83,7 @@ module render_sheet(type, colour = false) //! Render a sheet in the correct colo
         render() children();
 
 module render_2D_sheet(type, colour = false) //! Extrude a 2D sheet template and give it the correct colour
-    color(colour ? colour : sheet_colour(type))
-        linear_extrude(sheet_thickness(type), center = true)
-            children();
+    let($dxf_colour = colour ? colour : sheet_colour(type))
+        color($dxf_colour)
+            linear_extrude(sheet_thickness(type), center = true)
+                children();