fairphone-case: tidy up catch: Convert to thumbrecess_topcurve_r

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

diff --git a/fairphone-case.scad b/fairphone-case.scad
index a9d042364262c45604ebd331c5a6c7b14dee368f..13f037d4bdd3a497f41249844d5bb4158394049f 100644 (file)
--- a/fairphone-case.scad
+++ b/fairphone-case.scad
@@ -253,13 +253,13 @@ hinge_r_arms_gap = 0.55;
 rearspeaker_gap    = [ 2.0, 2.0 ]; // each side
 
 thumbrecess_depth = 1.3;
+thumbrecess_width = 16.5;
+thumbrecess_topcurve_r = 5.0;
 
 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;
@@ -268,8 +268,6 @@ catch_finger_depth = 2.5;
 catch_catch_slope = 2.00;
 catch_close_slope = 3.00;
 
-catch_topcurve_r = 5.0;
-
 prop_recess_under = 0.50;
 prop_recess_slop = 0.200; // each side
 prop_end_dia = 0.5;
@@ -965,9 +963,8 @@ module HingePortion(x0,x1){
 }
 
 module CatchPortion(ztop){
-  xwidth = catch_side_gap*2;
-  width = catch_width + xwidth;
-  w = width + catch_topcurve_r*2 + 1;
+  width = thumbrecess_width;
+  w = width + thumbrecess_topcurve_r*2 + 1;
   translate([phone_width/2, 0,0]){
     difference(){
       rotate([90,0,-90])
@@ -978,10 +975,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);
          }
        }
       }