circular output going deeper

and deeper and deeper and deeper insiiiiiiiiiide

1 files changed, 2 insertions, 2 deletions

diff --git a/fanduct.scad b/fanduct.scad
index e16c5ae..72143e2 100644
--- a/fanduct.scad
+++ b/fanduct.scad
@@ -36,111 +36,111 @@ module fanduct(type=type) {
   if(what=="in") {
    rotate_extrude($fn=smooth_f)
    translate([fanduct_ir,0])
    square([fanduct_w+2*fanduct_shell,fanduct_h+2*fanduct_shell]);
   }else if(what=="out") {
    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);
    } 
   }
  }
 
          //     ***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,0],
+       [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([
       [0,-fanduct_elevation],
       [fanduct_ir+fanduct_shell+1,fanduct_h/2],
-      [fanduct_ir+fanduct_shell+1,fanduct_shell],
+      [fanduct_ir+fanduct_w/2+fanduct_shell+1,fanduct_shell],
       [0,-fanduct_elevation-.1]]);
      circus("airguides");
     }
    }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+fanduct_shell;
    difference() {
     for(a=[0:120:359]) rotate([0,0,a]) {
      if(what=="in") {
       hull() {
        translate([fanduct_ir+od/2,0,od/2])
        rotate([90,0,0])
        cylinder(d=od,h=2*(fanduct_ir+fanduct_shell+fanduct_w/2)*sin(jet_angle/2)-3,center=true,$fn=36);
        translate([0,0,-fanduct_elevation]) sphere(r=.5);
       }
      }else if(what=="out") {
       hull() {
        translate([fanduct_ir+od/2,0,od/2])
        rotate([90,0,0])
        cylinder(d=od-2*fanduct_shell,h=2*(fanduct_ir+fanduct_shell+fanduct_w/2)*sin(jet_angle/2)-3-2*fanduct_shell,center=true);
        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);