TM: Do not emit an "error:" on the serial for recoverable errors
Use "echo:" for thermal model error reporting to avoid octoprint automatically sending a M112 kill. Keep using "error:" instead for other thermal errors (MAXTEMP/etc). This should allow resuming a thermal mode pause with the default octoprint settings.
This commit is contained in:
parent
ea7e717204
commit
d403d58b19
|
|
@ -9460,6 +9460,8 @@ void ThermalStop(bool allow_recovery)
|
|||
{
|
||||
if(Stopped == false) {
|
||||
Stopped = true;
|
||||
|
||||
// Either pause or stop the print
|
||||
if(allow_recovery && (IS_SD_PRINTING || usb_timer.running())) {
|
||||
if (!isPrintPaused) {
|
||||
lcd_setalertstatuspgm(_T(MSG_PAUSED_THERMAL_ERROR), LCD_STATUS_CRITICAL);
|
||||
|
|
@ -9482,8 +9484,8 @@ void ThermalStop(bool allow_recovery)
|
|||
print_stop();
|
||||
}
|
||||
|
||||
// Report the status on the serial, switch to a busy state
|
||||
SERIAL_ERROR_START;
|
||||
// Report the error on the serial
|
||||
serialprintPGM(allow_recovery ? echomagic : errormagic);
|
||||
SERIAL_ERRORLNRPGM(MSG_ERR_STOPPED);
|
||||
|
||||
// Eventually report the stopped status on the lcd (though this is usually overridden by a
|
||||
|
|
|
|||
Loading…
Reference in New Issue