X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=fairphone-case.scad;h=254abcf88cce30849c424cc024fce32a46b6dd80;hb=5b0034c7374fa1545a2656b2c18030532de5e395;hp=0b73f657e2654df6e58b460341ae5a69d2bda72f;hpb=881387d225eb39aab986d4a605aeca9b379c309d;p=reprap-play.git

diff --git a/fairphone-case.scad b/fairphone-case.scad
index 0b73f65..254abcf 100644
--- a/fairphone-case.scad
+++ b/fairphone-case.scad
@@ -1,7 +1,10 @@
 // -*- C -*-
 
-phone_height = 146.5;
-phone_width = 76.75;
+phone = [ 145.0, 75.0 ];
+
+bumpers = [ 1.5, 1.75 ];
+// ^ both sides together.
+// If no bumpers, is the gap around the phone.
 
 phone_cnr_rad = 6.0;
 
@@ -51,6 +54,9 @@ strut_min_at_end = 1.5;
 
 // ---------- calculated ----------
 
+phone_height = (phone + bumpers)[0];
+phone_width =  (phone + bumpers)[1];
+
 // ----- could be changed -----
 lid_buttoncover_gap = lid_gap_x;
 lid_buttoncover_overlap = case_th_lip + keeper_gap_z_top;
@@ -150,43 +156,47 @@ module ButtonCoverProfile(){
 }
 
 module ButtonPlan(l, deep, cut){
-  bigger =
-    (deep ? lid_buttoncover_overlap : 0) +
-    (cut  ? 0 : -lid_buttoncover_gap);
-
-  d_D1_y =
+  epsilon =
     (cut  ? 0 : lid_buttoncover_gap);
 
+  delta =
+    (deep ? lid_buttoncover_overlap : 0);
+
   C = [0,0]; // by definition
   T = [ 0, epp4[1] ];
   G = T + [0,10];
+
   B0 = C + [0,-1] * button_cutout_depth;
+  B1 = B0 + [0,1] * epsilon;
+
   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) ),
-	  T[1] - r1 + d_D1_y ];
-  E1  = 0.5 * (D1 + A);
-  F1  = D1 + [0,10];
+  H = A + [0,-1] * delta;
+
+  D = A + [-2,0] * r0;
+  F = D + [0,10];
+
+  E0 = 0.5 * (D + A);
+  E1 = E0 + [1,0] * epsilon;
+
+  I0 = [ E0[0], H[1] ];
+  I1 = [ E1[0], H[1] ];
 
   hull(){
     for (m=[0,1]) mirror([m,0])
-      circleat(A, r1);
+      circleat(H, r0 - epsilon);
   }
   for (m=[0,1]) mirror([m,0]) {
     difference(){
       polygon([ E1,
-		A,
-		B0,
+		I1,
+		H,
+		B1,
 		G,
-		F1,
-		D1
+		F,
+		D
 		]);
-      circleat(D1, r1);
+      circleat(D, r0 + epsilon);
     }
   }
 }
@@ -250,8 +260,6 @@ module AroundEdges(fill_zstart, fill_th, fill_downwards=0){
 module SideButton(y,l){
   $button_l= l;
   translate([0, -y, 0])
-    mirror([1,0,0])
-    rotate([90,0,90])
     children();
 }
 
@@ -325,12 +333,15 @@ module Case(){ ////toplevel
     Struts(epp2i[0], epp2i[1] - case_th_bottom, case_th_bottom);
 
     Buttons(){
-      translate([0,0,-10])
-	linear_extrude(height= 20)
-	ButtonPlan($button_l, 0,1);
-      translate([0,0, -bppR[0]])
-	linear_extrude(height= 20)
-	ButtonPlan($button_l, 1,1);
+      mirror([1,0,0])
+	rotate([90,0,90]) {
+	  translate([0,0,-10])
+	    linear_extrude(height= 20)
+	    ButtonPlan($button_l, 0,1);
+	  translate([0,0, -bppR[0]])
+	    linear_extrude(height= 20)
+	    ButtonPlan($button_l, 1,1);
+        }
     }
   }
 }
