quacks-ingredients: -counts: Include spares in Base_White

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

diff --git a/fairphone-case.scad b/fairphone-case.scad
index a9d042364262c45604ebd331c5a6c7b14dee368f..5d8eb6f558d82aaacbd1d4b086f940cfe24d9811 100644 (file)
--- a/fairphone-case.scad
+++ b/fairphone-case.scad
@@ -253,22 +253,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;
-catch_width = 15;
-catch_thickness = 1.3;
-catch_side_gap = 0.75; // each side
-
-catch_depth = 0.75;
-catch_height = 0.35;
-catch_finger_height = 1.5;
-catch_finger_depth = 2.5;
-catch_catch_slope = 2.00;
-catch_close_slope = 3.00;
-
-catch_topcurve_r = 5.0;
+thumbrecess_width = 16.5;
+thumbrecess_topcurve_r = 5.0;
 
 prop_recess_under = 0.50;
 prop_recess_slop = 0.200; // each side
@@ -732,7 +718,7 @@ module ButtonCoverReinf(){ ////toplevel
   }
 }
 
-module CatchCutProfile(){
+module ThumbRecessCutProfile(){
   difference(){
     polygon([ cppA + [-10,0],
              cppB + [-10,0],
@@ -964,10 +950,9 @@ module HingePortion(x0,x1){
     children();
 }
 
-module CatchPortion(ztop){
-  xwidth = catch_side_gap*2;
-  width = catch_width + xwidth;
-  w = width + catch_topcurve_r*2 + 1;
+module ThumbRecessApply(ztop){
+  width = thumbrecess_width;
+  w = width + thumbrecess_topcurve_r*2 + 1;
   translate([phone_width/2, 0,0]){
     difference(){
       rotate([90,0,-90])
@@ -978,10 +963,10 @@ module CatchPortion(ztop){
        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, ztop - thumbrecess_topcurve_r])
+             circle(thumbrecess_topcurve_r);
            translate([w/2, -50])
-             square(catch_topcurve_r*2, center=true);
+             square(thumbrecess_topcurve_r*2, center=true);
          }
        }
       }
@@ -1186,9 +1171,9 @@ module Case(){ ////toplevel
     // screw holes in the hinge arms
     HingeScrews();
 
-    // catch striker
-    CatchPortion(epp4[1])
-      CatchCutProfile();
+    // thumb recess
+    ThumbRecessApply(epp4[1])
+      ThumbRecessCutProfile();
 
     // lanyard
     Flip_bot(1)
@@ -1735,9 +1720,9 @@ module DemoProfiles(){ ////toplevel
   translate([20,-30]) {
     %EdgeProfile();
     %LidEdgeProfile();
-    //translate([0,0,1]) CatchCutProfile();
+    //translate([0,0,1]) ThumbRecessCutProfile();
     translate([0,0,+1]) color("red")
-      difference(){ EdgeProfile(); CatchCutProfile(); }
+      difference(){ EdgeProfile(); ThumbRecessCutProfile(); }
   }
 
   translate([40,-30]) {