poster-tube-lid: Introduce bayo_*_rad (nfc)

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

diff --git a/poster-tube-lid.scad b/poster-tube-lid.scad
index 8528673b9517dea6285a4f1e6e7e8fc680679fee..2e8209f0430e9e3ca591dce15c9d05e35c96275f 100644 (file)
--- a/poster-tube-lid.scad
+++ b/poster-tube-lid.scad
@@ -117,6 +117,9 @@ middle_bot_z = top_z - top_thick_middle;
 bayo_entry = bayo_behind / 3.0;
 bayo_top_z = bayo_behind + bayo_gap;
 
+bayo_nom_rad = main_dia/2 + side_thick;
+bayo_real_rad = main_dia/2 + rivet_tall;
+
 rivet_entry_width = rivet_width + side_rivet_gap;
 
 jig_mark_rad = jig_mark + main_dia/2 + jig_thick;
@@ -318,8 +321,8 @@ module RotateProject(x_min, x_max, slice_size, nom_rad, real_rad){
 
 module BayonetCutout(){
   RotateProject(bayo_c[0], bayo_i[0], bayo_slice_size,
-               main_dia/2 + side_thick, 
-               main_dia/2 + rivet_tall)
+               bayo_nom_rad, 
+               bayo_real_rad)
     translate([-0.5 * (bayo_a[0] + bayo_d[0]), 0])
     polygon(bayo_polygon, convexity=10);
 }
@@ -580,11 +583,32 @@ module CatchPreDistort(){ /////toplevel
 }
 
 module CatchAssembly(){ /////toplevel
-  scale(sm_inner_rad / 100)
+  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]);
+    }
+  }
+}
+
+module CatchDemo(){ /////toplevel
+  color("blue") translate([0,0,
+            -catch_strap_width
+            -cpp0[1]
+            ])
+    CatchAssembly();
+  translate([0,0,+side_height
+            ])
+    Cover();
 }
 
 //ProfilesDemo();