Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/Duet3D/RepRapFirmware.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/GCodes/GCodes3.cpp7
-rw-r--r--src/Version.h4
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"