move vars to parameters.scad, add a little spacing, fix rail cutout

2 files changed, 14 insertions, 20 deletions

diff --git a/parameters.scad b/parameters.scad
index 065dd5a..5307f9a 100644
--- a/parameters.scad
+++ b/parameters.scad
@@ -9,7 +9,7 @@ num_hdd_y = 5;
 
 // width of vertical and horizontal bars
 vrail_width = 15;
-hrail_height = 14.5;
+hrail_height = 15;
 
 // depth of front and back
 front_depth = 15;
@@ -23,6 +23,13 @@ rail_width = 20;
 rail_height = rail_width;
 rail_thickness = 2;
 
+// width and height of the horizontal support bar (U-shaped metal)
+support_bar_width = 10 + pla_epsilon;
+
+// width of the SATA power cable (including some extra space for
+// navigation)
+spc_width=3;
+
 
 /// HDD SIZE (from spec)
 
@@ -39,14 +46,6 @@ hdd_length = 146;
 pla_epsilon = 0.1;
 
 
-/// COMPUTED VARIABLES
-
-// dimension of a single hdd tray (hdd + space around)
-tray_height = hdd_height + max(cooling_height, 2 * bar_thickness + 10 * pla_epsilon);
-tray_width = hdd_width + bar_thickness;
-tray_length = hdd_length - hdd_standout;
-
-
 /// OPENSCAD HACKS
 
 $fn = 180;
diff --git a/tray.scad b/tray.scad
index 2ae686b..4b0d89c 100644
--- a/tray.scad
+++ b/tray.scad
@@ -14,19 +14,13 @@ H = hdd_height + hrail_height;
 SW=5;
 SH=1.5;
 
-// width of the SATA power cable (including some extra space for
-// navigation)
-spc_width=3;
-
-support_bar_width = 10;
-
 module front(capped_bottom=true) {
     total_height = num_hdd_y*H + (capped_bottom ? 2 : hrail_height);
     translate([0, 0, capped_bottom ? -(hrail_height/2 - 3) : -hrail_height/2])
     intersection() {
 	union() {
 	    translate([0, 0, 0*H])
-	    tray(front_depth, inlet=[1]);
+	    tray(front_depth, inlet=[1], power_hole=false, support_bar=false, straps=false);
 	    
 	    for (i = [1:num_hdd_y-1])
             translate([0, 0, i*H])
@@ -90,9 +84,9 @@ union() {
 
 	    // vertical strap holes
 	    for (i = [-1, 1])
-	    translate([i * (hdd_width/2 + SH/2 - epsilon), 0, -hrail_height])
+	    translate([i * (hdd_width/2 + SH/2 - epsilon), 0, -hrail_height*3/4])
 	    rotate([0, 90, 0])
-	    strap_hole(D);
+	    # strap_hole(D);
 	}
 
 	// hole for support bar
@@ -113,9 +107,10 @@ union() {
 
 	// space for rail
 	if (rail)
-	    for (i = [0:1])
+	    for (i = [0,1])
+	    for (j = [0,1])
 	    mirror([i, 0, 0])
-	    translate([-hdd_width/2 - rail_thickness, -D, hrail_height/2 - rail_thickness])
+	    translate([-hdd_width/2 - rail_thickness, -D, hrail_height/2 - rail_thickness - j*H])
 	    rail();
 
 	// female side connectors