poster-tube-lid: catch: set catch_pin_slop_x_extra to 0

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

diff --git a/poster-tube-lid.scad b/poster-tube-lid.scad
index b2718f22d71692678656d1f286b23d72415d482e..525db2bcb00c5321829cee99e9a2e281eb58cd75 100644 (file)
--- a/poster-tube-lid.scad
+++ b/poster-tube-lid.scad
@@ -1,5 +1,7 @@
 // -*- C -*-
 
+include <funcs.scad>
+
 coarse = false;
 
 main_dia = 71.2 + 0.50 - 2.26;
@@ -80,6 +82,7 @@ catch_stem_len = 50;
 catch_stem_th = 3;
 
 catch_pin_slop = 0.25; // each side, and above
+catch_pin_slop_x_extra = 0.0; // only on one side
 catch_stalk_above_gap = 1.5;
 catch_stalk_eff_bend_rad = catch_stem_len * 0.75;
 
@@ -207,9 +210,15 @@ cppxC = 0.41 * sm_inner_rad * TAU;
 
 // catch pin
 
-cppa = bayo_f + [1,-1] * catch_pin_slop;
-cppb = bayo_g + [1,-1] * catch_pin_slop;
-cppd = [ bayo_n[0] - catch_pin_slop, -catch_stalk_above_gap ];
+cpp_adj = (bayo_n[0] - bayo_f[0]) * (1 - sm_inner_rad / bayo_nom_rad);
+// radius scaling due to nom and actual radius difference in
+// bayo entry construction
+
+cppa = bayo_f + [1,-1] * catch_pin_slop + [1,0] * cpp_adj;
+cppb = bayo_g + [1,-1] * catch_pin_slop + [1,0] * cpp_adj;
+cppd = [ bayo_n[0]
+        - catch_pin_slop - catch_pin_slop_x_extra,
+        -catch_stalk_above_gap ];
 cppc = [ cppd[0], cppb[1] ];
 cpph = cppd + [0,-1] * catch_stem_h;
 cppe = cppd + [0,-1] * (catch_knob_above_gap + catch_knob_dia/2);
@@ -217,6 +226,8 @@ cppf = [ cppa[0], cppe[1] ];
 cppg = [ cppa[0], cpph[1] ];
 cppB = 0.5 * (cppf + cppe);
 
+echo("RR", sm_inner_rad / bayo_nom_rad);
+
 // catch assembly depression below pin
 
 cppy6 = cppB[1] - (catch_knob_dia/2
@@ -233,7 +244,7 @@ cppD = cppC + [0,-1] * catch_strap_width;
 
 // catch assembly stalk and so on
 
-cppF = [ cppg[0] - catch_stem_stalk_eff_bend_rad, cppd[1] ];
+cppF = [ cppg[0] - catch_stalk_eff_bend_rad, cppd[1] ];
 cpp4 = [ cppg[0] - catch_stem_len, cpph[1] ] + [1,-1] * catch_cr;
 cpp5 = [ cpp4[0], cppC[1] + catch_cr ];
 cpp2 = cpp5 + [-1,0] * (catch_cr * 2 + catch_stalk_base_width);
@@ -243,6 +254,8 @@ cpp3 = [ cpp2[0] + catch_cr * 2, cppd[1] - catch_cr ];
 cppA = [ -cppxC, cpp9[1] ];
 cppE = [ cppA[0], cppD[1] ];
 
+catch_assembly_dy = -cppy9 + catch_strap_width;
+
 
 module MainProfile(){
   main_cnr_pos = [ side_thick, top_z ] - [1,1]*main_cnr;
@@ -587,59 +600,40 @@ module CatchAssemblyCoreProfile(){
               cpp11,
               ]);
     }
+    translate(cpp2) circle(r= catch_cr);
   }
 }
 
-module CatchCoreProfile(){ ////toplevel
-  hull(){
-    translate(cppB) circle(r= catch_knob_dia/2);
-    polygon([cpp4,
-            cppB,
-            cpp3]);
-  }
-  translate(cpp8)
-    circle(catch_cr);
-  polygon([
-          cpp4,
-          cppB,
-          cpp3,
-          cpp2,
-          cpp1,
-          cpp12,
-          ]);
-  difference(){
-    polygon([ cpp4,
-             cpp3,
-             cpp12,
-             cppA,
-             cppE,
-             cppD,
-             cppC,
-             cpp9,
-             cpp10,
-             cpp11,
-             cpp7,
-             cpp5,
-             ], convexity=10);
-    hull(){
-      translate(cpp7) circle(r= catch_cr);
-      polygon([ cpp7,
-               cpp5,
-               cpp11 ]);
-    }
-    hull(){
-      translate(cpp6) circle(catch_cr);
-      polygon([ cppA,
-               cpp0,
-               cpp1 ]);
+module CatchHeadProfile(){
+  intersection(){
+    translate(cppF){
+      difference(){
+       circle(r = dist2d(cppF, cppd));
+       //circle(r = dist2d(cppF, cppa));
+      }
     }
+    polygon([ cppa,
+             cppg,
+             cpph,
+             cppd,
+             cppc,
+             cppb ]);
   }
+  polygon([ cppd,
+           cppg,
+           cppf,
+           cppe,
+           cpph ]);
 }
 
+
 module CatchCore(){ /////toplevel
   linear_extrude(height=catch_strap_thick, convexity=10)
     CatchAssemblyCoreProfile();
 
+  linear_extrude(height=catch_strap_thick, convexity=10)
+    CatchHeadProfile();
+
   translate(concat(cppB,[0])) hull(){
     translate([0,0, catch_knob_height - catch_knob_dia/2])
       sphere(r = catch_knob_dia/2);
@@ -654,8 +648,8 @@ module CatchPreDistort(){ /////toplevel
 }
 
 module CatchAssembly(){ /////toplevel
-  rotate([0,0, -0.5 * (cpp1[0] + cpp2[0]) / sm_inner_rad * 360/TAU])
-    translate([0,0, catch_strap_width])
+  rotate([0,0, -(cppe[0] + cppB[0] + catch_pin_slop) / sm_inner_rad * 360/TAU])
+    translate([0,0, catch_assembly_dy])
     scale(sm_inner_rad / 100)
     import(str("poster-tube-lid,CatchPostDistort-fa",
               (coarse ? 20 : 3),
@@ -673,8 +667,7 @@ module CatchAssembly(){ /////toplevel
 
 module CatchDemo(){ /////toplevel
   color("blue") translate([0,0,
-            -catch_strap_width
-            -cpp0[1]
+                          -catch_assembly_dy
             ])
     CatchAssembly();
   translate([0,0,+side_height
@@ -684,8 +677,7 @@ module CatchDemo(){ /////toplevel
 
 module CatchDemoS(){ /////toplevel
   color("blue") translate([0,0,
-            -catch_strap_width
-            -cpp0[1]
+            -catch_assembly_dy
             ])
     CatchAssembly();
   intersection(){
@@ -703,11 +695,12 @@ module CatchPinProfileDemo(){ /////toplevel
   echo("G ",
        cpp2[0] - cpp1[0],
        bayo_n[0] - bayo_e[0]);
-  color("blue") translate([-cpp2[0],
-                          -cpp2[1],
+  color("blue") translate([0,0,
                           +1,
-            ])
-    CatchCoreProfile();
+            ]) {
+    CatchAssemblyCoreProfile();
+    CatchHeadProfile();
+  }
   polygon(bayo_polygon, convexity=10);
 }