dualism: marks

1 files changed, 1 insertions, 1 deletions

diff --git a/fanduct.scad b/fanduct.scad
index 0cd89f7..1090e95 100644
--- a/fanduct.scad
+++ b/fanduct.scad
@@ -64,97 +64,97 @@ module fanduct(type=type,ductshape=ductshape,dual=dual) {
     sh = fanduct_w; sv = fanduct_h;
     smax = max(sh,sv);
     rotate_extrude($fn=smooth_f)
      if(ductshape=="round")
       translate([sh/2+fanduct_shell+fanduct_ir,sv/2+fanduct_shell])
       scale([sh/smax,sv/smax])
       circle(d=smax,$fn=4*smax);
      else if(ductshape=="square")
       translate([fanduct_ir+fanduct_shell,fanduct_shell])
       union() {
        square([sh,sv/2]);
        translate([sh/2,sv/2])
        scale([sh/smax,sv/smax])
        circle(d=smax,$fn=36);
       }
    }
   }
   module dual() {
    module hulls(spots=dual_spots) {
     for(my=[0,1]) mirror([0,my,0]) for(pn=[0:1:len(spots)-2]) hull() {
      for(p=[spots[pn],spots[pn+1]]) translate(p) children();
     }
    }
    if(what=="in") {
     hulls() cylinder(d=fanduct_w+2*fanduct_shell,h=fanduct_h+2*fanduct_shell);
    }else if(what=="out") {
     sh = fanduct_w; sv = fanduct_h;
     smax = max(sh,sv);
     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);
      }
     }
    }
   }
 
   if(dual) dual();
   else single();
  }
 
  //	***	bumps for easier position adjustments in line with hotend
  module marks(what) {
   if(what=="in") {
-   for(y=[-1,1])
+   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);
      }
   }
  }
 
  //	***	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+2*fanduct_shell+fanduct_w+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]) {