X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;ds=sidebyside;f=bike-lipo-box.scad;h=131e17d955b9a61dfb26c11178c95664bc44ea15;hb=f91c26ff587936aa5c79cbb5e1aad12717d8c4bd;hp=ec0b43b398b5dc052a688b2b17fe1a40e5a209c1;hpb=84d30106b39f3e7cf80d95ad48146f40da7106d1;p=reprap-play.git

diff --git a/bike-lipo-box.scad b/bike-lipo-box.scad
index ec0b43b..131e17d 100644
--- 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;
@@ -15,8 +16,20 @@ s1930_recess = 3;
 s1930_around = 3;
 s1930_behind = 3;
 
+totx_inner = 180;
+toty_outer = 95;
+totz_outer = 31;
+
 wallthick = 2.5;
 
+// calculated
+
+totx_outer = totx_inner + wallthick*2;
+toty_inner = toty_outer - wallthick*2;
+totz_inner = totz_outer - wallthick*2;
+
+sb_box_sz = [totx_outer, totz_outer, toty_inner];
+
 // origin is at centre on outer face wall
 // outside is towards positive x
 // mounting is vertical
@@ -68,38 +81,39 @@ module TestWall(){ ////toplevel
   }    
 }
 
-floorth = 2.5;
-ceilth = 2.5;
-innertube = 1.0 + 0.2;
-lidoverlap = 1.5;
-lidoverhang = 6;
-tubesealrad = 2.0;
+ts_totx = 30;
+ts_toty = 25;
+ts_totz_inner = 8;
 
-ts_xbox = 30;
-ts_ybox = 25;
-ts_cnrrad = 10;
-ts_zbox = 8;
+ts_box_sz = [ts_totx, ts_toty, ts_totz_inner];
 
-include <sealing-box.scad>
+$sealingbox_wallth = wallthick;
+$sealingbox_floorth = wallthick;
+$sealingbox_ceilth = wallthick;
 
 module TestSealBox(){ ////toplevel
-  TestSealBoxBox();
+  $sealingbox_sz = ts_box_sz;
+
+  SealingBox_RectBox();
+  ts_cidoff = ($sealingbox_cnrrad * (1-.7) + wallthick * .8) * [1,1];
   translate(ts_cidoff)
-    Commitid_BestCount([ts_xbox,ts_ybox] - 2*ts_cidoff);
+    Commitid_BestCount([ts_totx,ts_toty] - 2*ts_cidoff);
 }
 
 module TestSealLid(){ ////toplevel
+  $sealingbox_sz = ts_box_sz;
+
   difference(){
-    TestSealBoxLid();
+    SealingBox_RectLid();
 
-    translate([ts_xbox * .75, ts_ybox/2, 0])
+    translate([ts_totx * .75, ts_toty/2, 0])
       cylinder(h=100, r=5);
     
-    translate([-wallthick + ts_cnrrad*.5,
-	       ts_cnrrad*.5 - wallthick,
-	       ts_zbox + ceilth])
-      Commitid_BestCount([ts_xbox * .75 - 2.5 - (ts_cnrrad*.5),
-			  ts_ybox - (ts_cnrrad*.5 - wallthick)*2]);
+    translate([-wallthick + $sealingbox_cnrrad*.5,
+	       $sealingbox_cnrrad*.5 - wallthick,
+	       ts_totz_inner + $sealingbox_ceilth])
+      Commitid_BestCount([ts_totx * .75 - 2.5 - ($sealingbox_cnrrad*.5),
+			  ts_toty - ($sealingbox_cnrrad*.5 - wallthick)*2]);
   }
 }
 
@@ -107,13 +121,25 @@ module TestSealLidPrint(){ ////toplevel
   rotate([180,0,0]) TestSealLid();
 }
 
-module ProfileDemos(){
-  WallProfile();
-  color("blue") FloorProfile();
-  LidProfile();
-  color("blue") CeilProfile();
+module ProfileDemos(){ ////toplevel
+  $sealingbox_sz = ts_box_sz;
+
+  SealingBox_WallProfile();
+  color("blue") SealingBox_FloorProfile();
+  SealingBox_LidProfile();
+  color("blue") SealingBox_CeilProfile();
+  color("red") translate([-5,0]) square([1,ts_totz_inner]);
+}
+
+module Box(){ ////toplevel
+  $sealingbox_sz = sb_box_sz;
+  rotate([90,0,0])
+    translate([-wallthick,-wallthick, -toty_inner])
+    SealingBox_RectBox();
+  color("blue")
+    cube([totx_inner, toty_inner, totz_inner]);
 }
-			  
+
 //TestWall();
 //ProfileDemos();
 //TestSealBox();