adafruit-powerboost: reorganise layerframes

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

diff --git a/adafruit-powerboost-common.scad b/adafruit-powerboost-common.scad
index acbf33bca1a14d6d1a8d1734a169e359af0d2faa..b38753aa7d75aaab4434de12fd522d6ca3573882 100644 (file)
--- a/adafruit-powerboost-common.scad
+++ b/adafruit-powerboost-common.scad
@@ -192,6 +192,11 @@ module PsuLedWindowsPlan(){
   }
 }
 
+module PsuMountWindowsNegative(){
+  linextr(-10, 0.1)
+    PsuLedWindowsPlan();
+}
+
 module PsuMountDemo() { ////toplevel
   ceil = psu_test_ceil;
 
@@ -227,6 +232,8 @@ module PsuMountTest() { ////toplevel
       translate([0, psu_y, psu_z])
        PsuMountPositive();
       difference(){
+
+       // rectangular box with wall
        linextr_x_yz(-psu_mount_outer_sz_x/2,
                     +psu_mount_outer_sz_x/2) {
          difference(){
@@ -235,15 +242,14 @@ module PsuMountTest() { ////toplevel
            rectfromto([ceil,0], 400*[1,1]);
          }
        }
+
        translate([0, psu_y, psu_z]) {
          PsuMountNegative();
        }
       }
     }
-    translate([0, psu_y, psu_z]) {
-      linextr(-10, 0.1)
-       PsuLedWindowsPlan();
-    }
+    translate([0, psu_y, psu_z])
+      PsuMountWindowsNegative();
   }
 }
 
@@ -257,9 +263,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);
+    }
   }
 }
 
@@ -273,8 +281,7 @@ 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])
@@ -292,8 +299,8 @@ module PsuMountTestFullMain() { ////toplevel
 }
 
 module PsuMountTestFullOneLayer(ix) {
+  PsuMountTestFullLayerFrame(ix);
   linextr(0, psu_initial_layer_thick) {
-    PsuMountTestFullLayerFrame(ix);
     translate([0, psu_y]) children();
   }
 }