chiark
/
gitweb
/
~ianmdlvl
/
reprap-play.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
poster-tube-lid: catch stalk base outer curve same centre as inner
[reprap-play.git]
/
Makefile
diff --git
a/Makefile
b/Makefile
index 05ba8b3bb9bfa980fa184a5a8d006436beb171e4..14769bc58a0c1c9285ab61c2876f4d43f96019da 100644
(file)
--- a/
Makefile
+++ b/
Makefile
@@
-30,15
+30,16
@@
CONFIG=$(PLAY)/slic3r-config.ini
FILAMENTSPOOL_AUTOS = filamentspool filamentspool-lt filamentspool-sm
FILAMENTSPOOL_AUTOS += filamentspool-storarm3
FILAMENTSPOOL_AUTOS = filamentspool filamentspool-lt filamentspool-sm
FILAMENTSPOOL_AUTOS += filamentspool-storarm3
-USING_AUTOS ?= $(FILAMENTSPOOL_AUTOS) xeno-drivebay-bracket dungeonquest-cone anke-gps-bracket cable-hole-trunking-cover anglepoise-neck crossbar-computer-led-mount wardrobe-hook knifeblock pandemic-counter pattress-boxes-3-cover bike-lipo-box earring-stand
+USING_AUTOS ?= $(FILAMENTSPOOL_AUTOS) xeno-drivebay-bracket dungeonquest-cone anke-gps-bracket cable-hole-trunking-cover anglepoise-neck crossbar-computer-led-mount wardrobe-hook knifeblock pandemic-counter pattress-boxes-3-cover bike-lipo-box earring-stand
bike-stalk-led-mount sewing-table sewing-table-test sewing-table-jig maglite-holder poster-tube-lid poster-tube-lid-coarse fairphone-case lock-inframe-bracket ksafe-base
AUTO_TOPLEVELS := $(foreach m,$(USING_AUTOS),$(shell $(PLAY)/toplevel-find $m))
AUTO_TOPLEVELS := $(foreach m,$(USING_AUTOS),$(shell $(PLAY)/toplevel-find $m))
-AUTO_INCS = funcs.scad utils.scad sealing-box.scad
+AUTO_INCS += funcs.scad sealing-box.scad sewing-table.scad \
+ poster-tube-lid-parametric.scad
default: autoincs scads
default: autoincs scads
-$(shell set -xe;
.
/commitid.scad.pl >commitid.scad.tmp; cmp commitid.scad.tmp commitid.scad || mv -f commitid.scad.tmp commitid.scad )
+$(shell set -xe;
$(PLAY)
/commitid.scad.pl >commitid.scad.tmp; cmp commitid.scad.tmp commitid.scad || mv -f commitid.scad.tmp commitid.scad )
autoincs: $(AUTO_INCS)
scads: $(addsuffix .auto.scad, $(AUTO_TOPLEVELS))
autoincs: $(AUTO_INCS)
scads: $(addsuffix .auto.scad, $(AUTO_TOPLEVELS))
@@
-70,6
+71,7
@@
AUTOBASE=$(shell echo $(1) | perl -pe 's/,\w+\.auto$$//')
%.gcode-sd: %.gcode
mount /media/sd
%.gcode-sd: %.gcode
mount /media/sd
+ rm -f /media/sd/JOB.* /media/sd/job.*
cp $^ /media/sd/JOB.G
sleep 0.5
umount /media/sd
cp $^ /media/sd/JOB.G
sleep 0.5
umount /media/sd
@@
-114,6
+116,15
@@
pandemic-counter-l%.eps: pandemic-counter-letters.fig
fig2dev -D +$(notdir $*) -L eps <$< >$@.tmp
@mv -f $@.tmp $@
fig2dev -D +$(notdir $*) -L eps <$< >$@.tmp
@mv -f $@.tmp $@
+.PRECIOUS: maglite-holder-torch-curve.eps
+maglite-holder-torch-curve.eps: maglite-holder-torch.fig
+ fig2dev -D +1:70 -L eps <$< >$@.tmp
+ @mv -f $@.tmp $@
+
+maglite-holder-torch-curve.dxf: maglite-holder-torch-curve.eps
+ pstoedit -dt -flat 0.05 -f "dxf: -polyaslines -mm" $< $@
+
+
PANDEMICQUARANTINES_NUMBERS=1 2
PANDEMICQUARANTINES_DXFS=$(foreach l,$(PANDEMICQUARANTINES_NUMBERS), \
pandemic-quarantine-l$l.dxf)
PANDEMICQUARANTINES_NUMBERS=1 2
PANDEMICQUARANTINES_DXFS=$(foreach l,$(PANDEMICQUARANTINES_NUMBERS), \
pandemic-quarantine-l$l.dxf)
@@
-134,7
+145,7
@@
FILAMENTSPOOL_DXFS=$(foreach n,$(FILAMENTSPOOL_NUMBERS), \
filamentspool-number-n$n.dxf)
$(addsuffix .auto.stl, $(foreach f,$(FILAMENTSPOOL_AUTOS),$(shell \
filamentspool-number-n$n.dxf)
$(addsuffix .auto.stl, $(foreach f,$(FILAMENTSPOOL_AUTOS),$(shell \
-
./toplevel-find
$f))): $(FILAMENTSPOOL_DXFS)
+
$(PLAY)/toplevel-find $(PLAY)/
$f))): $(FILAMENTSPOOL_DXFS)
filamentspool-numbers filamentspool.stl: $(FILAMENTSPOOL_DXFS)
filamentspool-numbers filamentspool.stl: $(FILAMENTSPOOL_DXFS)
@@
-155,15
+166,31
@@
question-question.eps: question-question.fig
fig2dev -L eps <$< >$@.tmp
@mv -f $@.tmp $@
fig2dev -L eps <$< >$@.tmp
@mv -f $@.tmp $@
+sewing-table%.stl: sewing-table-rear-profile.dxf
+sewing-table%.stl: sewing-table-front-profile.dxf
+sewing-table%.stl: sewing-table-end-profile.dxf
+
+sewing-table-%-profile.eps: sewing-table-%-profile.fig
+ fig2dev -L eps -D +40 <$< >$@.tmp
+ @mv -f $@.tmp $@
+
question-token.stl: question-question.dxf
lemon-stand.stl: lemon-stand.scad
question-token.stl: question-question.dxf
lemon-stand.stl: lemon-stand.scad
+electron-token.stl: electron-token.scad
+
.PRECIOUS: $(SCREWRECESSTEST_DXFS) $(SCREWRECESSTEST_DXFS) \
$(foreach s,$(SCREWRECESSTEST_SIZES), \
screw-recess-test-number-s$s.fig \
screw-recess-test-number-s$s.eps)
.PRECIOUS: $(SCREWRECESSTEST_DXFS) $(SCREWRECESSTEST_DXFS) \
$(foreach s,$(SCREWRECESSTEST_SIZES), \
screw-recess-test-number-s$s.fig \
screw-recess-test-number-s$s.eps)
+poster-tube-lid,CatchPostDistort-fa%.stl: \
+ distort-stl poster-tube-lid,CatchPreDistort.auto.stl
+ ./distort-stl <poster-tube-lid,CatchPreDistort.auto.stl \
+ set-fa $(notdir $*) project-cylinder 100 >$@.tmp
+ mv -f $@.tmp $@
+
%.dxf: %.eps
pstoedit -dt -f "dxf: -polyaslines -mm" $< $@
%.dxf: %.eps
pstoedit -dt -f "dxf: -polyaslines -mm" $< $@