sewing-table: increase screw dia

[reprap-play.git] / sewing-table.scad.m4

diff --git a/sewing-table.scad.m4 b/sewing-table.scad.m4
index 399c9ed01c5195c2e80db6e6c9ea8650e8bf9c7d..172e875359c7414ca0084ca3c6ecc7390b322293 100644 (file)
--- a/sewing-table.scad.m4
+++ b/sewing-table.scad.m4
@@ -14,7 +14,7 @@ post_dia = 8;
 
 post_shorter = 1;
 
-screw_dia = 2.2;
+screw_dia = 2.64;
 screw_big_dia = 3.6;
 screw_big_len = 4.0;
 
@@ -30,18 +30,27 @@ interlock_fine_lenslop = 1.0;
 
 demo_slop = 0.1;
 
-leg_height = 50;
+leg_height = 53.75 - 0.95;
 
 leg_hole_dia = 5 + 0.75;
 leg_big_dia = 37;
 leg_bot_dia = 15;
-leg_top_flat_z = 5;
+leg_top_flat_z = 2;
+leg_top_thick = 8;
 
-leg_fin_top_w = 5;
+leg_midspc_dia = 20;
+leg_bot_thick = 8;
+leg_bot_mid_dia = 12;
+
+leg_fin_top_w = 3;
 leg_fin_bot_w = 5;
 leg_fin_bot_rad = 30;
 leg_fin_bot_flat_z = 5;
 
+leg_n_fins = 4;
+leg_n_tubules = 4;
+leg_tubule_dia = 4;
+
 // cutout
 
 machine_rear_to_front = 84 + 0.25 - 1.4;
@@ -130,6 +139,8 @@ interlock_sq_adj = 0.2; // arbitrary
 leg_fin_top_rad = sqrt( pow(leg_big_dia/2,2) -
                        pow(leg_fin_top_w/2,2) );
 
+leg_tubule_pos_rad = leg_big_dia/2 * 0.6;
+
 m4_define(`POST_TCROSSSZ',
           `2*( tile_hard_edge_hole_dist - test_edge + 1 )')
 
@@ -472,6 +483,21 @@ module TestDemo(){ ////toplevel
     TestPiece2();
 }
 
+module PostTestPiece(){ ////toplevel
+  holes = [ [   0, 0] ];
+  holes_forcnrs = concat(holes, [ [1, 0] ]);
+  corners = TestPiece_holes2corners(holes_forcnrs);
+  difference(){
+    union(){
+      TileBase(corners[0], corners[2]);
+      Posts(holes);
+      RoundEdge(corners[0], corners[1]);
+      InterlockEdge(corners[3], corners[0], 0, nlobes=1);
+    }
+    PostHoles(holes);
+  }
+}
+
 module Machine_NewRearProfile(){
   // figures copied out of xfig edit boxes
   // best not to edit the posbox size if poss - just move it
@@ -687,11 +713,14 @@ module Leg(){ ////toplevel
     union(){
       hull(){
        mirror([0,0,1])
-         cylinder(r= leg_big_dia/2, height=leg_top_flat_z, $fn=100);
-       translate([0,0, -leg_height])
+         cylinder(r= leg_big_dia/2, h=leg_top_flat_z, $fn=100);
+       translate([0,0, -leg_top_thick])
          cylinder(r= leg_bot_dia/2, height=1, $fn=100);
       }
-      for (rot=[0:90:270]) rotate(rot) {
+      if (!TEST)
+       translate([0,0,-leg_height])
+         cylinder(r= leg_bot_mid_dia/2, h=leg_bot_thick);
+      for (rot=[0: 360/leg_n_fins : 359]) rotate(rot) {
          hull(){
            mirror([0,0,1]) translate([0, -leg_fin_top_w/2, 0])
              cube([ leg_fin_top_rad - 0.1,
@@ -706,7 +735,25 @@ module Leg(){ ////toplevel
        }
     }
     mirror([0,0,1]) translate([0,0,-1])
-      cylinder(r= leg_hole_dia/2, h=leg_height+2, $fn=30);
+      cylinder(r= leg_hole_dia/2,
+              h= (!TEST ? leg_height+2 : leg_height/2),
+              $fn=30);
+    mirror([0,0,1]) translate([0,0,leg_top_thick - 0.1])
+      hull(){
+        cylinder(r= (!TEST ? leg_midspc_dia/2 : 0.1),
+                h= leg_height - leg_top_thick - leg_bot_thick + 0.2,
+                $fn=30);
+       if (TEST)
+         cylinder(r= leg_midspc_dia/2,
+                  h= leg_height - leg_top_thick - leg_bot_thick
+                     + (!TEST ? 0.2 : -leg_midspc_dia/2),
+                  $fn=30);
+      }
+    if (!TEST)
+      for (rot=[45: 360/leg_n_tubules : 359]) rotate(rot) {
+         mirror([0,0,1]) translate([ leg_tubule_pos_rad, 0, -1])
+           cylinder(r= leg_tubule_dia/2, h=leg_height+2, $fn=20);
+       }
   }
 }