Added ATX300 PSU model.

Now correctly shows the screw in the squeezed position.

CHANGELOG.md

@@ -3,6 +3,31 @@
 This changelog is generated by `changelog.py` using manually added semantic version tags to classify commits as breaking changes, additions or fixes.
 
 
+#### [v17.2.2](https://github.com/nophead/NopSCADlib/releases/tag/v17.2.2 "show release") Fixes [...](https://github.com/nophead/NopSCADlib/compare/v17.2.1...v17.2.2 "diff with v17.2.1")
+*   2021-10-02 [`046c475`](https://github.com/nophead/NopSCADlib/commit/046c475e1833c09a925a5310d1ccc6e4b07e7f89 "show commit") [M.B.](# "Martin Budden") Set convexity to 8 for `linear_extrude` of extrusion.
+
+#### [v17.2.1](https://github.com/nophead/NopSCADlib/releases/tag/v17.2.1 "show release") Fixes [...](https://github.com/nophead/NopSCADlib/compare/v17.2.0...v17.2.1 "diff with v17.2.0")
+*   2021-10-06 [`5f72a12`](https://github.com/nophead/NopSCADlib/commit/5f72a1212514ee7f8a795b53b1d1d180329660df "show commit") [C.P.](# "Chris Palmer") Nuts shown on jacks and fuseholders only shown threaded when exploded.
+
+### [v17.2.0](https://github.com/nophead/NopSCADlib/releases/tag/v17.2.0 "show release") Additions [...](https://github.com/nophead/NopSCADlib/compare/v17.1.0...v17.2.0 "diff with v17.1.0")
+*   2021-10-06 [`82502eb`](https://github.com/nophead/NopSCADlib/commit/82502eb470127b28e4036821077cbdbd06c17e9e "show commit") [C.P.](# "Chris Palmer") Added `pot_nut()` module to draw potentiometer nuts and washers.
+
+### [v17.1.0](https://github.com/nophead/NopSCADlib/releases/tag/v17.1.0 "show release") Additions [...](https://github.com/nophead/NopSCADlib/compare/v17.0.1...v17.1.0 "diff with v17.0.1")
+*   2021-10-05 [`b541298`](https://github.com/nophead/NopSCADlib/commit/b541298eae361b80df3c6c5797f3940a37fc2a38 "show commit") [C.P.](# "Chris Palmer") Printed foot assembly can now omit the top washer when space is at a premium.
+Now correctly shows the screw in the squeezed position.
+
+*   2021-10-02 [`9884160`](https://github.com/nophead/NopSCADlib/commit/9884160ed5e8cd7d1f44c6fee950e3682714da9c "show commit") [C.P.](# "Chris Palmer") Updated the gallery
+
+#### [v17.0.1](https://github.com/nophead/NopSCADlib/releases/tag/v17.0.1 "show release") Fixes [...](https://github.com/nophead/NopSCADlib/compare/v17.0.0...v17.0.1 "diff with v17.0.0")
+*   2021-10-01 [`38c973b`](https://github.com/nophead/NopSCADlib/commit/38c973b316a853fcbef3ccb857d99404a772d9dd "show commit") [C.P.](# "Chris Palmer") FR4 veroboard made the correct colour.
+veroboard track cuts made slightly bigger.
+
+*   2021-10-01 [`042d809`](https://github.com/nophead/NopSCADlib/commit/042d809ed056ba55c32f1d850b81dcf559fe9134 "show commit") [C.P.](# "Chris Palmer") Resistor and thermistor wires made more round.
+
+*   2021-10-01 [`3864839`](https://github.com/nophead/NopSCADlib/commit/3864839e521eb64189cba8453ea8835d6ffadd75 "show commit") [C.P.](# "Chris Palmer") Fixed encoder breakout descripion typo.
+
+*   2021-10-01 [`2ba2c2c`](https://github.com/nophead/NopSCADlib/commit/2ba2c2c115d4ab6c2371c662a3e54d7c77aa7785 "show commit") [C.P.](# "Chris Palmer") Removed some unused dependencies.
+
 ## [v17.0.0](https://github.com/nophead/NopSCADlib/releases/tag/v17.0.0 "show release") Breaking Changes [...](https://github.com/nophead/NopSCADlib/compare/v16.2.0...v17.0.0 "diff with v16.2.0")
 *   2021-09-28 [`a5c4bf0`](https://github.com/nophead/NopSCADlib/commit/a5c4bf05adbf53cb7eb113db1139b65eb616a2e0 "show commit") [M.B.](# "Martin Budden") Added hot end style string literals following discussion.
 

gallery/readme.md

@@ -25,6 +25,11 @@ WiFi controllable PSU
 
 ![](IOT_50V_PSU.png)
 
+## IOT LOAD
+WiFi controllable programmable load
+
+![](IOT_LOAD.png)
+
 ## Lab ATX PSU
 Bench power supply built around an ATX PSU.
 
@@ -65,6 +70,16 @@ Mains isolated and variable supply with metering.
 
 
 
+## PSU Cover
+A base and shroud to make PSU safe to sit on a desk
+
+![](PSU_cover.png)
+
+## PotBox
+Potentiometer box with course and fine controls and three 4mm binding posts
+
+![](PotBox.png)
+
 ## SunBot
 A solar tracker to keep a solar panel pointing at the sun.
 

printed/foot.scad

@@ -67,18 +67,18 @@ module foot(type = foot) { //! Generate STL
         }
 }
 
-module foot_assembly(t = 0, type = foot, flip = false) { //! Assembly with fasteners in place for specified sheet thickness
+module foot_assembly(t = 0, type = foot, flip = false, no_washer = false) { //! Assembly with fasteners in place for specified sheet thickness
     screw = foot_screw(type);
     nut = screw_nut(screw);
     squeeze = 0.5;
-    screw_length = screw_length(screw, foot_thickness(type) + t - squeeze, 2, nyloc = true);
+    screw_length = screw_length(screw, foot_thickness(type) + t - squeeze, no_washer ? 1 : 2, nyloc = true);
 
     vflip() explode(15, true) {
         stl_colour(pp4_colour) foot(type);
 
         if(t)
             explode(15, true)
-                translate_z(foot_thickness(type))
+                translate_z(foot_thickness(type) - squeeze)
                     if(flip)
                         nut_and_washer(nut, true);
                     else
@@ -87,9 +87,15 @@ module foot_assembly(t = 0, type = foot, flip = false) { //! Assembly with faste
     if(t)
         translate_z(t)
             if(flip)
-                screw_and_washer(screw, screw_length);
+                if(no_washer)
+                    screw(screw, screw_length);
+                else
+                    screw_and_washer(screw, screw_length);
             else
-                nut_and_washer(nut, true);
+                if(no_washer)
+                    nut(nut, true);
+                else
+                    nut_and_washer(nut, true);
 }
 
 module insert_foot(type = insert_foot) { //! Generate STL for foot with insert

readme.md

@@ -1454,6 +1454,7 @@ IEC mains inlets and outlet.
 |   1 | `iec(IEC_inlet)` |  IEC inlet |
 |   1 | `iec(IEC_inlet_atx)` |  IEC inlet for ATX |
 |   1 | `iec(IEC_outlet)` |  IEC outlet RS 811-7193 |
+|   1 | `iec(IEC_inlet_atx2)` |  IEC pressfit inlet for ATX |
 |   1 | `iec(IEC_320_C14_switched_fused_inlet)` |  IEC320 C14 switched fused inlet module |
 |  12 | `nut(M3_nut, nyloc = true)` |  Nut M3 x 2.4mm nyloc |
 |   4 | `screw(M3_cs_cap_screw, 10)` |  Screw M3 cs cap x 10mm |
@@ -2799,6 +2800,7 @@ Potentiometers and rotary encoders
 | `pot_face(type)` | Faceplate rib width, plate depth and plate height |
 | `pot_gangs(type)` | Number of gangs for mult-gang pot |
 | `pot_neck(type)` | Diameter and length of the shaft neck |
+| `pot_nut(type)` | Across flat diameter and thickness of the nut |
 | `pot_shaft(type)` | Diameter, flat diameter, length and flat/slot length and colour. If flat diameter is less than the radius then it is a slot width |
 | `pot_spigot(type)` | Spigot width, length and height above the boss |
 | `pot_spigot_x(type)` | Spigot offset from the shaft centre |
@@ -2806,16 +2808,18 @@ Potentiometers and rotary encoders
 | `pot_thread_h(type)` | Height of threaded part |
 | `pot_thread_p(type)` | Thread pritch |
 | `pot_wafer(type)` | Width, diameter and thickness of the track wafer plus true if curved |
+| `pot_washer(type)` | Outside diameter and thickness of the washer |
 
 ### Functions
 | Function | Description |
 |:--- |:--- |
 | `pot_size(type)` | Get pot body dimensions |
-| `pot_z(type)` | Ideal distance behind panel surface to get the nut on comfortably |
+| `pot_z(type, washer = true)` | Ideal distance behind panel surface to get the nut and washer on comfortably |
 
 ### Modules
 | Module | Description |
 |:--- |:--- |
+| `pot_nut(type, washer = true)` | Draw the nut for a potentiometer and possibly a washer |
 | `potentiometer(type, thickness = 3, shaft_length = undef)` | Draw a potentiometer with nut spaced by specified thickness |
 
 ![potentiometers](tests/png/potentiometers.png)
@@ -2886,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 |
 
 
 <a href="#top">Top</a>
@@ -5189,7 +5193,7 @@ inserts don't grip well in rubber.
 |:--- |:--- |
 | `fastened_insert_foot_assembly(t = 3, type = insert_foot)` | Assembly with fasteners in place for specified sheet thickness |
 | `foot(type = foot)` | Generate STL |
-| `foot_assembly(t = 0, type = foot, flip = false)` | Assembly with fasteners in place for specified sheet thickness |
+| `foot_assembly(t = 0, type = foot, flip = false, no_washer = false)` | Assembly with fasteners in place for specified sheet thickness |
 | `insert_foot(type = insert_foot)` | Generate STL for foot with insert |
 | `insert_foot_assembly(type = insert_foot)` | Printed part with insert in place |
 

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);
+}

tests/potentiometers.scad

@@ -23,9 +23,13 @@ include <../vitamins/potentiometers.scad>
 
 module potentiometers()
     layout([for(p = potentiometers) pot_size(p).x])
-        hflip()
+        hflip() {
             potentiometer(potentiometers[$i], shaft_length = 30);
 
+            translate_z(-3)
+                pot_nut(potentiometers[$i]);
+        }
+
 if($preview)
     let($show_threads = true)
         potentiometers();

vitamins/extrusion.scad

@@ -138,6 +138,6 @@ module extrusion(type, length, center = true, cornerHole = false) { //! Draw the
     vitamin(str("extrusion(", type[0], ", ", length, arg(cornerHole, false, "cornerHole"), "): Extrusion ", type[0], " x ", length, "mm"));
 
     color(grey(90))
-        linear_extrude(length, center = center)
+        linear_extrude(length, center = center, convexity = 8)
             extrusion_cross_section(type, cornerHole);
 }

vitamins/fuseholder.scad

@@ -68,7 +68,7 @@ module fuseholder(thickness) { //! Fuseholder with nut in place for specified pa
     colour = grey(40);
     vflip()
         translate_z(thickness)
-            explode(height) {
+            explode(height, explode_children = true) {
                 color(colour) {
                     tube(or = nut_d / 2, ir = thread_d / 2, h = nut_flange_t, center = false);
 
@@ -79,7 +79,7 @@ module fuseholder(thickness) { //! Fuseholder with nut in place for specified pa
                             circle(d = thread_d);
                         }
                 }
-                if(show_threads)
+                if(show_threads && exploded())
                     female_metric_thread(thread_d, thread_p, nut_t, false, colour = colour);
             }
     //

vitamins/iec.scad

@@ -203,9 +203,10 @@ module iec(type) { //! Draw specified IEC connector
 function iec_spade_depth(type) = iec_depth(type) + max([for(spade = iec_spades(type)) spade[1]]);
 
 module iec_screw_positions(type) //! Position children at the screw holes
-    for(side = [-1, 1])
-        translate([side * iec_pitch(type) / 2, 0])
-            children();
+    if(iec_pitch(type))
+        for(side = [-1, 1])
+            translate([side * iec_pitch(type) / 2, 0])
+                children();
 
 module iec_holes(type, h = 100, poly = false, horizontal = false, insert = false) { //! Drill the required panel holes
     clearance = 0.2;

vitamins/iecs.scad

@@ -59,7 +59,8 @@ IEC_320_C14_switched_fused_inlet = ["IEC_320_C14_switched_fused_inlet", "IEC320
                                                                      M3_cs_cap_screw, 40,  27, 16,46.8,3,28,   48, 2.4, 1.0, 33,   57, 4, 3.0, 48,16.5, iec320c14FusedSwitchedSpades,  false ];
 IEC_inlet       = ["IEC_inlet",       "IEC inlet",                   M3_cs_cap_screw, 40, 28, 18, 20, 3, 28,   20.5, 4, 2.5, 37,   23, 1, 2.5, 48, 14, inlet_spades,  false ];
 IEC_inlet_atx   = ["IEC_inlet_atx",   "IEC inlet for ATX",           M3_cs_cap_screw, 40, 27, 18, 19, 3, 30.5, 22,   2, 2.0, 30.5, 22, 2, 4.0, 50, 15, atx_spades,    false ];
+IEC_inlet_atx2  = ["IEC_inlet_atx2",  "IEC pressfit inlet for ATX",  M3_cs_cap_screw,  0, 27, 18, 19, 3, 30.5, 22,   1, 0,   30.5, 22, 1, 4.0, 50, 15, atx_spades,    false ]; // lugless
 IEC_outlet      = ["IEC_outlet",      "IEC outlet RS 811-7193",      M3_cs_cap_screw, 40, 32, 18, 24, 3, 28,   20.5, 2, 0.0, 29,   29, 2, 2.8, 50, 23, outlet_spades, true ];
 
-iecs = [IEC_inlet, IEC_inlet_atx, IEC_fused_inlet, IEC_fused_inlet2, IEC_320_C14_switched_fused_inlet, IEC_outlet];
+iecs = [IEC_inlet_atx2, IEC_inlet, IEC_inlet_atx, IEC_fused_inlet, IEC_fused_inlet2, IEC_320_C14_switched_fused_inlet, IEC_outlet];
 use <iec.scad>

vitamins/jack.scad

@@ -77,12 +77,12 @@ module jack_4mm(colour, thickness, display_colour = false) { //! Draw a 4mm jack
                 spade(spade4p8l, spade);
     }
     translate_z(-thickness)
-        explode(-length)
+        explode(-length, explode_children = true)
             vflip() {
                 color(silver)
                     tube(ir = thread_d / 2, or = nut_d / 2, h = nut_t, center = false);
 
-                if(show_threads)
+                if(show_threads && exploded())
                     female_metric_thread(thread_d, thread_p, nut_t, false, colour = silver);
             }
 }

vitamins/potentiometer.scad

@@ -40,12 +40,52 @@ function pot_spigot(type)   = type[9];  //! Spigot width, length and height abov
 function pot_spigot_x(type) = type[10]; //! Spigot offset from the shaft centre
 function pot_shaft(type)    = type[11]; //! Diameter, flat diameter, length and flat/slot length and colour. If flat diameter is less than the radius then it is a slot width
 function pot_neck(type)     = type[12]; //! Diameter and length of the shaft neck
+function pot_nut(type)      = type[13]; //! Across flat diameter and thickness of the nut
+function pot_washer(type)   = type[14]; //! Outside diameter and thickness of the washer
 
 function pot_size(type) = let(d = pot_body(type)) len(d) > 3 ? [d.x , d.y, d.z] : [d.x, d.x, d.y]; //! Get pot body dimensions
 
-function pot_z(type) = pot_thread_h(type) - pot_nut_t - pot_proud; //! Ideal distance behind panel surface to get the nut on comfortably
+function pot_z(type, washer = true) = pot_thread_h(type) - pot_nut(type)[1] - pot_proud - (washer ? pot_washer(type)[1] : 0); //! Ideal distance behind panel surface to get the nut and washer on comfortably
 function pot_spigot_r(type) = let(sp = pot_spigot(type)) sp.x > 2 * spigot_r ? spigot_r : 0;
 
+module pot_nut(type, washer = true) { //! Draw the nut for a potentiometer and possibly a washer
+    nut = pot_nut(type);
+    washer = washer ? pot_washer(type) : false;
+    nut_z = washer ? washer[1] : 0;
+    thread_d = pot_thread_d(type);
+    vflip() explode(23, explode_children = true) {
+        if(washer)
+            color(washer[2])
+                linear_extrude(washer[1])
+                    difference() {
+                        circle(d = washer.x);
+
+                        circle(d =  thread_d);
+
+                        serations = washer[3];
+                        if(serations)
+                            for(i = [1 : serations])
+                                rotate(i * 360 / serations)
+                                    translate([thread_d / 2, 0])
+                                        square([(washer.x - thread_d) / 2, PI * thread_d / (2 * serations)], center = true);
+                    }
+
+        if(nut)
+            color(nut[2])
+                translate_z(nut_z + exploded() * 10) {
+                    linear_extrude(nut[1])
+                        difference() {
+                            circle(d = nut.x / cos(30), $fn = 6);
+
+                            circle(d =  thread_d);
+                        }
+
+                    if(show_threads && exploded())
+                        female_metric_thread(thread_d, pot_thread_p(type), nut[1], center = false, colour = nut[2]);
+                }
+    }
+}
+
 module potentiometer(type, thickness = 3, shaft_length = undef) {//! Draw a potentiometer with nut spaced by specified thickness
     bh = pot_boss_h(type);
     s = pot_size(type);

vitamins/potentiometers.scad

@@ -17,11 +17,11 @@
 // If not, see <https://www.gnu.org/licenses/>.
 //
 //! Potentiometers and rotary encoders
-//                body     h     r     face               wafer                 gangs thread d   pitch       h     boss  h    spigot w, l, h  offset  shaft d flat h flat h   colour     neck
-imperial_pot_x2 = [[24,     22.5, 1.5], [5.7, 15.33, 0.8], [20, 28, 1.6, true],  2,   inch(3/8), inch(1/32), 6.35, 13.6, 2.4, [1.12, 3.03, 2],    11, [6.27, 5.5, 44.3, 44.3, silver],   [0, 0]];
-imperial_pot    = [[24,     12,   1.5], [5.7, 15.33, 0.8], [20, 28, 1.6, true],  1,   inch(3/8), inch(1/32), 6.35, 13.6, 2.4, [1.12, 3.03, 2],    11, [6.27, 5.5, 44.3, 44.3, grey(95)], [0, 0]];
-metric_pot      = [[23,     11,   1.0], [0, 15.33, 0.8],   [18, 27, 1.2, false], 1,   10,        0.75,       7.32, 13.9, 2.5, [1.12, 2.88, 1.26], 11, [6.27, 5.5, 43.8, 43.5, grey(50)], [0, 0]];
-KY_040_encoder  = [[12, 12, 6.5,  1.0], false,             false,                1,    7,        0.75,       7,    0,    0,   [0.4,  2,     0.8],5.8, [6,    4.5, 13,   10,   grey(60)], [4, 0.5]];
+//                 body     h     r     face               wafer                 gangs thread d  pitch       h     boss  h    spigot w, l, h  offset  shaft d flat d shaft h flat h colour neck   nut                  washer
+imperial_pot_x2 = [[24,     22.5, 1.5], [5.7, 15.33, 0.8], [20, 28, 1.6, true],  2,   inch(3/8), inch(1/32), 6.35, 13.6, 2.4, [1.12, 3.03, 2],    11, [6.27, 5.5, 44.3, 44.3, silver],   [0, 0],  [13.3, 2.4, brass],  [17.4, 0.8, grey(20), 9]];
+imperial_pot    = [[24,     12,   1.5], [5.7, 15.33, 0.8], [20, 28, 1.6, true],  1,   inch(3/8), inch(1/32), 6.35, 13.6, 2.4, [1.12, 3.03, 2],    11, [6.27, 5.5, 44.3, 44.3, grey(95)], [0, 0],  [13.3, 2.4, brass],  [17.4, 0.8, grey(20), 9]];
+metric_pot      = [[23,     11,   1.0], [0, 15.33, 0.8],   [18, 27, 1.2, false], 1,   10,        0.75,       7.32, 13.9, 2.5, [1.12, 2.88, 1.26], 11, [6.27, 5.5, 43.8, 43.5, grey(50)], [0, 0],  [12.8, 2,   silver], [17.7, 0.8, grey(20), 10]];
+KY_040_encoder  = [[12, 12, 6.5,  1.0], false,             false,                1,    7,        0.75,       7,    0,    0,   [0.4,  2,     0.8],5.8, [6,    4.5, 13,   10,   grey(60)], [4, 0.5],[9.8,  2.2, silver], [11.5, 0.4, silver]];
 BTT_encoder     = [[12, 11, 6,    0.5], false,             false,                1,    6,        0.8,        4.5,  0,    0,   false,               0, [5,    0.75, 9.5, 9,    silver],   [3, 0.5]];
 
 potentiometers = [BTT_encoder, KY_040_encoder, metric_pot, imperial_pot, imperial_pot_x2];

vitamins/psu.scad

@@ -124,19 +124,23 @@ function psu_face_transform(type, face) =           //! Returns a transformation
         translations = [h / 2, h / 2, l / 2 - left, l / 2 - right, w / 2, w / 2]
     ) translate([0, 0, h / 2]) * rotate(rotations[face]) * translate([0, 0, translations[face]]);
 
-grill_hole = 4.5;
-grill_gap = 1.5;
-module psu_grill(width, height) {
+module psu_grill(width, height, grill_hole = 4.5, grill_gap = 1.5, fn = 0, avoid = []) {
     nx = floor(width / (grill_hole + grill_gap));
     xpitch = width / nx;
     ny = floor(height / ((grill_hole + grill_gap) * cos(30)));
     ypitch = height / ny;
+    r = grill_hole / 2;
+    avoid = avoid ? [for(p = avoid) [[p.x - p[2] / 2 - r, p.y - p[3] / 2 - r], [p.x + p[2] / 2 + r, p.y + p[3] / 2 + r]]] : false;
+
+    function in(regions, x, y) = [for(r = regions) if(x >= r[0].x && x <= r[1].x && y >= r[0].y && y <= r[1].y) true];
 
     for(y = [0 : ny - 1], x = [0 : nx - 1 - (y % 2)]) {
         x = -width / 2 + (x + 0.5 + (y % 2) / 2) * xpitch;
         y = -height / 2 + (y + 0.5) * ypitch;
-        translate([x, y])
-            circle(d = grill_hole);
+        if(!avoid || !in(avoid, x, y))
+            translate([x, y])
+                rotate(30)
+                    circle(r, $fn = fn);
     }
 }
 
@@ -185,12 +189,18 @@ module psu(type) { //! Draw a power supply
                                     translate(h)
                                         drill(screw_pilot_hole(psu_screw(type)), 0);
 
-                                if(psu_face_grill(f)) {
+                                g = psu_face_grill(f);
+                                if(g) {
+                                    list = is_list(g);
+                                    fn = list ? g[2] : 0;
+                                    hole = list ? g[0] : 4.5;
+                                    gap = list ? g[1] : 1.5;
+                                    avoid = list ? g[3] : [];
                                     mx = 6;
                                     my1 = i == f_top && psu_face_grill(faces[f_back]) ? 0 : 6;
                                     my2 = i == f_back && psu_face_grill(faces[f_top]) ? 0 : 6;
                                     translate([0, (my2 - my1) / 2])
-                                        psu_grill(xw - 2 * mx, yw - my1 - my2);
+                                        psu_grill(xw - 2 * mx, yw - my1 - my2, grill_hole = hole, grill_gap = gap, fn = fn, avoid = avoid);
                                 }
                                 if(fan)
                                     translate([fan.x, fan.y]) intersection() {
@@ -234,7 +244,7 @@ module psu(type) { //! Draw a power supply
                             }
 
                         if(iec)
-                            translate([iec.x, iec.y])
+                            translate([iec.x, iec.y, t])
                                 rotate(iec.z)
                                     iec_assembly(iec[3], t);
 

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 <psu.scad>

vitamins/screw.scad

@@ -62,7 +62,9 @@ function screw_shorter_than(x) = x >= 20 ? floor(x / 5) * 5 : //! Returns the le
                                  x >= 10 ? 10 :
                                  x >=  8 ?  8 :
                                  x >=  6 ?  6 :
-                                 5;
+                                 x >=  5 ?  5 :
+                                 x >=  4 ?  4 :
+                                 3;
 
 function screw_length(screw, thickness, washers, insert = false, nyloc = false, nut = false, longer = false) = //! Returns the length of the longest or shortest screw that will got through `thickness` and `washers` and possibly an `insert`, `nut` or `nyloc`
     let(washer = washers ? washers * washer_thickness(screw_washer(screw)) : 0,