diff --git a/libtest.png b/libtest.png index 5936a50..c1b9058 100644 Binary files a/libtest.png and b/libtest.png differ diff --git a/readme.md b/readme.md index 483472c..be8ad06 100644 --- a/readme.md +++ b/readme.md @@ -2332,14 +2332,14 @@ PCBs and perfboard with optional components. The shape can be a rectangle with o | 1 | ```pcb(EnviroPlus)``` | Enviro+ | | 1 | ```pcb(ExtruderPCB)``` | Extruder connection PCB | | 1 | ```pcb(Keyes5p1)``` | Keyes5.1 Arduino Uno expansion board | +| 1 | ```pcb(MP1584EN)``` | MP1584EN 3A buck converter | | 1 | ```pcb(MT3608)``` | MT3608 boost converter module | -| 1 | ```pcb(Melzi)``` | Melzi electronics | -| 5 | | Micro SD card | +| 4 | | Micro SD card | | 1 | ```molex_254(2)``` | Molex KK header 2 way | | 1 | ```molex_254(3)``` | Molex KK header 3 way | | 16 | ```nut(M2_nut, nyloc = true)``` | Nut M2 x 1.6mm nyloc | | 34 | ```nut(M2p5_nut, nyloc = true)``` | Nut M2.5 x 2.2mm nyloc | -| 16 | ```nut(M3_nut, nyloc = true)``` | Nut M3 x 2.4mm nyloc | +| 12 | ```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 | @@ -2355,24 +2355,21 @@ PCBs and perfboard with optional components. The shape can be a rectangle with o | 1 | ```pcb(RPI0)``` | Raspberry Pi Zero | | 12 | ```screw(M2_cap_screw, 16)``` | Screw M2 cap x 16mm | | 4 | ```screw(M2_cap_screw, 20)``` | Screw M2 cap x 20mm | -| 2 | ```screw(M2p5_cap_screw, 16)``` | Screw M2.5 cap x 16mm | -| 4 | ```screw(M2p5_cap_screw, 20)``` | Screw M2.5 cap x 20mm | -| 4 | ```screw(M2p5_cap_screw, 25)``` | Screw M2.5 cap x 25mm | +| 2 | ```screw(M2p5_cap_screw, 20)``` | Screw M2.5 cap x 20mm | +| 8 | ```screw(M2p5_cap_screw, 25)``` | Screw M2.5 cap x 25mm | | 8 | ```screw(M2p5_cap_screw, 30)``` | Screw M2.5 cap x 30mm | | 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 | | 8 | ```screw(M3_cap_screw, 30)``` | Screw M3 cap x 30mm | -| 4 | ```screw(M3_cap_screw, 35)``` | Screw M3 cap x 35mm | | 12 | ```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 | | 34 | ```washer(M2p5_washer)``` | Washer M2.5 x 5.9mm x 0.5mm | -| 16 | ```washer(M3_washer)``` | Washer M3 x 7mm x 0.5mm | +| 12 | ```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 | @@ -2383,22 +2380,21 @@ PCBs and perfboard with optional components. The shape can be a rectangle with o | 4 | pcb_spacer2070.stl | | 4 | pcb_spacer2080.stl | | 4 | pcb_spacer2090.stl | -| 4 | pcb_spacer25100.stl | | 4 | pcb_spacer25110.stl | | 4 | pcb_spacer25120.stl | -| 4 | pcb_spacer25130_2.stl | +| 4 | pcb_spacer25130.stl | | 4 | pcb_spacer25140_2.stl | | 4 | pcb_spacer25150_2.stl | -| 4 | pcb_spacer25180.stl | +| 4 | pcb_spacer25160_2.stl | | 4 | pcb_spacer25190.stl | -| 2 | pcb_spacer2570.stl | -| 4 | pcb_spacer30160.stl | +| 4 | pcb_spacer25200.stl | +| 2 | pcb_spacer2580.stl | | 4 | pcb_spacer30170.stl | -| 4 | pcb_spacer30230.stl | +| 4 | pcb_spacer30180.stl | | 4 | pcb_spacer3050.stl | -| 4 | pcb_spacer40200.stl | | 4 | pcb_spacer40210.stl | | 4 | pcb_spacer40220.stl | +| 4 | pcb_spacer40230.stl | Top diff --git a/tests/png/pcbs.png b/tests/png/pcbs.png index cfbeaeb..7a1b6c1 100644 Binary files a/tests/png/pcbs.png and b/tests/png/pcbs.png differ diff --git a/vitamins/pcbs.scad b/vitamins/pcbs.scad index 855cbba..59a4123 100644 --- a/vitamins/pcbs.scad +++ b/vitamins/pcbs.scad @@ -385,6 +385,11 @@ 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]], + [] +]; + 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]]; @@ -410,7 +415,7 @@ RAMPSEndstop = ["RAMPSEndstop", "RAMPS Endstop Switch", []]; -pcbs = [TP4056, MT3608, RAMPSEndstop, ExtruderPCB, PI_IO, ZC_A0591, RPI0, EnviroPlus, ArduinoUno3, ArduinoLeonardo, Keyes5p1, PSU12V1A, WD2002SJ, RPI3, RPI4, DuetE, Duex2, Duex5, Melzi]; +pcbs = [MP1584EN, TP4056, MT3608, RAMPSEndstop, ExtruderPCB, PI_IO, ZC_A0591, RPI0, EnviroPlus, ArduinoUno3, ArduinoLeonardo, Keyes5p1, PSU12V1A, WD2002SJ, RPI3, RPI4, DuetE, Duex2, Duex5]; perfboards = [PERF74x51, PERF70x50, PERF60x40, PERF70x30, PERF80x20];