svg-prep-dxf: do Ungroup too

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

diff --git a/bike-lipo-box.scad b/bike-lipo-box.scad
index c7d376b224679c285b8563e41aa22a462f54db07..edd37010cdfd9ac36149516b4d99796deace7ec8 100644 (file)
--- a/bike-lipo-box.scad
+++ b/bike-lipo-box.scad
@@ -17,6 +17,9 @@ s1930_recess = 3;
 s1930_around = 3;
 s1930_behind = 3;
 
+jdae12pa_rad = 12 / 2 + 0.5;
+jdae12pa_rad_outer = 19 / 2 + 0.5; // head of an "M12 bolt"
+
 totx_inner = 180;
 toty_outer = 95;
 totz_inner = 27.0;
@@ -35,6 +38,8 @@ lipokeeper_w = 10;
 lipokeeper_h = 8;
 lipokeeper_d_min = 2;
 lipokeeper_slope = 0.75;
+lipokeeper_end_h = 12;
+lipokeeper_end_d_min = 15;
 
 straps_at_box = [45, 95, 125, 160];
 straps_every = 30;
@@ -195,13 +200,18 @@ module Box(){ ////toplevel
        S1930_Positive();
 
       // keepers for lipo
-      for (keepers= [[ 40, lipokeeper_d_min, [ 10, 40, 80, 120 ] ]])
-       for (kx= keepers[2]) {
+      for (keepers= [[ 35, lipokeeper_d_min,     lipokeeper_h,
+                      [ 40, 80, 120, 150 ] ],
+                    [ 10, lipokeeper_end_d_min, lipokeeper_end_h,
+                      [ 25 ] ]
+                    // each entry: [ y, d_min, h, [ x, ...] ]
+                    ])
+       for (kx= keepers[3]) {
          translate([kx, keepers[0], -1])
            hull(){
-             cube([lipokeeper_w, keepers[1], lipokeeper_h +1]);
+             cube([lipokeeper_w, keepers[1], keepers[2] +1]);
              cube([lipokeeper_w,
-                   keepers[1] + lipokeeper_h / lipokeeper_slope,
+                   keepers[1] + keepers[2] / lipokeeper_slope,
                    1]);
            }
       }
@@ -220,6 +230,13 @@ module Box(){ ////toplevel
               10])
       cylinder(r= pxp6012_rad, h= totz_outer);
 
+    // vent connector
+    translate([chargingconn_x,
+              toty_inner - (pxp6012_rad_outer*2 + 5 + 15 +
+                            jdae12pa_rad_outer),
+              10])
+      cylinder(r= jdae12pa_rad, h= totz_outer);
+
     translate([switch_x, toty_inner, totz_inner/2])
       rotate([90,0,90])
       S1930_Negative();
@@ -227,8 +244,10 @@ module Box(){ ////toplevel
     AtGlands()
       GlandNegative(cabledia);
 
-    translate($sealingbox_cnrrad * [1,1,0] +
-             [0, toty_inner/2, -wallthick])
+    translate(-$sealingbox_cnrrad * [1,1,0] +
+             [totx_inner, toty_inner/2, -wallthick])
+      rotate([0,0,180])
+      scale([2,2,1])
       Commitid_Full16_M();
   }
 }
@@ -252,7 +271,8 @@ module Lid(){ ////toplevel
 
     translate($sealingbox_cnrrad * [1,0,1])
       rotate([90,0,0])
-      Commitid_Full16_M();
+      scale([1.5, 1.5, 1])
+      Commitid_Small16_M();
   }
 }