X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=reprap-play.git;a=blobdiff_plain;f=fairphone-case.scad;h=44b30a2082dfe4a27397a0a272e70a092062540b;hp=15ac7fce9bc25025fec92d99c4b1b7a48cc7b243;hb=71ea05b899b678e8ef30e067dda22a1be83d0b3a;hpb=c2cf91b6a1c27a56409a80bd20ac6618f91ef6f1

diff --git a/fairphone-case.scad b/fairphone-case.scad
index 15ac7fc..44b30a2 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 ];
+
+bumper = [ 0.250, 0.250 ];
+// ^ One side.  Overall size is increased by twice this.
+// If no bumpers, is the gap around the phone.
 
 phone_cnr_rad = 6.0;
 
@@ -12,8 +15,8 @@ phone_total_thick = 12.0;
 phone_backside_slope_inner = 1.5; // larger means shallower
 phone_backside_slope_outer = 1.0; // larger means shallower
 
-camera_pos_tl = [  7.0, 13.0 ]; // measured from tl corner
-camera_pos_br = [ 22.85,37.85]; // tl/br as seen from back
+camera_pos_tl = [  6.450, 12.750 ]; // measured from tl corner
+camera_pos_br = [ 22.300, 37.600 ]; // tl/br as seen from back
 
 case_th_bottom = 2.5;
 case_th_lid = 2.5;
@@ -51,6 +54,12 @@ strut_min_at_end = 1.5;
 
 // ---------- calculated ----------
 
+phone_height = (phone + bumper*2)[0];
+phone_width =  (phone + bumper*2)[1];
+
+echo(camera_pos_tl + bumper,
+     camera_pos_br + bumper);
+
 // ----- could be changed -----
 lid_buttoncover_gap = lid_gap_x;
 lid_buttoncover_overlap = case_th_lip + keeper_gap_z_top;
@@ -83,8 +92,6 @@ lp_r12 = case_th_lid - (lpp11[1] - lpp10[1]);
 lpp12 = [ epp4[0] + lp_r12,    lpp11[1] ];
 lpp13 = [ lpp12[0],            lpp12[1] + lp_r12 ];
 
-echo(lpp13 - lpp10);
-
 // button profile
 bppM = epp4 + [0,5];
 bppN = [ 0.5 * (epp0[0] + epp4[0]), bppM[1] ];
@@ -161,6 +168,8 @@ module ButtonPlan(l, deep, cut){
   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]) ];
   H = A + [0,-1] * delta;
@@ -183,7 +192,7 @@ module ButtonPlan(l, deep, cut){
       polygon([ E1,
 		I1,
 		H,
-		B0,
+		B1,
 		G,
 		F,
 		D
@@ -256,7 +265,7 @@ module SideButton(y,l){
 }
 
 module Buttons(){
-  CaseBase_rhsflip([1]) SideButton(20.6, 8.8) children(); // power
+  CaseBase_rhsflip([1]) SideButton(19.650, 8.8) children(); // power
 }
 
 module Struts(x_start, z_min, th){
@@ -319,6 +328,7 @@ module Case(){ ////toplevel
       mirror([0, 0, 1])
       linear_extrude(height = 20)
       mirror([0, 1, 0])
+      translate(bumper)
       rectfromto(camera_pos_tl, camera_pos_br);
 
     // struts (invisible, because they're buried in the case)
@@ -350,7 +360,7 @@ module Lid(){ ////toplevel
 	  rotate([90,0,90])
 	    translate([0,0,-10])
 	    linear_extrude(height= 20)
-	    ButtonPlan($button_l, 0,0);
+	    ButtonPlan($button_l, 1,0);
 	  rotate([90,0,0])
 	     translate([0,0,-100])
 	    linear_extrude(height= 200)
@@ -370,37 +380,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 + bumper + [ 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])