fairphone-case: CatchPortion: introduce difference and some {} (nfc)

[reprap-play.git] / fairphone-case.scad

diff --git a/fairphone-case.scad b/fairphone-case.scad
index 5189cad7e4c23f2c81718aadad9648fd7b3f170a..32d52dfd8703ec10f4ef5705b1976ff39d4d3718 100644 (file)
--- 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;
 
@@ -318,7 +320,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 +342,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 +355,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 +849,15 @@ 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;
+  translate([phone_width/2, 0,0]){
+    difference(){
+      rotate([90,0,-90])
+       linextr(-width/2, width/2)
+       children(0);
+    }
+  }
 }
 
 module CaseBase(){
@@ -1050,7 +1058,7 @@ module Case(){ ////toplevel
     HingeScrews();
 
     // catch striker
-    CatchPortion(catch_width + catch_side_gap*2)
+    CatchPortion(catch_side_gap*2, epp4[1])
       CatchCutProfile();
 
     // prop recess
@@ -1117,7 +1125,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);