adjustments from print

1 files changed, 34 insertions, 39 deletions

diff --git a/enclosure/enclosure.scad b/enclosure/enclosure.scad
index bb32696..a1b7025 100644
--- a/enclosure/enclosure.scad
+++ b/enclosure/enclosure.scad
@@ -13,25 +13,26 @@
 WALL_THICKNESS=2;
 
 SCREW_DIAM=4;
-SCREW_PAD=1;
+SCREW_PAD=0;
 
 PM_X=40.8;
 PM_Y=40.8;
-PM_Z=12.4;
+PM_Z=12.5;
 PM_CONN_Y=15.8;
 PM_CONN_Z=4;
 PM_CONN_DEPTH=7.7;
 
 BATT_X=55;
-BATT_Y=34;
-BATT_Z=11;
+BATT_Y=33.5;
+BATT_Z=10.8;
 
-CO_X=24;
-CO_Y=28;
+CO_X=28.5;
+CO_Y=24.1;
 CO_Z=8;
 CO_CONN_Y=10;
 
-BOT_CABLE_WELL_X=25; // just some space for the battery & pm cables
+BOT_CABLE_WELL_X=15; // just some space for the battery & pm cables
+MID_CABLE_WELL_X=5;  // just some space between co2 & board
 CABLE_HOLE_DIAM=12.5;
 
 BOTTOM_Z=WALL_THICKNESS + PM_Z;
@@ -45,7 +46,7 @@ DISPLAY_OFF_Y=7;
 //PITCH=0.254; don't really care
 BOARD_X=66.5;
 BOARD_Y=36.8;
-BOARD_SINK=2.1;
+BOARD_SINK=2.2;
 
 BOARD_PIN_OFF_X=2.35; BOARD_PIN_DIST_X=61.43;
 BOARD_PIN_OFF_Y=2.15; BOARD_PIN_DIST_Y=32.5;
@@ -53,22 +54,19 @@ BOARD_PIN_OFF_Y=2.15; BOARD_PIN_DIST_Y=32.5;
 BOARD_SUPPORT_DIAM=3;
 BOARD_SUPPORT_PIN_DIAM=2;
 
-BOARD_OFF_X=3;
-BOARD_OFF_Y=3;
-
-// from https://web.archive.org/web/20151115224048/http://mgvs.org/public/shema/datasheet/usb_20/Micro-USB_final/Micro-USB_1_01.pdf
-USB_MICRO_B_X=10.6;
-USB_MICRO_B_Z=8.5;
+USB_MICRO_B_X=12;
+USB_MICRO_B_Z=5.5;
 
 USB_MICRO_B_SINK=2;
-USB_MICRO_B_OFF_X=43;
+USB_MICRO_B_OFF_X=42.7;
 
-SD_X=12;
+SD_X=12.5;
+SD_Y=9.5;
 SD_Z=1;
 SD_SINK=3;
 SD_OFF_X=54;
 
-SWITCH_X=8;
+SWITCH_X=9;
 SWITCH_Z=4;
 SWITCH_SINK=SWITCH_Z/2;
 SWITCH_OFF_X=42.5;
@@ -76,20 +74,20 @@ SWITCH_OFF_X=42.5;
 RESET_X=2;
 RESET_Z=2;
 RESET_SINK=1;
-RESET_OFF_X=SWITCH_OFF_X+7.5;
+RESET_OFF_X=51.5;
 
 BUTTON_X=5;
 BUTTON_Z=3;
 BUTTON_SINK=1;
-BUTTON_OFF_X=RESET_OFF_X+6;
+BUTTON_OFF_X=58;
 
 TOP_LAYER_Z=10;
 
 TOTAL_X=2*WALL_THICKNESS + max(
                                PM_X + BOT_CABLE_WELL_X + BATT_X,
-                               CO_X + BOARD_X
+                               CO_X + MID_CABLE_WELL_X + BOARD_X
                                );
