filamenttrestle remove demo

[reprap-play.git] / filamenttrestle.scad

diff --git a/filamenttrestle.scad b/filamenttrestle.scad
index 62b6994998e116fc053b070d3e6a389587689b41..54bf0c745d9ec443fdc373dacbbe514341caf3c8 100644 (file)
--- a/filamenttrestle.scad
+++ b/filamenttrestle.scad
@@ -10,7 +10,7 @@ include <axlepin.scad>
 spoolradclear = 10;
 spoolradslop = 2;
 
-spoolinnerslop = 2;
+spoolinnerslop = 4.5;
 axleslop = 0.5;
 
 axlerad = 7;
@@ -20,7 +20,7 @@ hubbasethick = 6;
 hubmainthick = 20;
 hubbaseweb = 2;
 hubbasestalkwidth = 6;
-hubwalls = 3;
+hubwalls = 2.5;
 hubpillarw = 4;
 hubbaserad = spoolinnerrad + 15;
 hubmainrad = spoolinnerrad - spoolradslop;
@@ -46,7 +46,7 @@ pindh = 0.50;
 pindwidth = 0.75;
 
 pintaperlen = plugwmax * 0.85;
-pinstraightlen = 10;
+pinstraightlen = 17.5;
 
 spoolouterpad = AxlePin_holerad()*2 * 1.5;
 spoolbarlen = spoolwidth +
@@ -159,7 +159,7 @@ module Trestle(){ ////toplevel
            rotate([-90,0,0]) %Pin();
          translate([-(topblockw+1), 0, 0]) {
            rotate([0,90,0]) {
-             linear_extrude(height = topblockw*1.0+2) {
+             linear_extrude(height = topblockw*2.0+2) {
                polygon([[-1.0 * pinholebasew, -0.01],
                         [-0.5 * pinholebasew, pinholeh],
                         [ 0                 , -0.01]]);
@@ -228,16 +228,18 @@ module HubEnd(){ ////toplevel
 
 
 module TestKit(){ ////toplevel
-  translate([30,0,0]) Pin();
-  translate([30,30,0]) Pin();
+  translate([60,0,0]) mirror([1,0,0]) Pin();
+  translate([60,15,0]) mirror([1,0,0]) Pin();
   translate([0,40,0]) intersection(){
     Trestle();
     translate([-50,-10,-1]) cube([100,100,100]);
   }
   intersection(){
-    translate([-60,0,0]) Bar();
+    translate([-60,10,0]) Bar();
     cube(50,center=true);
   }
+  translate([50,40, AxlePin_zoffset()]) FtAxlePin();
+  translate([0,-20,0]) AxleWasher();
 }
 
 module DemoSpool(){
@@ -249,13 +251,19 @@ module DemoSpool(){
 }
 
 module Demo(){
-  Bar();
+  color("blue") Bar();
   for (mir=[0,1]) {
     mirror([mir,0,0]) {
-      translate([spoolbarlen/2,0,0]) rotate([90,0,90]) Trestle();
-      translate([spoolwidth/2 + hubbasethick + spoolinnerslop/4, 0, barz])
+      color("red") translate([spoolbarlen/2,0,0])
+       rotate([90,0,90]) Trestle();
+      color("orange")
+       translate([spoolwidth/2 + hubbasethick + spoolinnerslop*2/3, 0, barz])
        rotate([0,90,0]) AxleWasher();
-      translate([axlepin_x, 0, barz]) rotate([90,0,90]) FtAxlePin();
+      color("orange") translate([axlepin_x, 0, barz])
+       rotate([90,0,90]) FtAxlePin();
+      color("cyan")
+       translate([spoolwidth/2 + hubbasethick + spoolinnerslop*1/3, 0, barz])
+       rotate([0,-90,0]) HubEnd();
     }
   }
   %translate([0,0,barz]) DemoSpool();
@@ -269,5 +277,5 @@ module Demo(){
 //TestKit();
 //Plug(d=1);
 //ExtenderPillars(80,12,8, baseweb=true);
-HubEnd();
+//HubEnd();
 //Demo();