poster-tube-lid: WallMountForBase looking good

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

diff --git a/poster-tube-lid.scad b/poster-tube-lid.scad
index d887c9bca5a52a161f388771bf95f45b44c38626..ea1828156dbf77720489afe9d43b3426b667dee2 100644 (file)
--- a/poster-tube-lid.scad
+++ b/poster-tube-lid.scad
@@ -179,10 +179,12 @@ wm_z_max = wm_z_slot1_screw + wm_screw_around;
 
 wmb_mount_cut_rad = sm_outer_rad + wmb_ring_gap;
 wmb_nut_rad = wmb_nut_across / cos(30) * 0.5;
-wmb_x_screw = -sm_outer_rad + max(
-                                 wmb_screw_around_x + wmb_screw_dia/2,
-                                 wmb_nut_around_min + wmb_nut_across/2
-                                 );
+wmb_x_screw_plus_around_r = max(
+                               wmb_screw_around_x + wmb_screw_dia/2,
+                               wmb_nut_around_min + wmb_nut_across/2
+                               );
+wmb_x_screw = -sm_outer_rad + wmb_x_screw_plus_around_r;
+wmb_x_outer = -sm_outer_rad + wmb_x_screw_plus_around_r * 2;
 function wmb_screw_thing_y_min(dia) = sqrt(
                       pow(wmb_mount_cut_rad, 2) -
                       pow(wmb_x_screw + dia/2, 2)
@@ -678,14 +680,14 @@ module WallMountBaseMounts(){
   linextr(0, wmb_z_max) {
     difference(){
       rectfromto([ -sm_outer_rad,            -wmb_y_mount_max ],
-                [ -sm_outer_rad + wm_thick, +wmb_y_mount_max ]);
+                [ wmb_x_outer, +wmb_y_mount_max ]);
       circle(r = wmb_mount_cut_rad);
     }
   }
 }
 
 // screws, nuts, slots for nuts to go down into
-module WallMountBaseScrewsEtc(){
+module WallMountBaseScrewsEtc(){ ////toplevel
   for (my=[0,1]) {
     mirror([0, my, 0]) {
       translate([wmb_x_screw, 0, wmb_z_screw]) {
@@ -729,7 +731,7 @@ module WallMountForBase(){ ////toplevel
     }
     union(){
       WallMountScrewHoles();
-      %WallMountBaseScrewsEtc();
+      WallMountBaseScrewsEtc();
     }
   }
 }