X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=reprap-play.git;a=blobdiff_plain;f=fairphone-case.scad;h=38e174329540d4a78c6c53fe8cf47098113442da;hp=b47413d0a4c2bb6c65c2eb7547bc77cecb01d190;hb=a7505642d9597b9bec3a657b51b69298e22c8830;hpb=9e09d6a2cd0c5c46efd4cc940fb52778f83886c4

diff --git a/fairphone-case.scad b/fairphone-case.scad
index b47413d..38e1743 100644
--- a/fairphone-case.scad
+++ b/fairphone-case.scad
@@ -176,7 +176,7 @@ microusb_width = 16.12 + 1.25;
 
 case_th_bottom = 2.5;
 case_th_lid = 3.0;
-case_th_side = 2;
+case_th_side = 2.3;
 case_th_lip = 1.2;
 
 lid_screen_gap_extra = .66;
@@ -204,6 +204,8 @@ case_lip = 1.25;
 lid_gap_x = 0.25;
 lid_gap_z = 0.25;
 lid_lip = 1.75;
+lid_edgepart_width = 5.0;
+lid_buttoncover_thick = 1.3;
 
 catch_slop = 0.50;
 
@@ -257,6 +259,8 @@ catch_height = 0.35;
 catch_finger_height = 1.5;
 catch_finger_depth = 2.5;
 
+catch_topcurve_r = 5.0;
+
 prop_recess_under = 0.50;
 prop_recess_slop = 0.200; // each side
 prop_end_dia = 0.5;
@@ -318,7 +322,7 @@ kppa = [ kppb[0], kppf[1] ];
 lpp10 = [ epp5[0] + lid_gap_x, kppc[1] + lid_gap_z ];
 lpp11 = [ lpp10[0],            epp5[1] + lid_gap_z ];
 
-lpp14 = lpp10 + [1,0] * keeper_inner_width;
+lpp14 = lpp10 + [1,0] * max(keeper_inner_width, lid_edgepart_width);
 // exact x posn not very important; must extend past end of keeper
 
 lpp15 = [ lpp14[0],
@@ -340,7 +344,7 @@ case_bottom_z = epp2o[1] - case_th_bottom;
 
 // button profile
 bppM = epp4 + [0,5];
-bppN = [ 0.5 * (epp0[0] + epp4[0]), bppM[1] ];
+bppN = [ bppM[0] + lid_buttoncover_thick, bppM[1] ];
 bppR = [ bppN[0] + lid_buttoncover_gap, -button_cutout_depth ];
 bppS = [ epp1[0], bppR[1] ];
 bppQ = [ bppM[0], bppR[1] - lid_buttoncover_overlap ];
@@ -353,6 +357,8 @@ bppU = [ bppJ[0], lpp12[1] ];
 bppV = lpp11;
 bppW = lpp10;
 
+echo("BUTTON COVER TH", bppO[0] - bppP[0]);
+
 // notification led aperture
 
 nla_r0 = led_aperture/2;
@@ -845,11 +851,28 @@ module HingePortion(x0,x1){
     children();
 }
 
-module CatchPortion(width){
-  translate([phone_width/2, 0,0])
-    rotate([90,0,-90])
-    linextr(-width/2, width/2)
-    children(0);
+module CatchPortion(xwidth, ztop){
+  width = catch_width + xwidth;
+  w = width + catch_topcurve_r*2 + 1;
+  translate([phone_width/2, 0,0]){
+    difference(){
+      rotate([90,0,-90])
+	linextr(-w/2, w/2)
+	children(0);
+      translate([0, 50, 0])
+	rotate([90,0,0])
+	linear_extrude(height=100){
+	for (m=[0,1]) mirror([m,0,0]) {
+	  hull(){
+	    translate([w/2, ztop - catch_topcurve_r])
+	      circle(catch_topcurve_r);
+	    translate([w/2, -50])
+	      square(catch_topcurve_r*2, center=true);
+	  }
+	}
+      }
+    }
+  }
 }
 
 module CaseBase(){
@@ -1050,7 +1073,7 @@ module Case(){ ////toplevel
     HingeScrews();
 
     // catch striker
-    CatchPortion(catch_width + catch_side_gap*2)
+    CatchPortion(catch_side_gap*2, epp4[1])
       CatchCutProfile();
 
     // prop recess
@@ -1074,7 +1097,7 @@ module LidAdhocMultiprintFrame(phase){
 }
 
 module LidAroundEdges(){
-  AroundEdges(lpp10[1], lpp13[1] - lpp10[1], 0)
+  AroundEdges(lpp15[1], lpp13[1] - lpp15[1], 0)
     children();
 }
 
@@ -1117,7 +1140,7 @@ module Lid(){ ////toplevel
       }
 
       // catch
-      CatchPortion(catch_width)
+      CatchPortion(0, lpp12[1])
 	CatchCatchProfile();
     }
     Struts(lpp10[0] + strut_min_at_end, lpp13[1], -case_th_lid);