fairphone-case: prop: remove old recesses

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

diff --git a/fairphone-case.scad b/fairphone-case.scad
index c321dbec7f66965c9455d091f470b61251eb5348..d891ffd82a52daa138fd79b7d7797c60d5ccb3ea 100644 (file)
--- a/fairphone-case.scad
+++ b/fairphone-case.scad
@@ -121,7 +121,7 @@ prop_main_width = 3;
 prop_side_gap = 0.75; // each side
 prop_lidrecess_behind = 0.75;
 prop_caserecess_behind = 0.75;
-prop_caserecess_taper = 0.35; // one side only
+prop_caserecess_taper = 0.45; // one side only
 prop_prop_gap = 0.5;
 prop_prong_heel_slope = 0.5;
 
@@ -622,7 +622,7 @@ module CaseBase(){
     EdgeProfile();
 }
 
-module PropProfile(gamma, cut=0){ ////toplevel
+module PropProfile(gamma, cut=0, rot=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];
@@ -636,7 +636,7 @@ module PropProfile(gamma, cut=0){ ////toplevel
 
   theta = 90 - alpha;
   beta = 180 - alpha - gamma;
-  psi = 90 - beta + atan(prop_caserecess_taper);
+  psi = 90 - beta;
 
   echo("abc", a,b,c);
 
@@ -654,7 +654,7 @@ module PropProfile(gamma, cut=0){ ////toplevel
   prpp3 = prpp1 +
     v1[0] * -prp_r1 +
     v1[1] * ((prcp2[1] - prcp1[1]) - prop_prop_gap);
-  prpp12 = prpp3 + [1,0] *
+  prpp12 = prpp3 + v1[0] *
     (prop_end_dia + prop_caserecess_taper * (prpp1[1] - prpp3[1]));
   prp_r8 = prop_main_th;
   prpp4 = [ prop_main_th/2, prpp3[1] ];
@@ -666,29 +666,30 @@ module PropProfile(gamma, cut=0){ ////toplevel
   prpp8 = prpp4 + [0,-1] * prp_r8;
   prpp9 = prpp8 + [-1,0] * prp_r8;
 
-  //#circleat(prpp5,1);
+  //#circleat(prpp3,1);
+  //#circleat(prpp12,1);
 
   if (!cut) {
     hull(){
       translate(prpp8)
        intersection(){
          circle(prp_r8);
-         rectfromto([-20,-0], [20,20]);
+         polygon([[-20,-0], [0,0], [20,20]]);
         }
       rectfromto(prpp6, prpp9);
       translate(prpp5) intersection(){
        circle(prp_r5);
-       rectfromto([-10,-10], [10,0]);
+       polygon([[-10,-10], [0,0], [10,0]]);
       }
       rectfromto(prpp12 + [0,-0.1], prpp3);
     }
-    %hull(){
+    hull(){
       circleat(prpp1, prp_r1);
       rectfromto(prpp12 + [0,-0.1], prpp3);
     }
   }
   // main shaft
-  rotate([0,0, cut ? -theta : 0]){
+  rotate([0,0, rot*-theta]){
     hull(){
       extra = cut ? prop_recess_slop : 0;
       rectfromto(prpp6, prpp9);
@@ -698,6 +699,11 @@ module PropProfile(gamma, cut=0){ ////toplevel
   }
 }
 
+module PropAggregateProfile(){
+  for (angle = prop_angles)
+    PropProfile(angle, 0,0);
+}
+
 module Case(){ ////toplevel
   difference(){
     union(){
@@ -843,6 +849,15 @@ module Lid(){ ////toplevel
 
     // screw holes in the hinge arms
     HingeScrews();
+
+    // prop recess
+    translate([prop_x_pos, -prlp10[0], prlp10[1]])
+      rotate([90,0,90])
+      linextr(-prop_recess_hw, +prop_recess_hw)
+      mirror([1,0])
+      hull()
+      for (pa = prop_angles)
+       PropProfile(pa, 1,1);
   }
 }
 
@@ -971,19 +986,6 @@ module LidPrint(){ ////toplevel
     Lid();
 }
 
-module TestSelectPropRecesses(posns){
-  linextr(-100,100){
-    translate([phone_width/2, -phone_height]){
-      square([ 3, 500 ], center=true);
-      for (y=posns)
-       hull()
-         for (dy=[ -prp5[0], -prp2[0] ])
-           translate([0,y+dy])
-             square([prop_main_width+5, 5], center=true);
-    }
-  }
-}
-
 module TestSelectFrame(){
   include = [1,-1] * (epp2i[0] + 4);
 
@@ -997,7 +999,6 @@ module TestSelectFrame(){
 
 module TestSelectLidFrame(){
   TestSelectFrame();
-  TestSelectPropRecesses(prop_lid_posns);
 }
 
 module TestFrameCase(){ ////toplevel
@@ -1108,13 +1109,16 @@ module DemoProfiles(){ ////toplevel
 
   translate([40,-30]) {
     difference(){
-      %LidEdgeProfile();
-      //translate(prlp10)
-       //PropProfile(10, 1);
+      LidEdgeProfile();
+      translate(prlp10)
+       PropProfile(10, 1, 0);
     }
     translate(prlp10)
       PropProfile(15, 0);
   }
+  translate([60,-30]) {
+    PropAggregateProfile();
+  }
 }
 
 //EdgeProfile();