X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=poster-tube-lid.scad;h=c6a0144ae89d83b43c9063020ed98eaea8444927;hb=037bc7abf5d11b0a963bbe6fd1a0344dc4f124d9;hp=1210d1779ea2672b82745db7ea22e6b3a6e817b3;hpb=9e7e35285653e4f92a1b0e68aae7b441cd1604c1;p=reprap-play.git

diff --git a/poster-tube-lid.scad b/poster-tube-lid.scad
index 1210d17..c6a0144 100644
--- a/poster-tube-lid.scad
+++ b/poster-tube-lid.scad
@@ -77,25 +77,23 @@ sm_bolt_y_over = 0.5;
 
 sm_closure_cnr = 3.0;
 
-catch_stem_h = 3;
-catch_stem_len = 50;
-catch_stem_th = 3;
+catch_stalk_h = 3;
+catch_stalk_len = 50;
+catch_head_th = 3;
 
 catch_pin_slop = 0.25; // each side, and above
-catch_pin_slop_x_extra = 0.25; // only on one side
+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;
+catch_stalk_eff_bend_rad = catch_stalk_len * 0.75;
 
 catch_stalk_base_width = 15;
 
 catch_knob_dia = 6;
 catch_knob_above_gap = 8;
-catch_knob_height = 6;
+catch_knob_height = 5;
 
-catch_stem_below_gap = 1.0;
-catch_stem_beside_gap = 2.0;
-catch_pin_gap = 0.5;
-catch_hook_slope = 0.15;
+catch_stalk_below_gap = 1.0;
+catch_stalk_beside_gap = 2.0;
 
 // calculated
 
@@ -150,12 +148,9 @@ smc_max_y = smc_bolt_y + sm_bolt_y_over
 smc_cnr_c_x = sm_bolt_shaft/2 - sm_closure_cnr
   + sm_bolt_head_thick/2 + smc_bolt_nut_eff_thick/2;
 
-catch_cr = catch_knob_dia/2 + catch_stem_beside_gap;
+catch_cr = catch_knob_dia/2 + catch_stalk_beside_gap;
 catch_strap_width = sm_main_width;
 catch_strap_thick = sm_main_thick;
-catch_stem_end_h = catch_stem_h;
-catch_pin_width = (rivet_entry_width * sm_inner_rad / bayo_nom_rad)
-		   - catch_pin_gap;
 
 echo("R ", sm_inner_rad, bayo_real_rad, bayo_nom_rad);
 
@@ -220,7 +215,7 @@ 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;
+cpph = cppd + [0,-1] * catch_stalk_h;
 cppe = cppd + [0,-1] * (catch_knob_above_gap + catch_knob_dia/2);
 cppf = [ cppa[0], cppe[1] ];
 cppg = [ cppa[0], cpph[1] ];
@@ -232,7 +227,7 @@ echo("RR", sm_inner_rad / bayo_nom_rad);
 
 cppy6 = cppB[1] - (catch_knob_dia/2
 		   + (cppc[1] - cppd[1])
-		   + catch_stem_below_gap);
+		   + catch_stalk_below_gap);
 cpp7 = [ cppB[0], cppy6 + catch_cr ];
 cpp11 = cpp7 + [1,0] * catch_cr;
 cppy9 = cppy6 + catch_strap_width * 1/3;
@@ -245,7 +240,7 @@ cppD = cppC + [0,-1] * catch_strap_width;
 // catch assembly stalk and so on
 
 cppF = [ cppg[0] - catch_stalk_eff_bend_rad, cppd[1] ];
-cpp4 = [ cppg[0] - catch_stem_len, cpph[1] ] + [1,-1] * catch_cr;
+cpp4 = [ cppg[0] - catch_stalk_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);
 cpp2r = cpp2 + [1,0] * catch_cr;
@@ -631,11 +626,11 @@ module CatchCore(){ /////toplevel
   linear_extrude(height=catch_strap_thick, convexity=10)
     CatchAssemblyCoreProfile();
 
-  linear_extrude(height=catch_strap_thick, convexity=10)
+  linear_extrude(height=catch_head_th, convexity=10)
     CatchHeadProfile();
 
   translate(concat(cppB,[0])) hull(){
-    translate([0,0, catch_knob_height - catch_knob_dia/2])
+    translate([0,0, catch_knob_height + catch_head_th - catch_knob_dia/2])
       sphere(r = catch_knob_dia/2);
     cylinder(r = catch_knob_dia/2, h = 0.1);
   }
@@ -648,7 +643,7 @@ module CatchPreDistort(){ /////toplevel
 }
 
 module CatchAssembly(){ /////toplevel
-  rotate([0,0, -(cppe[0] + cppB[0]) / sm_inner_rad * 360/TAU])
+  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",