X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;ds=sidebyside;f=flyscreen-handle.scad;h=5d8a65fa5d83c7163f360fceb168cc1b62f708c4;hb=622f47a84dcc117f623ccb0bdb4c11a98d4d8f64;hp=00136e725de4b08fffce74e750c22c97949c130a;hpb=094f52d0f010a3c9510ac06909c88587801303a9;p=reprap-play.git

diff --git a/flyscreen-handle.scad b/flyscreen-handle.scad
index 00136e7..5d8a65f 100644
--- a/flyscreen-handle.scad
+++ b/flyscreen-handle.scad
@@ -14,27 +14,30 @@ retain_hgap_adjust = 1.5;
 retain_stalk_len = 8.0;
 retain_stalk_h = 1.5;
 retain_bend_gap = 2.0;
-retain_empir_angle = -25;
+retain_empir_angle = -10;
+retain_pushmore_adj = 0.0;
 
 hgap_empir_adjust = -0.5 -2.50;
 
 topprotr_rad = 0.35;
 
-bot_overlap = 5;
+bot_overlap = 4;
 bot_w = 3;
 
-handle_w = 8;
+handle_w = 10;
 handle_rh = 3;
 handle_rcut = 3;
 
 cutout_gap = 1.5;
 
-total_len = 35;
-retaining_len = 10;
-overret_gaplen = 5;
+total_len = 40;
+retain_len = 8;
+basics_len = 8;
 
 overret_hch = 5;
 
+peg_width_slop = 0.5;
+
 // calculated
 
 ins_irad = openingcnr_dia/2 + gap;
@@ -53,6 +56,20 @@ topprotr_y = -ins_irad + opening_topprotr;
 retain_mxy = [handle_x0 - retain_rad - retain_hgap_adjust,
 	      -ins_orad + retain_rad - retain_protr];
 
+retain_cutout_h = retain_rad * 2 + retain_bend_gap;
+
+overret_gaplen = retain_cutout_h / cos(retain_empir_angle);
+
+peg_width = retain_stalk_len -
+  (handle_x0 - retain_mxy[0]) / cos(retain_empir_angle)
+  - peg_width_slop;
+
+peg_height = retain_cutout_h - (retain_rad + retain_stalk_h)
+  + retain_pushmore_adj;
+
+retain1_len = retain_len + retain_stalk_len;
+retain1_base = total_len - retain1_len;
+
 module InsertSection(){
   hull(){
     translate([-ins_irad, -ins_irad])
@@ -99,23 +116,40 @@ module HandleSection(){
       translate([handle_x1 - handle_rh/2, y])
 	circle(r = handle_rh/2, $fn=20);
   }
+  translate([ handle_x1 - handle_rh*2,
+	      handle_y1 - handle_rh/2 ])
+    circle(r = handle_rh/2, $fn=20);
 }
 
 module RetainSection(){
   translate(retain_mxy) {
     rotate(retain_empir_angle) {
       circle(r=retain_rad, $fn=20);
-      square([retain_stalk_len + 1, retain_stalk_h]);
+      translate([0, -retain_pushmore_adj])
+	square([retain_stalk_len + 1, retain_stalk_h]);
     }
   }
 }
 
+module PegSection(delta){
+  square([peg_width,
+	  peg_height + delta]);
+}
+
+module PegSectionForDemo(delta){
+  translate(retain_mxy)
+    rotate(retain_empir_angle)
+    translate([retain_stalk_len - peg_width - peg_width_slop/2,
+	       retain_stalk_h - retain_pushmore_adj])
+    PegSection(delta);
+}
+
 module RetainCutout(gapping=false){
   translate(retain_mxy) {
     rotate(retain_empir_angle) {
       translate([-50, -retain_rad]) {
 	square([50 + retain_stalk_len,
-		retain_rad * 2 + retain_bend_gap]);
+		retain_cutout_h]);
       }
     }
   }
@@ -123,10 +157,12 @@ module RetainCutout(gapping=false){
 
 module GappingSection(){
   difference(){
-    InsertSection();
+    union(){
+      InsertSection();
+      HandleSection();
+    }
     RetainCutout(true);
   }
-  HandleSection();
 }
 
 module WithRetainSection(){
@@ -146,27 +182,49 @@ module BasicSection(){
 }
 
 module Handle(){
-  bs0 = retaining_len + overret_gaplen;
-  bs1 = bs0 + overret_hch;
-  linear_extrude(height=total_len, convexity=100) GappingSection();
-  linear_extrude(height=retaining_len, convexity=100) WithRetainSection();
-  translate([0,0, bs1]) linear_extrude(height= total_len - bs1)
+  bs1 = retain_len + overret_gaplen + 4;
+
+  translate([0,0,0])
+    linear_extrude(height= retain_len)
+    WithRetainSection();
+
+  translate([0,0, bs1])
+    linear_extrude(height= basics_len)
     BasicSection();
+
   translate([0,0, bs1+0.1]) mirror([0,0,1]) {
     intersection_for (sl=[0,1]) {
       multmatrix([[1,0,0,0],
-		  [0,1,sl*0.65,0],
+		  [0,1,sl,0],
 		  [0,0,1,0],
 		  [0,0,0,1]])
-	linear_extrude(height= overret_gaplen+1, convexity=100)
+	linear_extrude(height= overret_gaplen + 10, convexity=100)
 	BasicSection();
     }
   }
+  
+  linear_extrude(height=total_len, convexity=100) GappingSection();
+
+  translate([0,0, retain1_base]) {
+    intersection(){
+      linear_extrude(height=retain1_len, convexity=100)
+	WithRetainSection();
+      translate([retain_mxy[0], retain_mxy[1], 0])
+	rotate([0,0, retain_empir_angle])
+	translate([retain_stalk_len, -30, 0])
+	multmatrix([[1,0,-1,0],
+		    [0,1,0,0],
+		    [0,0,1,0],
+		    [0,0,0,1]])
+	cube([50, 60, 50]);
+    }
+  }
 }
 
 module Demo(){
   color("red") translate([0,0,-3]) BasicSection();
   color("blue") translate([0,0,3]) WithRetainSection();
+  color("orange") translate([0,0,7]) PegSectionForDemo(0);
 }
 
 module Test(){
@@ -177,12 +235,12 @@ module Test(){
   }
 }
 
-//Demo();
+Demo();
 //HandleSection();
 //InsertSection();
 //WithRetainSection();
 //BasicSection();
 //GappingSection();
-Test();
+//Test();
 //Demo();
 //Handle();