From 5b0c818522a493f955752259c324c50387aba31d Mon Sep 17 00:00:00 2001 From: Keith Bennett <13375512+thisiskeithb@users.noreply.github.com> Date: Mon, 6 May 2024 15:45:44 -0700 Subject: [PATCH] =?UTF-8?q?=F0=9F=A9=B9=20Update=20preheat=20end=20time=20?= =?UTF-8?q?var=20(#27023)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: ellensp <530024+ellensp@users.noreply.github.com> Co-authored-by: Scott Lahteine --- Marlin/src/module/temperature.cpp | 4 ++-- Marlin/src/module/temperature.h | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Marlin/src/module/temperature.cpp b/Marlin/src/module/temperature.cpp index cfcfed5dcdf0..35e913454f4b 100644 --- a/Marlin/src/module/temperature.cpp +++ b/Marlin/src/module/temperature.cpp @@ -595,7 +595,7 @@ volatile bool Temperature::raw_temps_ready = false; #endif #if MILLISECONDS_PREHEAT_TIME > 0 - millis_t Temperature::preheat_end_ms_hotend[HOTENDS]; // = { 0 }; + millis_t Temperature::preheat_end_ms_hotend[HOTENDS]; // = { 0 } #endif #if HAS_HEATED_BED && PREHEAT_TIME_BED_MS > 0 millis_t Temperature::preheat_end_ms_bed = 0; @@ -2442,7 +2442,7 @@ void Temperature::updateTemperaturesFromRawValues() { /** // DEBUG PREHEATING TIME SERIAL_ECHOLNPGM("\nExtruder = ", e, " Preheat On/Off = ", is_preheating(e)); - const float test_is_preheating = (preheat_end_time[HOTEND_INDEX] - millis()) * 0.001f; + const float test_is_preheating = (preheat_end_ms_hotend[HOTEND_INDEX] - millis()) * 0.001f; if (test_is_preheating < 31) SERIAL_ECHOLNPGM("Extruder = ", e, " Preheat remaining time = ", test_is_preheating, "s", "\n"); //*/ diff --git a/Marlin/src/module/temperature.h b/Marlin/src/module/temperature.h index 10bb12f8b54c..bdb13177b815 100644 --- a/Marlin/src/module/temperature.h +++ b/Marlin/src/module/temperature.h @@ -747,7 +747,7 @@ class Temperature { #endif #if MILLISECONDS_PREHEAT_TIME > 0 - static millis_t preheat_end_time[HOTENDS]; + static millis_t preheat_end_ms_hotend[HOTENDS]; #endif #if HAS_FAN_LOGIC @@ -909,13 +909,13 @@ class Temperature { */ #if MILLISECONDS_PREHEAT_TIME > 0 static bool is_preheating(const uint8_t E_NAME) { - return preheat_end_time[HOTEND_INDEX] && PENDING(millis(), preheat_end_time[HOTEND_INDEX]); + return preheat_end_ms_hotend[HOTEND_INDEX] && PENDING(millis(), preheat_end_ms_hotend[HOTEND_INDEX]); } static void start_preheat_time(const uint8_t E_NAME) { - preheat_end_time[HOTEND_INDEX] = millis() + MILLISECONDS_PREHEAT_TIME; + preheat_end_ms_hotend[HOTEND_INDEX] = millis() + MILLISECONDS_PREHEAT_TIME; } static void reset_preheat_time(const uint8_t E_NAME) { - preheat_end_time[HOTEND_INDEX] = 0; + preheat_end_ms_hotend[HOTEND_INDEX] = 0; } #else #define is_preheating(n) (false)