poster-tube-lid: catch wip, centralise CatchAssembly

[reprap-play.git] / poster-tube-lid.scad

diff --git a/poster-tube-lid.scad b/poster-tube-lid.scad
index 4ce2176f513dbe34e646cfbac7859aae7a5a0ab6..dcb18b3df29725ab385a53acf77ab1f74f251e1c 100644 (file)
--- a/poster-tube-lid.scad
+++ b/poster-tube-lid.scad
@@ -145,7 +145,7 @@ catch_stem_end_h = catch_stem_h;
 catch_pin_width = rivet_entry_width - catch_pin_gap;
 
 cppy6 = -catch_strap_width/2;
-cppxC = TAU * 0.34 * main_dia/2;
+cppxC = 0.34 * sm_inner_rad * TAU;
 cppB = [ catch_pin_width/2,
         cppy6
         + catch_stem_below_gap
@@ -458,6 +458,26 @@ module ImplHeadCupTest(){ ////toplevel
       ImplHeadCup();
 }
 
+module SomeStrap(){
+  // children(0) is to add, (1) subtract
+  difference(){
+    union(){
+      cylinder(r=sm_outer_rad, h=sm_main_width);
+      StrapMountProtrusion(smc_cnr_c_x + sm_closure_cnr,
+                          smc_max_y,
+                          sm_closure_cnr);
+      children(0);
+    }
+    translate([0,0,-1])
+      cylinder(r=sm_inner_rad, h=sm_main_width+2);
+    translate(smc_pos)
+      StrapMountBolt(10);
+    translate(smc_pos)
+      cube([ sm_bolt_tighten_allow, 40,100 ], center=true);
+    children(1);
+  }
+}
+
 module StrapMountBolt(l_delta){ ///toplevel
   // positioned relative to smc_pos
   translate([(smc_bolt_nut_eff_thick - sm_bolt_head_thick)/2,
@@ -492,28 +512,17 @@ module StrapMountProtrusion(half_x, max_y, cnr){
 }
 
 module StrapMount(){ ////toplevel
-  difference(){
-    union(){
-      cylinder(r=sm_outer_rad, h=sm_main_width);
-      StrapMountProtrusion(smc_cnr_c_x + sm_closure_cnr,
-                          smc_max_y,
+  SomeStrap(){
+    rotate([0,0,180]){
+      StrapMountProtrusion(strap_hoop_inside/2 + strap_hoop_thick,
+                          strap_hoop_thick,
                           sm_closure_cnr);
-      rotate([0,0,180]){
-       StrapMountProtrusion(strap_hoop_inside/2 + strap_hoop_thick,
-                            strap_hoop_thick,
-                            sm_closure_cnr);
-       translate(smc_pos +
-                 [0,0, sm_main_width] +
-                 strap_hoop_thick * [ 0, 0.5, -1.0 ])
-         StrapHoop();
-      }
+      translate(smc_pos +
+               [0,0, sm_main_width] +
+               strap_hoop_thick * [ 0, 0.5, -1.0 ])
+       StrapHoop();
     }
-    translate([0,0,-1])
-      cylinder(r=sm_inner_rad, h=sm_main_width+2);
-    translate(smc_pos)
-      StrapMountBolt(10);
-    translate(smc_pos)
-      cube([ sm_bolt_tighten_allow, 40,100 ], center=true);
+    union(){ };
   }
 }
 
@@ -564,11 +573,30 @@ module CatchCoreProfile(){ ////toplevel
 }
 
 module CatchPreDistort(){ /////toplevel
-  rotate([90,0,0])
+  scale(100 / sm_inner_rad)
+    rotate([90,0,0])
     linear_extrude(height=catch_strap_thick, convexity=10)
     CatchCoreProfile();
 }
 
+module CatchAssembly(){ /////toplevel
+  rotate([0,0, -0.5 * (cpp1[0] + cpp2[0]) / sm_inner_rad * 360/TAU])
+    translate([0,0, catch_strap_width])
+    scale(sm_inner_rad / 100)
+    import(str("poster-tube-lid,CatchPostDistort-fa",
+              (coarse ? 20 : 1),
+              ".stl"),
+          convexity=20);
+
+  SomeStrap(){
+    union(){ }
+    union(){
+      translate([-200, -200, -200])
+       cube([400, 200, 400]);
+    }
+  }
+}
+
 //ProfilesDemo();
 //BayonetCutout();
 //MainProfile();