From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sun, 21 Jan 2018 17:34:25 +0000 (+0000)
Subject: fairphone-case: replace RearSpeakerAperture with OrdinaryRearApertures
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=reprap-play.git;a=commitdiff_plain;h=d4c1cea9e5f126dfa75434af5d04d179f397f972

fairphone-case: replace RearSpeakerAperture with OrdinaryRearApertures

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
---

diff --git a/fairphone-case.scad b/fairphone-case.scad
index 6428503..ff29be7 100644
--- a/fairphone-case.scad
+++ b/fairphone-case.scad
@@ -332,11 +332,17 @@ module Struts(x_start, z_min, th){
   }
 }
 
-module RearSpeakerAperture(){
-  CaseBase_rhsflip([1]) CaseBase_botflip([1])
+module OrdinaryRearAperture(rhs,bot, pos){
+  CaseBase_rhsflip(rhs) CaseBase_botflip(bot)
     linextr(-20, 20)
     mirror([0,1])
-    translate(rearspeaker_pos_bl + bumper)
+    translate(pos + bumper)
+    children();
+}
+
+module OrdinaryRearApertures(){
+  // rear speaker
+  OrdinaryRearAperture(1,1, rearspeaker_pos_bl)
     rectfromto(-rearspeaker_gap,
 	       rearspeaker_size + rearspeaker_gap);
 }
@@ -416,7 +422,7 @@ module Case(){ ////toplevel
     CaseBase_rhsflip([1])
       CaseAperture(noisecancelmic_pos, noisecancelmic_dia, 20);
 
-    RearSpeakerAperture();
+    OrdinaryRearApertures();
   }
 }
 
@@ -488,9 +494,9 @@ module TestSelectCamera(){
   }
 }
 
-module TestSelectRearSpeaker(){
+module TestSelectOrdinaryRearApertures(){
   TestSelectRearAperture()
-    RearSpeakerAperture();
+    OrdinaryRearApertures();
 }
 
 module TestCamera(){ ////toplevel
@@ -550,7 +556,7 @@ module TestFrameCase(){ ////toplevel
     union(){
       TestSelectFrame();
       TestSelectCamera();
-      TestSelectRearSpeaker();
+      TestSelectOrdinaryRearApertures();
     }
   }
 }