-TOTAL_Y=2*(WALL_THICKNESS*2 + SCREW_DIAM + SCREW_PAD) + PM_Y; // max(pm_y,...)
+TOTAL_Y=2*(WALL_THICKNESS + SCREW_DIAM + SCREW_PAD) + max(PM_Y,CO_Y,BOARD_Y,BATT_Y);
 
 module box(v) {
   translate([0,0,v[2]/2]) cube(v,center=true);
@@ -146,7 +144,7 @@ module co_sensor() {
 
 module middle_cable_well() {
   box([
-       TOTAL_X - CO_X/2,
+       20, // doesn't matter, wells at both sides are much wider
        CO_CONN_Y,
        CO_Z,
        ]);
@@ -194,7 +192,7 @@ module usb_well() {
 }
 
 module sd_well() {
-  translate([0,0,-SD_SINK-SD_Z/2]) box([SD_X, 30, 30]);
+  translate([0,SD_Y/2,-SD_SINK-SD_Z/2]) box([SD_X, SD_Y, 30]);
 }
 
 module switch_well() {
@@ -215,7 +213,7 @@ module outside_wells() {
   translate([-BOARD_X/2,0,0]) {
     translate([0,BOARD_Y/2,0]) {
         translate([USB_MICRO_B_OFF_X, 0,0]) usb_well();
-        translate([SD_OFF_X, 0,0]) sd_well();
+        translate([SD_OFF_X, 0,0]) sd_well(); // not actually facing outside
     };
     translate([0,-BOARD_Y/2,0]) {
         translate([SWITCH_OFF_X, 0,0]) switch_well();
@@ -251,6 +249,10 @@ module middle() {
   CO_X_OFF=(TOTAL_X - CO_X)/2 - WALL_THICKNESS;
   CO_Z_OFF=MIDDLE_Z - CO_Z;
 
+  CABLE_X_OFF= CO_X_OFF - CO_X/2 - MID_CABLE_WELL_X/2;
+
+  BOARD_X_OFF= (TOTAL_X-BOARD_X)/2 - CO_X - MID_CABLE_WELL_X - WALL_THICKNESS;
+  BOARD_Y_OFF= (TOTAL_Y-BOARD_Y)/2 - SD_Y - WALL_THICKNESS;
   BOARD_Z_OFF=MIDDLE_Z - BOARD_SINK;
 
   union() {
@@ -259,23 +261,16 @@ module middle() {
       screw_holes();
       translate([CABLE_HOLE_X_OFF, CABLE_HOLE_Y_OFF, 0]) cable_hole();
       translate([CO_X_OFF, 0, CO_Z_OFF]) co_sensor();
-      translate([0, 0, CO_Z_OFF]) middle_cable_well();
-      translate([0,0, CO_Z_OFF]) board_well();
-      translate([0,0, BOARD_Z_OFF]) outside_wells();
-    }
-    translate([0,0, CO_Z_OFF]) board_supports();
-  }
-}
-
-module top() {
-  difference() {
-    cube([TOTAL_X, TOTAL_Y, TOP_LAYER_Z]);
-    translate([BOARD_OFF_X, BOARD_OFF_Y, 0]) union() {
-      translate([DISPLAY_OFF_X, DISPLAY_OFF_Y, -1])
-        cube([DISPLAY_WIN_X, DISPLAY_WIN_Y, TOP_LAYER_Z*2]);
+      translate([CABLE_X_OFF, 0, CO_Z_OFF]) middle_cable_well();
+      translate([BOARD_X_OFF, BOARD_Y_OFF, 0]) {
+        translate([0,0, CO_Z_OFF]) board_well();
+        translate([0,0, BOARD_Z_OFF]) outside_wells();
+      }
     }
+    translate([BOARD_X_OFF, BOARD_Y_OFF, CO_Z_OFF]) board_supports();
   }
 }
 
-//translate([0, TOTAL_Y * 1.2, 0]) bottom();
+translate([0, TOTAL_Y * 1.2, 0]) bottom();
+//translate([0, 0, -BOTTOM_Z-2]) bottom();
 middle();