summaryrefslogtreecommitdiffabout
Unidiff
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--fanduct.scad7
1 files changed, 4 insertions, 3 deletions
diff --git a/fanduct.scad b/fanduct.scad
index 746f753..fa14b7a 100644
--- a/fanduct.scad
+++ b/fanduct.scad
@@ -40,51 +40,52 @@ module fanduct(type=type,ductshape=ductshape) {
40 // ***duct is all around! 40 // ***duct is all around!
41 module duct(what) { 41 module duct(what) {
42 if(what=="in") { 42 if(what=="in") {
43 sh = fanduct_w+2*fanduct_shell; sv = fanduct_h+2*fanduct_shell; 43 sh = fanduct_w+2*fanduct_shell; sv = fanduct_h+2*fanduct_shell;
44 smax = max(sh,sv); 44 smax = max(sh,sv);
45 rotate_extrude($fn=smooth_f) 45 rotate_extrude($fn=smooth_f)
46 if(ductshape=="round") 46 if(ductshape=="round")
47 translate([sh/2+fanduct_ir,sv/2]) 47 translate([sh/2+fanduct_ir,sv/2])
48 scale([sh/smax,sv/smax]) 48 scale([sh/smax,sv/smax])
49 circle(d=smax,$fn=4*smax); 49 circle(d=smax,$fn=4*smax);
50 else if(ductshape=="square") 50 else if(ductshape=="square")
51 translate([fanduct_ir,0]) 51 translate([fanduct_ir,0])
52 square([sh,sv]); 52 square([sh,sv]);
53 }else if(what=="out") { 53 }else if(what=="out") {
54 sh = fanduct_w; sv = fanduct_h; 54 sh = fanduct_w; sv = fanduct_h;
55 smax = max(sh,sv); 55 smax = max(sh,sv);
56 rotate_extrude($fn=smooth_f) 56 rotate_extrude($fn=smooth_f)
57 if(ductshape=="round") 57 if(ductshape=="round")
58 translate([sh/2+fanduct_shell+fanduct_ir,sv/2+fanduct_shell]) 58 translate([sh/2+fanduct_shell+fanduct_ir,sv/2+fanduct_shell])
59 scale([sh/smax,sv/smax]) 59 scale([sh/smax,sv/smax])
60 circle(d=smax,$fn=4*smax); 60 circle(d=smax,$fn=4*smax);
61 else if(ductshape=="square") 61 else if(ductshape=="square")
62 translate([fanduct_ir+fanduct_shell,fanduct_shell]) 62 translate([fanduct_ir+fanduct_shell,fanduct_shell])
63 union() { 63 union() {
64 square([fanduct_w,fanduct_h/2]); 64 square([sh,sv/2]);
65 translate([fanduct_w/2,fanduct_h-fanduct_w/2]) 65 translate([sh/2,sv/2])
66 rotate([0,0,90]) circle(d=fanduct_w,$fn=36); 66 scale([sh/smax,sv/smax])
67 circle(d=smax,$fn=36);
67 } 68 }
68 } 69 }
69 } 70 }
70 71
71 // ***bumps for easier position adjustments in line with hotend 72 // ***bumps for easier position adjustments in line with hotend
72 module marks(what) { 73 module marks(what) {
73 if(what=="in") { 74 if(what=="in") {
74 for(y=[-1,1]) 75 for(y=[-1,1])
75 hull() for(z=[0,-fanduct_shell-fanduct_h/2]) 76 hull() for(z=[0,-fanduct_shell-fanduct_h/2])
76 translate([0,y*(fanduct_ir+fanduct_shell+fanduct_w/2),fanduct_shell*2+fanduct_h+z]) 77 translate([0,y*(fanduct_ir+fanduct_shell+fanduct_w/2),fanduct_shell*2+fanduct_h+z])
77 rotate([90,0,0]) { 78 rotate([90,0,0]) {
78 cylinder(r=fanduct_shell,h=fanduct_w,center=true,$fn=30); 79 cylinder(r=fanduct_shell,h=fanduct_w,center=true,$fn=30);
79 for(z=[-1,1]) translate([0,0,z*fanduct_w/2]) 80 for(z=[-1,1]) translate([0,0,z*fanduct_w/2])
80 sphere(r=fanduct_shell,$fn=30); 81 sphere(r=fanduct_shell,$fn=30);
81 } 82 }
82 } 83 }
83 } 84 }
84 85
85 // ***output 86 // ***output
86 module output(what,type=type) { 87 module output(what,type=type) {
87 module guideline(xyxy) { 88 module guideline(xyxy) {
88 module pin(xy) { 89 module pin(xy) {
89 translate([xy[0],xy[1],0]) 90 translate([xy[0],xy[1],0])
90 cylinder(d=2*extrusion_width,h=2*fanduct_shell+inlet_h,$fn=6); 91 cylinder(d=2*extrusion_width,h=2*fanduct_shell+inlet_h,$fn=6);