Merge pull request #2352 from wavexx/fix_m603_regression

Use lcd_print_stop() in M603, fix octoprint regression
This commit is contained in:
DRracer 2019-12-13 13:52:40 +01:00 committed by GitHub
commit 838cec75ec
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -7271,7 +7271,7 @@ Sigma_Exit:
//! ### M603 - Stop print //! ### M603 - Stop print
// ------------------------------- // -------------------------------
case 603: { case 603: {
Stop(); lcd_print_stop();
} }
break; break;
@ -8745,6 +8745,16 @@ void kill(const char *full_screen_message, unsigned char id)
} // Wait for reset } // Wait for reset
} }
// Stop: Emergency stop used by overtemp functions which allows recovery
//
// In addition to stopping the print, this prevents subsequent G[0-3] commands to be
// processed via USB (using "Stopped") until the print is resumed via M999 or
// manually started from scratch with the LCD.
//
// Note that the current instruction is completely discarded, so resuming from Stop()
// will introduce either over/under extrusion on the current segment, and will not
// survive a power panic. Switching Stop() to use the pause machinery instead (with
// the addition of disabling the headers) could allow true recovery in the future.
void Stop() void Stop()
{ {
disable_heater(); disable_heater();