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:
Diffstat (limited to 'src/Platform.cpp')
-rw-r--r--src/Platform.cpp17
1 files changed, 13 insertions, 4 deletions
diff --git a/src/Platform.cpp b/src/Platform.cpp
index 4bbb2274..b4104610 100644
--- a/src/Platform.cpp
+++ b/src/Platform.cpp
@@ -2294,9 +2294,10 @@ void Platform::Diagnostics(MessageType mtype)
#if HAS_VOLTAGE_MONITOR
// Show the supply voltage
- MessageF(mtype, "Supply voltage: min %.1f, current %.1f, max %.1f, under voltage events: %" PRIu32 ", over voltage events: %" PRIu32 "\n",
+ MessageF(mtype, "Supply voltage: min %.1f, current %.1f, max %.1f, under voltage events: %" PRIu32 ", over voltage events: %" PRIu32 ", power good: %s\n",
(double)AdcReadingToPowerVoltage(lowestVin), (double)AdcReadingToPowerVoltage(currentVin), (double)AdcReadingToPowerVoltage(highestVin),
- numUnderVoltageEvents, numOverVoltageEvents);
+ numUnderVoltageEvents, numOverVoltageEvents,
+ (driversPowered) ? "yes" : "no");
lowestVin = highestVin = currentVin;
#endif
@@ -4436,7 +4437,11 @@ GCodeResult Platform::ConfigureStallDetection(GCodeBuffer& gb, const StringRef&
{
for (size_t j = 0; j < axisDrivers[i].numDrivers; ++j)
{
- SetBit(drivers, axisDrivers[i].driverNumbers[j]);
+ const uint8_t driver = axisDrivers[i].driverNumbers[j];
+ if (driver < numSmartDrivers)
+ {
+ SetBit(drivers, driver);
+ }
}
}
}
@@ -4451,7 +4456,11 @@ GCodeResult Platform::ConfigureStallDetection(GCodeBuffer& gb, const StringRef&
{
if (extruderNumbers[i] < MaxExtruders)
{
- SetBit(drivers, GetExtruderDriver(extruderNumbers[i]));
+ const uint8_t driver = GetExtruderDriver(extruderNumbers[i]);
+ if (driver < numSmartDrivers)
+ {
+ SetBit(drivers, driver);
+ }
}
}
}