fairphone4-case: change from v1

[reprap-play.git] / fairphone4-case.scad

diff --git a/fairphone4-case.scad b/fairphone4-case.scad
index d400d70986fad0a0054682439a113921e55e0e9f..6080e5e70f298aeea97da02d3c886eb53081e6ca 100644 (file)
--- a/fairphone4-case.scad
+++ b/fairphone4-case.scad
@@ -149,9 +149,9 @@ button_cutout_depth = 9;
 
 phone_edge_thick = 11.25;
 
-// xxx this is all wrong
-camera_pos_tl = [  6.450, 12.750 ]; // measured from tl corner
-camera_pos_br = [ 22.300, 37.600 ]; // tl/br as seen from back
+camera_pos_tl = [  6.600,  6.750 ]; // from tl corner (as seen from back)
+camera_edge_rad = 9.750;
+camera_sz = 32.920 + .750;
 
 // this is disabled, FP4 doesn't have one
 jack_pos = [ 13.83, 8.485 ];
@@ -162,13 +162,13 @@ led_pos = []; // [ 13.98, 10.00 ];
 led_aperture = 9;
 led_window_ledge = 0.75; // each side
 
-noisecancelmic_pos = [ 15.08, 4.35 ];   // from rhs, from top edge
+noisecancelmic_pos = [ 15.08 + .720, 4.35 ];   // from rhs, from top edge
 noisecancelmic_dia = 4.00;
 
-mainmic_pos = [ 21.0, 4.35 ];   // from lhs, from top edge
+mainmic_pos = [ 21.5, 3.45 ];   // from lhs, from top edge
 mainmic_dia = 4.00;
 
-lhshole_pos = [ phone[1]/2, 4.35 ];
+lhshole_pos = [ phone[1]/2 - 0.80, 4.35 ];
 
 // fingerpushhole_dias = [];
 fingerpushhole_dias = [ 15, 18 ]; // this is for testing
@@ -179,8 +179,8 @@ lanyard_channel_len = 8;
 //rearspeaker_pos_bl = [ 12.64, 18.72 ];
 //rearspeaker_size   = [  3.76,  7.36 ];
 
-bottomspeaker_size = [ 11.35, 1.40 ] + [1,1] * 0.5;
-bottomspeaker_pos = [ 19.45, 4.82 ];
+bottomspeaker_size = [ 12.35, 1.40 ] + [1,1] * 0.5;
+bottomspeaker_pos = [ 18.05, 5.52 ]; // from rhs, from top
 
 microusb_above = 1.64 - 0.25;
 microusb_below = 2.42;
@@ -208,6 +208,7 @@ keeper_gap_z_top = 0.25;
 keeper_gap_z_bot = 0.75;
 keeper_gap_x     = 0.25;
 keeper_gap_x_holes = 0.75;
+keeper_fatter = 0.30;
 
 keeper_side = 0; // 0 = lhs; 1 = rhs
 
@@ -223,8 +224,6 @@ lid_buttoncover_reinf = 0.65;
 foldover_gap = 0.50;
 foldover_lever_gap = 0.50;
 
-// xxx replace hinge screw with nail plan
-
 // properties of the hinge fasteners
 hingescrew_shaft_dia = 2.0 + 0.25; // M2 x 12mm machine screw
 hingescrew_shaft_len = 12;
@@ -311,9 +310,6 @@ lid_buttoncover_overlap = case_th_lip + keeper_gap_z_top;
 //prop_recess_width = prop_main_th / cos(prop_max_angle) + prop_backfwd_gap;
 
 
-//lid_lip_overlap_width xxx bad name = ;
-//lid_lip_inner_slope = [ 5, 5 ]; // xxx
-
 epp0 = [0,0];
 epp1 = [0, -phone_edge_thick];
 epp2i = epp1; // conflated for FP4
@@ -414,17 +410,17 @@ hex23 = hex27 - (hingescrew_nut_thick*2
                 + hingescrew_fasteners_extra_thick);
 hex26 = hex23 + hingescrew_nut_thick * 2/3;
 
