From f4c132768cefe88e025a3204df6feed7516efbcc Mon Sep 17 00:00:00 2001
From: Jacob Eva <jacob.eva@liberatedsystems.co.uk>
Date: Fri, 4 Aug 2023 13:47:45 +0100
Subject: [PATCH] Corrected bay dimensions + adjusted light columns

---
 Mechanical/OpenSCAD/Enclosure.scad | 34 ++++++++++++------------------
 1 file changed, 13 insertions(+), 21 deletions(-)

diff --git a/Mechanical/OpenSCAD/Enclosure.scad b/Mechanical/OpenSCAD/Enclosure.scad
index 20d5722..4959e6f 100644
--- a/Mechanical/OpenSCAD/Enclosure.scad
+++ b/Mechanical/OpenSCAD/Enclosure.scad
@@ -15,14 +15,13 @@ base = [30.0, 32.0, 6.8];
 // The extension for the SMA connectors & EG95
 base_ext = [40, 20.2, 16.5];
 
-// The dimensions of the NSCCP sim holder
-sim = [13.5, 13, 1.37];
-
-bay = [12, 8.95, 0.92];
-
 // The default wall thickness
 side_wall = 1.5;
 
+// The dimensions of the sim holder bay
+bay = [side_wall, 9.62, 0.79];
+
+
 // Size and location of the typical PCB
 pcb_gap = 0.5;
 pcb = [26.0, 30.0, 0.8];
@@ -63,8 +62,10 @@ ext_screw_hole = 2.5+side_wall;
 ledge_cut = 0.6;
 ledge_cut_d = 3.2;
 
-led_guide = [1.2, 10.65];
-led_guide_stopper = [1.5, 1,];
+led_guide = [1, 11.95];
+led_guide_stopper = [1.3, 1];
+
+led_h = 0.7;
 
 // The rail cutout in the sides of the card
 module rail(make_printable) {
@@ -239,7 +240,7 @@ module expansion_card_base(open_end, make_printable, pcb_mount="boss") {
 
         }
         // cutout for sim card access
-        translate([0,bay[1]-sim[1]/2+2.53,1.67]) cube(bay);
+        translate([0,1.6,pcb_h-1.4]) cube(bay);
         
         // The rounded front edge to match the laptop
         edge_r = 0.8;
@@ -335,13 +336,6 @@ module expansion_card_ext(make_printable, pcb_mount="boss_insert") {
     }
 }
 
-module sim_holder() {
-    difference() {
-        cube(sim);
-        translate([0,bay[1]-sim[1]/2+1,0]) cube(bay);
-    }
-}
-
 module led_cylinder(stopper) {
     if (stopper) { // if a stopper should be inserted
         cylinder(h = led_guide[1], r = led_guide[0], $fn = 64);
@@ -352,17 +346,15 @@ module led_cylinder(stopper) {
     }
 }
 
-translate([base_ext[0]-6.45-side_wall*2, -base[1]-base_ext[1]+side_wall*2+0.8, pcb_h+2.75]) led_cylinder(true); // D2 LED column
+translate([base_ext[0]-6.45-side_wall*2, -base[1]-base_ext[1]+side_wall*2+0.8, pcb_h+0.78+led_h]) led_cylinder(true); // D2 LED column
 
-translate([-0.5, -base[1]-base_ext[1]+side_wall*2+0.8, pcb_h+2.75]) led_cylinder(true); // D3 LED column
+translate([-0.5, -base[1]-base_ext[1]+side_wall*2+0.8, pcb_h+0.78+led_h]) led_cylinder(true); // D3 LED column
 
 
 translate([0, -base[1], 0]) expansion_card_base(open_end = false, make_printable = true, pcb_mount="boss");
 
 translate([-base_ext[0]+base[0]+5, -base_ext[1]-base[1], 0]) expansion_card_ext(make_printable = true, pcb_mount="boss");
 
-//translate([0, -32, 0]) expansion_card_lid();
+translate([0, -32, 0]) expansion_card_lid();
 
-//translate([-128.75, 95.6, pcb_h]) import("PCB.stl");
-
-translate([2, -30.48, 1.68]) sim_holder();
+translate([-128.75, 95.6, pcb_h]) import("PCB.stl");