fairphone-case: TestTopApertures: fix

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

diff --git a/fairphone-case.scad b/fairphone-case.scad
index 09c40e8365ddd9a22c31a17ce083f4886a957adc..b06b1741b5b9df8b53c5cd487a8b494e687cca2f 100644 (file)
--- a/fairphone-case.scad
+++ b/fairphone-case.scad
@@ -117,7 +117,7 @@ prop_recess_slop = 0.200; // each side
 prop_end_dia = 0.5;
 prop_main_th = 3;
 prop_taper_len = 6;
-prop_main_width = 3;
+prop_main_width = 4;
 prop_side_gap = 0.75; // each side
 prop_lidrecess_behind = 0.75;
 prop_caserecess_behind = 0.75;
@@ -263,8 +263,8 @@ prcp2 = [ epp4[0] + prop_buildout_less,
 
 prop_caserecess_buildout_r = -1; // prcp2[0] - epp2o[0];
 
-prcp1 = [ epp2o[0],
-         epp2i[1] - prc_r3 ];
+prcp1 = [ epp2o[0] + prc_r3 + prop_caserecess_behind,
+         epp2i[1] - prc_r3 - prop_recess_under];
 
 // prop recess in lid
 
@@ -651,7 +651,7 @@ module PropProfileAssignments(gamma){
 
   $prpp1 = $prpp7 + [1,0] *
     // this is approximate, but will do
-    (prop_main_th/2 + prop_prop_gap + prcp1[0] - epp4[0]);
+    (prop_main_th/2 + prop_prop_gap + prcp1[0] - cppA[0]);
   $prpp3 = $prpp1 +
     v1[0] * -$prp_r1 +
     v1[1] * ((prcp2[1] - prcp1[1]) - prop_prop_gap);
@@ -681,7 +681,7 @@ module PropProfile(gamma, cut=0, rot=0){ ////toplevel
        translate($prpp8)
          intersection(){
            circle($prp_r8);
-           polygon([[-20,-0], [0,0], [20,20]]);
+           polygon([[-20,-0], [20,20], [0,0]]);
          }
        rectfromto($prpp6, $prpp9);
        translate($prpp5) intersection(){
@@ -821,9 +821,9 @@ module Case(){ ////toplevel
     // prop recess
     Flip_rhs(1)
       translate([prop_x_pos,0,0])
+      mirror([0,1,0])
       rotate([90,0,90])
       linextr(-prop_recess_hw, +prop_recess_hw)
-      mirror([1,0])
       hull(){
         for (d=[ [0,0], [0,-1], [+1,-1/prop_caserecess_taper] ])
          circleat(prcp1 + 20*d,
@@ -866,9 +866,9 @@ module Lid(){ ////toplevel
 
     // prop recess
     translate([prop_x_pos, -prlp10[0], prlp10[1]])
+      mirror([0,1,0])
       rotate([90,0,90])
       linextr(-prop_recess_hw, +prop_recess_hw)
-      mirror([1,0])
       hull()
       for (pa = prop_angles)
        PropProfile(pa, 1,1);
@@ -1026,6 +1026,15 @@ module TestFrameCase(){ ////toplevel
   }
 }
 
+module TestTopApertures(){ ////toplevel
+  intersection(){
+    Case();
+    TestSelectFrame();
+    translate([-100, -35, -100])
+      cube([400, 100, 200]);
+  }
+}
+
 module TestFrameLidPrint(){ ////toplevel
   rotate([0,180,0]) intersection(){
     Lid();