fairphone-case: wip prop profile, fixes

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

diff --git a/fairphone-case.scad b/fairphone-case.scad
index 5ade84ab54bbd576d04d2a6381669717bc76789c..3f47c9f173a1f2aab61f9fb6ebf4bc9bf121dd7e 100644 (file)
--- a/fairphone-case.scad
+++ b/fairphone-case.scad
@@ -262,8 +262,6 @@ prcp2 = [ epp4[0] + prop_buildout_less,
 
 prop_caserecess_buildout_r = -1; // prcp2[0] - epp2o[0];
 
-echo(prc_r3);
-
 prcp1 = [ epp2o[0],
          epp2i[1] - prc_r3 ];
 
@@ -272,13 +270,15 @@ prcp1 = [ epp2o[0],
 prl_r10 = prop_end_dia/2;
 prl_r10o = prl_r10 + prop_recess_slop;
 
-prlp10 = lpp10 + [1,1] * prl_r10a;
+prlp10 = lpp10 + [1,1] * prl_r10o;
 
 // prop
 
 prpp10 = [0,0];
 prpp11 = [0, prop_taper_len];
 
+prp_r10 = prl_r10;
+
 // ---------- modules ----------
 
 module KeeperProfile(slant=0){
@@ -621,6 +621,7 @@ module CaseBase(){
 
 module PropProfile(gamma, cut=0){ ////toplevel
   // https://en.wikipedia.org/wiki/Solution_of_triangles#Two_sides_and_the_included_angle_given_(SAS)
+  k = hp_k;
   p = phone_height - prlp10[0] - hppB[0];
   x = k / (2 * sin(gamma/2)) - hppT[0];
   b = p + x;
@@ -638,7 +639,7 @@ module PropProfile(gamma, cut=0){ ////toplevel
   prpp7 = [0, c + (lpp13[1] - prpp10[1]) ];
 
   prp_r1 = prc_r1;
-  prp_r11 = prp_main_th/2;
+  prp_r11 = prop_main_th/2;
 
   prpp1 = prpp7 + [1,0] *
     // this is approximate, but will do