-echo(hex20, hex21, hex22, hex23, hex24);
-//  6, 10.8725, 10.9975, 13.74, 18.75
-module chk(act,exp) {
-  if (abs(act-exp) > 1e-9) echo("WRONG", act, exp);
-  else echo("ok", act);
-}
-chk(hex20, 6);
-chk(hex21, 10.8725);
-chk(hex22, 10.9975);
-chk(hex23, 13.74);
-chk(hex24, 18.75);
+//echo(hex20, hex21, hex22, hex23, hex24);
+////  6, 10.8725, 10.9975, 13.74, 18.75
+//module chk(act,exp) {
+//  if (abs(act-exp) > 1e-9) echo("WRONG", act, exp);
+//  else echo("ok", act);
+//}
+//chk(hex20, 6);
+//chk(hex21, 10.8725);
+//chk(hex22, 10.9975);
+//chk(hex23, 13.74);
+//chk(hex24, 18.75);
 
 lid_fold_clearance_skew =
   (lpp10[1] - hppB[1]) /
@@ -510,7 +506,13 @@ module AdhocMultiprintFrame(phase, z0, zs) {
 
 module KeeperProfile(slant=0){
   use_e = kppe + [0,-1] * slant * keeper_inner_width / keeper_slant_slope;
-  polygon([use_e, kppd, kppc, kppb, kppa, kppf]);
+  polygon([use_e + [+1,-1] * keeper_fatter,
+          kppd  + [ 0,-1] * keeper_fatter,
+          kppc,
+          kppb,
+          kppa,
+          kppf  + [+1, 0] * keeper_fatter
+          ]);
 }
 
 module EdgeProfile(){
@@ -834,8 +836,7 @@ module Buttons(){
   Flip_rhs(1) SideButton(64.220, +1, 14.500  ) children(); // power
   Flip_rhs(1) LidButtonishLeg(14, -1) children();
   Flip_rhs(0) LidButtonishLeg(21, -1) children();
-  Flip_rhs(0) LidButtonishLeg(14, +1) children();
-  // xxx need hole for whatever that hole is on lhs
+  Flip_rhs(0) LidButtonishLeg(21, +1) children();
 }
 
 module Struts(x_start, z_min, th){
@@ -902,7 +903,7 @@ module OrdinaryRearApertures(){
 module NotInTestFrameRearApertures(){
   // finger hole to remove phone
   if (len(fingerpushhole_dias))
-    OrdinaryRearAperture(0,0, [ fingerpushhole_dias[0]/2 + epp2i[0],
+    OrdinaryRearAperture(0,0, [ fingerpushhole_dias[0] + epp2i[0],
                                phone[1]/2 ])
     scale(fingerpushhole_dias)
     circle(r= 0.5 );
@@ -911,10 +912,19 @@ module NotInTestFrameRearApertures(){
 module RearCameraAperture(){
   Flip_rhs(1)
     mirror([0, 0, 1])
+    translate([0,0,0])
+    hull() // there is some kind of bug if hull() is done in 2D here!
     linear_extrude(height = 20)
     mirror([0, 1, 0])
     translate(bumper)
-    rectfromto(camera_pos_tl, camera_pos_br);
+    translate(camera_pos_tl)
+    for (xy = [ [0,0], [0,1], [1,0] ]) {
+      translate(
+         camera_edge_rad * [1,1] +
+         xy * (camera_sz - camera_edge_rad * 2)
+               )
+       circle(r = camera_edge_rad);
+    }
 }
 
 module HingeLidProfile(){
@@ -1510,6 +1520,11 @@ module TestSelectFrame(){
       linear_extrude(height=200)
       rectfromto(include,  inside_br - include);
   }
+
+  for (i= [1,2]) {
+    translate([ 0, -phone[1] * i/3, 0 ])
+      cube(center=true, [1000, 4, 100]);
+  }
 }
 
 module TestSelectLidFrame(){