fairphone-case: prop: remove old recesses

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

diff --git a/fairphone-case.scad b/fairphone-case.scad
index 5013bc16b9419ecab103d21408677346ac31ef85..d891ffd82a52daa138fd79b7d7797c60d5ccb3ea 100644 (file)
--- a/fairphone-case.scad
+++ b/fairphone-case.scad
@@ -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];
@@ -689,7 +689,7 @@ module PropProfile(gamma, cut=0){ ////toplevel
     }
   }
   // main shaft
-  rotate([0,0, cut ? -theta : 0]){
+  rotate([0,0, rot*-theta]){
     hull(){
       extra = cut ? prop_recess_slop : 0;
       rectfromto(prpp6, prpp9);
@@ -699,6 +699,11 @@ module PropProfile(gamma, cut=0){ ////toplevel
   }
 }
 
+module PropAggregateProfile(){
+  for (angle = prop_angles)
+    PropProfile(angle, 0,0);
+}
+
 module Case(){ ////toplevel
   difference(){
     union(){
@@ -844,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);
   }
 }
 
@@ -972,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);
 
@@ -998,7 +999,6 @@ module TestSelectFrame(){
 
 module TestSelectLidFrame(){
   TestSelectFrame();
-  TestSelectPropRecesses(prop_lid_posns);
 }
 
 module TestFrameCase(){ ////toplevel
@@ -1109,12 +1109,15 @@ module DemoProfiles(){ ////toplevel
 
   translate([40,-30]) {
     difference(){
-      %LidEdgeProfile();
-      //translate(prlp10)
-       //PropProfile(10, 1);
+      LidEdgeProfile();
+      translate(prlp10)
+       PropProfile(10, 1, 0);
     }
     translate(prlp10)
-      PropProfile(45, 0);
+      PropProfile(15, 0);
+  }
+  translate([60,-30]) {
+    PropAggregateProfile();
   }
 }