diff --git a/Marlin/Marlin_main.cpp b/Marlin/Marlin_main.cpp index 8a174aeb7b..45bfac5c0f 100644 --- a/Marlin/Marlin_main.cpp +++ b/Marlin/Marlin_main.cpp @@ -2058,32 +2058,24 @@ static void clean_up_after_endstop_or_probe_move() { #if ENABLED(PROBING_FANS_OFF) void fans_pause(bool p) { - if (p && fans_paused) { // If called out of order something is wrong + if (p == fans_paused) { // If called out of order something is wrong SERIAL_ERROR_START; - SERIAL_ERRORLNPGM("Fans already paused!"); + serialprintPGM(fans_paused ? PSTR("Fans already paused!") : PSTR("Fans already unpaused!")); return; } - if (!p && !fans_paused) { - SERIAL_ERROR_START; - SERIAL_ERRORLNPGM("Fans already unpaused!"); - return; - } - - if (p) { + if (p) for (uint8_t x = 0;x < FAN_COUNT;x++) { paused_fanSpeeds[x] = fanSpeeds[x]; fanSpeeds[x] = 0; } - } - else { + else for (uint8_t x = 0;x < FAN_COUNT;x++) fanSpeeds[x] = paused_fanSpeeds[x]; - } fans_paused = p; } -#endif +#endif // PROBING_FANS_OFF #if HAS_BED_PROBE diff --git a/Marlin/temperature.cpp b/Marlin/temperature.cpp index dbadd06f32..3b9454ccc4 100644 --- a/Marlin/temperature.cpp +++ b/Marlin/temperature.cpp @@ -1358,15 +1358,9 @@ void Temperature::disable_all_heaters() { #if ENABLED(PROBING_HEATERS_OFF) void Temperature::pause(bool p) { - if (p && paused) { // If called out of order something is wrong + if (p == paused) { // If called out of order something is wrong SERIAL_ERROR_START; - SERIAL_ERRORLNPGM("Heaters already paused!"); - return; - } - - if (!p && !paused) { - SERIAL_ERROR_START; - SERIAL_ERRORLNPGM("Heaters already unpaused!"); + serialprintPGM(paused ? PSTR("Heaters already paused!") : PSTR("Heaters already unpaused!")); return; } @@ -1393,7 +1387,7 @@ void Temperature::disable_all_heaters() { bool Temperature::ispaused() { return paused; } -#endif +#endif // PROBING_HEATERS_OFF #if ENABLED(HEATER_0_USES_MAX6675)