scaffold-clamp-cleat: sort out toplevels

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

diff --git a/fairphone-battery-case.scad b/fairphone-battery-case.scad
index 03eb0fb9b4d9b952342330271a647b345fb5fb76..557271d3e98d329d9982c19b574658fe7599ada0 100644 (file)
--- a/fairphone-battery-case.scad
+++ b/fairphone-battery-case.scad
@@ -1,5 +1,7 @@
 // -*- C -*-
 
+include <utils.scad>
+
 mainwall_th = 3.0;
 smallwall_th = 2.0;
 
@@ -22,12 +24,12 @@ handle_height = 3.5;
 handle_inward = 10;
 handle_len = 5;
 
-pushhole_ell_sz = 3.75;
+pushhole_ell_sz = 4.75;
 pushhole_ell_th = 1.75;
-pushhole_circle_dia = 2.5;
+pushhole_circle_dia = 4.0;
 
 // for testing:
-battery_len = 3;
+//battery_len = 3;
 //battery_wdth = 15;
 //battery_base_indent_fromside_inside = 6;
 
@@ -118,7 +120,7 @@ module ExtrudePlan(from,to){
   rotate([0,-90,0])
   for (mj=[0,1]) {
     mirror([0,0,mj]) translate([0,0,from]){
-      linear_extrude(height= to-from){
+      linear_extrude(height= to-from, convexity=5){
        for (mi=[0,1]) {
          mirror([0,mi])
            translate([0, battery_th/2])
@@ -130,13 +132,14 @@ module ExtrudePlan(from,to){
 }
 
 module PushHolePlan(){ ////toplevel
-  translate(-pushhole_ell_th * 0.5 * [1,1]) {
+  translate(-(pushhole_ell_th * 0.10 +
+             pushhole_ell_sz * 0.10) * [1,1]) {
     for (r=[0,90])
       rotate(r)
        translate(-pushhole_ell_th * 0.5 * [1,1])
        square([ pushhole_ell_sz, pushhole_ell_th ]);
-    circle(pushhole_circle_dia/2, $fn=20);
   }
+  circle(pushhole_circle_dia/2, $fn=40);
 }
 
 module PlanDemo(){ ////toplevel
@@ -146,7 +149,10 @@ module PlanDemo(){ ////toplevel
 }
 
 module Base(){ ////toplevel
-  ExtrudePlan(0,s1) BaseHalfPlan();
+  difference(){
+    ExtrudePlan(0,s1) BaseHalfPlan();
+    linextr(-(10+battery_len), battery_len+10, convexity=5) PushHolePlan();
+  }
   difference(){
     union(){
       ExtrudePlan(s0i, s1) SideHalfPlan();