fairphone-case: ButtonPlan: fix lengths, with fudge

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

diff --git a/fairphone-case.scad b/fairphone-case.scad
index f0de5d9a390753e2c801652eef38be31dc70f08f..a9f199a365a0543bb834ac82ea004c7043bb5773 100644 (file)
--- a/fairphone-case.scad
+++ b/fairphone-case.scad
@@ -44,6 +44,8 @@ lid_lip = 1.75;
 $fa = 5;
 $fs = 0.1;
 
+button_l_fudge = 4.5;
+
 // ---------- calculated ----------
 
 // ----- could be changed -----
@@ -138,19 +140,26 @@ module ButtonCoverProfile(){
   }
 }
 
-module ButtonPlan(l, bigger, d_D1_y){
+module ButtonPlan(l, deep, cut){
+  bigger =
+    (deep ? lid_buttoncover_overlap : 0) +
+    (cut  ? 0 : -lid_buttoncover_gap);
+
+  d_D1_y =
+    (cut  ? 0 : lid_buttoncover_gap);
+
   C = [0,0]; // by definition
   T = [ 0, epp4[1] ];
   G = T + [0,10];
-  B0 = T + [0,-1] * button_cutout_depth;
+  B0 = C + [0,-1] * button_cutout_depth;
   r0 = 0.5 * (T[1] - B0[1]);
-  A = [  -l/2 + r0, 0.5 * (T[1] + B0[1]) ];
+  A = [  -(l + button_l_fudge)/2 + r0, 0.5 * (T[1] + B0[1]) ];
   r1 = r0 + bigger;
   // | D1 - A | = r1 * 2
   // D1_y = T_y - r1 + d_D1_y
   // =>    4 * r1^2   =  (r1-r0 + d_D1_y)^2 + (D1_x - A_x)^2
   // =>    D1_x =  A_x + v/~ [  4 * r1^2   -   (r1-r0 + d_D1_y)^2 ]
-  D1  = [ A[0] + sqrt( 4*r1*r1 - pow(bigger + d_D1_y, 2) ),
+  D1  = [ A[0] - sqrt( 4*r1*r1 - pow(bigger + d_D1_y, 2) ),
          T[1] - r1 + d_D1_y ];
   E1  = 0.5 * (D1 + A);
   F1  = D1 + [0,10];
@@ -347,13 +356,10 @@ module Keeper(){ ////toplevel
     OneKeeper();
 }
 
-module ButtonPlanForDemo(colour, z, gap, overlap){
+module ButtonPlanForDemo(colour, z, deep, cut){
   color(colour)
     translate([0,0,z])
-    ButtonPlan(8,
-              lid_buttoncover_gap * gap +
-              lid_buttoncover_overlap * overlap,
-              lid_buttoncover_gap * (1-gap));
+    ButtonPlan(8, deep, cut);
 }
 
 module DemoProfiles(){ ////toplevel
@@ -375,10 +381,9 @@ module DemoProfiles(){ ////toplevel
   }
 
   translate([-20,0]) {
-    ButtonPlanForDemo("blue",    0, 0,0);
-    ButtonPlanForDemo("red",    -1, 1,0);
-    ButtonPlanForDemo("yellow", -2, 0,1);
-    ButtonPlanForDemo("blue",   -3, 1,1);
+    ButtonPlanForDemo("grey", -1, 0,1);
+    ButtonPlanForDemo("blue", -2, 1,0);
+    ButtonPlanForDemo("red",  -3, 1,1);
   }
 }