From 02859a37c8337e0a7e9a714497db947f97b10978 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gu=C3=B0ni=20M=C3=A1r=20Gilbert?= Date: Fri, 28 Apr 2023 18:29:33 +0000 Subject: [PATCH] optimisation: use CHECK_ALL_HEATERS in more places Change in memory: Flash: -162 bytes SRAM: 0 bytes --- Firmware/Marlin_main.cpp | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index b009d2b3c..2e860e5e3 100644 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -7805,9 +7805,7 @@ Sigma_Exit: cancel_heatup = false; bool is_pinda_cooling = false; - if ((degTargetBed() == 0) && (degTargetHotend(0) == 0)) { - is_pinda_cooling = true; - } + if (!(CHECK_ALL_HEATERS)) is_pinda_cooling = true; while ( ((!is_pinda_cooling) && (!cancel_heatup) && (current_temperature_pinda < set_target_pinda)) || (is_pinda_cooling && (current_temperature_pinda > set_target_pinda)) ) { if ((_millis() - codenum) > 1000) //Print Temp Reading every 1 second while waiting. @@ -9257,11 +9255,11 @@ void controllerFan() */ static void handleSafetyTimer() { - if (printer_active() || (!degTargetBed() && !degTargetHotend(0)) || (!safetytimer_inactive_time)) + if (printer_active() || !(CHECK_ALL_HEATERS) || !safetytimer_inactive_time) { safetyTimer.stop(); } - else if ((degTargetBed() || degTargetHotend(0)) && (!safetyTimer.running())) + else if ((CHECK_ALL_HEATERS) && !safetyTimer.running()) { safetyTimer.start(); }