X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=reprap-play.git;a=blobdiff_plain;f=fairphone-case.scad;h=04c4d61b93c93c6c11f5717a98d86a11bedca2a1;hp=1728ea027661c0560a3a86867dcf34e4a888b742;hb=85db45c1dd57ad34e781f8d108368fa1124a2e47;hpb=211a9b42456629deae9218a125991b5a95d39091

diff --git a/fairphone-case.scad b/fairphone-case.scad
index 1728ea0..04c4d61 100644
--- a/fairphone-case.scad
+++ b/fairphone-case.scad
@@ -26,7 +26,7 @@ phone_backside_slope_outer = 1.0; // larger means shallower
 camera_pos_tl = [  6.450, 12.750 ]; // measured from tl corner
 camera_pos_br = [ 22.300, 37.600 ]; // tl/br as seen from back
 
-jack_pos = [ 14.38, 7.96 ];
+jack_pos = [ 13.83, 8.485 ];
 jack_dia = 10.64 + .5; // some jack I had lying around
 
 noisecancelmic_pos = [ 19.54, 7.37 ];   // from rhs
@@ -117,7 +117,7 @@ prop_recess_slop = 0.200; // each side
 prop_end_dia = 0.5;
 prop_main_th = 3;
 prop_taper_len = 6;
-prop_main_width = 3;
+prop_main_width = 4;
 prop_side_gap = 0.75; // each side
 prop_lidrecess_behind = 0.75;
 prop_caserecess_behind = 0.75;
@@ -189,6 +189,9 @@ bppO = [ bppN[0], bppP[1] ];
 bppL = lpp10 + [5,0];
 bppK = [ bppL[0], bppN[1] ];
 bppJ = [ bppN[0], bppL[1] ];
+bppU = [ bppJ[0], lpp12[1] ];
+bppV = lpp11;
+bppW = lpp10;
 
 // hinge plan
 hp_rn = hingescrew_nut_dia/2;
@@ -263,8 +266,8 @@ prcp2 = [ epp4[0] + prop_buildout_less,
 
 prop_caserecess_buildout_r = -1; // prcp2[0] - epp2o[0];
 
-prcp1 = [ epp2o[0],
-	  epp2i[1] - prc_r3 ];
+prcp1 = [ epp2o[0] + prc_r3 + prop_caserecess_behind,
+	  epp2i[1] - prc_r3 - prop_recess_under];
 
 // prop recess in lid
 
@@ -321,7 +324,9 @@ module LidEdgeProfile(){
 
 module ButtonCoverProfile(){
   intersection(){
-    polygon([ bppM, bppP, bppO, bppJ, bppL, bppK ]);
+    polygon(concat([ bppM, bppP, bppO, bppJ ],
+		   (enable_support ? [ bppU, bppV, bppW ] : []),
+		   [ bppL, bppK ]));
     hull(){
       EdgeProfile();
       LidEdgeProfile();
@@ -584,12 +589,15 @@ module HingeLeverOuterProfile(){
 }
 
 module HingeLeverInnerProfile(){
-  for (c = [hppT, hppB]) {
-    hull()
+  for (s = [-1,+1]) {
+    c = s > 0 ? hppT : hppB;
+    translate(c)
+      mirror([0,0,s>0])
+      hull()
       for (x=[-20,20])
-	for (y=[0, c[1] - hppM[1]])
+	for (y=[0, s * 10])
 	  translate([x,y])
-	    circleat(c, hp_rn);
+	    circle(hp_rn);
   }
 }
 
@@ -627,10 +635,10 @@ function prop_x(gamma) = hp_k / (2 * sin(gamma/2)) - hppT[0];
 module PropProfileAssignments(gamma){
   // https://en.wikipedia.org/wiki/Solution_of_triangles#Two_sides_and_the_included_angle_given_(SAS)
   x = prop_x(gamma);
-  p = phone_height - prlp10[0] - hppB[0];
+  p = phone_height + prlp10[0] - hppB[0];
   b = p + x;
 
-  q = phone_height - hppT[0]; // $prpp7[0] is 0 by definition
+  q = phone_height - hppT[0] - prcp1[0]; // $prpp7[0] is 0 by definition
   a = q + x;
   c = sqrt(a*a + b*b - 2*a*b*cos(gamma));
   $prp_alpha = acos( (b*b + c*c - a*a) / (2*b*c) );
@@ -644,14 +652,14 @@ module PropProfileAssignments(gamma){
   v1 = [ [ cos(psi), -sin(psi) ],    // x
 	 [ sin(psi),  cos(psi) ] ];  // y
 
-  $prpp7 = [0, c + (lpp13[1] - $prpp10[1]) ];
+  $prpp7 = [0, c + (lpp13[1] - $prpp10[1] - hp_k) ];
 
   $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]);
+    (prop_main_th/2 + prop_prop_gap + prcp1[0] - cppA[0]);
   $prpp3 = $prpp1 +
     v1[0] * -$prp_r1 +
     v1[1] * ((prcp2[1] - prcp1[1]) - prop_prop_gap);
@@ -681,7 +689,7 @@ module PropProfile(gamma, cut=0, rot=0){ ////toplevel
 	translate($prpp8)
 	  intersection(){
 	    circle($prp_r8);
-	    polygon([[-20,-0], [0,0], [20,20]]);
+	    polygon([[-20,-0], [20,20], [0,0]]);
 	  }
 	rectfromto($prpp6, $prpp9);
 	translate($prpp5) intersection(){
@@ -821,9 +829,9 @@ module Case(){ ////toplevel
     // prop recess
     Flip_rhs(1)
       translate([prop_x_pos,0,0])
+      mirror([0,1,0])
       rotate([90,0,90])
       linextr(-prop_recess_hw, +prop_recess_hw)
-      mirror([1,0])
       hull(){
         for (d=[ [0,0], [0,-1], [+1,-1/prop_caserecess_taper] ])
 	  circleat(prcp1 + 20*d,
@@ -866,9 +874,9 @@ module Lid(){ ////toplevel
 
     // prop recess
     translate([prop_x_pos, -prlp10[0], prlp10[1]])
+      mirror([0,1,0])
       rotate([90,0,90])
       linextr(-prop_recess_hw, +prop_recess_hw)
-      mirror([1,0])
       hull()
       for (pa = prop_angles)
 	PropProfile(pa, 1,1);
@@ -1026,6 +1034,15 @@ module TestFrameCase(){ ////toplevel
   }
 }
 
+module TestTopApertures(){ ////toplevel
+  intersection(){
+    Case();
+    TestSelectFrame();
+    translate([-100, -35, -100])
+      cube([400, 100, 200]);
+  }
+}
+
 module TestFrameLidPrint(){ ////toplevel
   rotate([0,180,0]) intersection(){
     Lid();