From 849c692eff3162749514a327d14964d9c49be43b Mon Sep 17 00:00:00 2001
From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Tue, 27 Nov 2018 23:48:48 +0000
Subject: [PATCH 1/1] poster-tube-lid: Make SomeStrap etc. take width; adjust
 catch

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
---
 poster-tube-lid.scad | 25 +++++++++++++------------
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/poster-tube-lid.scad b/poster-tube-lid.scad
index d5d1f93..b08eae2 100644
--- a/poster-tube-lid.scad
+++ b/poster-tube-lid.scad
@@ -86,6 +86,7 @@ catch_pin_slop_x_extra = 0.0; // only on one side
 catch_stalk_above_gap = 1.5;
 catch_stalk_eff_bend_rad = catch_stalk_len * 0.75;
 
+catch_strap_width = 12;
 catch_stalk_base_width = 15;
 
 catch_knob_dia = 6;
@@ -149,7 +150,6 @@ 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_stalk_beside_gap;
-catch_strap_width = sm_main_width;
 catch_strap_thick = sm_main_thick;
 
 echo("R ", sm_inner_rad, bayo_real_rad, bayo_nom_rad);
@@ -491,31 +491,32 @@ module ImplHeadCupTest(){ ////toplevel
       ImplHeadCup();
 }
 
-module SomeStrap(){
+module SomeStrap(width){
   // children(0) is to add, (1) subtract
   difference(){
     union(){
-      cylinder(r=sm_outer_rad, h=sm_main_width);
+      cylinder(r=sm_outer_rad, h=width);
       StrapMountProtrusion(smc_cnr_c_x + sm_closure_cnr,
 			   smc_max_y,
-			   sm_closure_cnr);
+			   sm_closure_cnr,
+			   width);
       children(0);
     }
     translate([0,0,-1])
-      cylinder(r=sm_inner_rad, h=sm_main_width+2);
+      cylinder(r=sm_inner_rad, h=width+2);
     translate(smc_pos)
-      StrapMountBolt(10);
+      StrapMountBolt(10, width);
     translate(smc_pos)
       cube([ sm_bolt_tighten_allow, 40,100 ], center=true);
     children(1);
   }
 }
 
-module StrapMountBolt(l_delta){ ///toplevel
+module StrapMountBolt(l_delta, strap_width){ ///toplevel
   // positioned relative to smc_pos
   translate([(smc_bolt_nut_eff_thick - sm_bolt_head_thick)/2,
 	     smc_bolt_y,
-	     sm_main_width/2]){
+	     strap_width/2]){
     translate([ -sm_bolt_shaft/2-1, 0,0 ]){
       rotate([0,90,0]) cylinder(r= sm_bolt_dia/2, h= sm_bolt_shaft+2);
     }
@@ -529,9 +530,9 @@ module StrapMountBolt(l_delta){ ///toplevel
   }
 }
 
-module StrapMountProtrusion(half_x, max_y, cnr){
+module StrapMountProtrusion(half_x, max_y, cnr, width){
   translate(smc_pos){
-    linear_extrude(height=sm_main_width, convexity=10){
+    linear_extrude(height=width, convexity=10){
       hull(){
 	for (m = [0,1]) mirror([m,0,0]) {
 	  translate([-(half_x - cnr), max_y - cnr])
@@ -545,7 +546,7 @@ module StrapMountProtrusion(half_x, max_y, cnr){
 }
 
 module StrapMount(){ ////toplevel
-  SomeStrap(){
+  SomeStrap(sm_main_width){
     rotate([0,0,180]){
       StrapMountProtrusion(strap_hoop_inside/2 + strap_hoop_thick,
 			   strap_hoop_thick,
@@ -651,7 +652,7 @@ module CatchAssembly(){ /////toplevel
 	       ".stl"),
 	   convexity=20);
 
-  SomeStrap(){
+  SomeStrap(catch_strap_width){
     union(){ }
     union(){
       translate([-200, -200, -200])
-- 
2.30.2