poster-tube-lid: Sort out CatchTipProfile vs HeadProfile

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

diff --git a/poster-tube-lid.scad b/poster-tube-lid.scad
index ee092b4d90ebb4ba96e1b07084e5c5e6bb9b7231..3ef360d052afb0d51c97d61812ebc349cee039bf 100644 (file)
--- a/poster-tube-lid.scad
+++ b/poster-tube-lid.scad
@@ -79,10 +79,11 @@ sm_closure_cnr = 3.0;
 
 catch_stalk_h = 5.0;
 catch_stalk_len = 50;
+catch_tip_th = 5;
 catch_head_th = 3;
 
 catch_pin_slop = 0.25; // each side, and above
-catch_pin_slop_x_extra = 0.0; // only on one side
+catch_pin_slop_x_extra = -0.55; // only on one side
 catch_stalk_above_gap = 1.5;
 catch_stalk_eff_bend_rad = catch_stalk_len * 0.75;
 
@@ -91,7 +92,7 @@ catch_stalk_base_width = catch_stalk_h;
 
 catch_knob_dia = 6;
 catch_knob_above_gap = 5;
-catch_knob_height = 3.5;
+catch_knob_height = 3.0;
 
 catch_stalk_below_gap = 1.0;
 catch_stalk_beside_gap = 2.0;
@@ -212,6 +213,7 @@ 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 ];
+cppi = [ cppa[0], cppd[1] ];
 cppc = [ cppd[0], cppb[1] ];
 cpph = cppd + [0,-1] * catch_stalk_h;
 cppe = cppd + [0,-1] * (catch_knob_above_gap + catch_knob_dia/2);
@@ -609,7 +611,7 @@ module CatchAssemblyCoreProfile(){
            ]);
 }
 
-module CatchHeadProfile(){
+module CatchTipProfile(){
   intersection(){
     translate(cppF){
       difference(){
@@ -618,14 +620,17 @@ module CatchHeadProfile(){
       }
     }
     polygon([ cppa,
-             cppg,
-             cpph,
+             cppi,
              cppd,
              cppc,
              cppb ]);
   }
+}
+
+module CatchHeadProfile(){
   polygon([ cppd,
-           cppg,
+           cppd,
+           cppi,
            cppf,
            cppe,
            cpph ]);
@@ -636,6 +641,9 @@ module CatchCore(){ /////toplevel
   linear_extrude(height=catch_strap_thick, convexity=10)
     CatchAssemblyCoreProfile();
 
+  linear_extrude(height=catch_tip_th, convexity=10)
+    CatchTipProfile();
+
   linear_extrude(height=catch_head_th, convexity=10)
     CatchHeadProfile();