Merge branch 'master' of chiark:/u/ianmdlvl/reprap/play

diff --git a/Makefile b/Makefile
index 688c7cec6cbb507a462b8b2686c475d0d342d481..bd47f9cb668467df11f6c0d95ad627dc6ae4fc84 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -70,6 +70,7 @@ AUTOBASE=$(shell echo $(1) | perl -pe 's/,\w+\.auto$$//')
 
 %.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

diff --git a/filamentspool.scad b/filamentspool.scad
index 9fbd1f8188a4955136ae70cb73c106d88237c215..7c1023e4e6a99bbea69bfc215f6cbc9417e202e0 100644 (file)
--- a/filamentspool.scad
+++ b/filamentspool.scad
@@ -189,7 +189,7 @@ ratchettoothsmoothr=1;
 ratchettoothslope=0.75;
 overlap=0.5;
 cupwidth=selsz(40,25,50);
-cupheight=selsz(75,35,55);
+cupheight=selsz(75,35,75);
 
 cupstrong_dx=selsz(0,0,-10);