fairphone-case: CatchPortion: take xwidth rather than width (nfc)

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

diff --git a/fairphone-case.scad b/fairphone-case.scad
index 1f336d759cd0f233cab27793a113f0fdf05c65ab..e2b35612c0d1b2945cc5c399396180caaf709da9 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;
@@ -205,6 +205,7 @@ 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;
 
@@ -341,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 ];
@@ -848,7 +849,8 @@ module HingePortion(x0,x1){
     children();
 }
 
-module CatchPortion(width){
+module CatchPortion(xwidth){
+  width = catch_width + xwidth;
   translate([phone_width/2, 0,0])
     rotate([90,0,-90])
     linextr(-width/2, width/2)
@@ -1053,7 +1055,7 @@ module Case(){ ////toplevel
     HingeScrews();
 
     // catch striker
-    CatchPortion(catch_width + catch_side_gap*2)
+    CatchPortion(catch_side_gap*2)
       CatchCutProfile();
 
     // prop recess
@@ -1120,7 +1122,7 @@ module Lid(){ ////toplevel
       }
 
       // catch
-      CatchPortion(catch_width)
+      CatchPortion(0)
        CatchCatchProfile();
     }
     Struts(lpp10[0] + strut_min_at_end, lpp13[1], -case_th_lid);