toroidal duct

1 files changed, 10 insertions, 8 deletions

diff --git a/fanduct.scad b/fanduct.scad
index a843023..41048bf 100644
--- a/fanduct.scad
+++ b/fanduct.scad
@@ -25,35 +25,37 @@ hotend_clearance = 12;
         snapper_d = 8; snapper_overlap=0.2;// snip snap
 
 smooth_f = 120;
 
 type="3jets"; // "3jets" ; // circular|3jets
 
 
 module fanduct(type=type) {
 
          //     ***duct is all around!
  module duct(what) {
   if(what=="in") {
+   sh = fanduct_w+2*fanduct_shell; sv = fanduct_h+2*fanduct_shell;
+   smax = max(sh,sv);
    rotate_extrude($fn=smooth_f)
-   translate([fanduct_ir,0])
-   square([fanduct_w+2*fanduct_shell,fanduct_h+2*fanduct_shell]);
+   translate([sh/2+fanduct_ir,sv/2])
+   scale([sh/smax,sv/smax])
+   circle(d=smax,$fn=4*smax);
   }else if(what=="out") {
+   sh = fanduct_w; sv = fanduct_h;
+   smax = max(sh,sv);
    rotate_extrude($fn=smooth_f)
-   translate([fanduct_ir+fanduct_shell,fanduct_shell])
-   union() {
-    square([fanduct_w,fanduct_h/2]);
-    translate([fanduct_w/2,fanduct_h-fanduct_w/2])
-    rotate([0,0,90]) circle(d=fanduct_w,$fn=36);
-   } 
+   translate([sh/2+fanduct_shell+fanduct_ir,sv/2+fanduct_shell])
+   scale([sh/smax,sv/smax])
+   circle(d=smax,$fn=4*smax);
   }
  }
 
          //     ***bumps for easier position adjustments in line with hotend
  module marks(what) {
   if(what=="in") {
    for(y=[-1,1])
     hull() for(z=[0,-fanduct_shell-fanduct_h/2])
      translate([0,y*(fanduct_ir+fanduct_shell+fanduct_w/2),fanduct_shell*2+fanduct_h+z])
      rotate([90,0,0]) {
       cylinder(r=fanduct_shell,h=fanduct_w,center=true,$fn=30);
       for(z=[-1,1]) translate([0,0,z*fanduct_w/2])