quacks-ingredients: -counts: Include spares in Base_White

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

diff --git a/poster-tube-lid.scad b/poster-tube-lid.scad
index f7d4498b85334d22513b0421c11c5b67789ada43..08127cde3bd7f137113fe1c0e384a143b9e21f1a 100644 (file)
--- a/poster-tube-lid.scad
+++ b/poster-tube-lid.scad
@@ -79,6 +79,7 @@ sm_closure_cnr = 3.0;
 
 catch_stalk_h = 4.5;
 catch_stalk_len = 50;
+catch_tip_th = 4;
 catch_head_th = 3;
 
 catch_pin_slop = 0.25; // each side, and above
@@ -87,11 +88,11 @@ catch_stalk_above_gap = 1.5;
 catch_stalk_eff_bend_rad = catch_stalk_len * 0.75;
 
 catch_strap_width = 12;
-catch_stalk_base_width = catch_stalk_h;
+catch_stalk_base_width = 15;
 
 catch_knob_dia = 6;
 catch_knob_above_gap = 5;
-catch_knob_height = 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);
@@ -237,13 +239,15 @@ cppD = cppC + [0,-1] * catch_strap_width;
 
 // catch assembly stalk and so on
 
+catch_cr3 = catch_cr + catch_stalk_h;
+
 cppF = [ cppg[0] - catch_stalk_eff_bend_rad, cppd[1] ];
 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;
 cpp2d = cpp2 + [0,-1] * catch_cr;
-cpp3 = [ cpp2[0] + catch_cr * 2, cppd[1] - catch_cr ];
+cpp3 = [ cpp2[0] + catch_cr + catch_cr3, cppd[1] - catch_cr3 ];
 cppA = [ -cppxC, cpp9[1] ];
 cppE = [ cppA[0], cppD[1] ];
 
@@ -562,7 +566,7 @@ module CatchAssemblyCoreProfile(){
   difference(){
     union(){
       hull(){
-       translate(cpp3) circle(r= catch_cr);
+       translate(cpp3) circle(r= catch_cr3);
        polygon([ cpp3,
                  cpp2r,
                  cpp5,
@@ -607,7 +611,8 @@ module CatchAssemblyCoreProfile(){
            ]);
 }
 
-module CatchHeadProfile(){
+module CatchTipProfile(dy){
+  ddy = [0,dy];
   intersection(){
     translate(cppF){
       difference(){
@@ -616,14 +621,17 @@ module CatchHeadProfile(){
       }
     }
     polygon([ cppa,
-             cppg,
-             cpph,
-             cppd,
+             cppi + ddy,
+             cppd + ddy,
              cppc,
              cppb ]);
   }
+}
+
+module CatchHeadProfile(){
   polygon([ cppd,
-           cppg,
+           cppd,
+           cppi,
            cppf,
            cppe,
            cpph ]);
@@ -634,6 +642,13 @@ module CatchCore(){ /////toplevel
   linear_extrude(height=catch_strap_thick, convexity=10)
     CatchAssemblyCoreProfile();
 
+  hull(){
+    linear_extrude(height=catch_head_th, convexity=10)
+      CatchTipProfile(0);
+    linear_extrude(height=catch_tip_th, convexity=10)
+      CatchTipProfile(catch_tip_th - catch_head_th);
+  }
+
   linear_extrude(height=catch_head_th, convexity=10)
     CatchHeadProfile();