X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=flyscreen-handle.scad;h=144d0d44dd3cf2b3cf5595b9bdf27b58977fc1a9;hb=b1de7ec964921a5b643a55e9bcff515424b58614;hp=38597d6f201f774f0841ea8961e9f91e50a4677c;hpb=d0529db45620f37da21f219a44c8f28b1f8f5dfe;p=reprap-play.git

diff --git a/flyscreen-handle.scad b/flyscreen-handle.scad
index 38597d6..144d0d4 100644
--- a/flyscreen-handle.scad
+++ b/flyscreen-handle.scad
@@ -2,7 +2,7 @@
 
 opening_height = 7.84;
 opening_depth = 7.88;
-openingedge_dia = 1.34;
+openingedge_dia = 2.00;
 opening_protrh = 1.8;
 
 pivot_x = 6;
@@ -30,6 +30,10 @@ inside_h_xgap = 1;
 pivot_r = 2;
 pivot_slop = 0.25;
 
+strap_above = 0.1;
+strap_th = 2.5;
+strap_below = 3;
+
 width = 5;
 
 // calculated
@@ -52,13 +56,11 @@ P1 = [ P2[0], P3t[1] - (inside_h + ourcirc_r*2) ];
 
 P5 = Q0 + p4p5d;
 
-P9mid = [ outside_len - ourcirc_r, outside_gap/2 + ourcirc_r ];
-P8mid = P9mid + [ 0, outend_height - ourcirc_r*2 ];
-
-P89adj = [ 0, P5[1] - P8mid[1] ];
+P8t = [ outside_len - ourcirc_r, P5[1] ];
+P9t = P8t + [ 0, -(strap_above + strap_th + strap_below - ourcirc_r*2) ];
 
-P8t = P8mid + P89adj;
-P9t = P9mid + P89adj;
+P9b = [ P9t[0], -P9t[1] + outside_gap ];
+P8b = P9b + [ 0, outend_height ];
 
 P6t = P5 + [ 0, outside_pushh - ourcirc_r*2 ];
 P7 = [ P6t[0] + (P6t[1] - P1[1]) / outside_pushslope,
@@ -105,18 +107,20 @@ module PsHull(ps) {
 
 module LeverSect(top, inadj=false){
   P3 = inadj ? P3a : P3t;
-  P8 = top ? P8t : P8mid - P89adj;
-  P9 = top ? P9t : P9mid - P89adj;
-  diag = inadj ? 0 : atan(outside_push_inadj_slope);
-  PsHull([P2,P3,P4]);
+  P6 = inadj ? P6a : P6t;
+  P8 = top ? P8t : P8b;
+  P9 = top ? P9t : P9b;
   difference(){
-    PsHull([P0,P1,P2,P5,P8,P9]);
-    translate(Q0) {
-      rotate(diag){
-	hull(){
-	  circle(r=edge_or, $fn=20);
-	  translate([0,10]) circle(r=edge_or, $fn=20);
-	}
+    union(){
+      PsHull([P2,P3,P4]);
+      PsHull([P0,P1,P2,P5,P8,P9]);
+    }
+    hull(){
+      for (dp = [ [0,0],
+		  (P6-P5),
+		  (P3-P4)
+		  ]) {
+	translate(Q0 + 5*dp) circle(r=edge_or, $fn=20);
       }
     }
   }
@@ -125,8 +129,8 @@ module LeverSect(top, inadj=false){
 module StrapSect(){
   translate(P9t) {
     difference(){
-      circle(r = 4);
-      circle(r = 2);
+      circle(r = strap_below + strap_th, $fn=40);
+      circle(r = strap_below,            $fn=40);
     }
   }
 }
@@ -177,5 +181,6 @@ module Test(){
   translate([0,-opening_height - 2,0]) LeverBot(true);
 }
 
-Demo();
-//Test();
+//LeverSectBot(true);
+//Demo();
+Test();