1 files changed, 15 insertions, 2 deletions

diff --git a/fanduct.scad b/fanduct.scad
index 53630a3..746f753 100644
--- a/fanduct.scad
+++ b/fanduct.scad
@@ -23,44 +23,57 @@ jet_angle = 60-2;		// angular width of the jet
 inlet_w = 12.5;		// inlet width
 inlet_h = 17;		// inlet height
 inlet_l = 7;		// inlet length of protrusion (or depth of intrusion:))
 inlet_away = 15;	// how far away inlet is
 
 hotend_clearance = heater_clearance;
 
 snapper_d = 8; snapper_overlap=0.2;	// snip snap
 
 smooth_f = 120;
 
 type="3jets"; // "3jets" ; // circular|3jets
+ductshape="square"; // square|round
 
 
-module fanduct(type=type) {
+module fanduct(type=type,ductshape=ductshape) {
 
  //	***	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)
+    if(ductshape=="round")
    translate([sh/2+fanduct_ir,sv/2])
    scale([sh/smax,sv/smax])
    circle(d=smax,$fn=4*smax);
+    else if(ductshape=="square")
+     translate([fanduct_ir,0])
+     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() {
+      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);
+     } 
   }
  }
 
  //	***	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])
@@ -231,25 +244,25 @@ module fanduct(type=type) {
  }
  intersection() {
   union() {
    output("airguides");
    sphere(d=epsilon);
   }
   union() {
    duct("in"); output("in"); intake("in");
   }
  }
 }
 
-view="full"; // hcut|vcut|*
+view="vcut"; // 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() {
   fanduct();