X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=reprap-play.git;a=blobdiff_plain;f=fairphone-case.scad;h=678ea67cea016a48739b4046521647cdbf232690;hp=293692faa1965db426be3696423b967cc7c58d8f;hb=bc23a479fc9ffbaff4d5303288492078fcf393c2;hpb=219b07b4b4667caf76903bd55960d9b831dcbbf2

diff --git a/fairphone-case.scad b/fairphone-case.scad
index 293692f..678ea67 100644
--- a/fairphone-case.scad
+++ b/fairphone-case.scad
@@ -41,7 +41,7 @@ jack_pos = [ 13.83, 8.485 ];
 jack_dia = 10.64 + .5; // some jack I had lying around
 
 led_pos = [ 13.98, 10.00 ];
-led_aperture = 8;
+led_aperture = 9;
 led_window_ledge = 0.75; // each side
 
 noisecancelmic_pos = [ 19.54, 7.37 ];   // from rhs
@@ -349,7 +349,7 @@ $prp_r10 = prl_r10;
 
 module AdhocMultiprintFrame(phase, z0, zs) {
   // from z0 to z0 + zs*layer
-  extra = phase * 0.65 + 5;
+  extra = phase * (initial_layer_width + multicolour_gap) + 5;
   xextra = extra + -epp4[0];
   xrange = [ 0, phone_width ] + [-1,+1] * xextra;
   yextra = extra + -epp4[0];
@@ -577,7 +577,7 @@ module LidButtonishLeg(y, y_ref_sign, l=buttonishleg_default_l_is_fudge) {
 module Buttons(){
   Flip_rhs(1) SideButton(15.580, +1, 8.9     ) children(); // power
   Flip_rhs(1) SideButton(48.700, -1, 8.920   ) children(); // camera
-  Flip_rhs(0) SideButton(30.800, +1, 21.96   ) children(); // volume
+  Flip_rhs(0) SideButton(30.800, +1, 21.96, 1) children(); // volume
   Flip_rhs(   ) LidButtonishLeg(14, -1) children();
 //  Flip_rhs(0) LidButtonishLeg(20, +1, 20) children();
 }
@@ -1021,7 +1021,7 @@ module LidWindow(){ ////toplevel
   translate([led_pos[0], -led_pos[1], lpp13[1]])
     mirror([0,0,1])
     cylinder(r= nla_r1, h=nla_t);
-  LidAdhocMultiprintFrame(0, lpp13[1], -1);
+  LidAdhocMultiprintFrame(0);
 }
 
 module LidWindowPrint(){ ////toplevel
@@ -1165,7 +1165,7 @@ module TestSelectFrame(){
 module TestSelectLidFrame(){
   TestSelectFrame();
   translate([led_pos[0], -led_pos[1], -50])
-    cylinder(r= nla_r2+2, h=100);
+    cylinder(r= nla_r2+3, h=100);
 }
 
 module TestFrameCase(){ ////toplevel
@@ -1179,12 +1179,33 @@ module TestFrameCase(){ ////toplevel
   }
 }
 
+module TestSelectTopApertures(){
+  translate([-100, -35, -100])
+    cube([400, 100, 200]);
+  LidAdhocMultiprintFrame(0);
+  LidAdhocMultiprintFrame(1);
+}
+
 module TestTopApertures(){ ////toplevel
   intersection(){
     Case();
     TestSelectFrame();
-    translate([-100, -35, -100])
-      cube([400, 100, 200]);
+    TestSelectTopApertures();
+  }
+}
+
+module TestLidTopAperturesPrint(){ ////toplevel
+  rotate([0,180,0]) intersection(){
+    Lid();
+    TestSelectLidFrame();
+    TestSelectTopApertures();
+  }
+}
+
+module TestLidWindowTopAperturesPrint(){ ////toplevel
+  rotate([0,180,0]) intersection(){
+    LidWindow();
+    TestSelectTopApertures();
   }
 }