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=86241e5a0a23fc8cd7a0f8ede23fb3de8115914a;hpb=80145b71ce928c7251252abcdd4ce010cf05594a;p=reprap-play.git

diff --git a/adafruit-powerboost-common.scad b/adafruit-powerboost-common.scad
index 86241e5..b62643a 100644
--- a/adafruit-powerboost-common.scad
+++ b/adafruit-powerboost-common.scad
@@ -192,15 +192,33 @@ module PsuLedWindowsPlan(){
   }
 }
 
-module PsuMountWindowsNegative(ceil){
-  linextr(-10, 0.1)
+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)
-    offset(delta=psu_window_ledge + psu_multicolour_gap)
+    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;
 
@@ -250,17 +268,12 @@ module PsuMountTest() { ////toplevel
 	translate([0, psu_y, psu_z]) {
 	  PsuMountNegative();
 	}
-
-	translate([0, psu_y, -ceil]) {
-	  linextr(-1, psu_initial_layer_thick) {
-	    offset(delta=psu_multicolour_gap)
-	      PsuLedLegendsPlan();
-	  }
-	}
       }
     }
-    translate([0, psu_y, psu_z])
+    translate([0, psu_y, psu_z]) {
       PsuMountWindowsNegative(ceil);
+      PsuLedLegendsNegative(ceil);
+    }
   }
 }
 
@@ -312,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