diff options
author | David Crocker <dcrocker@eschertech.com> | 2020-10-06 14:28:55 +0300 |
---|---|---|
committer | David Crocker <dcrocker@eschertech.com> | 2020-10-06 14:28:55 +0300 |
commit | 15e3a526336019e71f0d13e181ed4ebd0125583f (patch) | |
tree | f89b26f3ec6cde2fea0bccffa39f433be4a49f09 | |
parent | 42b31bccc0d81eb476133c922b83e538a033d73c (diff) |
Bug fixes to G92
G92 Z was not clearing zDatumSetByProbing
G902 E0 was incrementing move.seqs
-rw-r--r-- | src/GCodes/GCodes3.cpp | 7 | ||||
-rw-r--r-- | src/Version.h | 4 |
2 files changed, 7 insertions, 4 deletions
diff --git a/src/GCodes/GCodes3.cpp b/src/GCodes/GCodes3.cpp index eae574f5..4fc9cb92 100644 --- a/src/GCodes/GCodes3.cpp +++ b/src/GCodes/GCodes3.cpp @@ -99,7 +99,11 @@ GCodeResult GCodes::SetPositions(GCodeBuffer& gb) THROWS(GCodeException) axesHomed |= reprap.GetMove().GetKinematics().AxesAssumedHomed(axesIncluded); if (axesIncluded.IsBitSet(Z_AXIS)) { - zDatumSetByProbing -= false; + if (zDatumSetByProbing) + { + zDatumSetByProbing = false; + reprap.MoveUpdated(); + } } #if SUPPORT_ROLAND @@ -116,7 +120,6 @@ GCodeResult GCodes::SetPositions(GCodeBuffer& gb) THROWS(GCodeException) #endif } - reprap.MoveUpdated(); // I'm not sure this is necessary because the position and homed fields in the OM are flagged 'frequent'; but we may have changed zDatumSetByProbing return GCodeResult::ok; } diff --git a/src/Version.h b/src/Version.h index d498c620..69e4d85e 100644 --- a/src/Version.h +++ b/src/Version.h @@ -9,7 +9,7 @@ #define SRC_VERSION_H_ #ifndef VERSION -# define MAIN_VERSION "3.2-beta2" +# define MAIN_VERSION "3.2-beta2+1" # ifdef USE_CAN0 # define VERSION_SUFFIX " (CAN0)" # else @@ -19,7 +19,7 @@ #endif #ifndef DATE -# define DATE "2020-10-05b2" +# define DATE "2020-10-06b1" #endif #define AUTHORS "reprappro, dc42, chrishamm, t3p3, dnewman, printm3d" |