X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=adafruit-powerboost-common.scad;h=b62643ac8ba297a2ad25efca633c980c1d2e860a;hb=ba7c5b240dcdab5fa3f4e3f7823bb828551471f0;hp=4fb93222e0470e260485b0dd0b9852a2537d95f5;hpb=9082331b935d029da51aea60c14e38dd6777009c;p=reprap-play.git

diff --git a/adafruit-powerboost-common.scad b/adafruit-powerboost-common.scad
index 4fb9322..b62643a 100644
--- a/adafruit-powerboost-common.scad
+++ b/adafruit-powerboost-common.scad
@@ -51,10 +51,9 @@ psu_z_down = psu_z + 0.1;
 psu_fix_sz = NutBox_outer_size(psu_board_nutbox);
 psu_board_nutbox_y = psu_sz[1]/2 + psu_board_nutbox[0]/2;
 
-psu_mount_outer_sz = psu_sz +
-  [ psu_board_support_wall * 2,
-    max(psu_board_support_wall,
-	psu_board_nutbox_y + psu_fix_sz/2) ];
+psu_mount_outer_sz_x = psu_sz[0] + psu_board_support_wall * 2; // centred
+psu_mount_outer_sz_y = psu_y + max(psu_board_support_wall, // at psu_y
+				   psu_board_nutbox_y + psu_fix_sz/2);
 
 module PsuBoardRepresentation(){
   linear_extrude(height= psu_th)
@@ -193,6 +192,33 @@ module PsuLedWindowsPlan(){
   }
 }
 
+module PsuLedWindowsWindows(ceil){
+  translate([0,0, -psu_z - ceil])
+    linextr(0, psu_initial_layer_thick)
+    offset(delta=psu_window_ledge)
+    PsuLedWindowsPlan();
+}
+
+module PsuFirstLayerNegative(ceil){
+  translate([0, 0, -psu_z - ceil])
+    linextr(-1, psu_initial_layer_thick)
+    children();
+}
+
+module PsuMountWindowsNegative(ceil){
+  linextr(-10, 0.1)
+    PsuLedWindowsPlan();
+  PsuFirstLayerNegative(ceil)
+    offset(delta= psu_window_ledge + psu_multicolour_gap)
+    PsuLedWindowsPlan();
+}
+
+module PsuLedLegendsNegative(ceil){
+  PsuFirstLayerNegative(ceil)
+    offset(delta= psu_multicolour_gap)
+    PsuLedLegendsPlan();
+}
+
 module PsuMountDemo() { ////toplevel
   ceil = psu_test_ceil;
 
@@ -228,21 +254,25 @@ module PsuMountTest() { ////toplevel
       translate([0, psu_y, psu_z])
 	PsuMountPositive();
       difference(){
-	linextr_x_yz(-(psu_sz[0]/2 + 5),
-		     +(psu_sz[0]/2 + 5)){
+
+	// rectangular box with wall
+	linextr_x_yz(-psu_mount_outer_sz_x/2,
+		     +psu_mount_outer_sz_x/2) {
 	  difference(){
-	    rectfromto([0, -ceil], [psu_sz[1] + 10, psu_z + 10]);
+	    rectfromto([0, -ceil],
+		       [psu_mount_outer_sz_y, psu_z + 10]);
 	    rectfromto([ceil,0], 400*[1,1]);
 	  }
 	}
+
 	translate([0, psu_y, psu_z]) {
 	  PsuMountNegative();
 	}
       }
     }
     translate([0, psu_y, psu_z]) {
-      linextr(-10, 0.1)
-	PsuLedWindowsPlan();
+      PsuMountWindowsNegative(ceil);
+      PsuLedLegendsNegative(ceil);
     }
   }
 }
@@ -252,39 +282,40 @@ psu_initial_layer_thick = 0.400;
 psu_initial_layer_width = 0.750;
 psu_window_ledge = 0.50; // each side
 
-module PsuMountTestFullLayerFrame(ix) {
-  sz = psu_sz*2 + [1,1]*psu_initial_layer_width*(3+ix);
-  translate([0, psu_y]) difference(){
-    square(center=true, sz + 2*[1,1]*psu_initial_layer_width);
-    square(center=true, sz);
+psu_frame_gap = 1.0;
+
+module PsuMountLayerFrame(bl, tr, ix) {
+  gap0 = [1,1] * (psu_frame_gap + psu_initial_layer_width*(ix+0));
+  gap1 = [1,1] * (psu_frame_gap + psu_initial_layer_width*(ix+1));
+  linextr(0, psu_initial_layer_thick) {
+    difference(){
+      rectfromto(bl-gap1, tr+gap1);
+      rectfromto(bl-gap0, tr+gap0);
+    }
   }
 }
 
+module PsuMountTestFullLayerFrame(ix) {
+  PsuMountLayerFrame([-0.5 * psu_mount_outer_sz_x, 0],
+		     [+0.5 * psu_mount_outer_sz_x,
+		      psu_mount_outer_sz_y],
+		     ix);
+}
 
 module PsuMountTestFullMain() { ////toplevel
   ceil = psu_test_ceil;
 
-  linextr(0, psu_initial_layer_thick)
-    PsuMountTestFullLayerFrame(2);
+  PsuMountTestFullLayerFrame(2);
   
   difference(){
     translate([0,0, ceil])
       PsuMountTest();
-
-    translate([0, psu_y, 0]) {
-      linextr(-1, psu_initial_layer_thick) {
-	offset(delta=psu_window_ledge + psu_multicolour_gap)
-	  PsuLedWindowsPlan();
-	offset(delta=psu_multicolour_gap)
-	  PsuLedLegendsPlan();
-      }
-    }
   }
 }
 
 module PsuMountTestFullOneLayer(ix) {
+  PsuMountTestFullLayerFrame(ix);
   linextr(0, psu_initial_layer_thick) {
-    PsuMountTestFullLayerFrame(ix);
     translate([0, psu_y]) children();
   }
 }
@@ -294,9 +325,9 @@ module PsuMountTestFullText() { ////toplevel
     PsuLedLegendsPlan();
 }
 module PsuMountTestFullWindows() { ////toplevel
-  PsuMountTestFullOneLayer(1)
-    offset(delta=psu_window_ledge)
-    PsuLedWindowsPlan();
+  PsuMountTestFullLayerFrame(1);
+  translate([0, psu_y, psu_z + psu_test_ceil])
+    PsuLedWindowsWindows(psu_test_ceil);
 }
 
 module PsuMountTestFullDemo() { ////toplevel