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:
authorDavid Crocker <dcrocker@eschertech.com>2022-09-13 17:32:08 +0300
committerDavid Crocker <dcrocker@eschertech.com>2022-09-13 17:32:08 +0300
commit3b5fe90f4ecc2527c7dcb7bbba35000d6ad789cf (patch)
treef54530472ec56b72e9e82fbd782fa2dab91c706b
parent6901180c481e181ff656b9c7dd3fe4a901fd31da (diff)
M915 in expansion mode now reports whether event-on-stall enabled, 3.4.23.4.2
-rw-r--r--src/Platform/Platform.cpp4
-rw-r--r--src/Version.h2
2 files changed, 4 insertions, 2 deletions
diff --git a/src/Platform/Platform.cpp b/src/Platform/Platform.cpp
index ba00aab9..bbc1c0d9 100644
--- a/src/Platform/Platform.cpp
+++ b/src/Platform/Platform.cpp
@@ -5172,10 +5172,12 @@ GCodeResult Platform::EutProcessM915(const CanMessageGeneric& msg, const StringR
if (!seen)
{
- drivers.Iterate([&reply](unsigned int drive, unsigned int) noexcept
+ drivers.Iterate([&reply, this](unsigned int drive, unsigned int) noexcept
{
reply.lcatf("Driver %u.%u: ", CanInterface::GetCanAddress(), drive);
SmartDrivers::AppendStallConfig(drive, reply);
+ reply.cat(", event on stall: ");
+ reply.cat((eventOnStallDrivers.IsBitSet(drive)) ? "yes" : "no");
}
);
}
diff --git a/src/Version.h b/src/Version.h
index 44a59909..aa1ab386 100644
--- a/src/Version.h
+++ b/src/Version.h
@@ -10,7 +10,7 @@
#ifndef VERSION
// Note: the complete VERSION string must be in standard version number format and must not contain spaces! This is so that DWC can parse it.
-# define MAIN_VERSION "3.4.2rc3+2"
+# define MAIN_VERSION "3.4.2"
# ifdef USE_CAN0
# define VERSION_SUFFIX "(CAN0)"
# else