adafruit-powerboost: reorganise layerframes

[reprap-play.git] / adafruit-powerboost-common.scad

diff --git a/adafruit-powerboost-common.scad b/adafruit-powerboost-common.scad
index b38753aa7d75aaab4434de12fd522d6ca3573882..c9489148855b1b79a80e98ea3da86eb14d6f8018 100644 (file)
--- a/adafruit-powerboost-common.scad
+++ b/adafruit-powerboost-common.scad
@@ -192,9 +192,23 @@ module PsuLedWindowsPlan(){
   }
 }
 
-module PsuMountWindowsNegative(){
+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)
+    PsuLedWindowsPlan();
+}
+
+module PsuLedLegendsNegative(ceil){
+  PsuFirstLayerNegative(ceil)
+    PsuLedLegendsPlan();
 }
 
 module PsuMountDemo() { ////toplevel
@@ -248,8 +262,10 @@ module PsuMountTest() { ////toplevel
        }
       }
     }
-    translate([0, psu_y, psu_z])
-      PsuMountWindowsNegative();
+    translate([0, psu_y, psu_z]) {
+      PsuMountWindowsNegative(ceil);
+      PsuLedLegendsNegative(ceil);
+    }
   }
 }
 
@@ -286,15 +302,6 @@ module PsuMountTestFullMain() { ////toplevel
   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();
-      }
-    }
   }
 }