fairphone-case: make lid_close_clearance_skew into a variable

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

diff --git a/fairphone-case.scad b/fairphone-case.scad
index 75c45ad2ae347610c4dc4d4c9e053e0eb5f2791a..0b2ad4dbf2e2d483b616aea150ac838c4d1e951f 100644 (file)
--- a/fairphone-case.scad
+++ b/fairphone-case.scad
@@ -336,6 +336,8 @@ lpp13 = [ lpp12[0],            lpp12[1] + lp_r12 ];
 
 case_bottom_z = epp2o[1] - case_th_bottom;
 
+lid_close_clearance_skew = 1.3;
+
 // button profile
 bppM = epp4 + [0,5];
 bppN = [ 0.5 * (epp0[0] + epp4[0]), bppM[1] ];
@@ -521,6 +523,15 @@ module LidEdgeProfile(){
   }
 }
 
+module LidEdgeFoldClearanceProfile(){
+  polygon([ lpp10,
+           lpp11,
+           lpp11 + [-20,  0],
+           lpp11 + [-20, 20],
+           lpp11 + [+20, 20],
+           lpp10 + [+20,  0] ]);
+}
+
 module ButtonCoverProfile(){
   intersection(){
     polygon(concat([ bppM, bppP, bppO, bppJ ],
@@ -561,10 +572,6 @@ module ButtonPlan(l, deep, cut){
   I0 = [ E0[0], H[1] ];
   I1 = [ E1[0], H[1] ];
 
-  multmatrix([[ 1, $button_plan_shear ? 0.4 : 0, 0 ],
-             [ 0,1,0 ],
-             [ 0,0,1 ],
-             ]){
   hull(){
     for (m=[0,1]) mirror([m,0])
       circleat(H, r0 - epsilon);
@@ -582,7 +589,6 @@ module ButtonPlan(l, deep, cut){
       circleat(D, r0 + epsilon);
     }
   }
-  }
 }
 
 module CatchCatchProfile(){
@@ -693,7 +699,6 @@ module SideButton(y, y_ref_sign, l, suppress_over_keeper=0){
 
 module LidButtonishLeg(y, y_ref_sign, l=buttonishleg_default_l_is_fudge) {
   $button_leg_only = true;
-  $button_plan_shear = true;
   SideButton(y, y_ref_sign, l) children();
 }
 
@@ -830,7 +835,7 @@ module HingePortion(x0,x1){
     mirror([1,0,0])
     rotate([90,0,-90])
     linear_extrude(height=x1-x0)
-    children(0);
+    children();
 }
 
 module CatchPortion(width){
@@ -1061,11 +1066,28 @@ module LidAdhocMultiprintFrame(phase){
   }
 }
 
+module LidAroundEdges(){
+  AroundEdges(lpp10[1], lpp13[1] - lpp10[1], 0)
+    children();
+}
+
 module Lid(){ ////toplevel
+  skew_centre = [0, lpp11[0], lpp11[1]];
   difference(){
     union(){
-      AroundEdges(lpp10[1], lpp13[1] - lpp10[1], 0)
-        LidEdgeProfile();
+      intersection(){
+       LidAroundEdges()
+         LidEdgeProfile();
+
+       translate(skew_centre)
+         multmatrix([[ 1, 0, 0, 0 ],
+                     [ 0, 1, -lid_close_clearance_skew, 0 ],
+                     [ 0, 0, 1, 0 ],
+                     [ 0, 0, 0, 1 ]])
+         translate(-skew_centre)
+         LidAroundEdges()
+         LidEdgeFoldClearanceProfile();
+      }
 
       // button covers
       Buttons(){
@@ -1082,7 +1104,10 @@ module Lid(){ ////toplevel
       }
 
       // hinge arms
-      HingePortion(hex20, hex21) HingeLidProfile();
+      HingePortion(hex20, hex21) {
+       LidEdgeProfile();
+       HingeLidProfile();
+      }
 
       // catch
       CatchPortion(catch_width)
@@ -1429,7 +1454,7 @@ module DemoHingeAngle(ang1,ang2){
 }
 
 module DemoHingeAngles(){ ////toplevel
-  angles = [ 0, 6, 12, 16, 24, 36 ];
+  angles = [ 0, 4, 8, 12 ];
   echo("angles",angles);
   for (i=[0 : len(angles)-1]) {
     translate(i * [0, 0, 30]) {