scaffold-clamp: Remove redundant "Part" in names

[reprap-play.git] / scaffold-clamp-common.scad

diff --git a/scaffold-clamp-common.scad b/scaffold-clamp-common.scad
index 60d603aba749ff93e7ece5124b6c9ea8527febc6..d2640b6a9a08ef3e8b75c0467896634de7a9da05 100644 (file)
--- a/scaffold-clamp-common.scad
+++ b/scaffold-clamp-common.scad
@@ -10,7 +10,7 @@ pin_gap = 1.5; // around
 
 smooth_r = 15;
 
-bolt_dia = 5 + 0.75;
+bolt_dia = 5;
 bolt_flat = 10 + 1;
 
 nbolts = 2;
@@ -22,6 +22,8 @@ hinge_z_gap = 1;
 
 hinge_units = 4;
 
+bolt_gap = 1.0; // total, on both sides
+
 // ---------- vhook ----------
 
 vhook_th = 14;
@@ -37,12 +39,14 @@ hhook_l = 40;
 pin_head_th = th/2;
 pin_dia = th;
 pin_hole_dia = pin_dia/2;
-pin_tail = pin_hole_dia + pin_head_th*3;
+pin_tail = pin_hole_dia + pin_head_th + hinge_z_gap*3;
 
 // ========== calculated ==========
 
 hole_dia = th + pin_gap;
 
+bolt_hole_r = (bolt_dia + bolt_gap)/2;
+
 main_r = tube_dia/2 + th;
 
 hinge_gap = pin_gap;
@@ -51,7 +55,7 @@ hinge_o_r = 0.5 * hole_dia + th;
 
 hinge_x = -0.5 * tube_dia - hinge_o_r;
 bolt_x = 0.5 * tube_dia + th + bolt_flat * 0.5;
-max_x = bolt_x + max(0.5 + bolt_dia + th, 0.5 * bolt_flat/2);
+max_x = bolt_x + max(bolt_hole_r + th, 0.5 * bolt_flat/2);
 
 flats_y = open_gap/2 + th;
 
@@ -163,7 +167,7 @@ module HalfClampX(flatten=false){
       translate([ bolt_x, 0, min_z + (j + 0.5) * bolt_stride ]) {
        translate([0, -tube_dia/2, 0])
          rotate([-90,0,0])
-         cylinder(r= bolt_dia/2, h= tube_dia);
+         cylinder(r= bolt_hole_r, h= tube_dia);
        translate([0, -flats_y, 0])
          rotate([90,0,0])
          cylinder(r= bolt_flat/2, h= tube_dia/2);
@@ -191,7 +195,7 @@ module VHookHookMain(outer=false){ ////toplevel
     }
 }
 
-module VHookPartA(){ ////toplevel
+module VHookA(){ ////toplevel
   DummyA();
 
   translate([0, vhook_ctr, 0]){
@@ -252,7 +256,7 @@ module HHookHookPlan(){
   }
 }
 
-module HHookPartA(){ ////toplevel
+module HHookA(){ ////toplevel
   DummyA();
   linextr(min_z, max_z) {
     HHookHookPlan();
@@ -272,7 +276,7 @@ module PinSitu(){ ////toplevel
       translate([0,0, -pin_head_th])
        cylinder(r= pin_dia/2, h = total_z + pin_head_th + pin_tail);
       mirror([0,0,1])
-       cylinder(r= hinge_o_r, h = pin_head_th);
+       cylinder(r= hinge_o_r - pin_gap, h = pin_head_th);
     }
     translate([0,0, total_z + pin_tail/2])
       rotate([0,90,0])
@@ -284,7 +288,7 @@ module PinSitu(){ ////toplevel
 }
 
 module Pin(){ ////toplevel
-  rotate([0,0,0]) {
+  rotate([0,90,0]) {
     PinSitu();
   }
 }
@@ -316,9 +320,13 @@ module PlanDemo(){ ////toplevel
 //  translate([max_x - hinge_x + 20, 0]) color("blue") MainPlanA();
 }
 
+module DemoA(){ DummyA(); }
+
 module Demo(){ ////toplevel
   color("red") rotate([180,0,0]) GeneralB();
-  color("blue") DummyA();
+  color("blue") DemoA();
+  color("orange") translate([hinge_x, 0, min_z - hinge_z_gap])
+    rotate([0,0,180]) PinSitu();
 }
 
 //PlanDemo();