3d_print_resources/Marlin
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Fix: M112 calling kill from interrupt (#9922)

Browse source 
Fix #9906
This commit is contained in:
Scott Lahteine 2018-03-03 23:13:53 -06:00 • committed by GitHub
parent 7450b7c36e
commit b6fa55aa37
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 17 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Marlin/temperature.cpp
View file

@ -744,6 +744,10 @@ void Temperature::manage_heater() {
static bool last_pause_state;
#endif
#if ENABLED(EMERGENCY_PARSER)
if (killed_by_M112) kill(PSTR(MSG_KILLED));
#endif
if (!temp_meas_ready) return;
updateTemperaturesFromRawValues(); // also resets the watchdog