bike-lipo-box: TestWall: replace ad-hoc with S1930_Negative (nfc)

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

diff --git a/bike-lipo-box.scad.m4 b/bike-lipo-box.scad.m4
index da97cd4e04327cd1771327beb3c6a4faf8dd1c51..85f6e5946807e2a3e8f206c0d374f58a63a0e790 100644 (file)
--- a/bike-lipo-box.scad.m4
+++ b/bike-lipo-box.scad.m4
@@ -13,11 +13,33 @@ s1930_x_outer = 27.6 + 0.2;
 
 s1930_recess = 3;
 s1930_around = 3;
+s1930_behind = 3;
 
 wallthick = 2.5;
 
-module TestWall(){
+// origin is at centre on outer face wall
+// outside is towards positive x
+// mounting is vertical
+module S1930_Positive(){
+  d = s1930_recess + s1930_behind;
+  translate([-d/2, 0,0])
+    cube([d,
+         s1930_x_outer + s1930_around,
+         s1930_y_outer + s1930_around], center=true);
+}
+module S1930_Negative(){
+  cube([60, s1930_x, s1930_y],
+       center=true);
+  translate([1, 0,0])
+    cube([s1930_recess*2+2, s1930_x_outer, s1930_y_outer],
+        center=true);
+}
+
+module TestWall(){ ////toplevel
   sw_ctr = [25, 0, 25];
+  sw_ctr_new = [25,
+               wallthick + 0.5, // xxx compatibility bug
+               25];
 
   rotate([0,0,-90]){
     difference(){
@@ -37,21 +59,14 @@ module TestWall(){
   difference(){
     union(){
       cube([50, wallthick, 50]);
-      translate(sw_ctr) {
-       rotate([90,0,0])
-         cube([s1930_x_outer + s1930_around,
-               s1930_y_outer + s1930_around,
-               s1930_recess*2],
-              center=true);
-      }
+      translate(sw_ctr_new)
+       rotate([0,0,90])
+       S1930_Positive();
     }
 
-    translate(sw_ctr) {
-      rotate([90,0,0]) {
-       cube([s1930_x, s1930_y, 10], center=true);
-       translate([0,0, -5])
-         cube([s1930_x_outer, s1930_y_outer, 10], center=true);
-      }
+    translate(sw_ctr_new) {
+      rotate([0,0,90])
+       S1930_Negative();
     }
   }    
 }
@@ -68,6 +83,8 @@ ts_ybox = 25;
 ts_cnrrad = 10;
 ts_zbox = 8;
 
+ts_cidoff = (ts_cnrrad * (1-.7) + wallthick * .8) * [1,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',`
@@ -166,6 +183,8 @@ module CeilProfile(){
 module TestSealBox(){ ////toplevel
   TestSealDoBoxShape(WallProfile(););
   hull(){ TestSealDoBoxShape(FloorProfile();); }
+  translate(ts_cidoff)
+    Commitid_BestCount([ts_xbox,ts_ybox] - 2*ts_cidoff);
 }
 
 module TestSealLid(){ ////toplevel
@@ -174,8 +193,14 @@ module TestSealLid(){ ////toplevel
       TestSealDoBoxShape(LidProfile(););
       hull(){ TestSealDoBoxShape(CeilProfile();); }
     }
-    translate([ts_xbox/2, ts_ybox/2, 0])
+    translate([ts_xbox * .75, ts_ybox/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]);
   }
 }