poster-tube-lid: catch: introduce cpp_adj

I think the problem is actually the lack of the radius scaling
which we had before the rework.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

diff --git a/poster-tube-lid.scad b/poster-tube-lid.scad
index 73abf8d8b09dbf2d7732d77d2cf9065e48987b7e..abc2c17f3738c8e295aef48930c3db5f599deca5 100644 (file)
--- a/poster-tube-lid.scad
+++ b/poster-tube-lid.scad
@@ -210,9 +210,14 @@ 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_pin_slop_x_extra,
+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;
@@ -221,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