zaubentrucker/muele-marlin
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Fix Busy State in temperature.cpp

Browse source 
Fix #11954
This commit is contained in:
Scott Lahteine 2018-09-29 17:03:23 -05:00
parent 70e7a465d8
commit d89d8fe852
1 changed files with 4 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
Marlin/src/module/temperature.cpp
View file

@ -2435,10 +2435,8 @@ void Temperature::isr() {
#define TEMP_CONDITIONS (wants_to_cool ? isCoolingHotend(target_extruder) : isHeatingHotend(target_extruder)) #define TEMP_CONDITIONS (wants_to_cool ? isCoolingHotend(target_extruder) : isHeatingHotend(target_extruder))
#endif #endif
#if DISABLED(BUSY_WHILE_HEATING) #if DISABLED(BUSY_WHILE_HEATING) && ENABLED(HOST_KEEPALIVE_FEATURE)
#if ENABLED(HOST_KEEPALIVE_FEATURE) const GcodeSuite::MarlinBusyState old_busy_state = gcode.busy_state;
const MarlinBusyState old_busy_state = gcode.busy_state;
#endif
KEEPALIVE_STATE(NOT_BUSY); KEEPALIVE_STATE(NOT_BUSY);
#endif #endif
@ -2564,10 +2562,8 @@ void Temperature::isr() {
wait_for_heatup = true; wait_for_heatup = true;
millis_t now, next_temp_ms = 0, next_cool_check_ms = 0; millis_t now, next_temp_ms = 0, next_cool_check_ms = 0;
#if DISABLED(BUSY_WHILE_HEATING) #if DISABLED(BUSY_WHILE_HEATING) && ENABLED(HOST_KEEPALIVE_FEATURE)
#if ENABLED(HOST_KEEPALIVE_FEATURE) const GcodeSuite::MarlinBusyState old_busy_state = gcode.busy_state;
const MarlinBusyState old_busy_state = gcode.busy_state;
#endif
KEEPALIVE_STATE(NOT_BUSY); KEEPALIVE_STATE(NOT_BUSY);
#endif #endif