Merge branch 'elliotf-add-raspberry-pi-3a'

Tweaked some PCB component positions.

CHANGELOG.md

@@ -3,6 +3,28 @@
 This changelog is generated by `changelog.py` using manually added semantic version tags to classify commits as breaking changes, additions or fixes.
 
 
+### [v20.19.0](https://github.com/nophead/NopSCADlib/releases/tag/v20.19.0 "show release") Additions [...](https://github.com/nophead/NopSCADlib/compare/v20.18.1...v20.19.0 "diff with v20.18.1")
+*   2023-01-12 [`ebd50ba`](https://github.com/nophead/NopSCADlib/commit/ebd50bae535283b94b310ee74c9b98b2e3b7f8be "show commit") [C.P.](# "Chris Palmer") Added SMD diodes, inductors and potentiometers.
+Complete set of components added to MP1584EN buck regulator.
+
+#### [v20.18.1](https://github.com/nophead/NopSCADlib/releases/tag/v20.18.1 "show release") Fixes [...](https://github.com/nophead/NopSCADlib/compare/v20.18.0...v20.18.1 "diff with v20.18.0")
+*   2023-01-07 [`ec3e752`](https://github.com/nophead/NopSCADlib/commit/ec3e752fc5b5586ef5ac838c709ab4b704dac817 "show commit") [C.](# "Chris") Added missing documentation for `hinge_female()` module.
+
+### [v20.18.0](https://github.com/nophead/NopSCADlib/releases/tag/v20.18.0 "show release") Additions [...](https://github.com/nophead/NopSCADlib/compare/v20.17.0...v20.18.0 "diff with v20.17.0")
+*   2023-01-07 [`8587d52`](https://github.com/nophead/NopSCADlib/commit/8587d52d1b87dc9932c7e458798d4a6f3722a371 "show commit") [C.](# "Chris") Added `screw_keyhole()` module.
+
+### [v20.17.0](https://github.com/nophead/NopSCADlib/releases/tag/v20.17.0 "show release") Additions [...](https://github.com/nophead/NopSCADlib/compare/v20.16.0...v20.17.0 "diff with v20.16.0")
+*   2023-01-07 [`cec8c3a`](https://github.com/nophead/NopSCADlib/commit/cec8c3a107b81f8badb4e2077a318cc36fcdd481 "show commit") [C.](# "Chris") Added printed LED bezels.
+
+### [v20.16.0](https://github.com/nophead/NopSCADlib/releases/tag/v20.16.0 "show release") Additions [...](https://github.com/nophead/NopSCADlib/compare/v20.15.2...v20.16.0 "diff with v20.15.2")
+*   2023-01-07 [`848dcb8`](https://github.com/nophead/NopSCADlib/commit/848dcb86b9f1d9a164366208da76faea6d6050f1 "show commit") [C.](# "Chris") Added 8mm LED.
+
+#### [v20.15.2](https://github.com/nophead/NopSCADlib/releases/tag/v20.15.2 "show release") Fixes [...](https://github.com/nophead/NopSCADlib/compare/v20.15.1...v20.15.2 "diff with v20.15.1")
+*   2023-01-07 [`a31f6f1`](https://github.com/nophead/NopSCADlib/commit/a31f6f100ce18168594b02a25d5229536f02a65c "show commit") [C.](# "Chris") Revised LED dimensions.
+
+*   2023-01-07 [`b3dd635`](https://github.com/nophead/NopSCADlib/commit/b3dd635889f7ed4f779ee9408ff81ac64cb1f7ec "show commit") [C.](# "Chris") Fixed duplicated `dxf()` calls in printed box and `butt_box`.
+Client code now calls `dxf()` so that the generated files can be used to speed up assembly views.
+
 #### [v20.15.1](https://github.com/nophead/NopSCADlib/releases/tag/v20.15.1 "show release") Fixes [...](https://github.com/nophead/NopSCADlib/compare/v20.15.0...v20.15.1 "diff with v20.15.0")
 *   2022-12-06 [`e256801`](https://github.com/nophead/NopSCADlib/commit/e256801206189eafcf020cc7fdb50fff4314c397 "show commit") [C.P.](# "Chris Palmer") Added comment to indicate the `.py` suffix may be needed on linux and OSX.
 

printed/flat_hinge.scad

@@ -119,7 +119,8 @@ module hinge_male(type, female = false) {       //! The half with the stationary
         }
 }
 
-module hinge_female(type) hinge_male(type, true);
+module hinge_female(type) //! The half without the pin
+    hinge_male(type, true);
 
 module hinge_both(type) { //! Both parts together for printing
     hinge_male(type);

readme.md

@@ -2438,14 +2438,17 @@ PCBs and perfboard with optional components. The shape can be a rectangle with o
 |   1 | `box_header(2p54header, 4, 2)` |  Box header 4 x 2 |
 |   1 | `d_plug(DCONN9, pcb = true)` |  D-type 9 way PCB mount plug |
 |   1 | `dil_socket(12, 15.24)` |  DIL socket 24 x 0.6" |
+|   1 | `smd_diode(DO241AC)` |  DO241AC package SS34 |
 |   1 | `hdmi(hdmi_full)` |  HDMI socket |
 |   1 | `pdip(24, 27C32, w = 15.24)` |  IC 27C32 PDIP24 |
 |   1 | `pdip(8, NE555)` |  IC NE555 PDIP8 |
 |   1 | `idc_transition(2p54header, 5)` |  IDC transition header 5 x 2 |
+|   1 | `smd_inductor(IND2525)` |  IND2525 package 4R7 |
 |   1 | `potentiometer(KY_040_encoder)` |  KY_040_encoder |
 |   1 | `led(LED10mm, "yellow")` |  LED 10 mm yellow |
 |   1 | `led(LED3mm)` |  LED 3 mm red |
 |   1 | `led(LED5mm, "orange")` |  LED 5 mm orange |
+|   1 | `led(LED8mm, "blue")` |  LED 8 mm blue |
 |   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 |
@@ -2476,6 +2479,7 @@ PCBs and perfboard with optional components. The shape can be a rectangle with o
 |   1 | `smd_sot(SOT23)` |  SOT23 package 2N7000 |
 |   1 | `square_button(button_4p5mm)` |  Square button 4.5mm |
 |   1 | `square_button(button_6mm)` |  Square button 6mm |
+|   1 | `smd_pot(TC33X1)` |  TC33X1 package 10K |
 |   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" |
@@ -2612,12 +2616,12 @@ PCBs and perfboard with optional components. The shape can be a rectangle with o
 |   1 | `pcb(MP1584EN)` |  MP1584EN 3A buck converter |
 |   1 | `pcb(MT3608)` |  MT3608 boost converter module |
 |   1 | `pcb(Melzi)` |  Melzi electronics - not shown |
-|   4 |  |  Micro SD card |
+|   5 |  |  Micro SD card |
 |   1 |  |  Micro SD card - not shown |
 |   1 | `molex_254(2)` |  Molex KK header 2 way - not shown |
 |   1 | `molex_254(3)` |  Molex KK header 3 way - not shown |
 |  20 | `nut(M2_nut, nyloc = true)` |  Nut M2 x 1.6mm nyloc |
-|  30 | `nut(M2p5_nut, nyloc = true)` |  Nut M2.5 x 2.2mm nyloc |
+|  34 | `nut(M2p5_nut, nyloc = true)` |  Nut M2.5 x 2.2mm nyloc |
 |  36 | `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(PI_IO)` |  PI_IO V2 - not shown |
@@ -2631,6 +2635,7 @@ PCBs and perfboard with optional components. The shape can be a rectangle with o
 |   1 | `pin_socket(2p54header, 13, 2, right_angle = true)` |  Pin socket 13 x 2 right_angle - not shown |
 |   1 | `pcb(RAMPSEndstop)` |  RAMPS Endstop Switch |
 |   1 | `pcb(RPI3)` |  Raspberry Pi 3 |
+|   1 | `pcb(RPI3A)` |  Raspberry Pi 3 A+ |
 |   1 | `pcb(RPI4)` |  Raspberry Pi 4 |
 |   1 | `pcb(RPI_Pico)` |  Raspberry Pi Pico |
 |   1 | `pcb(RPI0)` |  Raspberry Pi Zero |
@@ -2638,15 +2643,14 @@ PCBs and perfboard with optional components. The shape can be a rectangle with o
 |  12 | `screw(M2_cap_screw, 20)` |  Screw M2 cap x 20mm |
 |   2 | `screw(M2p5_cap_screw, 16)` |  Screw M2.5 cap x 16mm |
 |   8 | `screw(M2p5_cap_screw, 25)` |  Screw M2.5 cap x 25mm |
-|   8 | `screw(M2p5_cap_screw, 30)` |  Screw M2.5 cap x 30mm |
+|  12 | `screw(M2p5_cap_screw, 30)` |  Screw M2.5 cap x 30mm |
 |   4 | `screw(M2p5_pan_screw, 20)` |  Screw M2.5 pan x 20mm |
 |   8 | `screw(M2p5_pan_screw, 25)` |  Screw M2.5 pan x 25mm |
 |   8 | `screw(M3_cap_screw, 16)` |  Screw M3 cap x 16mm |
 |   6 | `screw(M3_cap_screw, 20)` |  Screw M3 cap x 20mm |
 |   8 | `screw(M3_cap_screw, 30)` |  Screw M3 cap x 30mm |
 |  14 | `screw(M3_cap_screw, 35)` |  Screw M3 cap x 35mm |
-|   4 | `screw(M4_cap_screw, 35)` |  Screw M4 cap x 35mm |
-|   4 | `screw(M4_cap_screw, 40)` |  Screw M4 cap x 40mm |
+|   8 | `screw(M4_cap_screw, 40)` |  Screw M4 cap x 40mm |
 |   1 | `pcb(XIAO)` |  Seeeduino XIAO |
 |   1 | `pcb(TP4056)` |  TP4056 Li-lon Battery charger module |
 |   3 | `terminal_35(2)` |  Terminal block 2 way 3.5mm - not shown |
@@ -2654,7 +2658,7 @@ PCBs and perfboard with optional components. The shape can be a rectangle with o
 |   1 |  |  USB A to Mini B lead - not shown |
 |   1 | `pcb(WD2002SJ)` |  WD2002SJ Buck Boost DC-DC converter |
 |  20 | `washer(M2_washer)` |  Washer  M2 x 5mm x 0.3mm |
-|  30 | `washer(M2p5_washer)` |  Washer  M2.5 x 5.9mm x 0.5mm |
+|  34 | `washer(M2p5_washer)` |  Washer  M2.5 x 5.9mm x 0.5mm |
 |  36 | `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 |
@@ -2673,19 +2677,20 @@ PCBs and perfboard with optional components. The shape can be a rectangle with o
 |   4 | pcb_spacer25160_2.stl |
 |   4 | pcb_spacer25180.stl |
 |   4 | pcb_spacer25190.stl |
+|   4 | pcb_spacer25200.stl |
 |   2 | pcb_spacer2550.stl |
 |   4 | pcb_spacer2590.stl |
 |   4 | pcb_spacer30170.stl |
-|   4 | pcb_spacer30200.stl |
-|   5 | pcb_spacer30210.stl |
+|   4 | pcb_spacer30210.stl |
 |   5 | pcb_spacer30220.stl |
-|   4 | pcb_spacer30230.stl |
+|   5 | pcb_spacer30230.stl |
+|   4 | pcb_spacer30240.stl |
 |   4 | pcb_spacer3050.stl |
 |   4 | pcb_spacer3060.stl |
 |   2 | pcb_spacer3070.stl |
 |   4 | pcb_spacer3080.stl |
-|   4 | pcb_spacer40240.stl |
 |   4 | pcb_spacer40250.stl |
+|   4 | pcb_spacer40260.stl |
 
 
 <a href="#top">Top</a>
@@ -3348,6 +3353,7 @@ For an explanation of `screw_polysink()` see <https://hydraraptor.blogspot.com/2
 | `screw(type, length, hob_point = 0, nylon = false)` | Draw specified screw, optionally hobbed or nylon |
 | `screw_and_washer(type, length, star = false, penny = false)` | Screw with a washer which can be standard or penny and an optional star washer on top |
 | `screw_countersink(type, drilled = true)` | Countersink shape |
+| `screw_keyhole(type, h = 0)` | Make keyhole slot to accept and retain screw head |
 | `screw_polysink(type, h = 100, alt = false, sink = 0)` | A countersink hole made from stacked polyholes for printed parts, default is flush, `sink` can be used to recess the head |
 
 ![screws](tests/png/screws.png)
@@ -3577,7 +3583,7 @@ When woven sheets (e.g. carbon fibre) are rendered it is necessary to specify th
 |   1 | `sheet(AL3, 30, 30, 2)` |  Aluminium tooling plate 30mm x 30mm x 3mm |
 |   1 | `sheet(AL6, 30, 30, 2)` |  Aluminium tooling plate 30mm x 30mm x 6mm |
 |   1 | `sheet(AL8, 30, 30, 2)` |  Aluminium tooling plate 30mm x 30mm x 8mm |
-|   1 | `sheet(Spring05, 30, 30, 2)` |  Bi-metal saw blade 30mm x 30mm x 0.5mm |
+|   1 | `sheet(Spring08, 30, 30, 2)` |  Bi-metal saw blade 30mm x 30mm x 0.8mm |
 |   1 | `sheet(Cardboard, 30, 30, 2)` |  Corrugated cardboard 30mm x 30mm x 5mm |
 |   1 | `sheet(Foam20, 30, 30, 2)` |  Foam sponge 30mm x 30mm x 20mm |
 |   1 | `sheet(DiBond, 30, 30, 2)` |  Sheet DiBond 30mm x 30mm x 3mm |
@@ -3673,8 +3679,22 @@ Surface mount components for PCBs.
 |:--- |:--- |
 | `smd_cap_end_cap(type)` | End cap width |
 | `smd_cap_size(type)` | Body length, width |
+| `smd_diode_lead_z(type)` | Top of lead frame from top |
+| `smd_diode_leads(type)` | Lead extent in x, width, thickness and gap |
+| `smd_diode_size(type)` | Body length, width and height |
+| `smd_diode_z(type)` | Height above PCB surface |
+| `smd_inductor_colour(type)` | Body colour |
+| `smd_inductor_lead_z(type)` | Top of lead frame from top |
+| `smd_inductor_leads(type)` | Lead extent in x, width, thickness and gap |
+| `smd_inductor_size(type)` | Body length, width and height |
+| `smd_inductor_z(type)` | Height above PCB surface |
 | `smd_led_lens(type)` | Lens length width and height |
 | `smd_led_size(type)` | Body length, width and height |
+| `smd_pot_contacts(type)` | Contacts width, depth, pitch and width, depth, gap for center contact |
+| `smd_pot_cross(type)` | Cross head slot for screwdriver |
+| `smd_pot_flat(type)` | Flat at the back of the wiper |
+| `smd_pot_size(type)` | Base length, width and height |
+| `smd_pot_wiper(type)` | Wiper diameter, offset, thickness, height, d1, d2, d3, d4 |
 | `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 |
@@ -3703,7 +3723,10 @@ Surface mount components for PCBs.
 | Module | Description |
 |:--- |:--- |
 | `smd_capacitor(type, height, value = undef)` | Draw an SMD capacitor with specified height |
+| `smd_diode(type, value)` | Draw an SMD diode |
+| `smd_inductor(type, value)` | Draw an SMD inductor |
 | `smd_led(type, colour, cutout)` | Draw an SMD LED with specified `colour` |
+| `smd_pot(type, value)` | Draw an SMD pot |
 | `smd_resistor(type, value)` | Draw an SMD resistor with specified value |
 | `smd_soic(type, value)` | Draw an SMD SOIC |
 | `smd_sot(type, value)` | Draw an SMD transistor |
@@ -3713,6 +3736,8 @@ Surface mount components for PCBs.
 ### Vitamins
 | Qty | Module call | BOM entry |
 | ---:|:--- |:---|
+|   1 | `smd_diode(DO241AC)` |  DO241AC package SS34 |
+|   1 | `smd_inductor(IND2525)` |  IND2525 package 4R7 |
 |   1 | `smd_led(LED0603, green)` |  SMD LED 0603 green |
 |   1 | `smd_led(LED0805, blue)` |  SMD LED 0805 blue |
 |   1 | `smd_led(LED1206, red)` |  SMD LED 1306 red |
@@ -3727,6 +3752,7 @@ Surface mount components for PCBs.
 |   1 | `smd_soic(SOIC8)` |  SOIC8 package SOIC8 |
 |   1 | `smd_sot(SOT223)` |  SOT223 package FZT851 |
 |   1 | `smd_sot(SOT23)` |  SOT23 package 2N7000 |
+|   1 | `smd_pot(TC33X1)` |  TC33X1 package 10K |
 
 
 <a href="#top">Top</a>
@@ -5356,6 +5382,7 @@ This allows the hinges and one set of screws to belong to one assembly and the o
 |:--- |:--- |
 | `hinge_both(type)` | Both parts together for printing |
 | `hinge_fastened_assembly(type, thickness1, thickness2, angle, show_hinge = true)` | Assembled hinge with its fasteners |
+| `hinge_female(type)` | The half without the pin |
 | `hinge_male(type, female = false)` | The half with the stationary pin |
 | `hinge_screw_positions(type)` | Place children at the screw positions |
 

tests/PCB.scad

@@ -70,6 +70,8 @@ test_pcb = ["test_pcb", "Test PCB",
         [ 25,  2,   90, "smd_cap", CAP1206, 1.5],
         [ 28,  2,   90, "smd_cap", CAP0805, 1.0],
         [ 31,  2,   90, "smd_cap", CAP0603, 0.7],
+        [ 34,  3,   90, "smd_diode",DO241AC, "SS34"],
+        [ 22,  6,  -90, "smd_pot", TC33X1, "10K"],
         [ 16,  6,  -90, "smd_sot", SOT23, "2N7000"],
         [ 28,  20, -90, "smd_sot", SOT223, "LM117"],
 
@@ -78,9 +80,10 @@ test_pcb = ["test_pcb", "Test PCB",
         [ 10,  20,   0, "2p54boxhdr", 4, 2],
         [ 10,  30,   0, "2p54socket", 6, 1],
         [ 25,  30,   0, "2p54socket", 4, 1, false, 0, false, "red" ],
-        [ 65,  50,   0, "led", LED3mm, "red"],
-        [ 75,  50,   0, "led", LED5mm, "orange"],
-        [ 90,  50,   0, "led", LED10mm, "yellow"],
+        [ 59,  50, 180, "led", LED3mm, "red"],
+        [ 66,  50, 180, "led", LED5mm, "orange"],
+        [ 77,  50, 180, "led", LED8mm, "blue"],
+        [ 90,  50, 180, "led", LED10mm, "yellow"],
         [ 10,  45, 180, "rj45"],
         [  8,  65, 180, "usb_A"],
         [  8, 105, 180, "usb_Ax2"],
@@ -141,6 +144,8 @@ test_pcb = ["test_pcb", "Test PCB",
         [ 52, 200,   0, "pcb", 11, TMC2130 ],
         [ 80, 210,   0, "pdip", 24, "27C32", true, inch(0.6) ],
         [ 80, 180,   0, "pdip", 8, "NE555" ],
+        [ 71, 180,    0, "smd_inductor", IND2525, "4R7"],
+
         [ 80, 166, -90, "smd_soic", SOIC18, "PIC18F88"],
         [ 71, 166, -90, "smd_soic", SOIC16, "ICL323"],
         [ 64, 166, -90, "smd_soic", SOIC8, "M34063"],

tests/SMDs.scad

@@ -34,16 +34,30 @@ module smds() {
             let(c = smd_capacitors[$i])
                 smd_capacitor(c, smd_cap_size(c).y * 0.8);
 
-    translate([0, 12])
+    translate([0, 9])
+        layout([for(d = smd_diodes) smd_diode_size(d).x], 1)
+            let(d = smd_diodes[$i])
+                smd_diode(d, ["SS34"][$i]);
+
+    translate([0, 15])
         layout([for(s = smd_sots) smd_sot_size(s).x], 1)
             let(s = smd_sots[$i])
                 smd_sot(s, ["2N7000", "FZT851"][$i]);
 
-    translate([0, 20])
+    translate([0, 21])
+        layout([for(p = smd_pots) smd_pot_size(p).x], 1)
+            let(p = smd_pots[$i])
+                smd_pot(p, "10K");
+
+    translate([0, 28])
         layout([for(s = smd_soics) smd_soic_size(s).x], 1)
             let(s = smd_soics[$i])
                 smd_soic(s, s[0]);
 
+    translate([0, 36])
+        layout([for(i = smd_inductors) smd_inductor_size(i).x], 1)
+            let(i = smd_inductors[$i])
+                smd_inductor(i, "4R7");
 }
 
 if($preview)

vitamins/opengrab.scad

@@ -37,14 +37,13 @@ pole_w = 2;
 pole_l = 36;
 poles = 15;
 
-pcb = ["", "",        width, width, 0.8, 0, 3.5, 0, "darkgreen", false, [],
-    [     [ 3.45,   19,   0, "button_4p5mm"],
-          [ 2.75,   24.5, 0, "smd_led", LED0805, "green"],
-          [ 2.75,   28.0, 0, "smd_led", LED0805, "red"],
-          [ 28.5,   13,   0, "2p54header", 3, 1, false, undef, true],
+pcb = ["", "", width, width, 0.8, 0, 3.5, 0, "darkgreen", false, [],
+    [     [ 3.475,  19.05,    0, "button_4p5mm"],
+          [ 2.2,    24.125,   0, "smd_led", LED0805, "green"],
+          [ 2.375,  27.9,     0, "smd_led", LED0805, "red"],
+          [ 28.4,   13.345,   0, "2p54header", 3, 1, false, undef, true],
      ]];
 
-
 module opengrab_hole_positions()    //! Position children at the screw positions
     let($d = 3.2)
         for($x = [-pitch, pitch], $y = [-pitch, pitch])
@@ -96,6 +95,17 @@ module opengrab() { //! Draw OpenGrab module
             if(show_threads)
                 female_metric_thread(3, metric_coarse_pitch(3), depth - 1, center = false, colour = brass);
         }
+
+    module molex()
+        translate_z(opengrab_pcb_z() + pcb_thickness(pcb))
+            color(grey(90))
+                import("stl/Molex_5023860470.stl");
+
+    translate([-8.4, -14.2])
+        molex();
+
+    translate([0.125, -14.2])
+        molex();
 }
 
 module opengrab_target() { //! Draw OpenGrab target

vitamins/pcb.scad

@@ -1088,6 +1088,7 @@ module pcb_component(comp, cutouts = false, angle = undef) { //! Draw pcb compon
         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_Ax1"))       usb_Ax1(cutouts);
         if(show(comp, "usb_Ax2"))       usb_Ax2(cutouts);
         if(show(comp, "usb_uA"))        usb_uA(cutouts);
         if(show(comp, "usb_miniA"))     usb_miniA(cutouts);
@@ -1135,6 +1136,9 @@ module pcb_component(comp, cutouts = false, angle = undef) { //! Draw pcb compon
             if(show(comp, "smd_cap"))       smd_capacitor(comp[4], comp[5], param(6, undef));
             if(show(comp, "smd_sot"))       smd_sot(comp[4], comp[5]);
             if(show(comp, "smd_soic"))      smd_soic(comp[4], comp[5]);
+            if(show(comp, "smd_diode"))     smd_diode(comp[4], comp[5]);
+            if(show(comp, "smd_inductor"))  smd_inductor(comp[4], comp[5]);
+            if(show(comp, "smd_pot"))       smd_pot(comp[4], comp[5]);
             if(show(comp, "vero_pin"))      vero_pin(param(4, false));
             if(show(comp, "terminal"))      terminal_block(comp[5], comp[4]);
             if(show(comp, "text"))          color("white") linear_extrude(eps) resize([comp[4], comp[5]]) text(comp[6], font = param(7, "Liberation Mono"), valign = "center", halign = "center");

vitamins/pcbs.scad

@@ -537,6 +537,20 @@ Melzi = ["Melzi", "Melzi electronics", 203.2, 49.53, 1.6, 3.81, 3.1,  6, "green"
                                                                     [],
                                                                     [": USB A to Mini B lead", ": Micro SD card"]];
 
+RPI3A =  ["RPI3A", "Raspberry Pi 3 A+",     65,    56,    1.4, 3,    2.75, 6, "green", false, [[3.5, 3.5], [61.5, 3.5], [61.5, -3.5], [3.5, -3.5]],
+    [[32.5, -3.5,   0, "2p54header", 20, 2],
+     [27,   -24.6,  0, "chip",       14, 14, 1],
+     [53.5,   6,  -90, "jack"],
+     [32,   4.4,  -90, "hdmi"],
+     [-6.5,  31.45,    0, "usb_Ax1"],
+     [10.6,   2,  -90, "usb_uA"],
+     [3.6,   28,   90, "flex"],
+     [45,    11.5,-90, "flex"],
+     [7.75,  28,  180, "-uSD", [12, 11.5, 1.28]],
+    ],
+    [": Micro SD card"],
+    [32.5 - 9.5 * 2.54, 52.5 - 1.27, 20, 2]];
+
 RPI3 =  ["RPI3", "Raspberry Pi 3",     85,    56,    1.4, 3,    2.75, 6, "green", false, [[3.5, 3.5], [61.5, 3.5], [61.5, -3.5], [3.5, -3.5]],
     [[32.5, -3.5,   0, "2p54header", 20, 2],
      [27,   -24.6,  0, "chip",       14, 14, 1],
@@ -744,9 +758,29 @@ WD2002SJ = ["WD2002SJ", "WD2002SJ Buck Boost DC-DC converter", 78, 47, 1.6, 0, 3
     ],
     []];
 
-MP1584EN = ["MP1584EN", "MP1584EN 3A buck converter", 22, 17, 1.2, 0, 1, [2, 2], "green", false,
-    [[1.75, 1.75], [1.75, -1.75], [-1.75, 1.75], [-1.75, -1.75], [-1.75, -4.4], [-1.75, 4.48], [1.75, -4.4], [1.75, 4.4]],
-    []
+MP1584EN = ["MP1584EN", "MP1584EN 3A buck converter", 22, 17, 1.25, 0, 1, [2, 2], "green", false,
+    [[1.75, 1.75], [-1.75, 1.75], [-1.75, 4.4], [1.75, 4.4]],
+    [ [1.75, 8.5, 90, "smd_cap", CAP1206, 1],
+      [-1.75, 8.5, 90, "smd_cap", CAP1206, 1],
+      [7.5, 8.5, 0, "smd_soic", SOIC8, "WP1584EN"],
+      [3.9, 8.3, 90, "smd_res", RES0603, "104"],
+      [3.9, 11.2, 90,"smd_cap", CAP0603, 0.5],
+      [3.9, 5.4, 90, "smd_res", RES0603, "822"],
+      [6.2, 3.5,  0, "smd_res", RES0603, "104"],
+      [6.2, 2.1,  0, "smd_cap", CAP0603, 0.5],
+      [9.2, 3.5,  0, "smd_res", RES0603, "104"],
+      [9.2, 2.1,  0, "smd_res", RES0603, "104"],
+      [6.3, 14.4, 0, "smd_diode",DO241AC, "SS34"],
+      [12.1, 4.9, 0, "smd_cap", CAP0603, 0.5],
+      [15.8, 4.9, 0, "smd_cap", CAP0603, 0.5],
+      [14.5, 10, 90, "smd_inductor", IND2525, "4R7"],
+      [14.7, 1.8,-90,"smd_pot", TC33X1, "10K"],
+      [13.9, -1.4, 0,"text", 5, 1.5, "D-SUN", "Liberation Mono:style=Bold"],
+      [17.7, -1.2, 0,"text", 1.5,1.5,"\u2296", "MS Gothic:style=Bold"],
+      [17.9, 1.75, 0,"text", 1.5,1.5,"\u2295", "MS Gothic:style=Bold"],
+   ],
+   [],
+   [1.75,17 -4.4, 2, 2, silver, 18.5, 2.65], // Abuse the grid facility to get the round pads
 ];
 
 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.71, 3.65]];
@@ -920,7 +954,7 @@ L9110S = ["L9110S", "L9110S 2-Channel motor driver module", 29.2, 23, 1.6, 0, 3,
 
 tiny_pcbs = [XIAO, MP1584EN, TP4056, ESP_01, LIPO_fuel_gauge];
 
-pcbs = [RAMPSEndstop, MT3608, KY_040, L9110S, ZC_A0591, ArduinoNano, RPI_Pico, ESP32_DOIT_V1, RPI0, EnviroPlus, ArduinoUno3, ArduinoLeonardo, WD2002SJ, RPI3, RPI4, BTT_RELAY_V1_2, BTT_SKR_MINI_E3_V2_0, BTT_SKR_E3_TURBO, BTT_SKR_V1_4_TURBO, DuetE, Duex5];
+pcbs = [RAMPSEndstop, MT3608, KY_040, L9110S, ZC_A0591, ArduinoNano, RPI_Pico, ESP32_DOIT_V1, RPI0, EnviroPlus, ArduinoUno3, ArduinoLeonardo, WD2002SJ, RPI3A, RPI3, RPI4, BTT_RELAY_V1_2, BTT_SKR_MINI_E3_V2_0, BTT_SKR_E3_TURBO, BTT_SKR_V1_4_TURBO, DuetE, Duex5];
 
 pcbs_not_shown = [Melzi, Duex2, PSU12V1A, Keyes5p1, PI_IO, ExtruderPCB];
 

vitamins/pin_header.scad

@@ -20,7 +20,7 @@
 include <../utils/core/core.scad>
 use <../utils/dogbones.scad>
 
-panel_clearance = 0.2;
+panel_clearance = 0.5;
 housing_height = 14.12;  // measured height of a Dupont connector.
 housing_colour = grey(25);
 

vitamins/screw.scad

@@ -328,6 +328,19 @@ module screw_polysink(type, h = 100, alt = false, sink = 0) { //! A countersink
         }
 }
 
+module screw_keyhole(type, h = 0) { //! Make keyhole slot to accept and retain screw head
+    r = screw_head_radius(type);
+    extrude_if(h) {
+        translate([0, - 2 * r])
+            drill(r + 0.5, 0);
+
+        hull()
+            for(y = [0, -2 * r])
+                translate([0, y])
+                    drill(screw_clearance_radius(type), 0);
+    }
+}
+
 module screw_and_washer(type, length, star = false, penny = false) { //! Screw with a washer which can be standard or penny and an optional star washer on top
     washer = screw_washer(type);
     head_type = screw_head_type(type);

vitamins/sheets.scad

@@ -49,7 +49,7 @@ AL3       = [ "AL3",       "Aluminium tooling plate", 3, [0.9, 0.9, 0.9, 1    ],
 AL6       = [ "AL6",       "Aluminium tooling plate", 6, [0.9, 0.9, 0.9, 1    ], false];
 AL8       = [ "AL8",       "Aluminium tooling plate", 8, [0.9, 0.9, 0.9, 1    ], false];
 Steel06   = [ "Steel06",   "Sheet mild steel",       0.6,"silver"              , false];
-Spring05  = [ "Spring05",  "Bi-metal saw blade",     0.5,"#FBC300",              false];
+Spring08  = [ "Spring08",  "Bi-metal saw blade",     0.8,"#FBC300",              false];
 Silicone3 = [ "Silicone3", "Sheet silicone",          3, [0.9, 0.9, 0.9, 0.95 ], false];
 CF1 =       [ "CF1",       "Sheet carbon fiber",      1, grey(35),               false,  2,  2,  grey(20)];
 CF2 =       [ "CF2",       "Sheet carbon fiber",      2, grey(35),               false,  2,  2,  grey(20)];
@@ -57,6 +57,6 @@ CF3 =       [ "CF3",       "Sheet carbon fiber",      3, grey(35),
 
 
 sheets = [CF1, CF2, CF3, MDF6, MDF10, MDF12, MDF19, PMMA1p25, PMMA2, PMMA3, PMMA6, PMMA8, PMMA10,
-         glass2, DiBond, DiBond6, Cardboard, FoilTape, AL1_6, AL2, AL3, AL6, AL8, Steel06, Spring05, Silicone3, Foam20];
+         glass2, DiBond, DiBond6, Cardboard, FoilTape, AL1_6, AL2, AL3, AL6, AL8, Steel06, Spring08, Silicone3, Foam20];
 
 use <sheet.scad>

vitamins/smd.scad

@@ -24,6 +24,7 @@ include <../utils/core/core.scad>
 
 use <../utils/tube.scad>
 use <../utils/sweep.scad>
+use <../utils/sector.scad>
 
 function smd_led_size(type) = type[1]; //! Body length, width and height
 function smd_led_lens(type) = type[2]; //! Lens length width and height
@@ -228,3 +229,205 @@ module smd_soic(type, value) { //! Draw an SMD SOIC
                     text(value, halign = "center", valign = "center");
 
 }
+
+function smd_diode_size(type)   = type[1]; //! Body length, width and height
+function smd_diode_z(type)      = type[2]; //! Height above PCB surface
+function smd_diode_lead_z(type) = type[3]; //! Top of lead frame from top
+function smd_diode_leads(type)  = type[4]; //! Lead extent in x, width, thickness and gap
+
+module smd_diode(type, value) { //! Draw an SMD diode
+    vitamin(str("smd_diode(", type[0], "): ", type[0], " package ", value));
+
+    slant = 5;                              //! 5 degree body draft angle
+    size = smd_diode_size(type);
+    z0 = smd_diode_z(type);
+    z2 = z0 + size.z;
+    z1 = z2 - smd_diode_lead_z(type);
+    stripe = size.x / 5;
+    leads = smd_diode_leads(type);
+    gap = leads[3];
+    gap2 = gap - leads.z * 2;
+
+    color(grey(20))
+        difference() {
+            hull()
+                for(z = [z0, z1, z2], inset = abs(z - z1) * tan(slant))
+                    translate_z(z)
+                        cube([size.x - 2 * inset, size.y - 2 * inset, eps], center = true);
+
+            for(side = [-1, 1])
+                translate([side * (size.x / 2 - (size.x - gap2) / 4), 0, eps])
+                    cube([(size.x - gap2) / 2, size.y, 3 * leads.z], center = true);
+        }
+
+    color("white")
+        translate([-stripe / 2, 0, z2])
+            linear_extrude(eps)
+                resize([0.9 * (size.x - stripe), size.y / 2])
+                    text(value, halign = "center", valign = "center");
+
+    color(grey(90)) {
+        inset = (z2 - z1) * tan(slant);
+        translate([size.x / 2 - stripe, -size.y / 2 + inset, z2])
+            cube([stripe - inset, size.y - 2 * inset, eps]);
+    }
+
+    color(silver)
+        translate_z(z1 / 2)
+            rotate([90, 0, 0])
+                linear_extrude(leads.y, center = true, convexity = 3)  let($fn = 32)
+                    difference() {
+                        rounded_square([leads.x, z1], 2 * leads.z);
+
+                        rounded_square([leads.x - 2 * leads.z, z1 - 2 * leads.z], leads.z);
+
+                        translate([0, - z1 / 2])
+                            square([gap, leads.z * 2 + eps], center = true);
+                    }
+
+}
+
+function smd_inductor_size(type)   = type[1]; //! Body length, width and height
+function smd_inductor_z(type)      = type[2]; //! Height above PCB surface
+function smd_inductor_lead_z(type) = type[3]; //! Top of lead frame from top
+function smd_inductor_leads(type)  = type[4]; //! Lead extent in x, width, thickness and gap
+function smd_inductor_colour(type) = type[5]; //! Body colour
+
+module smd_inductor(type, value) { //! Draw an SMD inductor
+    vitamin(str("smd_inductor(", type[0], "): ", type[0], " package ", value));
+
+    size = smd_inductor_size(type);
+    z0 = smd_inductor_z(type);
+    z1 = smd_inductor_lead_z(type);
+    z2 = z0 + size.z;
+    leads = smd_inductor_leads(type);
+    gap = leads[3];
+    gap2 = gap - leads.z * 2;
+
+    color(smd_inductor_colour(type))
+        difference() {
+            translate_z(z0)
+                rounded_rectangle(size, 0.5);
+
+            for(side = [-1, 1])
+                translate([side * (size.x / 2 - (size.x - gap2) / 4), 0, eps])
+                    cube([(size.x - gap2) / 2, leads.y + 2 * leads.z, 3 * leads.z], center = true);
+        }
+
+    color("white")
+        translate_z(z2)
+            linear_extrude(eps)
+                resize([0.9 * size.x, size.y / 2])
+                    text(value, halign = "center", valign = "center");
+
+    color(silver)
+        translate_z(z1 / 2)
+            rotate([90, 0, 0])
+                linear_extrude(leads.y, center = true, convexity = 3)  let($fn = 32)
+                    difference() {
+                        rounded_square([leads.x, z1], 2 * leads.z);
+
+                        rounded_square([leads.x - 2 * leads.z, z1 - 2 * leads.z], leads.z);
+
+                        translate([0, - z1 / 2])
+                            square([gap, leads.z * 2 + eps], center = true);
+                    }
+}
+
+function smd_pot_size(type)     = type[1]; //! Base length, width and height
+function smd_pot_contacts(type) = type[2]; //! Contacts width, depth, pitch and width, depth, gap for center contact
+function smd_pot_wiper(type)    = type[3]; //! Wiper diameter, offset, thickness, height, d1, d2, d3, d4
+function smd_pot_cross(type)    = type[4]; //! Cross head slot for screwdriver
+function smd_pot_flat(type)     = type[5]; //! Flat at the back of the wiper
+
+module smd_pot(type, value) { //! Draw an SMD pot
+    vitamin(str("smd_pot(", type[0], "): ", type[0], " package ", value));
+
+    size = smd_pot_size(type);
+    contacts = smd_pot_contacts(type);
+    contacts_pitch = contacts[2];
+    centre_contact_w = contacts[3];
+    centre_contact_d = contacts[4];
+    centre_contact_gap = contacts[5];
+    wiper = smd_pot_wiper(type);
+    wiper_r1 = wiper.x / 2; // outer radius
+    wiper_y = wiper.y;
+    wiper_t = wiper.z;
+    wiper_h = wiper[3];
+    wiper_r2 = wiper[4] / 2;   // inner radius at the top
+    wiper_r3 = wiper[5] / 2;   // inner radius at the bottom
+    wiper_r4 = wiper[6] / 2;   // outer radius of rivet
+    wiper_r5 = wiper[7] / 2;   // inner radius of rivet
+    cross = smd_pot_cross(type);
+    flat = smd_pot_flat(type);
+    track_or = size.x * 0.48;
+    track_ir = track_or * 0.6;
+
+    color(grey(90))
+        translate_z(size.z / 2)
+            cube(size, center = true);
+
+    color(silver) {
+        for(side = [-1, 1])
+            translate([side * contacts_pitch, -size.y / 2 + contacts.y / 2, size.z / 2])
+                cube([contacts.x, contacts.y, size.z] + 2 * eps * [1,1,1], center = true);
+
+        translate([0, size.y / 2 - centre_contact_d / 2, size.z / 2])
+            render() difference() {
+                cube([centre_contact_w, centre_contact_d + 2 * eps, size.z + 2 * eps], center = true);
+
+                translate_z(size.z / 2)
+                    cube([centre_contact_gap, centre_contact_d + 4 * eps, 2 * eps], center = true);
+            }
+        slope_angle = atan((wiper_h - size.z - wiper_t) / (wiper_r2 - wiper_r3));
+        dx = wiper_t / tan(90 - slope_angle / 2);
+        translate([0, wiper_y]) {
+            render() difference() {
+                rotate_extrude() {
+                    polygon([
+                        [wiper_r5,      size.z + wiper_t],
+                        [wiper_r3,      size.z + wiper_t],
+                        [wiper_r2,      wiper_h],
+                        [wiper_r1,      wiper_h],
+                        [wiper_r1,      wiper_h - wiper_t],
+                        [wiper_r2 + dx, wiper_h - wiper_t],
+                        [wiper_r3 + dx, size.z],
+                        [wiper_r5,      size.z],
+                    ]);
+                    r = (wiper_r4 - wiper_r5) / 2;
+                    translate([wiper_r5 + r, size.z + wiper_t])
+                        circle(r, $fn = 16);
+                }
+
+                translate_z(size.z + wiper_t)
+                    linear_extrude(wiper_h - size.z - wiper_t)
+                        difference() {
+                            union() {
+                                square(cross, center = true);
+
+                                rotate(90)
+                                    square(cross, center = true);
+                            }
+                            circle(wiper_r4 + eps);
+                        }
+
+            }
+            translate([0, -(wiper_r1 + cross.x / 2) / 2, wiper_h - wiper_t / 2])
+                cube([flat, wiper_r1 - cross.x / 2, wiper_t], center = true);
+        }
+    }
+
+    color("black")
+        translate([0, wiper.y, size.z])
+            linear_extrude(eps) {
+                difference() {
+                    sector(track_or, -270 / 2 + 90, 270 / 2 + 90);
+                    circle(track_ir);
+                }
+                track_w = track_or - track_ir;
+                track_l = wiper.y - track_ir / sqrt(2) + size.y / 2 - contacts.y;
+                for(side = [-1, 1])
+                    translate([side * (track_ir / sqrt(2) + track_w / 2), -wiper.y -size.y / 2 + track_l / 2 + contacts.y])
+                        square([track_w, track_l], center = true);
+            }
+}

vitamins/smds.scad

@@ -50,4 +50,16 @@ SOIC18 = ["SOIC18", [11.40, 7.50, 2.00], 0.10, 1.20, 1.27, 10.30, [0.31, .50, 0.
 
 smd_soics = [SOIC8, SOIC16, SOIC18];
 
+DO241AC = ["DO241AC", [4.0, 2.5, 2.0], 0.1, 1, [4.8, 1.2, 0.15, 2]];
+
+smd_diodes = [DO241AC];
+
+IND2525 = ["IND2525", [6.75, 6.75, 2], 0.1, 1.75, [7.24, 3.2, 0.15, 4.4], grey(50)];
+
+smd_inductors = [IND2525];
+
+TC33X1 = ["TC33X1", [3.0, 3.8, 0.5], [0.95, 0.9, 0.88, 1.5, 0.2, 0.75],[3.0, 0.1, 0.2, 1.2, 1.7, 1.2, 1, 0.5], [2.1, 0.5], 1.5];
+
+smd_pots = [TC33X1];
+
 use <smd.scad>