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

1 files changed, 6 insertions, 11 deletions

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