summaryrefslogtreecommitdiffabout
authorMichael Krelin <hacker@klever.net>2016-07-22 12:44:23 (UTC)
committer Michael Krelin <hacker@klever.net>2016-07-22 12:44:23 (UTC)
commit57ffe20dcc5e5c0077272e8a0a3bb093d4da001d (patch) (side-by-side diff)
tree773c2977611b5efd34eaac3936d0779ce996c1d8
parent6ea7375f142f59cf9d97c86bf70a765d76b436eb (diff)
downloadfanductory-57ffe20dcc5e5c0077272e8a0a3bb093d4da001d.zip
fanductory-57ffe20dcc5e5c0077272e8a0a3bb093d4da001d.tar.gz
fanductory-57ffe20dcc5e5c0077272e8a0a3bb093d4da001d.tar.bz2
change 3jets to jets
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--Makefile2
-rw-r--r--fanduct-3jets.scad2
-rw-r--r--fanduct-jets.scad2
-rw-r--r--fanduct.scad4
4 files changed, 5 insertions, 5 deletions
diff --git a/Makefile b/Makefile
index b72584f..c82e15a 100644
--- a/Makefile
+++ b/Makefile
@@ -1,16 +1,16 @@
-include Makefile.local
OPENSCAD_APP?=/Applications/OpenSCAD.app
OPENSCAD_BIN?=${OPENSCAD_APP}/Contents/MacOS/OpenSCAD
OPENSCAD_FLAGS=-D draft=false
-default: fanduct-circular.stl fanduct-3jets.stl fanduct-dual.stl fanduct-dual-jets.stl
+default: fanduct-circular.stl fanduct-jets.stl fanduct-dual.stl fanduct-dual-jets.stl
clean:
rm -f *.stl
fanduct-%.stl: fanduct-%.scad fanduct.scad
%.stl: %.scad
${OPENSCAD_BIN} ${OPENSCAD_FLAGS} -o "$@" "$<"
diff --git a/fanduct-3jets.scad b/fanduct-3jets.scad
deleted file mode 100644
index cd88ab0..0000000
--- a/fanduct-3jets.scad
+++ b/dev/null
@@ -1,2 +0,0 @@
-use <fanduct.scad>;
-fanduct(type="3jets");
diff --git a/fanduct-jets.scad b/fanduct-jets.scad
new file mode 100644
index 0000000..eb8a388
--- a/dev/null
+++ b/fanduct-jets.scad
@@ -0,0 +1,2 @@
+use <fanduct.scad>;
+fanduct(type="jets");
diff --git a/fanduct.scad b/fanduct.scad
index 2bc5623..efc6a19 100644
--- a/fanduct.scad
+++ b/fanduct.scad
@@ -1,30 +1,30 @@
use <snapper.scad>;
extrusion_width=.5; layer_height=.2; // print parameters
epsilon=.005; // for finer cuts
-type="simple"; // circular|3jets
+type="jets"; // jets|circular|simple
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 = dual
? max(20,15.5) - 4.5 + silicone_shell
: 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
@@ -367,49 +367,49 @@ module fanduct(type=type,ductshape=ductshape,dual=dual) {
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 if(type=="jets") dual_jets(what);
else dual(what);
}else if(type=="circular") circus(what);
- else if(type=="3jets") jets(what);
+ else if(type=="jets") 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]) {
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+1,
extrusion_width,