fairphone-case: reorganise catch, drop now-unused cpp* variables

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

diff --git a/fairphone-case.scad b/fairphone-case.scad
index 4daf80736ad901006c1ea1bdc78c7bc2bad8f63f..bcad96da8d2f893f74424fa0a0b013658af7458f 100644 (file)
--- a/fairphone-case.scad
+++ b/fairphone-case.scad
@@ -252,6 +252,8 @@ hinge_r_arms_gap = 0.55;
 
 rearspeaker_gap    = [ 2.0, 2.0 ]; // each side
 
+thumbrecess_depth = 1.3;
+
 catch_slop = -0.75;
 
 catch_len = 4.5;
@@ -429,26 +431,10 @@ lid_fold_clearance_skew =
 
 echo("SK",lid_fold_clearance_skew);
 
-// catch
-
-cppJ = [ epp4[0] + catch_thickness, lpp10[1] ];
-cppA = cppJ + [lid_gap_x, -lid_gap_z];
-cppB = [ epp0[0], cppA[1] ];
-cppP = [ epp4[0], cppJ[1] ];
-
-cppS = cppJ + [0,-1] * catch_len;
-cppD = [ cppA[0], cppS[1] + catch_slop ];
-cppC = [ cppB[0], cppD[1] ];
-cppT = cppS + [1, -catch_catch_slope] * catch_depth;
-cppU = cppT + [0,-1] * catch_height;
-cppV = [ cppS[0], cppU[1] - catch_depth * catch_close_slope ];
-
-cppR = 0.5*(cppP + cppJ);
+// thumb recess (used to be "catch" hence cpp*
 
-cp_rQ = 0.5 * (cppJ[0] - cppP[0]);
-cppQ = [ cppR[0],
-        cppV[1] - (catch_finger_height - cp_rQ) ];
-cppF = [ cppV[0] + catch_finger_depth, cppC[1] ];
+cppA = epp4 + [thumbrecess_depth, 0];
+cppB = [ cppA[0], epp1[1] ];
 
 // lanyard
 
@@ -746,29 +732,14 @@ module ButtonCoverReinf(){ ////toplevel
   }
 }
 
-module CatchCatchProfile(){
-  hull(){
-    for (c=[ cppR, cppQ ])
-      circleat(c, cp_rQ);
-  }
-  hull(){
-    circleat(lpp12, lp_r12);
-    circleat(lpp12 + [5,0], lp_r12);
-    rectfromto(cppP, cppP + [5,0.1]);
-  }
-  polygon([cppJ, cppS, cppT, cppU, cppV, cppQ, cppR]);
-}
-
 module CatchCutProfile(){
-  polygon([ cppB,
-           cppA,
-           cppD,
-           cppF,
-           cppF + [0,-10],
-           cppF + [-10,-10],
-           lpp12 + [-10,0],
-           lpp12 + [10,0]
-           ]);
+  difference(){
+    polygon([ cppA + [-10,0],
+             cppB + [-10,0],
+             cppB,
+             cppA ]);
+    circleat(epp1, r=case_th_side);
+  }
 }
 
 module Flip_rhs(yn=[0,1]) {
@@ -1294,10 +1265,6 @@ module Lid(){ ////toplevel
        LidEdgeProfile();
        HingeLidProfile();
       }
-
-      // catch
-      CatchPortion(0, lpp12[1])
-       CatchCatchProfile();
     }
     Struts(lpp10[0] + strut_min_at_end, lpp13[1], -case_th_lid);
 
@@ -1770,7 +1737,6 @@ module DemoProfiles(){ ////toplevel
     //translate([0,0,1]) CatchCutProfile();
     translate([0,0,+1]) color("red")
       difference(){ EdgeProfile(); CatchCutProfile(); }
-    color("blue") CatchCatchProfile();
   }
 
   translate([40,-30]) {