X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=reprap-play.git;a=blobdiff_plain;f=fairphone-case.scad;h=4daf80736ad901006c1ea1bdc78c7bc2bad8f63f;hp=1ed4614e5c0f5f0a870617de6b9e6ec03217fc16;hb=22a422688b02e6d11945531cf528df8dae0a8e86;hpb=5c6b926b93458f22e621bc33c530bdb780b609eb

diff --git a/fairphone-case.scad b/fairphone-case.scad
index 1ed4614..4daf807 100644
--- a/fairphone-case.scad
+++ b/fairphone-case.scad
@@ -170,6 +170,7 @@ fingerpushhole_dias = [];
 
 lanyard_half_dia = 1.15;
 lanyard_entry_rel_breadth = 2;
+lanyard_channel_len = 15;
 rearspeaker_pos_bl = [ 12.64, 18.72 ];
 rearspeaker_size   = [  3.76,  7.36 ];
 
@@ -209,8 +210,7 @@ lid_gap_z = 0.25;
 lid_lip = 1.75;
 lid_edgepart_width = 5.0;
 lid_buttoncover_thick = 1.3;
-
-catch_slop = 0.50;
+lid_buttoncover_reinf = 0.65;
 
 foldover_gap = 0.50;
 foldover_lever_gap = 0.50;
@@ -252,15 +252,19 @@ hinge_r_arms_gap = 0.55;
 
 rearspeaker_gap    = [ 2.0, 2.0 ]; // each side
 
-catch_len = 7.5;
+catch_slop = -0.75;
+
+catch_len = 4.5;
 catch_width = 15;
-catch_thickness = 1.0;
+catch_thickness = 1.3;
 catch_side_gap = 0.75; // each side
 
 catch_depth = 0.75;
 catch_height = 0.35;
 catch_finger_height = 1.5;
 catch_finger_depth = 2.5;
+catch_catch_slope = 2.00;
+catch_close_slope = 3.00;
 
 catch_topcurve_r = 5.0;
 
@@ -435,9 +439,9 @@ cppP = [ epp4[0], cppJ[1] ];
 cppS = cppJ + [0,-1] * catch_len;
 cppD = [ cppA[0], cppS[1] + catch_slop ];
 cppC = [ cppB[0], cppD[1] ];
-cppT = cppS + [1,0] * catch_depth;
+cppT = cppS + [1, -catch_catch_slope] * catch_depth;
 cppU = cppT + [0,-1] * catch_height;
-cppV = [ cppS[0], cppU[1] - catch_depth ];
+cppV = [ cppS[0], cppU[1] - catch_depth * catch_close_slope ];
 
 cppR = 0.5*(cppP + cppJ);
 
@@ -726,6 +730,22 @@ module ButtonPlan(l, deep, cut){
   }
 }
 
+module ButtonCoverReinf(){ ////toplevel
+  minkowski(){
+    rotate([90,0,0])
+      linear_extrude(height=0.01)
+      intersection(){
+        ButtonCoverProfile();
+	translate([bppJ[0] + 0.1, -50]) mirror([1,0])
+	  square([100,100]);
+    }
+    mirror([0,0,1]) linear_extrude(height=0.01) intersection(){
+      circle(r= lid_buttoncover_reinf);
+      translate([-20,0]) square(40, center=true);
+    }
+  }
+}
+
 module CatchCatchProfile(){
   hull(){
     for (c=[ cppR, cppQ ])
@@ -1050,7 +1070,7 @@ module PropProfileAssignments(gamma){
   children();
 }
 
-module PropProfile(gamma, cut=0, rot=0){ ////toplevel
+module PropProfile(gamma, cut=0, rot=0){
   PropProfileAssignments(gamma){
 
     //#circleat($prpp3,1);
@@ -1198,6 +1218,13 @@ module Case(){ ////toplevel
     CatchPortion(catch_side_gap*2, epp4[1])
       CatchCutProfile();
 
+    // lanyard
+    Flip_bot(1)
+      translate([ly_o[0], -(phone_cnr_rad + ly_re), ly_o[1]])
+      rotate([0, ly_theta, 0])
+      rotate([0,0,90])
+      LanyardCutout(lanyard_channel_len);
+
     // prop recess
     Flip_rhs(1)
       translate([prop_x_pos,0,0])
@@ -1248,10 +1275,17 @@ module Lid(){ ////toplevel
 	    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();
+	  union(){
+	    rotate([90,0,0])
+	      translate([0,0,-100])
+	      linear_extrude(height= 200)
+	      ButtonCoverProfile();
+	    hull()
+	      for (y= [-1,+1] * (($button_l + button_l_fudge)/2
+				 - lid_buttoncover_reinf))
+		translate([0,y,0])
+		  ButtonCoverReinf();
+	  }
 	}
       }
 
@@ -1734,8 +1768,9 @@ module DemoProfiles(){ ////toplevel
     %EdgeProfile();
     %LidEdgeProfile();
     //translate([0,0,1]) CatchCutProfile();
+    translate([0,0,+1]) color("red")
+      difference(){ EdgeProfile(); CatchCutProfile(); }
     color("blue") CatchCatchProfile();
-    color("red") difference(){ EdgeProfile(); CatchCutProfile(); }
   }
 
   translate([40,-30]) {