WIP: Remove magic numbers

cad/display.scad

@@ -1,26 +1,26 @@
 $fn=32*2;
 
-thinkness=1.6;
+thickness=1.6;
 width=208.5;
 depth=70.5;
 height=8;
 
 // outer display frame
 difference(){
-  cube([width+(thinkness*2), depth+(thinkness*2), height]);
-  translate([thinkness, thinkness, 0])
+  cube([width+(thickness*2), depth+(thickness*2), height]);
+  translate([thickness, thickness, 0])
     cube([width, depth, height]);
 }
 
 // inner display catch
-translate([thinkness, thinkness, 1.5]){
-  offset=5;
+translate([thickness, thickness, 1.5]){
+  padding=5;
   ledge=0.8;
   difference(){
-    translate([offset, 0, 0])
-      cube([width-(offset*2), depth, thinkness]);
+    translate([padding, 0, 0])
+      cube([width-(padding*2), depth, thickness]);
     translate([0, ledge, 0])
-      cube([width, depth-(ledge*2), thinkness]);
+      cube([width, depth-(ledge*2), thickness]);
   }
 }
 
@@ -34,63 +34,72 @@ battery_floor(145);
 rpi4_cover();
 
 module usb_floor(){
-  offset=5.6+thinkness;
+  padding=5.6+thickness;
   hole=6;
+  usb_width=41;
+  usb_height=2;
+  usb_step_width=10;
+  center_hole=usb_width-(usb_step_width/2)+thickness;
 
-  difference([]){
+  difference(){
     translate([0, 0, height])
-      cube([31+thinkness+10, depth+(thinkness*2), 2+thinkness]);
+      cube([usb_width+thickness, depth+(thickness*2), usb_height+thickness]);
 
-    translate([0, 0, height+thinkness])
-      cube([31, depth+(thinkness*2), 2+thinkness]);
+    translate([0, 0, height+thickness])
+      cube([usb_width-usb_step_width, depth+(thickness*2), usb_height]);
 
-    translate([31+thinkness, thinkness, height])
-      cube([10, depth, 2]);
+    translate([usb_width-usb_step_width+thickness, thickness, height])
+      cube([usb_step_width, depth, usb_height]);
 
-    translate([31+thinkness+5, offset, height+2])
-      cylinder(h=thinkness, d=hole);
+    translate([center_hole, padding, height+usb_height])
+      cylinder(h=thickness, d=hole);
 
-    translate([31+thinkness+5, depth+(thinkness*2)-offset, height+2])
-      cylinder(h=thinkness, d=hole);
+    translate([center_hole, depth+(thickness*2)-padding, height+usb_height])
+      cylinder(h=thickness, d=hole);
   }
 }
 
 module battery_floor(x){
-    offset=5.6+thinkness;
+    offset=5.6+thickness;
     hole=6;
 
     difference(){
-      translate([x+thinkness, 0, height])
-        cube([width-x+thinkness, depth+(thinkness*2), 4+thinkness]);
+      translate([x+thickness, 0, height])
+        cube([width-x+thickness, depth+(thickness*2), 4+thickness]);
 
-      translate([x+thinkness, thinkness, height])
+      translate([x+thickness, thickness, height])
         cube([width-x, depth, 4]);
 
-      translate([x+thinkness+5, offset, height+4])
-        cylinder(h=thinkness, d=hole);
+      translate([x+thickness+5, offset, height+4])
+        cylinder(h=thickness, d=hole);
 
-      translate([x+thinkness+5, depth+(thinkness*2)-offset, height+4])
-        cylinder(h=thinkness, d=hole);
+      translate([x+thickness+5, depth+(thickness*2)-offset, height+4])
+        cylinder(h=thickness, d=hole);
     }
 }
 
 module rpi4_cover(){
     difference(){
-      translate([31+thinkness+10, 0, height])
-        cube([104, depth+(thinkness*2), 25+thinkness]);
+      translate([31+thickness+10, 0, height])
+        cube([104, depth+(thickness*2), 25+thickness]);
 
-      translate([31+thinkness+10, thinkness, height])
+      translate([31+thickness+10, thickness, height])
         cube([104, depth, 25]);
 
-      translate([31+thinkness+62, (depth+(thinkness*2))/2, height+25])
-        cylinder(h=thinkness, d=41.5);
+      translate([31+thickness+62, (depth+(thickness*2))/2, height+25])
+        cylinder(h=thickness, d=41.5);
     }
 
-    translate([17+thinkness, 0, height+2.6])
-      prism(24, thinkness, 24);
+    difference(){
+      translate([19+thickness, 0, height+thickness])
+        prism(22, depth+(thickness*2), 25);
+
+      translate([19+thickness, thickness, height+thickness])
+        prism(22, depth, 25);
+    }
 
     // logo
-    translate([31+thinkness+62, (depth+(thinkness*2))/2, height+25])
+    translate([31+thickness+62, (depth+(thickness*2))/2, height+25])
       linear_extrude(height=1.6)
         resize([42, 42, 0])
           import(file="mk-logo.svg", center=true);