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) (unidiff)
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,13 +1,13 @@
1-include Makefile.local 1-include Makefile.local
2 2
3OPENSCAD_APP?=/Applications/OpenSCAD.app 3OPENSCAD_APP?=/Applications/OpenSCAD.app
4OPENSCAD_BIN?=${OPENSCAD_APP}/Contents/MacOS/OpenSCAD 4OPENSCAD_BIN?=${OPENSCAD_APP}/Contents/MacOS/OpenSCAD
5OPENSCAD_FLAGS=-D draft=false 5OPENSCAD_FLAGS=-D draft=false
6 6
7default: fanduct-circular.stl fanduct-3jets.stl fanduct-dual.stl fanduct-dual-jets.stl 7default: fanduct-circular.stl fanduct-jets.stl fanduct-dual.stl fanduct-dual-jets.stl
8 8
9clean: 9clean:
10 rm -f *.stl 10 rm -f *.stl
11 11
12fanduct-%.stl: fanduct-%.scad fanduct.scad 12fanduct-%.stl: fanduct-%.scad fanduct.scad
13 13
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 @@
1use <fanduct.scad>;
2fanduct(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 @@
1use <fanduct.scad>;
2fanduct(type="jets");
diff --git a/fanduct.scad b/fanduct.scad
index 2bc5623..efc6a19 100644
--- a/fanduct.scad
+++ b/fanduct.scad
@@ -1,12 +1,12 @@
1use <snapper.scad>; 1use <snapper.scad>;
2 extrusion_width=.5; layer_height=.2; // print parameters 2 extrusion_width=.5; layer_height=.2; // print parameters
3 3
4 epsilon=.005; // for finer cuts 4 epsilon=.005; // for finer cuts
5 5
6 type="simple"; // circular|3jets 6 type="jets"; // jets|circular|simple
7 ductshape="square"; // square|round 7 ductshape="square"; // square|round
8 dual=true; // dual or single 8 dual=true; // dual or single
9 9
10 nozzles_apart = 18; // distance between nozzles for dual hotend 10 nozzles_apart = 18; // distance between nozzles for dual hotend
11 space_behind_nozzle = 10;// space behind the nozzle where we're allowed to go 11 space_behind_nozzle = 10;// space behind the nozzle where we're allowed to go
12 // without the fear of hitting carriage 12 // without the fear of hitting carriage
@@ -385,13 +385,13 @@ module fanduct(type=type,ductshape=ductshape,dual=dual) {
385 385
386 if(dual) { 386 if(dual) {
387 if(type=="simple") dual_simple(what); 387 if(type=="simple") dual_simple(what);
388 else if(type=="jets") dual_jets(what); 388 else if(type=="jets") dual_jets(what);
389 else dual(what); 389 else dual(what);
390 }else if(type=="circular") circus(what); 390 }else if(type=="circular") circus(what);
391 else if(type=="3jets") jets(what); 391 else if(type=="jets") jets(what);
392 } 392 }
393 393
394 // ***air intake 394 // ***air intake
395 module intake(what) { 395 module intake(what) {
396 module placeit() { 396 module placeit() {
397 translate([-fanduct_ir-2*fanduct_shell-fanduct_w-inlet_away,0,fanduct_shell]) 397 translate([-fanduct_ir-2*fanduct_shell-fanduct_w-inlet_away,0,fanduct_shell])