1 files changed, 8 insertions, 4 deletions

diff --git a/fanduct.scad b/fanduct.scad
index 563920c..421dd5a 100644
--- a/fanduct.scad
+++ b/fanduct.scad
@@ -1,111 +1,115 @@
 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
+function hypothenuse(a,b) = sqrt(pow(a,2)+pow(b,2));
+
+silicone_shell = 2;
+heater_clearance = max(
+                hypothenuse(16/2     +silicone_shell, 20-4.5 +silicone_shell),// E3D v6
+                hypothenuse(11.5-4.5 +silicone_shell, 15.5   +silicone_shell)// E3D volcano
+);
 
         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 = sqrt(pow(heater_w/2,2)+pow(heater_l-nozzle_offset,2))+5;// inner radius
+        fanduct_ir = heater_clearance+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([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([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_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([
      [0,-fanduct_elevation+fanduct_blowtarget+epsilon],
      [fanduct_ir+fanduct_shell+1,fanduct_h/2],
      [fanduct_ir+fanduct_w/2+fanduct_shell+1,fanduct_shell],
      [0,-fanduct_elevation+fanduct_blowtarget-epsilon]]);
    }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]) {