1 files changed, 12 insertions, 5 deletions

diff --git a/fanduct.scad b/fanduct.scad
index 75a3bb1..7a9e205 100644
--- a/fanduct.scad
+++ b/fanduct.scad
@@ -13,27 +13,28 @@ heater_clearance = max(
 
         fanduct_elevation = 3;                                          // fanduct elevation above nozzle tip
         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_short_l = 7;// inlet length of protrusion (or depth of intrusion:))
         inlet_away = 15;// how far away inlet is
 
+inlet_long_l = inlet_short_l+inlet_h;
 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) {
 
@@ -179,44 +180,50 @@ module fanduct(type=type,ductshape=ductshape) {
   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]) {
-    cube(size=[inlet_h,inlet_w,inlet_l+fanduct_shell]);
+    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_l+fanduct_shell+inlet_away+fanduct_w/2]);
+      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_l+fanduct_shell+1]);
+   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) {
@@ -245,25 +252,25 @@ module fanduct(type=type,ductshape=ductshape) {
  }
  intersection() {
   union() {
    output("airguides");
    sphere(d=epsilon);
   }
   union() {
    duct("in"); output("in"); intake("in");
   }
  }
 }
 
-view="vcut"; // hcut|vcut|*
+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() {
   fanduct();