bike-lipo-box: move include of sealing-box to top

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

diff --git a/bike-lipo-box.scad b/bike-lipo-box.scad
index 4cc52de6e24571f45230f23f45520d4e3086642f..f71d1e83e0463fc0fd1d36ec1929e9a0f4f8b586 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;
@@ -72,23 +73,16 @@ totx_outer = 30;
 toty_outer = 25;
 totz_inner = 8;
 
-$sealingbox_wallthick = wallthick;
+$sealingbox_wallth = wallthick;
 $sealingbox_floorth = 2.5;
 $sealingbox_ceilth = 2.5;
 $sealingbox_xbox = totx_outer;
 $sealingbox_ybox = toty_outer;
 $sealingbox_zbox = totz_inner;
 
-innertube = 1.0 + 0.2;
-lidoverlap = 1.5;
-lidoverhang = 6;
-tubesealrad = 2.0;
-ts_cnrrad = 10;
-
-include <sealing-box.scad>
-
 module TestSealBox(){ ////toplevel
   TestSealBoxBox();
+  ts_cidoff = ($sealingbox_cnrrad * (1-.7) + wallthick * .8) * [1,1];
   translate(ts_cidoff)
     Commitid_BestCount([totx_outer,toty_outer] - 2*ts_cidoff);
 }
@@ -100,11 +94,11 @@ module TestSealLid(){ ////toplevel
     translate([totx_outer * .75, toty_outer/2, 0])
       cylinder(h=100, r=5);
     
-    translate([-wallthick + ts_cnrrad*.5,
-              ts_cnrrad*.5 - wallthick,
+    translate([-wallthick + $sealingbox_cnrrad*.5,
+              $sealingbox_cnrrad*.5 - wallthick,
               totz_inner + $sealingbox_ceilth])
-      Commitid_BestCount([totx_outer * .75 - 2.5 - (ts_cnrrad*.5),
-                         toty_outer - (ts_cnrrad*.5 - wallthick)*2]);
+      Commitid_BestCount([totx_outer * .75 - 2.5 - ($sealingbox_cnrrad*.5),
+                         toty_outer - ($sealingbox_cnrrad*.5 - wallthick)*2]);
   }
 }