1 files changed, 22 insertions, 20 deletions

diff --git a/fanduct.scad b/fanduct.scad
index a17b261..ba63717 100644
--- a/fanduct.scad
+++ b/fanduct.scad
@@ -5,125 +5,127 @@ epsilon=.005;		// for finer cuts
 
         type="simple"; // circular|3jets
         ductshape="square"; // square|round
         dual=true;      // dual or single
 
         nozzles_apart = 18;     // distance between nozzles for dual hotend
         space_behind_nozzle = 10;// space behind the nozzle where we're allowed to go
                                 // without the fear of hitting carriage
 
         inlet_w = 12.5;         // inlet width
         inlet_h = 17;   // inlet height
         inlet_short_l = 7;// inlet length of protrusion (or depth of intrusion:))
         inlet_away = 15;// how far away inlet is
 
 inlet_long_l = inlet_short_l+inlet_h;
 function hypothenuse(a,b) = sqrt(pow(a,2)+pow(b,2));
 
 silicone_shell = 2;
 heater_clearance = dual
        ? max(20,15.5) - 4.5 + silicone_shell
        : max(
                 hypothenuse(16/2     +silicone_shell, 20-4.5 +silicone_shell),// E3D v6
                 hypothenuse(11.5-4.5 +silicone_shell, 15.5   +silicone_shell)// E3D volcano
        );
 
         fanduct_elevation = 3;                                          // fanduct elevation above nozzle tip
         fanduct_blowtarget = -2;                                        // what to blow at
         fanduct_h = 6;                                                  // inner height of the duct
         fanduct_w = 7;                                                  // inner width of the duct
         fanduct_shell=1.2;                                              // shell thickness
         fanduct_ir = heater_clearance+5;                                // inner radius
 
         jet_angle = 60-2;       // angular width of the jet
 
 hotend_clearance = heater_clearance;
 
         snapper_d = 8; snapper_overlap=0.2;// snip snap
 
 draft=true;
 smooth_f = draft? 30 : 120;
 
 to_midduct = fanduct_ir+fanduct_shell+fanduct_w/2;
 dual_spots = [ [+space_behind_nozzle, -(to_midduct+nozzles_apart/2)],
                [-         to_midduct, -(to_midduct+nozzles_apart/2)],
                [-         to_midduct, 0] ];
 
 module fanduct(type=type,ductshape=ductshape,dual=dual) {
          //     ***duct is all around!
+
  module duct(what) {
-  module single() {
-   if(what=="in") {
-    sh = fanduct_w+2*fanduct_shell; sv = fanduct_h+2*fanduct_shell;
+  module ductshape(what,sh,sv,r) {
     smax = max(sh,sv);
-    rotate_extrude($fn=smooth_f)
-     if(ductshape=="round")
-      translate([sh/2+fanduct_ir,sv/2])
+   translate([what=="in"?0:fanduct_shell,what=="in"?0:fanduct_shell])
+   if(ductshape=="round") {
+    translate([sh/2+r,sv/2])
       scale([sh/smax,sv/smax])
       circle(d=smax,$fn=4*smax);
-     else if(ductshape=="square")
-      translate([fanduct_ir,0])
+   }else if(ductshape=="square") {
+    translate([r,0])
+    if(what=="in")
       square([sh,sv]);
-   }else if(what=="out") {
-    sh = fanduct_w; sv = fanduct_h;
-    smax = max(sh,sv);
-    rotate_extrude($fn=smooth_f)
-     if(ductshape=="round")
-      translate([sh/2+fanduct_shell+fanduct_ir,sv/2+fanduct_shell])
-      scale([sh/smax,sv/smax])
-      circle(d=smax,$fn=4*smax);
-     else if(ductshape=="square")
-      translate([fanduct_ir+fanduct_shell,fanduct_shell])
-      union() {
+    else if(what=="out") union() {
        square([sh,sv/2]);
        translate([sh/2,sv/2])
        scale([sh/smax,sv/smax])
-       circle(d=smax,$fn=36);
+     circle(d=smax,$fn=4*smax);
+    }
+   }
       }
+  module single() {
+   if(what=="in") {
+    sh = fanduct_w+2*fanduct_shell; sv = fanduct_h+2*fanduct_shell;
+    rotate_extrude($fn=smooth_f)
+    ductshape(what=what,sh=sh,sv=sv,r=fanduct_ir);
+   }else if(what=="out") {
+    sh = fanduct_w; sv = fanduct_h;
+    smax = max(sh,sv);
+    rotate_extrude($fn=smooth_f)
+    ductshape(what=what,sh=sh,sv=sv,r=fanduct_ir);
    }
   }
   module dual() {
    module hulls(spots=dual_spots) {
     for(my=[0,1]) mirror([0,my,0]) for(pn=[0:1:len(spots)-2]) hull() {
      for(p=[spots[pn],spots[pn+1]]) translate(p) children();
     }
    }
    if(what=="in") {
     hulls() cylinder(d=fanduct_w+2*fanduct_shell,h=fanduct_h+2*fanduct_shell);
    }else if(what=="out") {
     sh = fanduct_w; sv = fanduct_h;
     smax = max(sh,sv);
     translate([0,0,fanduct_shell]) hulls() {
      cylinder(d=fanduct_w,h=fanduct_h/2);
      translate([0,0,fanduct_h/2])
      scale([sh/smax,sh/smax,sv/smax])
      intersection() {
       sphere(d=smax,$fn=36);
       translate([0,0,-1])
       cylinder(d=smax+2,h=smax+2,$fn=36);
      }
     }
    }
   }
   module dual_simple() {
    for(my=[0,1]) mirror([0,my,0])
    if(what=="in") {
     sh = fanduct_w+2*fanduct_shell; sv = fanduct_h+2*fanduct_shell;
     translate([0,nozzles_apart/2,0])
     intersection() {
      rotate_extrude($fn=smooth_f)
       translate([fanduct_ir,0]) square([sh,sv]);
      translate([-fanduct_ir-sh-1,0,-1])
      cube(size=[fanduct_ir+sh+2,fanduct_ir+sh+2,sv+2]);
     }
     translate([-fanduct_ir-sh,-epsilon,0])
     cube(size=[sh,nozzles_apart/2+2*epsilon,sv]);
     translate([0,sh/2+fanduct_ir+nozzles_apart/2,0]) cylinder(d=sh,h=sv,$fn=36);
    }else if(what=="out") {
     sh = fanduct_w; sv = fanduct_h;
     translate([0,nozzles_apart/2,fanduct_shell])
     intersection() {
      rotate_extrude($fn=smooth_f)
       translate([fanduct_ir+fanduct_shell,0]) square([sh,sv]);
      translate([-fanduct_ir-2*fanduct_shell-sh-1,-1,0])
      cube(size=[fanduct_ir+2*fanduct_shell+sh+2,fanduct_ir+2*fanduct_shell+sh+2,sv]);
     }