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=12fb893b6c063b88be86a4c6fc2a05048d757147;hb=77c39f4394b1ede3825b88234a0d9832cc6d3b78;hpb=d1186933d52fbafc6908c5e3c706ec6aae797825

diff --git a/fairphone-case.scad b/fairphone-case.scad
index 12fb893..4daf807 100644
--- a/fairphone-case.scad
+++ b/fairphone-case.scad
@@ -169,7 +169,8 @@ noisecancelmic_dia = 4.00;
 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);
 
@@ -451,6 +455,18 @@ cppF = [ cppV[0] + catch_finger_depth, cppC[1] ];
 ly_r = lanyard_half_dia / 2;
 ly_rc = ly_r * 2;
 
+ly_theta = -atan2vector(epp2i - epp1);
+ly_o = epp2i + 3 * ly_r * unitvector2d(epp1 - epp2i);
+
+max_case_bottom_edge_thickness =
+  case_th_bottom
+  + sin(ly_theta) * (epp2i-epp2o)[0];
+
+ly_q_z = -(ly_rc + ly_r);
+ly_re = max_case_bottom_edge_thickness - (-ly_q_z);
+
+ly_oec_y = lanyard_entry_rel_breadth * ly_r;
+
 // prop recess in case
 
 prop_x_pos = phone_width/2;
@@ -528,7 +544,7 @@ module EdgeProfile(){
 
 module LanyardLanyardProfile(entry=false){
   hull(){
-    for (xs=[-1,+1] * (entry ? 2 : 1))
+    for (xs=[-1,+1] * (entry ? lanyard_entry_rel_breadth : 1))
       translate(xs * 0.5 * lanyard_half_dia * [1,0])
 	circle(r= lanyard_half_dia/2);
   }
@@ -540,8 +556,7 @@ module LanyardCurveChannelProfile(){
 }  
 
 module LanyardEntryChannelProfile(){
-  translate([0, -ly_r])
-    LanyardLanyardProfile(true);
+  LanyardLanyardProfile(true);
 }  
 
 module LanyardMainChannelProfile(){
@@ -554,8 +569,14 @@ module LanyardMainChannelProfile(){
   }
 }
 
+module LanyardEntryOuterProfile(){
+  circleat([ly_re + ly_r, 0], ly_re);
+}
+
 module LanyardEntry(){
-  q_z = -(ly_rc + ly_r);
+  q_z = ly_q_z;
+  oec_y = ly_oec_y;
+
   d_x = -ly_rc;
 
   translate([d_x, 0, q_z]) {
@@ -569,10 +590,58 @@ module LanyardEntry(){
 	cube([20,20,20]);
     }
   }
+
+  mirror([0,0,1])
+    translate([0,0,-1])
+    linear_extrude(height=20)
+    rotate(-90)
+    LanyardEntryChannelProfile();
+
+  translate([0, ly_r*2, 0])
+    rotate([90,0,0])
+    linear_extrude(height = ly_r*4){
+    difference(){
+      rectfromto([d_x, q_z], [ly_r, 0]);
+      circleat([d_x, q_z], ly_rc);
+    }
+  }
+
+  translate([0,0,q_z]){
+    for (my=[0,1])
+      mirror([0,my,0]){
+	translate([0, oec_y, 0]){
+	  difference(){
+	    translate(ly_re * [-1,0,-2])
+	      cube(ly_re * [2,1,2]);
+	    rotate_extrude(convexity=10)
+	      LanyardEntryOuterProfile();
+	  }
+	}
+      }
+    difference(){
+      translate([-ly_re, -(oec_y + 0.01), -2*ly_re])
+	cube([ly_re*2, 2*(oec_y + 0.01), 2*ly_re]);
+      for (mx=[0,1])
+	mirror([mx,0,0])
+	  rotate([90,0,0])
+	  translate([0,0,-10])
+	  linear_extrude(height=20)
+	  LanyardEntryOuterProfile();
+    }
+  }
 }
 
-module LanyardCutout(){
-  LanyardEntry();
+module LanyardCutout(l){
+  rotate([0,-90,0])
+    linear_extrude(height=l)
+    rotate(-90)
+    LanyardMainChannelProfile();
+
+  for (ee=[0,1]){
+    translate(ee * l * [-1,0])
+      mirror([ee,0,0])
+      LanyardEntry();
+  }
 }
 
 module LidEdgeProfile(){
@@ -661,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 ])
@@ -985,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);
@@ -1133,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])
@@ -1183,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();
+	  }
 	}
       }
 
@@ -1570,8 +1669,8 @@ module DemoFrame(){ ////toplevel
   %HingeLever();
 }
 
-module DemoLanyardEntry(){ ////toplevel
-  LanyardEntry();
+module DemoLanyardCutout(){ ////toplevel
+  LanyardCutout(25);
 }
 
 module DemoHingedFrame(){ ///toplevel
@@ -1598,14 +1697,20 @@ module DemoProfiles(){ ////toplevel
   %EdgeProfile();
   KeeperProfile();
   translate([0,0,-1]) color("black") KeeperProfile(1);
-  color("purple") translate(epp2i)
-    rotate(atan2vector(epp2i - epp1)) {
-    translate(lanyard_half_dia * 0.5 * [-3,-1])
-      LanyardLanyardProfile();
-    translate(lanyard_half_dia * 0.5 * [-3,+1])
-      translate([0,-1] * case_th_side)
-      LanyardLanyardProfile(true);
+  translate(ly_o){
+    rotate(-ly_theta){
+      translate([0,0,+1]) color("purple") LanyardMainChannelProfile();
+      translate([0,0,+2]) color("red") LanyardCurveChannelProfile();
+      translate([0, ly_q_z]){
+	translate([0,0,-1]) color("blue") LanyardEntryChannelProfile();
+	translate([ly_oec_y,0,-2]) color("black") LanyardEntryOuterProfile();
+      }
+    }
   }
+  translate([0,0,-5]) color("white") translate(epp2i)
+    rotate(-ly_theta)
+    rectfromto([-15, 0],
+	       [+15, -max_case_bottom_edge_thickness]);
 
   translate([0,20]) {
     LanyardMainChannelProfile();
@@ -1663,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]) {