X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=fairphone-case.scad;h=5013bc16b9419ecab103d21408677346ac31ef85;hb=e5341097e8405194583402d52f868d386dd7d1ea;hp=3f47c9f173a1f2aab61f9fb6ebf4bc9bf121dd7e;hpb=d52df2329a68bcffcb1399c51ca274690ef1338e;p=reprap-play.git

diff --git a/fairphone-case.scad b/fairphone-case.scad
index 3f47c9f..5013bc1 100644
--- a/fairphone-case.scad
+++ b/fairphone-case.scad
@@ -119,10 +119,11 @@ prop_main_th = 3;
 prop_taper_len = 6;
 prop_main_width = 3;
 prop_side_gap = 0.75; // each side
+prop_lidrecess_behind = 0.75;
 prop_caserecess_behind = 0.75;
-prop_caserecess_taper = 0.35; // one side only
+prop_caserecess_taper = 0.45; // one side only
 prop_prop_gap = 0.5;
-prop_prong_heel_slope = 1.0;
+prop_prong_heel_slope = 0.5;
 
 // ---------- calculated ----------
 
@@ -270,7 +271,9 @@ prcp1 = [ epp2o[0],
 prl_r10 = prop_end_dia/2;
 prl_r10o = prl_r10 + prop_recess_slop;
 
-prlp10 = lpp10 + [1,1] * prl_r10o;
+prlp10 = lpp10 + [1,1] * prl_r10o
+  + [1,0] * prop_lidrecess_behind
+  + [0,1] * prop_recess_under;
 
 // prop
 
@@ -633,8 +636,12 @@ module PropProfile(gamma, cut=0){ ////toplevel
 
   theta = 90 - alpha;
   beta = 180 - alpha - gamma;
-  psi = 90 - beta + atan(prop_caserecess_taper);
-  prpv1 = [ sin(psi), cos(psi) ];
+  psi = 90 - beta;
+
+  echo("abc", a,b,c);
+
+  v1 = [ [ cos(psi), -sin(psi) ],    // x
+	 [ sin(psi),  cos(psi) ] ];  // y
 
   prpp7 = [0, c + (lpp13[1] - prpp10[1]) ];
 
@@ -643,28 +650,37 @@ module PropProfile(gamma, cut=0){ ////toplevel
 
   prpp1 = prpp7 + [1,0] *
     // this is approximate, but will do
-    (prop_main_th/2 + prop_prop_gap + prcp1[0] - prcp1[1]);
-  prpp3 = prpp1 + [ -prp_r1,
-		    (prcp2[1] - prcp1[1]) - prop_prop_gap ];
+    (prop_main_th/2 + prop_prop_gap + prcp1[0] - epp4[0]);
+  prpp3 = prpp1 +
+    v1[0] * -prp_r1 +
+    v1[1] * ((prcp2[1] - prcp1[1]) - prop_prop_gap);
+  prpp12 = prpp3 + v1[0] *
+    (prop_end_dia + prop_caserecess_taper * (prpp1[1] - prpp3[1]));
+  prp_r8 = prop_main_th;
   prpp4 = [ prop_main_th/2, prpp3[1] ];
-  prp_r5 = prop_end_dia/2;
-  prpp5 = [ prpp1[0], prpp3[1] - prop_prong_h + prp_r5 ];
+  prp_r5 = prp_r8;
+  prpp5 = [ prpp12[0] - prp_r5,
+	    prpp3[1] - prop_prong_h + prp_r5 ];
   prpp6 = prpp4 + [0,-1] * (prop_prong_h +
          prop_prong_heel_slope * (prpp5[0] - prpp4[0]));
-  prp_r8 = prop_main_th/2;
   prpp8 = prpp4 + [0,-1] * prp_r8;
   prpp9 = prpp8 + [-1,0] * prp_r8;
-  prpp12 = prpp3 + [0,1] * prop_end_dia;
+
+  //#circleat(prpp3,1);
+  //#circleat(prpp12,1);
 
   if (!cut) {
     hull(){
       translate(prpp8)
 	intersection(){
 	  circle(prp_r8);
-	  rectfromto([-20,-0], [20,20]);
+	  polygon([[-20,-0], [0,0], [20,20]]);
         }
       rectfromto(prpp6, prpp9);
-      circleat(prpp5, prp_r5);
+      translate(prpp5) intersection(){
+	circle(prp_r5);
+	polygon([[-10,-10], [0,0], [10,0]]);
+      }
       rectfromto(prpp12 + [0,-0.1], prpp3);
     }
     hull(){
@@ -672,6 +688,7 @@ module PropProfile(gamma, cut=0){ ////toplevel
       rectfromto(prpp12 + [0,-0.1], prpp3);
     }
   }
+  // main shaft
   rotate([0,0, cut ? -theta : 0]){
     hull(){
       extra = cut ? prop_recess_slop : 0;
@@ -1091,8 +1108,13 @@ module DemoProfiles(){ ////toplevel
   }
 
   translate([40,-30]) {
-    %LidEdgeProfile();
-    PropProfile(10, 0);
+    difference(){
+      %LidEdgeProfile();
+      //translate(prlp10)
+	//PropProfile(10, 1);
+    }
+    translate(prlp10)
+      PropProfile(45, 0);
   }
 }