From 0e8e387d35c1897c3b747c9924748a883c5f5448 Mon Sep 17 00:00:00 2001
From: Martin Budden <mjbudden@gmail.com>
Date: Fri, 28 Feb 2020 03:05:45 +0000
Subject: [PATCH] Improved S_300_12 PSU.

---
 vitamins/psu.scad  | 31 +++++++++---------
 vitamins/psus.scad | 78 +++++++++++++++++++++++++++++++++++++++++-----
 2 files changed, 87 insertions(+), 22 deletions(-)

diff --git a/vitamins/psu.scad b/vitamins/psu.scad
index 7a46a18..6175ba7 100644
--- a/vitamins/psu.scad
+++ b/vitamins/psu.scad
@@ -259,23 +259,26 @@ module psu(type) { //! Draw a power supply
                             square(16, center = true);
                     }
 
-        // earth strap
         tab_w = w / 2 + cutout[2].x;
-        color("silver")
-            translate([-l / 2, w / 2 - tab_w, z])
-                cube([left, tab_w - bt, lt]);
-
-        // Earth pilar and screw
-        earth_inset = 4.5;
-        earth_d = 5;
-        translate([-l / 2 + earth_inset, w / 2 - tab_w / 2]) {
+        // if the cutout is too wide, then don't draw earth strap, pillar and screw
+        if (tab_w - bt > 0) {
+            // earth strap
             color("silver")
-                cylinder(d = earth_d, h = z - pcb_thickness);
+                translate([-l / 2, w / 2 - tab_w, z])
+                    cube([left, tab_w - bt, lt]);
 
-            translate_z(z + lt)
-                not_on_bom() no_explode()
-                    spring_washer(M3_washer)
-                        screw(M3_pan_screw, 8);
+            // Earth pillar and screw
+            earth_inset = 4.5;
+            earth_d = 5;
+            translate([-l / 2 + earth_inset, w / 2 - tab_w / 2]) {
+                color("silver")
+                    cylinder(d = earth_d, h = z - pcb_thickness);
+
+                translate_z(z + lt)
+                    not_on_bom() no_explode()
+                        spring_washer(M3_washer)
+                            screw(M3_pan_screw, 8);
+            }
         }
 
         // terminal block
diff --git a/vitamins/psus.scad b/vitamins/psus.scad
index f27f5e5..be98751 100644
--- a/vitamins/psus.scad
+++ b/vitamins/psus.scad
@@ -83,15 +83,76 @@ KY240W =
 // This PSU, and ones very like it, are sold by LulzBot, and various sellers on eBay.
 // The screw layout specified here uses the inner set of screw-mounts on the PSU, which are M4.
 // The outer set don't appear to be M3, even though the datasheet claims they are.
-S_300_12 =
-    ["S_300_12", "S-300-12", 215, 115, 50, M4_cap_screw, M4_clearance_radius, false, 0, 0, [],
-        [  [[[ 215 / 2 - 32.5,  115 / 2 - 82.5],
-            [ 215 / 2 - 32.5,  115 / 2 - 32.5],
-            [ 215 / 2 - 182.5, 115 / 2 - 82.5],
-            [ 215 / 2 - 182.5, 115 / 2 - 32.5]]]
+S_300_12 = [
+    "S_300_12",
+    "S-300-12",// part name
+    215, 115, 50,// length, width, height
+    M4_cap_screw, M4_clearance_radius,// screw type and clearance
+    false,// true if ATX style
+    13,// terminals bay depth
+    0,// heatsink bay depth
+    [// terminals
+        9,// count
+        18,// y offset
+        st_terminals
+    ],
+    // faces
+    [
+        [// f_bottom, bottom
+            [// holes
+                [215/2 - 32.5, 115/2 - 82.5], [215/2 - 32.5, 115/2 - 32.5], [215/2 - 182.5, 115/2 - 82.5], [215/2 - 182.5, 115/2 - 32.5]
+            ],
+            1.5,// thickness
+            [],// cutouts
+            false,// grill
+            [],[],[]// fan, iec, rocker
         ],
-       []
-    ];
+        [// f_top, top
+            [],// holes
+            0.5,// thickness
+            [],// coutouts
+            false,// grill
+            [215/2 - 47.5, 115/2 - 37.5, fan50x15]
+        ],
+        [// f_left, front (terminals) after rotation
+            [],// holes
+            0.5,// thickness
+            [// cutouts
+                [
+                [-56, -25], [-56, -17],
+                [-60, -17], [-60, 0],
+                [115/2, 0], [115/2, -25]
+                ]
+            ],
+            false,// grill
+        ],
+        [// f_right, back after rotation
+            [], // holes
+            1.5,// thickness
+            [],// cutouts
+            false,// grill
+        ],
+        [// f_front, right after rotation
+            [// holes, offset from center
+                [215/2 -  32.5,-15], [215/2 - 182.5,-15],
+                [215/2 -  32.5, 10], [215/2 - 182.5, 10]
+            ],
+            1.5,// thickness
+            [],// cutouts
+            false,// grill
+        ],
+        [// f_back, left after rotation
+            [// holes, offset from center
+                [215/2 -  32.5, 15], [215/2 - 182.5, 15]
+            ],
+            1.5,// thickness
+            [],// cutouts
+            false,// grill
+        ],
+    ],
+    // accessories to add to BOM
+    []
+];
 
 External =
     ["External", "X Box", 0, 0, 0, false, false, false, 0, 0, [],
@@ -102,3 +163,4 @@ External =
 psus = [PD_150_12, S_250_48, ATX500, KY240W, S_300_12];
 
 use <psu.scad>
+