1 files changed, 61 insertions, 5 deletions

diff --git a/fanduct.scad b/fanduct.scad
index 52aee0e..a17b261 100644
--- a/fanduct.scad
+++ b/fanduct.scad
@@ -1,18 +1,18 @@
 use <snapper.scad>;
         extrusion_width=.5; layer_height=.2;    // print parameters
 
         epsilon=.005;   // for finer cuts
 
-        type="circular"; // circular|3jets
+        type="simple"; // circular|3jets
         ductshape="square"; // square|round
         dual=true;      // dual or single
 
         nozzles_apart = 18;     // distance between nozzles for dual hotend
         space_behind_nozzle = 10;// space behind the nozzle where we're allowed to go
                                 // without the fear of hitting carriage
 
         inlet_w = 12.5;         // inlet width
         inlet_h = 17;   // inlet height
         inlet_short_l = 7;// inlet length of protrusion (or depth of intrusion:))
         inlet_away = 15;// how far away inlet is
 
@@ -95,27 +95,59 @@ module fanduct(type=type,ductshape=ductshape,dual=dual) {
     translate([0,0,fanduct_shell]) hulls() {
      cylinder(d=fanduct_w,h=fanduct_h/2);
      translate([0,0,fanduct_h/2])
      scale([sh/smax,sh/smax,sv/smax])
      intersection() {
       sphere(d=smax,$fn=36);
       translate([0,0,-1])
       cylinder(d=smax+2,h=smax+2,$fn=36);
      }
     }
    }
   }
+  module dual_simple() {
+   for(my=[0,1]) mirror([0,my,0])
+   if(what=="in") {
+    sh = fanduct_w+2*fanduct_shell; sv = fanduct_h+2*fanduct_shell;
+    translate([0,nozzles_apart/2,0])
+    intersection() {
+     rotate_extrude($fn=smooth_f)
+      translate([fanduct_ir,0]) square([sh,sv]);
+     translate([-fanduct_ir-sh-1,0,-1])
+     cube(size=[fanduct_ir+sh+2,fanduct_ir+sh+2,sv+2]);
+    }
+    translate([-fanduct_ir-sh,-epsilon,0])
+    cube(size=[sh,nozzles_apart/2+2*epsilon,sv]);
+    translate([0,sh/2+fanduct_ir+nozzles_apart/2,0]) cylinder(d=sh,h=sv,$fn=36);
+   }else if(what=="out") {
+    sh = fanduct_w; sv = fanduct_h;
+    translate([0,nozzles_apart/2,fanduct_shell])
+    intersection() {
+     rotate_extrude($fn=smooth_f)
+      translate([fanduct_ir+fanduct_shell,0]) square([sh,sv]);
+     translate([-fanduct_ir-2*fanduct_shell-sh-1,-1,0])
+     cube(size=[fanduct_ir+2*fanduct_shell+sh+2,fanduct_ir+2*fanduct_shell+sh+2,sv]);
+    }
+    translate([-fanduct_ir-fanduct_shell-sh,-epsilon,fanduct_shell])
+    cube(size=[sh,nozzles_apart/2+2*epsilon,sv]);
+    translate([0,sh/2+fanduct_shell+fanduct_ir+nozzles_apart/2,fanduct_shell])
+    cylinder(d=sh,h=sv,$fn=36);
+   }
+  }
 
-  if(dual) dual();
-  else single();
+  if(dual) {
+   if(type=="simple")
+    dual_simple();
+   else dual();
+  }else single();
  }
 
          //     ***bumps for easier position adjustments in line with hotend
  module marks(what) {
   if(what=="in") {
    for(y=[-1,1]) translate([0,dual?y*nozzles_apart/2:0,0])
     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);
@@ -246,26 +278,50 @@ module fanduct(type=type,ductshape=ductshape,dual=dual) {
      for(my=[0,1]) mirror([0,my,0]) {
       guideline([ [-far             ,0], [0, nozzles_apart/8] ]);
       guideline([ [-far             ,inlet_w/2/4 ],
                   [-near            ,to_midduct/2] ]);
       guideline([ [-near-fanduct_w/3,  to_midduct/2       ],
                   [-near            ,nozzles_apart/2+near ] ]);
       guideline([ [0                ,nozzles_apart/2+near+fanduct_w*space_behind_nozzle/to_midduct] ]);
      }
     }
    }
   }
 
-  if(dual) dual(what);
-  else if(type=="circular") circus(what);
+  module dual_simple(what=what) {
+   for(my=[0:1]) mirror([0,my,0]) if(what=="in") {
+    difference() {
+     hull() {
+      translate([0,nozzles_apart/2+fanduct_ir+fanduct_shell+fanduct_w/2,0])
+      cylinder(d=fanduct_w+2*fanduct_shell,h=fanduct_h*2/3+2*fanduct_shell);
+      translate([0,nozzles_apart/2,-fanduct_elevation+fanduct_blowtarget])
+      rotate([0,90,0]) cylinder(r=.5,h=fanduct_w*2,center=true);
+     }
+     rr = 2*(fanduct_ir+fanduct_shell*2+fanduct_w+2);
+     translate([-rr/2,0,0]) mirror([0,0,1]) cube(size=[rr,rr,rr]);
+    }
+   }else if(what=="out") {
+    hull() {
+     translate([0,nozzles_apart/2+fanduct_ir+fanduct_shell+fanduct_w/2,fanduct_shell])
+     cylinder(d=fanduct_w,h=fanduct_h*2/3);
+     translate([0,nozzles_apart/2,-fanduct_elevation+fanduct_blowtarget])
+     rotate([0,90,0]) cylinder(d=.5,h=fanduct_w*2,center=true);
+    }
+   }
+  }
+
+  if(dual) {
+   if(type=="simple") dual_simple(what);
+   else dual(what);
+  }else if(type=="circular") circus(what);
   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]) {