flyscreen-handle: from v1, adj openingedge

[reprap-play.git] / flyscreen-handle.scad

diff --git a/flyscreen-handle.scad b/flyscreen-handle.scad
index 5a535fcd218a5fd0880eb23ef08a1b9c2b5d30bb..144d0d44dd3cf2b3cf5595b9bdf27b58977fc1a9 100644 (file)
--- 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;
@@ -107,18 +107,20 @@ module PsHull(ps) {
 
 module LeverSect(top, inadj=false){
   P3 = inadj ? P3a : P3t;
+  P6 = inadj ? P6a : P6t;
   P8 = top ? P8t : P8b;
   P9 = top ? P9t : P9b;
-  diag = inadj ? atan(outside_push_inadj_slope) : 0;
-  PsHull([P2,P3,P4]);
   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);
       }
     }
   }
@@ -179,5 +181,6 @@ module Test(){
   translate([0,-opening_height - 2,0]) LeverBot(true);
 }
 
-Demo();
-//Test();
+//LeverSectBot(true);
+//Demo();
+Test();