X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=reprap-play.git;a=blobdiff_plain;f=trackpump-mutlihead-clip.scad;h=c5108fd39cb5fc88e0f7fc1d64fed5f4a69fa375;hp=265f2ba54473acb22e2273cfe5caeb1aec6cf1a9;hb=4f66d0f9315a053ba0a36b21c1e9f04a9f0c4e7a;hpb=1c70ad66addcd93770fcb692f208216e66d5ddde

diff --git a/trackpump-mutlihead-clip.scad b/trackpump-mutlihead-clip.scad
index 265f2ba..c5108fd 100644
--- a/trackpump-mutlihead-clip.scad
+++ b/trackpump-mutlihead-clip.scad
@@ -1,10 +1,12 @@
 // -*- C -*-
 
+include <commitid.scad>
+
 pump_main_dia = 38;
 pump_side_width = 5;
-pump_side_thick = 5;
+pump_side_thick = 4;
 pump_shaft_dia = 14;
-baseplate = 4;
+baseplate = 3;
 
 pump_protr_flat = 3;
 pump_protr_slope = 0.9;
@@ -14,9 +16,8 @@ hose_aperture = 11;
 hose_side_width = 5;
 hose_base_offset = 30;
 
-hose_head_dia = 28;
-hose_side_thick = 5;
-hose_head_width = 22;
+hose_side_thick = 6;
+hose_side_stalk_width = 6;
 
 pump_protr_protr = 3;
 pump_side_height = 20;
@@ -26,18 +27,25 @@ pump_protr_slheight = pump_protr_protr / pump_protr_slope;
 
 pump_side_outer_rad = pump_side_width + pump_main_dia/2;
 
+baseplate_width_rad =
+  sqrt( pow(pump_side_outer_rad, 2)
+	-pow( pump_main_dia/2 - pump_protr_protr, 2) );
+
+xm = baseplate + pump_main_dia/2;
+
+pump_side_total_height =
+  pump_side_thick + pump_side_height + pump_protr_slheight + pump_protr_flat;
+
 $fa=5;
 
 module PumpSidePlan() {
-  xm = baseplate + pump_main_dia/2;
   or = pump_side_outer_rad;
   difference(){
     union(){
       intersection(){
 	translate([-xm, 0]) circle(r=or);
-	translate([-(xm+or), -or]) square([xm+or, or*2]);
+//	translate([-(xm+or), -or]) square([xm+or, or*2]);
       }
-      translate([-xm, -or]) square([xm, or*2]);
     }
     translate([-xm-or, 0])
       square(center=true, [pump_side_width*4, pump_shaft_dia]);
@@ -50,6 +58,7 @@ module PumpSideElevation(){
   x1 = x2 - pump_main_dia;
   x0 = x1 - pump_side_width;
   x2a = x2 - pump_protr_protr;
+  x4 = x2 + pump_side_width;
 
   z0 = 0;
   z1 = z0 - pump_side_thick;
@@ -67,66 +76,68 @@ module PumpSideElevation(){
     translate([x1,z2]) scale([1,arcy/arcx]) circle(r=arcx);
   }
 
-  translate([x2,z2a]) square([x3-x2, z0-z2a]);
+  translate([x2,z2a]) square([x4-x2, z0-z2a]);
 
   hull(){
-    translate([x2,z2a]) square([x3-x2, z2-z2a]);
+    translate([x2,z2a]) square([x4-x2, z2-z2a]);
     translate([x2a,z2b]) square([x3-x2a, z2a-z2b]);
   }
 }
 
 module PumpSide(){
+  br = baseplate_width_rad;
+  brs = hose_side_stalk_width/2;
+  echo(brs);
+
   difference(){
     intersection(){
       translate([0,100,0])
 	rotate([90,0,0])
-	linear_extrude(height=200)
-      PumpSideElevation();
-      translate([0,0,-100])
-	linear_extrude(height=200)
-	PumpSidePlan();
+	linear_extrude(height=200, convexity=10)
+	PumpSideElevation();
+      union(){
+	translate([0,0,-100])
+	  linear_extrude(height=200, convexity=10)
+	  PumpSidePlan();
+	// baseplate
+	hull(){
+	  mirror([0,0,1])
+	    translate([-xm, -brs, 0])
+	    cube([pump_main_dia/2 + pump_side_width,
+		  brs*2,
+		  1]);
+	  translate([-xm, -br, -pump_side_total_height])
+	    cube([xm,
+		  br*2,
+		  pump_protr_flat]);
+	}
+      }
     }
     translate([-(baseplate + pump_main_dia/2), 0,
 		-(pump_side_thick + pump_side_height)])
       cylinder(r=pump_main_dia/2, h=200);
   }
-}
-
-module HoseSideElevation(){
-  or = hose_head_dia/2 + hose_side_thick;
-
-  x3 = 0;
-  x4 = x3 + hose_base_offset;
-  x5 = x4 + hose_head_dia/2;
-  x6 = x4 + hose_head_dia;
-  x7 = x5 + or;
-
-  z0 = 0;
-  zm = -or;
-
-  difference(){
-    intersection(){
-      translate([-100,-100]) square([x7+210, 100]);
-      hull(){
-	translate([x5, 0]) circle(r=or);
-	translate([-1, zm]) square([1,z0-zm]);
-      }
-    }
-    translate([x5,0]) circle(r=hose_head_dia/2);
-  }
+  rotate([0,0,180])
+    mirror([0,0,1])
+    translate([-0,
+	       -br,
+	       pump_side_total_height])
+    Commitid_BestCount_M([baseplate + pump_protr_protr,
+			  br*2]);
 }
 
 module HoseSidePlan(){
   ro = hose_inner_dia/2 + hose_side_width;
   ri = (hose_inner_dia/2);
+  st = hose_side_stalk_width/2;
 
   apx = sqrt( ri*ri - (hose_aperture*hose_aperture)/4 );
-  apsq = hose_base_offset + apx - hose_aperture/sqrt(2);
-  echo(apsq);
+  apsq = hose_base_offset + apx - hose_aperture/2;
+  echo(apx,apsq);
 
   difference(){
-    hull(){
-      translate([-1, -ro]) square([1, ro*2]);
+    union(){
+      translate([-1, -st]) square([hose_base_offset+1, st*2]);
       translate([hose_base_offset, 0]) circle(r= ro);
     }
     translate([hose_base_offset, 0]) circle(r= hose_inner_dia/2);
@@ -135,17 +146,14 @@ module HoseSidePlan(){
       square([50,50]);
   }
 
-  %square(center=true, [100, hose_aperture]);
+  //%translate([hose_base_offset + apx, 0]) square([50,50]);
+  //%square(center=true, [100, hose_aperture]);
 }
 
 module HoseSide(){
-  for (m=[0,1]) {
-    mirror([0,m,0])
-      translate([0, hose_head_width, 0])
-      rotate([90,0,0])
-      linear_extrude(height= hose_side_width)
-      HoseSideElevation();
-  }
+  mirror([0,0,1])
+    linear_extrude(height=hose_side_thick, convexity=10)
+    HoseSidePlan();
 }
 
 module Clip(){
@@ -160,8 +168,7 @@ module ClipPrint(){
 
 //PumpSidePlan();
 //PumpSideElevation();
-linear_extrude(height=1) HoseSidePlan();
 //PumpSide();
 //HoseSide();
 //Clip();
-//ClipPrint();
+ClipPrint();