poster-tube-lid: tidy

[reprap-play.git] / poster-tube-lid.scad

diff --git a/poster-tube-lid.scad b/poster-tube-lid.scad
index 592f29e598d0339a91bf30fde6de89ac7022835b..d8ca09cbf3b9ecfd710c4331f52b22a3ce13cb6a 100644 (file)
--- a/poster-tube-lid.scad
+++ b/poster-tube-lid.scad
@@ -95,17 +95,16 @@ sm_closure_cnr = 3.0;
 
 wm_thick = 5;
 wm_screw_dia = 4.5; // Timco wood screw 40mm, use brown plug
-wm_screwdriver_dia = 8.0; // XXX
-wm_screw_around = 4.0;
+wm_screw_around = 5.0;
 wm_screw_slot = 3.5;
 wm_screw_head = 8.0;
 
 wmb_screw_dia = 5;
-wmb_screw_head_dia = 10; // XXX
+wmb_screw_head_dia = 8.7 + 0.5;
 wmb_screw_around_x = 4; // XXX
 wmb_screw_around_z = 6; // XXX
 wmb_screw_depth_min = 10;
-web_screw_len = 15 + 1; // XXX
+web_screw_len = 15 + 1;
 wmb_nut_across = 8; // XXX
 wmb_nut_around_min = 2; // XXX
 wmb_nut_behind_min = 5;
@@ -184,13 +183,15 @@ sm_inner_rad = (sm_inner_circum + sm_bolt_tighten_allow/2) / TAU;
 sm_outer_rad = sm_inner_rad + sm_main_thick;
 
 wm_main_width = sm_main_width;
+wm_screwdriver_dia = wm_screw_head;
 wm_y_min = sqrt( pow(sm_inner_rad, 2) -
                 pow(sm_inner_rad - (wm_thick - sm_main_thick), 2) );
 wm_y_screw = wm_y_min + wm_screw_around + wm_screw_dia/2;
 wm_y_max = wm_y_screw + wm_screw_dia/2 + wm_screw_around;
+wm_lhs_y_min = -wm_y_max;
 wm_y_slotc_screw = wm_y_screw + wm_screw_slot/2;
 wm_y_slot1_screw = wm_y_screw + wm_screw_slot;
-wm_y_slot1_max = wm_y_max + wm_screw_slot;
+wm_y_slot1_max = wm_y_max + wm_screw_slot/2;
 wm_z_slot0_screw = wm_main_width + wm_screwdriver_dia/2;
 wm_z_slotc_screw = wm_z_slot0_screw + wm_screw_slot/2;
 wm_z_slot1_screw = wm_z_slot0_screw + wm_screw_slot;
@@ -222,7 +223,10 @@ wmb_z_screw = max(
                  wmb_nut_around_min + wmb_nut_rad
                  );
 wmb_z_max = wmb_z_screw * 2;
-wmbb_y_max = wmb_y_mount_max + wmb_mount_gap_xy + wmb_mount_wall;
+wmbb_y_max = max(
+                wmb_y_mount_max + wmb_mount_gap_xy + wmb_mount_wall,
+                wmb_y_screw_end + web_screw_len
+                );
 wmbb_x_outer = wmb_x_outer + (wmb_mount_gap_xy + wmb_mount_wall);
 wmbb_z_flat_max = -wmb_bottom_gap;
 wmbb_z_flat_whole_min = wmbb_z_flat_max - wmb_bottom_th_min;
@@ -684,12 +688,12 @@ module WallScrewHoleSlot(){ ////toplevel
 module WallMountMounts(){
   linextr(0, wm_z_max){
     translate([ -sm_outer_rad, 0 ])
-      rectfromto([ 0, -wm_y_max ],
+      rectfromto([ 0,        wm_lhs_y_min ],
                 [ wm_thick, wm_y_slot1_max ]);
   }
 }
 module WallMountScrewHoles(){
-  translate([ -sm_outer_rad + wm_thick, 0, wm_z_slotc_screw]) {
+  translate([ -sm_outer_rad + wm_thick, 0, wm_z_slotc_screw ]) {
     translate([ 0, wm_y_slotc_screw, 0 ])
       WallScrewHoleSlot();
     translate([ 0, -wm_y_slotc_screw, 0 ])
@@ -725,17 +729,17 @@ module WallMountBaseScrewsEtc(){ ////toplevel
     mirror([0, my, 0]) {
       translate([wmb_x_screw, 0, wmb_z_screw]) {
        linextr_y_xz(wmb_y_screw_end,
-                    wmb_y_screw_end + 100) // XXX change 100
+                    wmb_y_screw_end + 50)
          circle(r = wmb_screw_dia/2);
        linextr_y_xz(wmb_y_screw_end + web_screw_len,
-                    wmb_y_screw_end + 100) // XXX change 100
+                    wmb_y_screw_end + 50)
          circle(r = wmb_screw_head_dia/2);
        linextr_y_xz(wmb_y_nut_min,
                     wmb_y_nut_min + wmb_nut_th) {
          hull(){
            rotate(30)
              circle(r = wmb_nut_rad, $fn = 6);
-           translate([0, 100]) // XXX change 100
+           translate([0, 50])
              square(wmb_nut_across, center=true);
          }
        }