sealing-box, bike-lipo-box: move remaining sealing-box vars out of bike-lipo-box

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

diff --git a/bike-lipo-box.scad b/bike-lipo-box.scad
index 4cc52de6e24571f45230f23f45520d4e3086642f..c036d8c33f17616649662f857da5a0259ef629fe 100644 (file)
--- a/bike-lipo-box.scad
+++ b/bike-lipo-box.scad
@@ -72,23 +72,18 @@ 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 +95,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]);
   }
 }