diff options
| author | David Crocker <dcrocker@eschertech.com> | 2022-03-03 14:51:46 +0300 |
|---|---|---|
| committer | David Crocker <dcrocker@eschertech.com> | 2022-03-03 14:51:46 +0300 |
| commit | 43615f495e00221c701b407e8901a6768d57452d (patch) | |
| tree | 719778edf0f1c63addadbc6c48e7f4022e0f3681 /src | |
| parent | 830931087cd432f9e77e7057e89d282af06a446a (diff) | |
Don't report empty responses to PanelDue
Diffstat (limited to 'src')
| -rw-r--r-- | src/GCodes/GCodes.cpp | 18 |
1 files changed, 13 insertions, 5 deletions
diff --git a/src/GCodes/GCodes.cpp b/src/GCodes/GCodes.cpp index cc0f34cf..1989ab99 100644 --- a/src/GCodes/GCodes.cpp +++ b/src/GCodes/GCodes.cpp @@ -3618,9 +3618,18 @@ void GCodes::HandleReplyPreserveResult(GCodeBuffer& gb, GCodeResult rslt, const } #endif - // Don't report empty responses if a file or macro is being processed, or if the GCode was queued - // Also check that this response was triggered by a gcode - if (reply[0] == 0 && (&gb == fileGCode || &gb == queuedGCode || &gb == triggerGCode || &gb == autoPauseGCode || &gb == daemonGCode || gb.IsDoingFileMacro())) + // Don't report empty responses if a file or macro is being processed, or if the GCode was queued, or to PanelDue + if ( reply[0] == 0 + && ( &gb == fileGCode || &gb == queuedGCode || &gb == triggerGCode || &gb == autoPauseGCode || &gb == daemonGCode +#if HAS_AUX_DEVICES + || (&gb == auxGCode && !platform.IsAuxRaw(0)) +# ifdef SERIAL_AUX2_DEVICE + || (&gb == aux2GCode && !platform.IsAuxRaw(1)) +# endif +#endif + || gb.IsDoingFileMacro() + ) + ) { return; } @@ -3634,8 +3643,7 @@ void GCodes::HandleReplyPreserveResult(GCodeBuffer& gb, GCodeResult rslt, const { case Compatibility::Default: case Compatibility::RepRapFirmware: - // In RepRapFirmware compatibility mode we suppress empty responses in most cases. - // However, DWC expects a reply from every code, so we must even send empty responses + // DWC expects a reply from every code, so we must even send empty responses if (reply[0] != 0 || gb.IsLastCommand() || &gb == httpGCode) { platform.MessageF(mt, "%s\n", reply); |