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=90141af7733792a138376a0fac23d211c886ad11;hb=357c231defc0f31fa89e12a71a6ea1c3f7d217c2;hpb=de2130137c65858021d8c1328de87037208930ed

diff --git a/trackpump-mutlihead-clip.scad b/trackpump-mutlihead-clip.scad
index 90141af..c5108fd 100644
--- a/trackpump-mutlihead-clip.scad
+++ b/trackpump-mutlihead-clip.scad
@@ -1,5 +1,7 @@
 // -*- C -*-
 
+include <commitid.scad>
+
 pump_main_dia = 38;
 pump_side_width = 5;
 pump_side_thick = 4;
@@ -42,7 +44,7 @@ module PumpSidePlan() {
     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, 0])
@@ -56,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;
@@ -73,39 +76,54 @@ 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)
+	linear_extrude(height=200, convexity=10)
 	PumpSideElevation();
       union(){
 	translate([0,0,-100])
-	  linear_extrude(height=200)
+	  linear_extrude(height=200, convexity=10)
 	  PumpSidePlan();
 	// baseplate
-	mirror([0,0,1])
-	  translate([-xm, -br, 0])
-	  cube([xm,
-		br*2,
-		pump_side_total_height]);
+	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);
   }
+  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(){
@@ -134,7 +152,7 @@ module HoseSidePlan(){
 
 module HoseSide(){
   mirror([0,0,1])
-    linear_extrude(height=hose_side_thick)
+    linear_extrude(height=hose_side_thick, convexity=10)
     HoseSidePlan();
 }
 
@@ -149,6 +167,7 @@ module ClipPrint(){
 }
 
 //PumpSidePlan();
+//PumpSideElevation();
 //PumpSide();
 //HoseSide();
 //Clip();