X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=reprap-play.git;a=blobdiff_plain;f=fairphone-case.scad;h=d83c53474f4b548972d672539cecb5210bf28c8b;hp=a79983903e84f54963e1d80c9bb3560a39cacd10;hb=9f21563a34c99c15c3adcd2a72ab0da7cf741bbe;hpb=5907f637ec09176657720fade432433acb9b3c76

diff --git a/fairphone-case.scad b/fairphone-case.scad
index a799839..d83c534 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 ];
 
@@ -254,13 +255,14 @@ rearspeaker_gap    = [ 2.0, 2.0 ]; // each side
 
 catch_len = 7.5;
 catch_width = 15;
-catch_thickness = 1.0;
+catch_thickness = 1.3;
 catch_side_gap = 0.75; // each side
 
-catch_depth = 0.75;
+catch_depth = 1.25;
 catch_height = 0.35;
 catch_finger_height = 1.5;
 catch_finger_depth = 2.5;
+catch_catch_slope = 0.25;
 
 catch_topcurve_r = 5.0;
 
@@ -435,7 +437,7 @@ 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 ];
 
@@ -452,12 +454,16 @@ 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_re = 10; // xxx
+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
 
@@ -566,10 +572,10 @@ module LanyardEntryOuterProfile(){
 }
 
 module LanyardEntry(){
-  q_z = -(ly_rc + ly_r);
-  d_x = -ly_rc;
+  q_z = ly_q_z;
+  oec_y = ly_oec_y;
 
-  oec_y = lanyard_entry_rel_breadth * ly_r;
+  d_x = -ly_rc;
 
   translate([d_x, 0, q_z]) {
     intersection(){
@@ -1046,7 +1052,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);
@@ -1194,6 +1200,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])
@@ -1659,13 +1672,15 @@ module DemoProfiles(){ ////toplevel
   %EdgeProfile();
   KeeperProfile();
   translate([0,0,-1]) color("black") KeeperProfile(1);
-  color("purple") translate(epp2i)
-    rotate(-ly_theta) {
-    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)