felix/Marlin
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Update emergency_parser for 2.0.x parity (#10530)

Browse Source
This commit is contained in:
Scott Lahteine
2018-04-25 22:42:43 -05:00
committed by GitHub
parent d429d5a4ae
commit 11bbcfd69e
6 changed files with 192 additions and 115 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Marlin/temperature.cpp
View File

@@ -48,6 +48,10 @@
#include "watchdog.h"
#endif
#if ENABLED(EMERGENCY_PARSER)
#include "emergency_parser.h"
#endif
#if ENABLED(TEMP_SENSOR_1_AS_REDUNDANT)
static void* heater_ttbl_map[2] = { (void*)HEATER_0_TEMPTABLE, (void*)HEATER_1_TEMPTABLE };
static uint8_t heater_ttbllen_map[2] = { HEATER_0_TEMPTABLE_LEN, HEATER_1_TEMPTABLE_LEN };
@@ -773,7 +777,7 @@ void Temperature::manage_heater() {
#endif
#if ENABLED(EMERGENCY_PARSER)
if (killed_by_M112) kill(PSTR(MSG_KILLED));
if (emergency_parser.killed_by_M112) kill(PSTR(MSG_KILLED));
#endif
if (!temp_meas_ready) return;