@@ -340,6 +351,20 @@ module Lid(){ ////toplevel
     union(){
       AroundEdges(lpp10[1], lpp13[1] - lpp10[1], 0)
         LidEdgeProfile();
+
+      // button covers
+      Buttons(){
+	intersection(){
+	  rotate([90,0,90])
+	    translate([0,0,-10])
+	    linear_extrude(height= 20)
+	    ButtonPlan($button_l, 1,0);
+	  rotate([90,0,0])
+	     translate([0,0,-100])
+	    linear_extrude(height= 200)
+	    ButtonCoverProfile();
+	}
+      }
     }
     Struts(lpp10[0] + strut_min_at_end, lpp13[1], -case_th_lid);
   }
@@ -353,37 +378,55 @@ module TestLength(){ ////toplevel
   }
 }
 
+module TestSelectWidth(){
+  translate([-30, -(phone_height - 25), -20])
+    mirror([0, 1, 0])
+    cube([200, 50, 40]);
+}
+
 module TestWidth(){ ////toplevel
   intersection(){
     Case();
-    translate([-30, -(phone_height - 25), -20])
-      mirror([0, 1, 0])
-      cube([200, 50, 40]);
+    TestSelectWidth();
   }
 }
 
 module TestLidWidthPrint(){ ////toplevel
-  rotate([0,180.0])
-    intersection(){
-      Lid();
-      translate([-30, -(phone_height - 25), -20])
-	mirror([0, 1, 0])
-	cube([200, 50, 40]);
-    }
+  rotate([0,180.0]) TestLidWidth();
+}
+
+module TestSelectCamera(){
+  CaseBase_rhsflip(1)
+    translate([0,0,-25])
+    linear_extrude(height = 50)
+    mirror([0, 1, 0])
+    rectfromto([-20, -20],
+	       camera_pos_br + [ 5, 5 ]);
 }
 
 module TestCamera(){ ////toplevel
   intersection(){
     Case();
-    CaseBase_rhsflip(1)
-      translate([0,0,-25])
-      linear_extrude(height = 50)
-      mirror([0, 1, 0])
-      rectfromto([-20, -20],
-		 camera_pos_br + [ 5, 5 ]);
+    TestSelectCamera();
   }
 }
 
+module TestLidByCamera(){ ////toplevel
+  intersection(){
+    Lid();
+    TestSelectCamera();
+  }
+}
+
+module TestLidByCameraPrint(){ ////toplevel
+  rotate([180,0,0]) TestLidByCamera();
+}
+
+module DemoByCamera(){ ////toplevel
+  color("blue") TestLidByCamera();
+  color("red")  TestCamera();
+}
+
 module OneKeeper(){ ////toplevel
   translate([0, -phone_cnr_rad, 0])
     rotate([90, 0, 0])
@@ -401,9 +444,8 @@ module Keeper(){ ////toplevel
     OneKeeper();
 }
 
-module ButtonPlanForDemo(colour, z, deep, cut){
-  color(colour)
-    translate([0,0,z])
+module ButtonPlanForDemo(z, deep, cut){
+  translate([0,0,z])
     ButtonPlan(8, deep, cut);
 }
 
@@ -427,9 +469,9 @@ module DemoProfiles(){ ////toplevel
   }
 
   translate([-20,0]) {
-    ButtonPlanForDemo("grey", -1, 0,1);
-    ButtonPlanForDemo("blue", -2, 1,0);
-    ButtonPlanForDemo("red",  -3, 1,1);
+    color("black") ButtonPlanForDemo(-2, 0,1);
+    color("red" )  ButtonPlanForDemo(-4, 1,1);
+    color("blue")  ButtonPlanForDemo(-6, 1,0);
   }
 }