fix duct inner shape

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
@@ -16,99 +16,100 @@ 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
 
 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,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);
+      square([sh,sv/2]);
+      translate([sh/2,sv/2])
+      scale([sh/smax,sv/smax])
+      circle(d=smax,$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])
        sphere(r=fanduct_shell,$fn=30);
      }
   }
  }
 
  //	***	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+fanduct_shell+1,h=fanduct_elevation+.1+2);
     }
    }else if(what=="out") {
     rotate_extrude($fn=smooth_f)
     polygon([