diff options
| author | David Crocker <dcrocker@eschertech.com> | 2021-10-29 15:50:30 +0300 |
|---|---|---|
| committer | David Crocker <dcrocker@eschertech.com> | 2021-10-29 15:50:30 +0300 |
| commit | 63a6a133c683f12e4a69f4e5fbc694c03e1d8ceb (patch) | |
| tree | bd839d4bf6baef9e416e8571bddae2c2449a7b40 | |
| parent | e7d848e4da694758eaaa168af82afd9d8564760e (diff) | |
Report checkNonPrintingMoves in M591 response and in OM
| -rw-r--r-- | src/FilamentMonitors/LaserFilamentMonitor.cpp | 6 | ||||
| -rw-r--r-- | src/FilamentMonitors/RotatingMagnetFilamentMonitor.cpp | 6 |
2 files changed, 8 insertions, 4 deletions
diff --git a/src/FilamentMonitors/LaserFilamentMonitor.cpp b/src/FilamentMonitors/LaserFilamentMonitor.cpp index 4021e8dd..d20d8adf 100644 --- a/src/FilamentMonitors/LaserFilamentMonitor.cpp +++ b/src/FilamentMonitors/LaserFilamentMonitor.cpp @@ -54,6 +54,7 @@ constexpr ObjectModelTableEntry LaserFilamentMonitor::objectModelTable[] = { "totalDistance", OBJECT_MODEL_FUNC(self->totalExtrusionCommanded, 1), ObjectModelEntryFlags::live }, // 2. LaserFilamentMonitor.configured members + { "allMoves", OBJECT_MODEL_FUNC(self->checkNonPrintingMoves), ObjectModelEntryFlags::none }, { "calibrationFactor", OBJECT_MODEL_FUNC(self->calibrationFactor, 3), ObjectModelEntryFlags::none }, { "percentMax", OBJECT_MODEL_FUNC(ConvertToPercent(self->maxMovementAllowed)), ObjectModelEntryFlags::none }, { "percentMin", OBJECT_MODEL_FUNC(ConvertToPercent(self->minMovementAllowed)), ObjectModelEntryFlags::none }, @@ -69,7 +70,7 @@ constexpr uint8_t LaserFilamentMonitor::objectModelTableDescriptor[] = 5, #endif 4, - 4 + 5 }; DEFINE_GET_OBJECT_MODEL_TABLE(LaserFilamentMonitor) @@ -164,10 +165,11 @@ GCodeResult LaserFilamentMonitor::Configure(GCodeBuffer& gb, const StringRef& re { reply.printf("Duet3D laser filament monitor v%u%s on pin ", version, (switchOpenMask != 0) ? " with switch" : ""); GetPort().AppendPinName(reply); - reply.catf(", %s, allow %ld%% to %ld%%, check every %.1fmm, calibration factor %.3f, ", + reply.catf(", %s, allow %ld%% to %ld%%, check %s moves every %.1fmm, calibration factor %.3f, ", (comparisonEnabled) ? "enabled" : "disabled", ConvertToPercent(minMovementAllowed), ConvertToPercent(maxMovementAllowed), + (checkNonPrintingMoves) ? "all" : "printing", (double)minimumExtrusionCheckLength, (double)calibrationFactor); diff --git a/src/FilamentMonitors/RotatingMagnetFilamentMonitor.cpp b/src/FilamentMonitors/RotatingMagnetFilamentMonitor.cpp index 3c361c2c..2957411d 100644 --- a/src/FilamentMonitors/RotatingMagnetFilamentMonitor.cpp +++ b/src/FilamentMonitors/RotatingMagnetFilamentMonitor.cpp @@ -54,6 +54,7 @@ constexpr ObjectModelTableEntry RotatingMagnetFilamentMonitor::objectModelTable[ { "totalDistance", OBJECT_MODEL_FUNC(self->totalExtrusionCommanded, 1), ObjectModelEntryFlags::live }, // 2. RotatingMagnetFilamentMonitor.configured members + { "allMoves", OBJECT_MODEL_FUNC(self->checkNonPrintingMoves), ObjectModelEntryFlags::none }, { "mmPerRev", OBJECT_MODEL_FUNC(self->mmPerRev, 2), ObjectModelEntryFlags::none }, { "percentMax", OBJECT_MODEL_FUNC(ConvertToPercent(self->maxMovementAllowed)), ObjectModelEntryFlags::none }, { "percentMin", OBJECT_MODEL_FUNC(ConvertToPercent(self->minMovementAllowed)), ObjectModelEntryFlags::none }, @@ -69,7 +70,7 @@ constexpr uint8_t RotatingMagnetFilamentMonitor::objectModelTableDescriptor[] = 5, #endif 4, - 4 + 5 }; DEFINE_GET_OBJECT_MODEL_TABLE(RotatingMagnetFilamentMonitor) @@ -166,11 +167,12 @@ GCodeResult RotatingMagnetFilamentMonitor::Configure(GCodeBuffer& gb, const Stri { reply.printf("Duet3D rotating magnet filament monitor v%u%s on pin ", version, (switchOpenMask != 0) ? " with switch" : ""); GetPort().AppendPinName(reply); - reply.catf(", %s, sensitivity %.2fmm/rev, allow %ld%% to %ld%%, check every %.1fmm, ", + reply.catf(", %s, sensitivity %.2fmm/rev, allow %ld%% to %ld%%, check %s moves every %.1fmm, ", (comparisonEnabled) ? "enabled" : "disabled", (double)mmPerRev, ConvertToPercent(minMovementAllowed), ConvertToPercent(maxMovementAllowed), + (checkNonPrintingMoves) ? "all" : "printing", (double)minimumExtrusionCheckLength); if (!dataReceived) |