moved definitions around

1 files changed, 14 insertions, 14 deletions

diff --git a/fanduct.scad b/fanduct.scad
index 302ea07..a18ce56 100644
--- a/fanduct.scad
+++ b/fanduct.scad
@@ -1,90 +1,90 @@
 use <snapper.scad>;
         extrusion_width=.5; layer_height=.2;    // print parameters
 
         epsilon=.005;   // for finer cuts
 
+        type="circular"; // 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
+
+inlet_long_l = inlet_short_l+inlet_h;
 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 = 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_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;
 
-        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
-
         snapper_d = 8; snapper_overlap=0.2;// snip snap
 
 smooth_f = 120;
 
-        type="circular"; // circular|3jets
-        ductshape="square"; // square|round
-        dual=false;     // dual or single
-
 to_midduct = fanduct_ir+fanduct_shell+fanduct_w/2;
 dual_spots = [ [+space_behind_nozzle, -(to_midduct+nozzles_apart/2)],
                [-         to_midduct, -(to_midduct+nozzles_apart/2)],
                [-         to_midduct, 0] ];
 
 module fanduct(type=type,ductshape=ductshape,dual=dual) {
          //     ***duct is all around!
  module duct(what) {
   module single() {
    if(what=="in") {
     sh = fanduct_w+2*fanduct_shell; sv = fanduct_h+2*fanduct_shell;
     smax = max(sh,sv);
     rotate_extrude($fn=smooth_f)
      if(ductshape=="round")
       translate([sh/2+fanduct_ir,sv/2])
       scale([sh/smax,sv/smax])
       circle(d=smax,$fn=4*smax);
      else if(ductshape=="square")
       translate([fanduct_ir,0])
       square([sh,sv]);
    }else if(what=="out") {
     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;