X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=fairphone-case.scad;h=5ec6d8c9e274f50f39011dd68729b487f462108f;hb=8dcf0fd0ebc05eb8fc6947b27f3924cdf495f015;hp=3a3cf1d99af08299e9cee582fcd43ee5a67e4818;hpb=18b3658219ebd4e65a9c72b607ec4704ff20c4b5;p=reprap-play.git

diff --git a/fairphone-case.scad b/fairphone-case.scad
index 3a3cf1d..5ec6d8c 100644
--- a/fairphone-case.scad
+++ b/fairphone-case.scad
@@ -27,8 +27,9 @@ case_struts_width = 0.10;
 
 keeper_th_z = 0.75;
 keeper_th_x = 0.75;
-keeper_inner_width = 1.75;
-keeper_inner_height = 1.75;
+keeper_inner_width = 2.75;
+keeper_inner_height = 2.75;
+keeper_slant_slope = 2; // larger means steeper
 
 keeper_gap_z_top = 0.25;
 keeper_gap_z_bot = 0.75;
@@ -44,6 +45,8 @@ lid_lip = 1.75;
 $fa = 5;
 $fs = 0.1;
 
+button_l_fudge = 4.5;
+
 // ---------- calculated ----------
 
 // ----- could be changed -----
@@ -94,8 +97,9 @@ module rectfromto(a,b) {
 }
 module circleat(c,r) { translate(c) circle(r); }
 
-module KeeperProfile(){
-  polygon([kppe, kppd, kppc, kppb, kppa, kppf]);
+module KeeperProfile(slant=0){
+  use_e = kppe + [0,-1] * slant * keeper_inner_width / keeper_slant_slope;
+  polygon([use_e, kppd, kppc, kppb, kppa, kppf]);
 }
 
 module EdgeProfile(){
@@ -141,7 +145,7 @@ module ButtonCoverProfile(){
 module ButtonPlan(l, deep, cut){
   bigger =
     (deep ? lid_buttoncover_overlap : 0) +
-    (cut  ? lid_buttoncover_gap     : 0);
+    (cut  ? 0 : -lid_buttoncover_gap);
 
   d_D1_y =
     (cut  ? 0 : lid_buttoncover_gap);
@@ -149,15 +153,15 @@ module ButtonPlan(l, deep, cut){
   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];
@@ -250,7 +254,7 @@ module Case(){ ////toplevel
       intersection(){
 	rotate([90, 0, 0])
 	  linear_extrude(height = phone_height + phone_cnr_rad * 2)
-	  KeeperProfile();
+	  KeeperProfile(1);
 
 	// outline of the whole case, to stop it protruding
 	translate([0,0, -25])
@@ -354,7 +358,7 @@ module Keeper(){ ////toplevel
     OneKeeper();
 }
 
-module ButtonPlanForDemo(colour, z, cut, deep){
+module ButtonPlanForDemo(colour, z, deep, cut){
   color(colour)
     translate([0,0,z])
     ButtonPlan(8, deep, cut);
@@ -364,6 +368,7 @@ module DemoProfiles(){ ////toplevel
   LidEdgeProfile();
   %EdgeProfile();
   KeeperProfile();
+  translate([0,0,-1]) color("black") KeeperProfile(1);
 
   translate([20,0]) {
     LidEdgeProfile();
@@ -379,10 +384,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);
   }
 }