From 73a903e6569c3acda05c811dee766ab264246ab0 Mon Sep 17 00:00:00 2001 From: Adrian Bowyer Date: Wed, 20 Nov 2013 18:47:53 +0000 Subject: [PATCH] Fixed (I think) the M83 bug. --- .gitignore | 1 + Data/.~lock.duet-testing.doc# | 1 + Data/duet-testing.doc | Bin 68096 -> 71680 bytes GCodes.cpp | 4 ++-- 4 files changed, 4 insertions(+), 2 deletions(-) create mode 100644 Data/.~lock.duet-testing.doc# diff --git a/.gitignore b/.gitignore index 2c5e144..fee10ee 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,7 @@ *.d *.o Release/* +!Release/RepRapFirmware.bin *~ *orig /Release diff --git a/Data/.~lock.duet-testing.doc# b/Data/.~lock.duet-testing.doc# new file mode 100644 index 0000000..a5f5040 --- /dev/null +++ b/Data/.~lock.duet-testing.doc# @@ -0,0 +1 @@ +Adrian Bowyer,ensab,Charles,20.11.2013 18:47,file:///home/ensab/.config/libreoffice/3; \ No newline at end of file diff --git a/Data/duet-testing.doc b/Data/duet-testing.doc index 726dd38596a57ab82c852ea9cec97d58dbad1209..4adadb0c0977a49cd5b3adbd1a8639806f0229c6 100644 GIT binary patch delta 4688 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 GSp5r>vG@xB diff --git a/GCodes.cpp b/GCodes.cpp index e5b47a7..ea28902 100644 --- a/GCodes.cpp +++ b/GCodes.cpp @@ -1042,14 +1042,14 @@ bool GCodes::ActOnGcode(GCodeBuffer *gb) break; case 82: - if(drivesRelative) +// if(drivesRelative) for(int8_t extruder = AXES; extruder < DRIVES; extruder++) lastPos[extruder - AXES] = 0.0; drivesRelative = false; break; case 83: - if(!drivesRelative) +// if(!drivesRelative) for(int8_t extruder = AXES; extruder < DRIVES; extruder++) lastPos[extruder - AXES] = 0.0; drivesRelative = true;