1 files changed, 28 insertions, 1 deletions

diff --git a/fanduct.scad b/fanduct.scad
index b9689c9..0cd89f7 100644
--- a/fanduct.scad
+++ b/fanduct.scad
@@ -119,193 +119,220 @@ module fanduct(type=type,ductshape=ductshape,dual=dual) {
      }
   }
  }
 
          //     ***output
  module output(what,type=type) {
   module guideline(xyxy) {
    module pin(xy) {
     translate([xy[0],xy[1],0])
     cylinder(d=2*extrusion_width,h=2*fanduct_shell+inlet_h,$fn=6);
    }
    xyxyxy=concat(xyxy,[[0,0]]);
    for(i=[0:1:len(xyxyxy)-2])
     hull() for(j=[i,i+1]) pin(xyxyxy[j]);
   }
 
   module circus(what) {
    if(what=="in") {
     difference() {
      rotate_extrude($fn=smooth_f)
       polygon([
        [0,-fanduct_elevation+fanduct_blowtarget+epsilon],
        [fanduct_ir+fanduct_shell,fanduct_shell+fanduct_h/2],
        [fanduct_ir+fanduct_shell+fanduct_w/2,0],
        [0,-fanduct_elevation+fanduct_blowtarget-epsilon]]);
      translate([0,0,-1])
      cylinder(r=hotend_clearance,h=fanduct_h+2*fanduct_shell+2,$fn=smooth_f);
      mirror([0,0,1])
      translate([0,0,-epsilon])
      cylinder(r=fanduct_ir+2*fanduct_shell+fanduct_w+1,h=fanduct_elevation+.1+2);
     }
    }else if(what=="out") {
     rotate_extrude($fn=smooth_f)
     polygon([
      [0,-fanduct_elevation+fanduct_blowtarget+epsilon],
      [fanduct_ir+fanduct_shell+1,fanduct_h/2],
      [fanduct_ir+fanduct_w/2+fanduct_shell+1,fanduct_shell],
      [0,-fanduct_elevation+fanduct_blowtarget-epsilon]]);
    }else if(what=="airguides") {
     inr = fanduct_ir+fanduct_shell; our = inr+fanduct_w;
     union() {
      for(my=[0,1]) mirror([0,my,0]) {
       guideline([
        [-our,inlet_w/6],
        [-inr*sin(60),inr*cos(60)]
       ]);
       a0=30; as=15; a1=180;
       for(a=[a0+as:as:a1]) {
        f = as/(a1-a+as);
        rotate([0,0,a]) guideline([[-inr-fanduct_w*f,0]]);
       }
       guideline([
        [-our+fanduct_w*cos(30)*3/4,fanduct_w*sin(30)*3/4],
        [-inr*cos(10),inr*sin(10)]
       ]);
      }
     }/*union*/
    }/*airguides*/
   }
 
   module jets(what) {
    od = fanduct_h*2/3+fanduct_shell;
    md = fanduct_ir+fanduct_shell+fanduct_w/2;
    jww = 2*md*sin(jet_angle/2);
    difference() {
     for(a=[0:120:359]) rotate([0,0,a]) {
      if(what=="in") {
       hull() {
        intersection() {
         translate([md-fanduct_w/2,-jww/2,0])
         cube(size=[fanduct_shell+fanduct_w/2,jww,od]);
         duct(what=what);
        }
        translate([0,0,-fanduct_elevation]) sphere(r=.5);
       }
      }else if(what=="out") {
       hull() {
        intersection() {
         translate([md-fanduct_w/2,-jww/2+fanduct_shell,fanduct_shell])
         cube(size=[fanduct_w/2,jww-2*fanduct_shell,od-2*fanduct_shell]);
         duct(what=what);
        }
        translate([0,0,-fanduct_elevation]) sphere(r=.2);
       }
      }
     }
     if(what=="in") {
      translate([0,0,-fanduct_elevation-2+epsilon])
      cylinder(r=fanduct_ir+fanduct_shell*2+fanduct_w+1,h=fanduct_elevation+2);
      translate([0,0,-hotend_clearance])
      rotate([0,0,30])
      cylinder(r1=hotend_clearance*2,r2=0,h=hotend_clearance*2,$fn=6);
     }
    }
   }
 
-  if(type=="circular") circus(what);
+  module dual(what=what) {
+   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(0);
+     children([1:$children-1]);
+    }
+   }
+   if(what=="in") {
+    difference() {
+     hulls() {
+      cylinder(d=fanduct_w+2*fanduct_shell,h=2*fanduct_shell+fanduct_h/2);
+      translate([0,-nozzles_apart/2,-fanduct_elevation-fanduct_blowtarget]) sphere(d=.1);
+     }
+     translate([0,0,epsilon]) hull() for(my=[0:1]) mirror([0,my,0]) for(s=dual_spots) translate(s)
+      mirror([0,0,1]) cylinder(d=fanduct_w+2*fanduct_shell+2,h=fanduct_elevation-fanduct_blowtarget+1);
+     for(s=[-1,1]) translate([0,s*nozzles_apart/2,-1])
+      cylinder(r=hotend_clearance,h=fanduct_h+2*fanduct_shell+2,$fn=smooth_f);
+    }
+   }else if(what=="out") {
+    hulls() {
+     translate([0,0,fanduct_shell]) cylinder(d=fanduct_w,h=fanduct_h/2-fanduct_shell/2);
+     translate([0,-nozzles_apart/2,-fanduct_elevation+fanduct_blowtarget]) sphere(d=.1);
+    }
+   }
+  }
+
+  if(dual) dual(what);
+  else if(type=="circular") circus(what);
   else if(type=="3jets") jets(what);
  }
 
          //     ***air intake
  module intake(what) {
   module placeit() {
    translate([-fanduct_ir-2*fanduct_shell-fanduct_w-inlet_away,0,fanduct_shell])
    rotate([0,-90,0])
    children();
   }
   if(what=="in") {
    placeit() translate([0,-inlet_w/2,0]) {
     difference() {
      cube(size=[inlet_h,inlet_w,inlet_long_l+fanduct_shell]);
      translate([inlet_h+fanduct_shell,0,inlet_long_l+fanduct_shell])
      rotate([-90,0,0])
      translate([0,0,-1])
      cylinder(r=inlet_h,h=inlet_w+2*fanduct_shell+2,$fn=inlet_h*4);
     }
     // supports
     for(i=[-1,0,1])
      translate([-fanduct_shell,
       (i+1)*(inlet_w-extrusion_width)/2,
      -inlet_away-fanduct_w/2])
      cube(size=[fanduct_shell,
       extrusion_width,
       inlet_long_l+fanduct_shell+inlet_away+fanduct_w/2]);
    }
    hull() {
     placeit() translate([-fanduct_shell,-inlet_w/2-fanduct_shell,0])
     cube(size=[inlet_h+2*fanduct_shell,inlet_w+2*fanduct_shell,fanduct_shell]);
     translate([-fanduct_ir-fanduct_shell-fanduct_w/2,0,0])
     translate([0,-inlet_w/2-fanduct_shell/2,0])
     cube(size=[1,inlet_w+fanduct_shell,fanduct_shell*2+fanduct_h]);
    }
   }else if(what=="out") {
    placeit() translate([fanduct_shell,-inlet_w/2+fanduct_shell,0])
    cube(size=[inlet_h-2*fanduct_shell,inlet_w-2*fanduct_shell,inlet_long_l+fanduct_shell+1]);
    hull() {
     placeit() translate([fanduct_shell,-inlet_w/2+fanduct_shell,0])
     cube(size=[inlet_h-2*fanduct_shell,inlet_w-2*fanduct_shell,fanduct_shell]);
     translate([-fanduct_ir-fanduct_shell-fanduct_w/2,0,fanduct_shell])
     translate([0,-inlet_w/2+fanduct_shell,0])
     cube(size=[1,inlet_w-2*fanduct_shell,fanduct_h]);
    }
   }
  }
 
          //     ***DUCT TAILS!!! WOO-OO! (every day they're out there making duct tails…)
  module tails(what) {
   if(what=="in") {
    for(mx=[0,1]) mirror([mx,0,0])
    translate([fanduct_ir+fanduct_shell+fanduct_w/2,0,fanduct_shell+fanduct_h/2])
    rotate([90,0,90])
    translate([0,0,-snapper_d/2])
    snapper(d=snapper_d,o=snapper_overlap,side=0,l=fanduct_h*3/2+fanduct_shell);
   }
  }
 
  module parts(what) {
   union() {
    duct(what);
    marks(what);
    output(what);
    intake(what);
    tails(what);
   }
  }
 
  difference() {
   parts("in");
   parts("out");
  }
  intersection() {
   union() {
    output("airguides");
    sphere(d=epsilon);
   }
   union() {
    duct("in"); output("in"); intake("in");
   }
  }
 }
 
 view="*"; // hcut|vcut|*
 
 hinfinity=4*(fanduct_ir+fanduct_shell*2+fanduct_w+inlet_away);
 vinfinity=2*(fanduct_shell*2+fanduct_h+inlet_h);
 if(view=="hcut") {
  difference() {
   fanduct();
   translate([-hinfinity/2,-hinfinity/2,fanduct_shell+fanduct_h/2])
   cube(size=[hinfinity,hinfinity,vinfinity]);
  }
 }else if(view=="vcut") {
  difference() {