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
@@ -1,95 +1,97 @@
 use <snapper.scad>;
         extrusion_width=.5; layer_height=.2;    // print parameters
 
         epsilon=.005;   // for finer cuts
 
         heater_w = 16;  // heatblock width
         heater_l = 20;  // heatblock length
         nozzle_offset=4.5;// nozzle offset from the edge of heatblock
 
         fanduct_elevation = 3;                                          // fanduct elevation above nozzle tip
         fanduct_h = 6;                                                  // inner height of the duct
         fanduct_w = 6;                                                  // inner width of the duct
         fanduct_shell=1.2;                                              // shell thickness
         fanduct_ir = sqrt(pow(heater_w/2,2)+pow(heater_l-nozzle_offset,2))+5;// inner radius
 
         jet_angle = 60;         // 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 = 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])
        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_ir+fanduct_shell,fanduct_shell+fanduct_h/2],
        [fanduct_ir+fanduct_shell+fanduct_w/2,0],
        [0,-fanduct_elevation-.1]]);
      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") {
     difference() {
      rotate_extrude($fn=smooth_f)
      polygon([