summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--Makefile4
-rw-r--r--another.scad1
2 files changed, 4 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 6393033..5753a68 100644
--- a/Makefile
+++ b/Makefile
@@ -5,34 +5,36 @@ OPENSCAD_BIN?=${OPENSCAD_APP}/Contents/MacOS/OpenSCAD
5OPENSCAD_FLAGS=-D draft=false -D debug=false 5OPENSCAD_FLAGS=-D draft=false -D debug=false
6SED?=sed 6SED?=sed
7ECHO?=/bin/echo 7ECHO?=/bin/echo
8AWK?=awk 8AWK?=awk
9 9
10default: 10default:
11 @echo "And?" 11 @echo "And?"
12 12
13clean: 13clean:
14 rm -f *.stl *.gcode 14 rm -f *.stl *.gcode
15 15
16stl-another-%: 16stl-another-%:
17 $(MAKE) another-$*-{body,body-label,lever,knob,springpad}.stl 17 $(MAKE) another-$*-{body,body-label,lever,knob,knob-label,springpad}.stl
18 18
19another-%-body.stl: another-%.scad another.scad 19another-%-body.stl: another-%.scad another.scad
20 $(OPENSCAD_BIN) $(OPENSCAD_FLAGS) -D 'what="body"' -o "$@" "$<" 20 $(OPENSCAD_BIN) $(OPENSCAD_FLAGS) -D 'what="body"' -o "$@" "$<"
21another-%-body-label.stl: another-%.scad another.scad 21another-%-body-label.stl: another-%.scad another.scad
22 $(OPENSCAD_BIN) $(OPENSCAD_FLAGS) -D 'what="body.label"' -o "$@" "$<" 22 $(OPENSCAD_BIN) $(OPENSCAD_FLAGS) -D 'what="body.label"' -o "$@" "$<"
23another-%-lever.stl: another-%.scad another.scad 23another-%-lever.stl: another-%.scad another.scad
24 $(OPENSCAD_BIN) $(OPENSCAD_FLAGS) -D 'what="lever"' -o "$@" "$<" 24 $(OPENSCAD_BIN) $(OPENSCAD_FLAGS) -D 'what="lever"' -o "$@" "$<"
25another-%-knob.stl: another-%.scad another.scad 25another-%-knob.stl: another-%.scad another.scad
26 $(OPENSCAD_BIN) $(OPENSCAD_FLAGS) -D 'what="knob"' -o "$@" "$<" 26 $(OPENSCAD_BIN) $(OPENSCAD_FLAGS) -D 'what="knob"' -o "$@" "$<"
27another-%-knob-label.stl: another-%.scad another.scad
28 $(OPENSCAD_BIN) $(OPENSCAD_FLAGS) -D 'what="knob.label"' -o "$@" "$<"
27another-%-springpad.stl: another-%.scad another.scad 29another-%-springpad.stl: another-%.scad another.scad
28 $(OPENSCAD_BIN) $(OPENSCAD_FLAGS) -D 'what="springpad"' -o "$@" "$<" 30 $(OPENSCAD_BIN) $(OPENSCAD_FLAGS) -D 'what="springpad"' -o "$@" "$<"
29 31
30multiswitch: multiswitch.c8r.scad $(addsuffix .stl,$(addprefix multiswitch-embeddest-,2 3 4 5 6)) 32multiswitch: multiswitch.c8r.scad $(addsuffix .stl,$(addprefix multiswitch-embeddest-,2 3 4 5 6))
31multiswitch-embeddest-%.stl: multiswitch-embeddest.scad 33multiswitch-embeddest-%.stl: multiswitch-embeddest.scad
32 $(OPENSCAD_BIN) $(OPENSCAD_FLAGS) -D inputs=$* -o "$@" "$<" 34 $(OPENSCAD_BIN) $(OPENSCAD_FLAGS) -D inputs=$* -o "$@" "$<"
33 35
34multiswitch.c8r.scad: multiswitch-c8r.scad threads.scad pushfit_data.scad pushfittery.scad multiswitch.scad 36multiswitch.c8r.scad: multiswitch-c8r.scad threads.scad pushfit_data.scad pushfittery.scad multiswitch.scad
35 @echo "Preprocessing into $@…" 37 @echo "Preprocessing into $@…"
36 @( \ 38 @( \
37 $(ECHO) "/* DO NOT. JUST DO NOT. FORGET THIS FILE, IT'S PREPROCESSED, GET THE SOURCE. */" ;\ 39 $(ECHO) "/* DO NOT. JUST DO NOT. FORGET THIS FILE, IT'S PREPROCESSED, GET THE SOURCE. */" ;\
38 $(AWK) '/^\/\/CUSTOMIZERCUTOFF/ {nextfile} {print}' $^ | $(SED) -Ee 's,^(use|include),//\1,g' \ 40 $(AWK) '/^\/\/CUSTOMIZERCUTOFF/ {nextfile} {print}' $^ | $(SED) -Ee 's,^(use|include),//\1,g' \
diff --git a/another.scad b/another.scad
index 3c4f27a..1c6d836 100644
--- a/another.scad
+++ b/another.scad
@@ -470,24 +470,25 @@ module the_extruder(
470 translate([-idler_d/2+filament_offset,0,ls_z]) 470 translate([-idler_d/2+filament_offset,0,ls_z])
471 cube(size=[gearbox_d/2,gearbox_d/2+pf_h(pf),body_h-ls_z+knob_h+1]); 471 cube(size=[gearbox_d/2,gearbox_d/2+pf_h(pf),body_h-ls_z+knob_h+1]);
472 }//if debug 472 }//if debug
473 }//difference 473 }//difference
474 } 474 }
475 475
476 mirrorleft() 476 mirrorleft()
477 debug() 477 debug()
478 if(what=="lever") color("green",0.7) lever(); 478 if(what=="lever") color("green",0.7) lever();
479 else if(what=="body") color("yellow",0.7) body(); 479 else if(what=="body") color("yellow",0.7) body();
480 else if(what=="body.label") color("brown",0.7) body_label(); 480 else if(what=="body.label") color("brown",0.7) body_label();
481 else if(what=="knob") color("red",0.7) knob(); 481 else if(what=="knob") color("red",0.7) knob();
482 else if(what=="knob.label") color("brown",0.7) knob_label();
482 else if(what=="springpad") color("blue",0.7) springpad(); 483 else if(what=="springpad") color("blue",0.7) springpad();
483 else if(what=="both") { 484 else if(what=="both") {
484 color("green",0.7) lever(); 485 color("green",0.7) lever();
485 color("yellow",0.7) body(); 486 color("yellow",0.7) body();
486 color("brown",0.7) body_label(); 487 color("brown",0.7) body_label();
487 }else{ 488 }else{
488 color("green",0.7) lever(); 489 color("green",0.7) lever();
489 color("yellow",0.7) body(); 490 color("yellow",0.7) body();
490 color("brown",0.7) body_label(); 491 color("brown",0.7) body_label();
491 color("red",0.7) knob(); 492 color("red",0.7) knob();
492 color("brown",0.7) knob_label(); 493 color("brown",0.7) knob_label();
493 color("blue",0.7) springpad(); 494 color("blue",0.7) springpad();