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

diff --git a/fairphone-case.scad b/fairphone-case.scad
index a434efe..5013bc1 100644
--- a/fairphone-case.scad
+++ b/fairphone-case.scad
@@ -4,7 +4,7 @@ include <utils.scad>
 
 phone = [ 75.0, 145.0 ];
 
-prop_x_pos = 18;
+prop_buildout_less = 3;
 
 prop_angles = [ 15, 30, 45, 60 ];
 
@@ -119,8 +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.25; // each side
+prop_caserecess_taper = 0.45; // one side only
+prop_prop_gap = 0.5;
+prop_prong_heel_slope = 0.5;
 
 // ---------- calculated ----------
 
@@ -129,6 +132,8 @@ phone_height = (phone + bumper*2)[1];
 
 inside_br = [phone_width, -phone_height];
 
+prop_prong_h = prop_main_th;
+
 //echo(camera_pos_tl + bumper,
 //     camera_pos_br + bumper);
 
@@ -244,21 +249,39 @@ cppQ = [ cppR[0],
 	 cppV[1] - (catch_finger_height - cp_rQ) ];
 cppF = [ cppV[0] + catch_finger_depth, cppC[1] ];
 
-// prop recess
-
-prop_recess_hw = 0.5 * prop_main_width + prop_side_gap;
+// prop recess in case
 
-prcp2 = [ epp4[0], case_bottom_z ];
+prop_x_pos = phone_width/2;
 
-prop_caserecess_buildout_r = prcp2[0] - epp2o[0];
+prop_recess_hw = 0.5 * prop_main_width + prop_side_gap;
 
 prc_r1 = prop_end_dia/2;
 prc_r3 = prc_r1 + prop_recess_slop;
-echo(prc_r3);
 
-prcp1 = [ prcp2[0] + prop_caserecess_behind + prc_r3,
+prcp2 = [ epp4[0] + prop_buildout_less,
+	  case_bottom_z ];
+
+prop_caserecess_buildout_r = -1; // prcp2[0] - epp2o[0];
+
+prcp1 = [ epp2o[0],
 	  epp2i[1] - prc_r3 ];
 
+// prop recess in lid
+
+prl_r10 = prop_end_dia/2;
+prl_r10o = prl_r10 + prop_recess_slop;
+
+prlp10 = lpp10 + [1,1] * prl_r10o
+  + [1,0] * prop_lidrecess_behind
+  + [0,1] * prop_recess_under;
+
+// prop
+
+prpp10 = [0,0];
+prpp11 = [0, prop_taper_len];
+
+prp_r10 = prl_r10;
+
 // ---------- modules ----------
 
 module KeeperProfile(slant=0){
@@ -599,6 +622,83 @@ module CaseBase(){
     EdgeProfile();
 }
 
+module PropProfile(gamma, cut=0){ ////toplevel
+  // https://en.wikipedia.org/wiki/Solution_of_triangles#Two_sides_and_the_included_angle_given_(SAS)
+  k = hp_k;
+  p = phone_height - prlp10[0] - hppB[0];
+  x = k / (2 * sin(gamma/2)) - hppT[0];
+  b = p + x;
+
+  q = phone_height - hppT[0]; // prpp7[0] is 0 by definition
+  a = q + x;
+  c = sqrt(a*a + b*b - 2*a*b*cos(gamma));
+  alpha = acos( (b*b + c*c - a*a) / (2*b*c) );
+
+  theta = 90 - alpha;
+  beta = 180 - alpha - gamma;
+  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]) ];
+
+  prp_r1 = prc_r1;
+  prp_r11 = prop_main_th/2;
+
+  prpp1 = prpp7 + [1,0] *
+    // this is approximate, but will do
+    (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 = 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]));
+  prpp8 = prpp4 + [0,-1] * prp_r8;
+  prpp9 = prpp8 + [-1,0] * prp_r8;
+
+  //#circleat(prpp3,1);
+  //#circleat(prpp12,1);
+
+  if (!cut) {
+    hull(){
+      translate(prpp8)
+	intersection(){
+	  circle(prp_r8);
+	  polygon([[-20,-0], [0,0], [20,20]]);
+        }
+      rectfromto(prpp6, prpp9);
+      translate(prpp5) intersection(){
+	circle(prp_r5);
+	polygon([[-10,-10], [0,0], [10,0]]);
+      }
+      rectfromto(prpp12 + [0,-0.1], prpp3);
+    }
+    hull(){
+      circleat(prpp1, prp_r1);
+      rectfromto(prpp12 + [0,-0.1], prpp3);
+    }
+  }
+  // main shaft
+  rotate([0,0, cut ? -theta : 0]){
+    hull(){
+      extra = cut ? prop_recess_slop : 0;
+      rectfromto(prpp6, prpp9);
+      circleat(prpp11, prp_r11 + extra);
+      circleat(prpp10, prp_r10 + extra);
+    }
+  }
+}
+
 module Case(){ ////toplevel
   difference(){
     union(){
@@ -622,7 +722,7 @@ module Case(){ ////toplevel
       HingePortion(hex20, hex21) HingeBaseProfile();
 
       // buildout for prop recess
-      Flip_rhs(1)
+      if (prop_caserecess_buildout_r > 0) Flip_rhs(1)
 	linextr(case_bottom_z, epp2i[1])
 	hull() {
   	  for (dxs = [-1,+1])
@@ -701,13 +801,13 @@ module Case(){ ////toplevel
 
     // prop recess
     Flip_rhs(1)
-      translate([0,0,1])
+      translate([prop_x_pos,0,0])
       rotate([90,0,90])
       linextr(-prop_recess_hw, +prop_recess_hw)
+      mirror([1,0])
       hull(){
-        for (zs=[ -1,0,+1 ])
-	  circleat(prcp2 + 20*(abs(zs) * [0,-1] +
-			       zs * [1,0] * prop_caserecess_taper),
+        for (d=[ [0,0], [0,-1], [+1,-1/prop_caserecess_taper] ])
+	  circleat(prcp1 + 20*d,
 		   prc_r3);
       }
   }
@@ -1006,6 +1106,16 @@ module DemoProfiles(){ ////toplevel
     color("blue") CatchCatchProfile();
     color("red") difference(){ EdgeProfile(); CatchCutProfile(); }
   }
+
+  translate([40,-30]) {
+    difference(){
+      %LidEdgeProfile();
+      //translate(prlp10)
+	//PropProfile(10, 1);
+    }
+    translate(prlp10)
+      PropProfile(45, 0);
+  }
 }
 
 //EdgeProfile();