Merge branch 'loekwous-feature/add-blackpill-pcb'

CHANGELOG.md

@@ -3,6 +3,13 @@
 This changelog is generated by `changelog.py` using manually added semantic version tags to classify commits as breaking changes, additions or fixes.
 
 
+### [v21.32.0](https://github.com/nophead/NopSCADlib/releases/tag/v21.32.0 "show release") Additions [...](https://github.com/nophead/NopSCADlib/compare/v21.31.0...v21.32.0 "diff with v21.31.0")
+*   2024-10-20 [`4d89117`](https://github.com/nophead/NopSCADlib/commit/4d8911718c54fdee5054d934c4aeeee34386d7f9 "show commit") [C.P.](# "Chris Palmer") Updated images and readme.
+
+*   2024-10-17 [`cb57b25`](https://github.com/nophead/NopSCADlib/commit/cb57b25b0bbe23b5f5a7f5c910dbdd3cf53530dd "show commit") [F.R.](# "Fran<61>ois Revol") Add 10x15 micro rocker switches
+
+ * Spades are not exact but close enough.
+
 ### [v21.31.0](https://github.com/nophead/NopSCADlib/releases/tag/v21.31.0 "show release") Additions [...](https://github.com/nophead/NopSCADlib/compare/v21.30.0...v21.31.0 "diff with v21.30.0")
 *   2024-10-17 [`066242a`](https://github.com/nophead/NopSCADlib/commit/066242af588446037fc69606388ccc65d9884ad6 "show commit") [C.P.](# "Chris Palmer") Updated images and readme.
 

readme.md

@@ -2982,6 +2982,7 @@ PCBs and perfboard with optional components. The shape can be a rectangle with o
 |   1 | `pcb(BTT_SKR_E3_TURBO)` |  BigTreeTech SKR E3 Turbo |
 |   1 | `pcb(BTT_SKR_MINI_E3_V2_0)` |  BigTreeTech SKR Mini E3 v2.0 |
 |   1 | `pcb(BTT_SKR_V1_4_TURBO)` |  BigTreeTech SKR v1.4 Turbo |
+|   1 | `pcb(BlackPill)` |  Black Pill |
 |   1 |  |  Cat 5 patch cable 300mm |
 |   1 | `d_plug(DCONN15, pcb = true)` |  D-type 15 way PCB mount plug - not shown |
 |   1 | `pcb(DuetE)` |  Duet 2 Ethernet electronics |
@@ -3009,7 +3010,7 @@ PCBs and perfboard with optional components. The shape can be a rectangle with o
 |   1 | `molex_254(3)` |  Molex KK header 3 way - not shown |
 |  20 | `nut(M2_nut, nyloc = true)` |  Nut M2 x 1.6mm nyloc |
 |  38 | `nut(M2p5_nut, nyloc = true)` |  Nut M2.5 x 2.2mm nyloc |
-|  47 | `nut(M3_nut, nyloc = true)` |  Nut M3 x 2.4mm nyloc |
+|  48 | `nut(M3_nut, nyloc = true)` |  Nut M3 x 2.4mm nyloc |
 |   8 | `nut(M4_nut, nyloc = true)` |  Nut M4 x 3.2mm nyloc |
 |   1 | `pcb(OPZ2)` |  Orange Pi Zero 2 |
 |   1 | `pcb(PI_IO)` |  PI_IO V2 - not shown |
@@ -3033,17 +3034,19 @@ PCBs and perfboard with optional components. The shape can be a rectangle with o
 |   4 | `screw(M2_cap_screw, 25)` |  Screw M2 cap x 25mm |
 |   2 | `screw(M2p5_cap_screw, 20)` |  Screw M2.5 cap x 20mm |
 |   8 | `screw(M2p5_cap_screw, 30)` |  Screw M2.5 cap x 30mm |
-|  12 | `screw(M2p5_cap_screw, 35)` |  Screw M2.5 cap x 35mm |
+|   8 | `screw(M2p5_cap_screw, 35)` |  Screw M2.5 cap x 35mm |
+|   4 | `screw(M2p5_cap_screw, 40)` |  Screw M2.5 cap x 40mm |
 |   4 | `screw(M2p5_dome_screw, 25)` |  Screw M2.5 dome x 25mm |
 |   4 | `screw(M2p5_pan_screw, 20)` |  Screw M2.5 pan x 20mm |
 |   8 | `screw(M2p5_pan_screw, 30)` |  Screw M2.5 pan x 30mm |
 |  19 | `screw(M3_cap_screw, 16)` |  Screw M3 cap x 16mm |
 |  13 | `screw(M3_cap_screw, 20)` |  Screw M3 cap x 20mm |
-|   4 | `screw(M3_cap_screw, 25)` |  Screw M3 cap x 25mm |
+|   5 | `screw(M3_cap_screw, 25)` |  Screw M3 cap x 25mm |
 |  11 | `screw(M3_cap_screw, 35)` |  Screw M3 cap x 35mm |
 |   4 | `screw(M4_cap_screw, 20)` |  Screw M4 cap x 20mm |
 |   4 | `screw(M4_cap_screw, 25)` |  Screw M4 cap x 25mm |
 |   1 | `pcb(XIAO)` |  Seeeduino XIAO |
+|   1 | `pcb(9DOF_stick)` |  Sparkfun 9 degrees of freedom IMU |
 |   1 | `pcb(TP4056)` |  TP4056 Li-lon Battery charger module |
 |   3 | `terminal_35(2)` |  Terminal block 2 way 3.5mm - not shown |
 |   2 | `green_terminal(gt_2p54, 4)` |  Terminal block 4 way 0.1" - not shown |
@@ -3052,7 +3055,7 @@ PCBs and perfboard with optional components. The shape can be a rectangle with o
 |   1 | `pcb(WD2002SJ)` |  WD2002SJ Buck Boost DC-DC converter |
 |  20 | `washer(M2_washer)` |  Washer  M2 x 5mm x 0.3mm |
 |  38 | `washer(M2p5_washer)` |  Washer  M2.5 x 5.9mm x 0.5mm |
-|  47 | `washer(M3_washer)` |  Washer  M3 x 7mm x 0.5mm |
+|  48 | `washer(M3_washer)` |  Washer  M3 x 7mm x 0.5mm |
 |   8 | `washer(M4_washer)` |  Washer  M4 x 9mm x 0.8mm |
 |   1 | `pcb(ZC_A0591)` |  ZC-A0591 ULN2003 driver PCB |
 
@@ -3066,18 +3069,18 @@ PCBs and perfboard with optional components. The shape can be a rectangle with o
 |   4 | pcb_spacer2090.stl |
 |   2 | pcb_spacer25110.stl |
 |   4 | pcb_spacer25140.stl |
-|   4 | pcb_spacer25170.stl |
 |   4 | pcb_spacer25180.stl |
-|   4 | pcb_spacer25190_2.stl |
+|   4 | pcb_spacer25190.stl |
 |   4 | pcb_spacer25200_2.stl |
-|   4 | pcb_spacer25240.stl |
+|   4 | pcb_spacer25210_2.stl |
 |   4 | pcb_spacer25250.stl |
 |   4 | pcb_spacer25260.stl |
+|   4 | pcb_spacer25270.stl |
 |   4 | pcb_spacer2580.stl |
-|   4 | pcb_spacer30130.stl |
-|   4 | pcb_spacer30210.stl |
+|   5 | pcb_spacer30130.stl |
 |   4 | pcb_spacer30220.stl |
-|   3 | pcb_spacer30230.stl |
+|   4 | pcb_spacer30230.stl |
+|   3 | pcb_spacer30240.stl |
 |  10 | pcb_spacer3050.stl |
 |   9 | pcb_spacer3060.stl |
 |   9 | pcb_spacer3070.stl |

scripts/exports.py

@@ -66,9 +66,16 @@ def make_parts(target, part_type, parts = None):
     top_dir = set_config(target, lambda: usage(part_type))
     target_dir = top_dir + part_type + 's'
     deps_dir = target_dir + "/deps"
-    bom_dir = top_dir + "bom"
-    tmp_dir = mktmpdir(top_dir)
 
+    #
+    # Check we have some of this type
+    #
+    bom_dir = top_dir + "bom"
+    all_parts = bom_to_parts(bom_dir, part_type)
+    if not all_parts:
+        return
+
+    tmp_dir = mktmpdir(top_dir)
     if not os.path.isdir(target_dir):
         os.makedirs(target_dir)
 
@@ -83,7 +90,6 @@ def make_parts(target, part_type, parts = None):
     #
     # Decide which files to make
     #
-    all_parts = bom_to_parts(bom_dir, part_type)
     if parts:
         targets = list(parts)           #copy the list so we dont modify the list passed in
     else:

scripts/render.py

@@ -37,19 +37,21 @@ def usage():
     sys.exit(1)
 
 def render(target, type):
-    #
-    # Make the target directory
-    #
     top_dir = set_config(target, usage)
-    tmp_dir = mktmpdir(top_dir)
-    target_dir = top_dir + type + 's'
     bom_dir = top_dir + 'bom'
-    if not os.path.isdir(target_dir):
-        os.makedirs(target_dir)
     #
     # Find all the parts
     #
     parts = bom_to_parts(bom_dir, type)
+    if not parts:
+        return
+    #
+    # Make the target directory
+    #
+    tmp_dir = mktmpdir(top_dir)
+    target_dir = top_dir + type + 's'
+    if not os.path.isdir(target_dir):
+        os.makedirs(target_dir)
     #
     # Read the json bom to get the colours
     #

vitamins/pcbs.scad

@@ -750,7 +750,7 @@ ZC_A0591 = ["ZC_A0591", "ZC-A0591 ULN2003 driver PCB", 35, 32, 1.6, 0, 2.5, 0, "
     [ [ 11.725, 8.3,  -90, "jst_xh", 5],
       [ -6.5,  10,      0, "2p54header", 1, 4],
       [ 20.4,  -4.5,    0, "2p54header", 4, 1],
-      [ 20.4,  11,  180, "pdip", 16, "ULN2803AN", true],
+      [ 20.4,  11,  180, "pdip", 16, "ULN2003AN", true],
       [  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]],
@@ -1020,6 +1020,39 @@ ArduinoNano = let(l = 43.18, w = 17.78, pitch = inch(0.6), pins = 15, poffset =
     [(l - inch(pins - 1) / 10) / 2 + poffset, (w - pitch) / 2, pins, 2, silver, 2.54, pitch], // 15x2 grid of holes
 ];
 
+BlackPill = let(l = 52.81, w = 20.78, pitch = inch(0.6), pins = 20, poffset = inch(-0.05), led_spacing = [0, 9.93/2], btn_spacing = [0, 4.3/2]) [
+    "BlackPill", "Black Pill",
+    l, w, 1.6, // Size
+    0, // corner radius
+    0, // mounting hole diameter
+    0, // pad around mounting hole
+    "#101010", // color
+    false, // true if parts should be separate BOM items
+    [],
+    [ // components
+      [l / 2 + poffset, w / 2 - pitch / 2,  0, "-2p54joiner", pins, 1, undef, "yellow"],
+      [l / 2 + poffset, w / 2 + pitch / 2,  0, "-2p54joiner", pins, 1, undef, "yellow"],
+      [l - inch(0.27), w / 2, 90, "2p54header",  4,    1, undef, undef, true],
+      [ l -26.75, w / 2, 45, "chip", 7, 7, 1.3],
+      [ 3.6, w / 2, 180, "usb_C" ],
+      [ 15,                       5.3,   0, "text",    4, 1.27, "BOOT0"],
+      [ 15,                     w-5.3,   0, "text",    4, 1.27, "NRST"],
+      [ l - 16,     w/2-led_spacing.y,   0, "text",    4, 1.27, "PWR"],
+      [ l - 16,     w/2+led_spacing.y,   0, "text",    4, 1.27, "C13"],
+      [ 15,     w / 2 - btn_spacing.y,  90, "chip",  3.5,    6, 1.8, silver ], // mock button boot0
+      [ 15,     w / 2 - btn_spacing.y,  90, "chip",  1.3,  2.6, 2.6, grey(90) ], // mock button boot0
+      [ 15,     w / 2 + btn_spacing.y,  90, "chip",  3.5,    6, 1.8, silver ], // mock button nrst
+      [ 15,     w / 2 + btn_spacing.y,  90, "chip",  1.3,  2.6, 2.6, grey(90) ], // mock button nrst
+      [ l - 12,                   8.5,  90, "chip",  3.5,    6, 1.8, silver ], // mock button user
+      [ l - 12,                   8.5,  90, "chip",  1.3,  2.6, 2.6, grey(90) ], // mock button user
+      [ l - 17,                  12.5,  90, "chip",  3.2,  2.5, 0.6, brass ], // xtal
+      [ l - 12,                  12.5,  90, "smd_sot", SOT23],
+      [ l - 12, w / 2 - led_spacing.y,   0, "smd_led", LED0603, "red"],
+      [ l - 12, w / 2 + led_spacing.y,   0, "smd_led", LED0603, "blue"]],
+    [], // accessories
+    [(l - inch(pins - 1) / 10) / 2 + poffset, (w - pitch) / 2, pins, 2, silver, 2.54, pitch], // 15x2 grid of holes
+];
+
 KY_040 = ["KY_040", "KY-040 rotart encoder breakout",
     26.3, 19.5, 1.6, 0, 3, 0, grey(20),  false,
     [
@@ -1244,11 +1277,31 @@ tiny_buck = pcb("tiny_buck", "Ultra Small 3A buck regulator", [20, 11, 1.6],
     ]
 );
 
-tiny_pcbs = [ESP_201, ESP_01M, XIAO, ESP_12F, MP1584EN, ESP_01,tiny_buck, LIPO_fuel_gauge];
+9DOF_stick = pcb("9DOF_stick", "Sparkfun 9 degrees of freedom IMU", [24, 11, 0.8],
+    colour = "red",
+    hole_d = 3.3,
+    holes = [[-1.2 - 3.3 / 2, 11 / 2]],
+    components = [
+        [9.7, 11/ 2, 0, "chip", 3, 3.5, 1],
+        [9.7, 8.5, 0, "smd_cap",  CAP0603, 0.8],
+        for(i = [0 : 3])
+            [5.27, 2.5 + i * 2, 0, "smd_cap", CAP0603, 0.8],
+        [12.8, 4, 90, "smd_res", RES0603, "472"],
+        [14.1, 4, 90, "smd_res", RES0603, "472"],
+
+        // Silkscreen
+        [17.75, 1.4,   0,"text", 11, 1.4, "9DOF Stick",     "Liberation Sans:style=Bold"],
+        [3,  11/2, 90, "text", 10, 1, "SCL SDA VDD GND", "Liberation Sans:style=Bold"],
+    ],
+    grid = [inch(0.05), 11 / 2 - inch(0.15), 1, 4, "silver", 0, inch(0.1)]
+);
+
+tiny_pcbs = [ESP_201, ESP_01M, XIAO, ESP_12F, MP1584EN, ESP_01,tiny_buck, LIPO_fuel_gauge, 9DOF_stick];
 
 big_pcbs = [BTT_RELAY_V1_2, BTT_SKR_MINI_E3_V2_0, BTT_SKR_E3_TURBO, BTT_SKR_V1_4_TURBO, DuetE, Duex5];
 
-pcbs = [KY_040, TP4056, L9110S, ZC_A0591, RCWL0516, MT3608,RAMPSEndstop, ArduinoNano, HW803_1WAY_RELAY, Feather405, RPI_Pico, ESP32_DOIT_V1, RPI0, EnviroPlus, ArduinoUno3, ArduinoLeonardo, WD2002SJ, OPZ2, PanelDue_v3, RPI3A, RPI3, RPI4];
+pcbs = [KY_040, TP4056, L9110S, ZC_A0591, RCWL0516, MT3608,RAMPSEndstop, ArduinoNano, HW803_1WAY_RELAY, Feather405, RPI_Pico,
+        ESP32_DOIT_V1, BlackPill, RPI0, EnviroPlus, ArduinoUno3, ArduinoLeonardo, WD2002SJ, OPZ2, PanelDue_v3, RPI3A, RPI3, RPI4];
 
 pcbs_not_shown = [Melzi, Duex2, PSU12V1A, Keyes5p1, PI_IO, ExtruderPCB];