X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=reprap-play.git;a=blobdiff_plain;f=sealing-box.scad.m4;h=dbfb220f9519b7535a4ec66f16a40ce6d588b30b;hp=efc253a1077d4a74820ba7577a8767e244b63cf4;hb=9f21563a34c99c15c3adcd2a72ab0da7cf741bbe;hpb=2cbfe8e17ae89257bce84a58c340fa90bca555d9

diff --git a/sealing-box.scad.m4 b/sealing-box.scad.m4
index efc253a..dbfb220 100644
--- a/sealing-box.scad.m4
+++ b/sealing-box.scad.m4
@@ -6,15 +6,17 @@
 //      1. include <sealing-box.scad>
 //      2. assign() values to (xxx these should be $ variables)
 //           $sealingbox_wallth
-//           $sealingbox_xbox (outer dimension)
-//           $sealingbox_ybox (outer dimension)
-//           $sealingbox_zbox (inner dimension)
+//           $sealingbox_sz[0] (outer dimension)
+//           $sealingbox_sz[1] (outer dimension)
+//           $sealingbox_sz[2] (inner dimension)
 //           $sealingbox_ceilth
 //           $sealingbox_floorth
 //           $sealingbox_wallth
 //      3. use the modules
 //           SealingBox_RectBox
 //           SealingBox_RectLid
+//           (origin is notional outside corner, but at level of
+//            inside of base; box extends to positive x,y,z)
 //
 // B. Complicated shapes, but harder work
 //      1. Be a .m4 file and m4_include sealing-box.scad.m4
@@ -26,22 +28,29 @@
 //  $sealingbox_cnrrad
 
 $sealingbox_cnrrad = 10;
+$sealingbox_crude = false;
+$sealingbox_inner_slop = 0.2;
 
 m4_define(`BoxLocals',`
+  xbox = $sealingbox_sz[0];
+  ybox = $sealingbox_sz[1];
+  zbox = $sealingbox_sz[2];
   wall = $sealingbox_wallth;
   floorth = $sealingbox_floorth;
   ceilth = $sealingbox_ceilth;
-  xbox = $sealingbox_xbox;
-  ybox = $sealingbox_ybox;
-  zbox = $sealingbox_zbox;
   cnrrad = $sealingbox_cnrrad;
 
-  ts_cidoff = (cnrrad * (1-.7) + wall * .8) * [1,1];
-
   xbox_lin = xbox - cnrrad*2;
   ybox_lin = ybox - cnrrad*2;
 ')
 
+m4_define(`innertube', `(1.0 + 0.2)')
+m4_define(`lidoverlap', `1.5')
+m4_define(`lidoverhang', `6')
+m4_define(`tubesealrad', `2.0')
+
+m4_define(`BoxFn',`$fn= $sealingbox_crude ? ($2) : ($1)')
+
 m4_dnl Box_Part($1=transl_x,$2=transl_y, $3=rot_z,$4=mirror_xy)
 m4_dnl          $5=kind, $6=kindargs, $7=profile(profileargsargs))
 m4_define(`Box_Part',`
@@ -75,7 +84,7 @@ m4_define(`BoxPart_Extrude_Arc',`
         scale(500)
         mirror([($1)<0, 0,0])
         FArcSegment_mask($2);
-      rotate_extrude(convexity=10, $fs=1, $fn=36)
+      rotate_extrude(convexity=10, $fs=1, BoxFn(36,8))
         mirror([($1)<0, 0,0])
         translate([+($1),0,0]){
           $3
@@ -101,7 +110,7 @@ module SealingBox_WallProfile(){
   BoxLocals
   z = zbox - innertube - tubesealrad;
   translate([0, -0.1]) square([wall, z]);
-  translate([tubesealrad, z]) circle(r=tubesealrad, $fn=20);
+  translate([tubesealrad, z]) circle(r=tubesealrad, BoxFn(20,6));
 }
 
 module SealingBox_FloorProfile(){
@@ -109,27 +118,41 @@ module SealingBox_FloorProfile(){
   mirror([0,1]) square([wall, floorth]);
 }
 
+function SealingBox_lidbigger() = lidoverlap + innertube;
+
 module SealingBox_LidProfile(){
   BoxLocals
   rad = tubesealrad + innertube;
   morex = wall;
+  inner_buttress_h = tubesealrad*1.5 + innertube + ceilth;
+
   difference(){
-    translate([-lidoverlap - innertube,
-	       zbox - lidoverhang - innertube])
-      square([lidoverlap + innertube + wall,
+    translate([0, zbox + ceilth]) mirror([0,1]) {
+      translate([-SealingBox_lidbigger(),
+		 0])
+      square([lidoverlap + innertube + tubesealrad,
 	      lidoverhang + innertube + ceilth]);
+      square([tubesealrad*2 + innertube + lidoverlap,
+	      inner_buttress_h]);
+    }
     hull(){
       translate([tubesealrad,
 		 zbox - innertube - tubesealrad])
 	for (t=[ [0,0],
-		 [morex*2, 0],
 		 [0, -zbox]
 		 ]) {
 	  translate(t)
-	    circle(r= tubesealrad + innertube, $fn=20);
+	    circle(r= tubesealrad + innertube, BoxFn(20,6));
 	}
     }
   }
+  translate([tubesealrad*2 + $sealingbox_inner_slop,
+	     zbox + ceilth]) {
+    mirror([0,1]) {
+      square([lidoverlap + innertube,
+	      inner_buttress_h]);
+    }
+  }
 }
 
 module SealingBox_CeilProfile(){
@@ -154,4 +177,4 @@ m4_define(`BoxUseShape',`
   }
 ')
 
-BoxUseShape(`TestSealBox',`BoxDoShapeRect')
+BoxUseShape(`SealingBox_Rect',`BoxDoShapeRect')