X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=reprap-play.git;a=blobdiff_plain;f=flyscreen-handle.scad;h=47588a0732dfa22cd73a5c7292fddb5fb970312c;hp=feb606b74a50acdec1f91e84969b62bbdeafea0d;hb=e6b5e0314e0e3a73cf121ea85df45db83c30a960;hpb=dae56cbae311e30c9d461a29e54c611b9bde45b4

diff --git a/flyscreen-handle.scad b/flyscreen-handle.scad
index feb606b..47588a0 100644
--- a/flyscreen-handle.scad
+++ b/flyscreen-handle.scad
@@ -1,32 +1,38 @@
 // -*- C -*-
 
-opening_height = 7.84 - 0.3;
-opening_depth = 7.88;
+opening_height = 7.84 - 0.3 + 0.60;
+opening_depth = 6.0; // 7.88;
 openingcnr_dia = 2.75;
-opening_topprotr = 1.54 - 0.65;
+opening_topprotr = 1.54;
 
 gap = 0.25;
 
-retain_empir_angle = 20;
-retain_empir_stalkw = 0.8;
 retain_rad = 1.65;
-retain_empir_inward = 0.65;
+retain_protr = 0.35;
+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_pushmore_adj = 0.45;
+
+hgap_empir_adjust = -0.5 -2.50;
 
 topprotr_rad = 0.35;
 
 bot_overlap = 5;
 bot_w = 3;
 
-handle_d = 2;
-handle_w = 8;
-handle_rh = 2;
+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;
 
@@ -36,23 +42,39 @@ ins_irad = openingcnr_dia/2 + gap;
 ins_orad = openingcnr_dia/2 + opening_height - gap;
 ins_th = ins_orad - ins_irad;
 
-handle_x0 = ins_irad;
+handle_x0 = ins_irad + hgap_empir_adjust;
 handle_h = bot_overlap + ins_th;
 handle_y0 = -ins_orad-bot_overlap;
 handle_y1 = handle_y0 + handle_h;
 
 handle_x1 = handle_x0 + bot_w + handle_w;
 
+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);
+
+retain1_len = retain_len + retain_stalk_len;
+retain1_base = total_len - retain1_len;
+
 module InsertSection(){
   hull(){
-    translate([-ins_orad, 0]) square([ins_th, 0.1]);
+    translate([-ins_irad, -ins_irad])
+      mirror([1, 0])
+      square([opening_depth - ins_irad, 0.1]);
     translate([-ins_irad - topprotr_rad,
-	       opening_topprotr - topprotr_rad])
+	       topprotr_y - topprotr_rad])
       circle(r=topprotr_rad, $fn=10);
   }
   translate([0, -ins_orad]) square([ins_irad+1, ins_th]);
   intersection(){
-    translate([0.1,0.1]) mirror([1,1]) square([100,100]);
+    translate([0, -ins_irad])
+      mirror([1,1])
+      square([100, opening_depth]);
     difference(){
       circle(r= ins_orad);
       circle(r= ins_irad, $fn=20);
@@ -85,41 +107,50 @@ 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(){
-  rotate(180-retain_empir_angle)
-    translate([0, ins_orad - retain_empir_inward])
-    circle(r=retain_rad, $fn=20);
+  translate(retain_mxy) {
+    rotate(retain_empir_angle) {
+      circle(r=retain_rad, $fn=20);
+      translate([0, -retain_pushmore_adj])
+	square([retain_stalk_len + 1, retain_stalk_h]);
+    }
+  }
 }
 
 module RetainCutout(gapping=false){
-  rotate(180-retain_empir_angle)
-    translate([0, ins_orad - retain_empir_inward]) {
-    difference(){
-      circle(r=retain_rad + cutout_gap, $fn=20);
-      if (!gapping)
-	rotate(180 + retain_empir_angle/2)
-	  translate([0, -retain_empir_stalkw])
-	  square([100, retain_empir_stalkw*2]);
+  translate(retain_mxy) {
+    rotate(retain_empir_angle) {
+      translate([-50, -retain_rad]) {
+	square([50 + retain_stalk_len,
+		retain_cutout_h]);
+      }
     }
   }
 }  
 
 module GappingSection(){
   difference(){
-    InsertSection();
+    union(){
+      InsertSection();
+      HandleSection();
+    }
     RetainCutout(true);
   }
-  HandleSection();
 }
 
 module WithRetainSection(){
   difference(){
-    InsertSection();
+    union(){
+      InsertSection();
+      HandleSection();
+    }
     RetainCutout();
   }
-  HandleSection();
   RetainSection();
 }
 
@@ -129,44 +160,64 @@ 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(){
-  difference(){
-    InsertSection();
-    RetainCutout();
-  }
-  HandleSection();
-  color("red") RetainSection();
+  color("red") translate([0,0,-3]) BasicSection();
+  color("blue") translate([0,0,3]) WithRetainSection();
 }
 
 module Test(){
   linear_extrude(height=2) {
     WithRetainSection();
-    translate([0, -handle_y0 + opening_topprotr])
+    translate([0, -handle_y0 + topprotr_y + 10])
       BasicSection();
   }
 }
 
 //Demo();
+//HandleSection();
+//InsertSection();
 //WithRetainSection();
 //BasicSection();
 //GappingSection();
-Test();
-//Handle();
+//Test();
+//Demo();
+Handle();