diff --git a/libtest.png b/libtest.png index 5bee76b..147b0ae 100644 Binary files a/libtest.png and b/libtest.png differ diff --git a/readme.md b/readme.md index a9d9b2e..3fcfb74 100644 --- a/readme.md +++ b/readme.md @@ -2890,18 +2890,18 @@ Face order is bottom, top, left, right, front, back. ### Vitamins | Qty | Module call | BOM entry | | ---:|:--- |:---| -| 1 | | IEC mains lead | +| 2 | | IEC mains lead | | 1 | `psu(ATX500)` | PSU ATX500 | -| 1 | `psu(KY240W)` | PSU KY-240W-12-L | +| 1 | `psu(ATX300)` | PSU FSP300-60GHX | +| 1 | `psu(KY240W)` | PSU KY-240W-12-L - not shown | | 1 | `psu(PD_150_12)` | PSU PD-150-12 | | 1 | `psu(S_250_48)` | PSU S-250-48 | | 1 | `psu(S_300_12)` | PSU S-300-12 | -| 4 | `screw(No632_pan_screw, 8)` | Screw 6-32 pan x 8mm | -| 4 | `screw(M3_cap_screw, 8)` | Screw M3 cap x 8mm | +| 9 | `screw(No632_pan_screw, 8)` | Screw 6-32 pan x 8mm | | 8 | `screw(M3_pan_screw, 8)` | Screw M3 pan x 8mm | | 4 | `screw(M4_cap_screw, 8)` | Screw M4 cap x 8mm | -| 12 | `washer(M3_washer)` | Washer M3 x 7mm x 0.5mm | -| 8 | `washer(M4_washer)` | Washer M4 x 9mm x 0.8mm | +| 8 | `washer(M3_washer)` | Washer M3 x 7mm x 0.5mm | +| 13 | `washer(M4_washer)` | Washer M4 x 9mm x 0.8mm | Top diff --git a/tests/PSUs.scad b/tests/PSUs.scad index c964e4a..3704ac7 100644 --- a/tests/PSUs.scad +++ b/tests/PSUs.scad @@ -22,7 +22,7 @@ include <../vitamins/psus.scad> use <../utils/layout.scad> module psus() - layout([for(p = psus) psu_width(p)], 10) let(p = psus[$i]) + layout([for(p = psus) atx_psu(p) ? psu_length(p) : psu_width(p)], 10) let(p = psus[$i]) rotate(atx_psu(p) ? 0 : 90) { psu(p); @@ -31,5 +31,10 @@ module psus() screw_and_washer(psu_screw(p), 8); } -if($preview) +if($preview) { psus(); + + for(p = psus_not_shown) + hidden() + psu(p); +} diff --git a/tests/png/psus.png b/tests/png/psus.png index a5c1246..081d2ce 100644 Binary files a/tests/png/psus.png and b/tests/png/psus.png differ diff --git a/vitamins/psus.scad b/vitamins/psus.scad index b6e0013..2d6ce64 100644 --- a/vitamins/psus.scad +++ b/vitamins/psus.scad @@ -68,6 +68,29 @@ ATX500 = [": IEC mains lead"] ]; +// Single fan in the top, wires exit opposite side from mains in +ATX300 = let(p = [113 / 2, 51 / 2], iec = [35.5, 6], sw = [6.5, 7]) + ["ATX300", "FSP300-60GHX", 125, 100, 64, No632_pan_screw, 5/2, true, 0, 0, [], + [ + [[], 0.5, []], + [[], 0.5, [], false, [0, 8, fan80x25]], + [[], 0.5, []], + [[], 0.5, []], + [[-p, p, [-p.x, p.y], [p.x, -p.y], [p.x, 0]], 0.5, [], [3, 0.35, 6, [ + [-p.x, -p.y, 5, 5], + [-p.x, p.y, 5, 5], + [p.x, 0, 9, 100], + [p.x, -p.y, 17, 6], + [iec.x, iec.y, 32, 22], + [sw.x, sw.y, 23, 20], + [sw.x, sw.y, 28, 12], + ]], false, [iec.x, iec.y, 180, IEC_inlet_atx2], [sw.x, sw.y, 90, small_rocker]], + [[], 0.5, []], + ], + [": IEC mains lead"] + ]; + + KY240W = ["KY240W", "KY-240W-12-L", 199, 110, 50, M3_cap_screw, M3_clearance_radius, false, 0, 0, [], [ @@ -75,7 +98,6 @@ KY240W = [ 199 / 2 - 12, 110 / 2 - 9 ], [ 199 / 2 - 138, 110 / 2 - 93], [ 199 / 2 - 138, 110 / 2 - 9 ]]] - ], [] ]; @@ -179,6 +201,8 @@ External = [": IEC mains lead"] ]; -psus = [PD_150_12, S_250_48, S_300_12, ATX500, KY240W]; +psus = [PD_150_12, S_250_48, S_300_12, ATX300, ATX500]; + +psus_not_shown = [KY240W]; use