bike-lipo-box: move $sealingbox settings for testing into individual modules

[reprap-play.git] / bike-lipo-box.scad

diff --git a/bike-lipo-box.scad b/bike-lipo-box.scad
index c036d8c33f17616649662f857da5a0259ef629fe..6ad60b0a2a964d16a2aa0129b5758bd73c683501 100644 (file)
--- a/bike-lipo-box.scad
+++ b/bike-lipo-box.scad
@@ -2,6 +2,7 @@
 
 include <commitid.scad>
 include <utils.scad>
+include <sealing-box.scad>
 
 pxp6012_rad = 22.5 / 2 + 0.5; // make circular hole this size in outer wall
 pxp6012_rad_outer = 32.0 / 2 - 0.5;
@@ -68,38 +69,41 @@ module TestWall(){ ////toplevel
   }    
 }
 
-totx_outer = 30;
-toty_outer = 25;
-totz_inner = 8;
+ts_totx = 30;
+ts_toty = 25;
+ts_totz_inner = 8;
 
 $sealingbox_wallth = wallthick;
-$sealingbox_floorth = 2.5;
-$sealingbox_ceilth = 2.5;
-$sealingbox_xbox = totx_outer;
-$sealingbox_ybox = toty_outer;
-$sealingbox_zbox = totz_inner;
-
-include <sealing-box.scad>
+$sealingbox_floorth = wallthick;
+$sealingbox_ceilth = wallthick;
 
 module TestSealBox(){ ////toplevel
-  TestSealBoxBox();
+  $sealingbox_xbox = ts_totx;
+  $sealingbox_ybox = ts_toty;
+  $sealingbox_zbox = ts_totz_inner;
+
+  SealingBox_RectBox();
   ts_cidoff = ($sealingbox_cnrrad * (1-.7) + wallthick * .8) * [1,1];
   translate(ts_cidoff)
-    Commitid_BestCount([totx_outer,toty_outer] - 2*ts_cidoff);
+    Commitid_BestCount([ts_totx,ts_toty] - 2*ts_cidoff);
 }
 
 module TestSealLid(){ ////toplevel
+  $sealingbox_xbox = ts_totx;
+  $sealingbox_ybox = ts_toty;
+  $sealingbox_zbox = ts_totz_inner;
+
   difference(){
-    TestSealBoxLid();
+    SealingBox_RectLid();
 
-    translate([totx_outer * .75, toty_outer/2, 0])
+    translate([ts_totx * .75, ts_toty/2, 0])
       cylinder(h=100, r=5);
     
     translate([-wallthick + $sealingbox_cnrrad*.5,
               $sealingbox_cnrrad*.5 - wallthick,
-              totz_inner + $sealingbox_ceilth])
-      Commitid_BestCount([totx_outer * .75 - 2.5 - ($sealingbox_cnrrad*.5),
-                         toty_outer - ($sealingbox_cnrrad*.5 - wallthick)*2]);
+              ts_totz_inner + $sealingbox_ceilth])
+      Commitid_BestCount([ts_totx * .75 - 2.5 - ($sealingbox_cnrrad*.5),
+                         ts_toty - ($sealingbox_cnrrad*.5 - wallthick)*2]);
   }
 }
 
@@ -108,11 +112,15 @@ module TestSealLidPrint(){ ////toplevel
 }
 
 module ProfileDemos(){ ////toplevel
+  $sealingbox_xbox = ts_totx;
+  $sealingbox_ybox = ts_toty;
+  $sealingbox_zbox = ts_totz_inner;
+
   SealingBox_WallProfile();
   color("blue") SealingBox_FloorProfile();
   SealingBox_LidProfile();
   color("blue") SealingBox_CeilProfile();
-  color("red") translate([-5,0]) square([1,totz_inner]);
+  color("red") translate([-5,0]) square([1,ts_totz_inner]);
 }
                          
 //TestWall();