adafruit-powerboost: reorganise layerframes

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

diff --git a/adafruit-powerboost-common.scad b/adafruit-powerboost-common.scad
index 7b5536ebcf1f574bc98e9829daf74adf051662f3..7e2f556977f56a5fbc94640119393fe0845a74cc 100644 (file)
--- a/adafruit-powerboost-common.scad
+++ b/adafruit-powerboost-common.scad
@@ -195,12 +195,20 @@ module PsuLedWindowsPlan(){
 module PsuMountWindowsNegative(ceil){
   linextr(-10, 0.1)
     PsuLedWindowsPlan();
+
   translate([0, 0, -psu_z - ceil])
     linextr(-1, psu_initial_layer_thick)
     offset(delta=psu_window_ledge + psu_multicolour_gap)
     PsuLedWindowsPlan();
 }
 
+module PsuLedLegendsNegative(ceil){
+  translate([0, 0, -psu_z - ceil])
+    linextr(-1, psu_initial_layer_thick)
+    offset(delta=psu_multicolour_gap)
+    PsuLedLegendsPlan();
+}
+
 module PsuMountDemo() { ////toplevel
   ceil = psu_test_ceil;
 
@@ -252,14 +260,9 @@ module PsuMountTest() { ////toplevel
        }
       }
     }
-    translate([0, psu_y, psu_z])
+    translate([0, psu_y, psu_z]) {
       PsuMountWindowsNegative(ceil);
-
-    translate([0, psu_y, -ceil]) {
-      linextr(-1, psu_initial_layer_thick) {
-       offset(delta=psu_multicolour_gap)
-         PsuLedLegendsPlan();
-      }
+      PsuLedLegendsNegative(ceil);
     }
   }
 }