adafruit-powerboost: reorganise layerframes

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

diff --git a/adafruit-powerboost-common.scad b/adafruit-powerboost-common.scad
index 6eda9e58fe6b997e766f7e708f888256fda83f82..86241e5a0a23fc8cd7a0f8ede23fb3de8115914a 100644 (file)
--- a/adafruit-powerboost-common.scad
+++ b/adafruit-powerboost-common.scad
@@ -192,6 +192,15 @@ 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 PsuMountDemo() { ////toplevel
   ceil = psu_test_ceil;
 
@@ -241,12 +250,17 @@ 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]) {
-      linextr(-10, 0.1)
-       PsuLedWindowsPlan();
-    }
+    translate([0, psu_y, psu_z])
+      PsuMountWindowsNegative(ceil);
   }
 }
 
@@ -260,9 +274,11 @@ 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));
-  difference(){
-    rectfromto(bl-gap1, tr+gap1);
-    rectfromto(bl-gap0, tr+gap0);
+  linextr(0, psu_initial_layer_thick) {
+    difference(){
+      rectfromto(bl-gap1, tr+gap1);
+      rectfromto(bl-gap0, tr+gap0);
+    }
   }
 }
 
@@ -276,27 +292,17 @@ module PsuMountTestFullLayerFrame(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();
   }
 }