From 726321bc845bb45628a62158059157b455c9d39b Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Fri, 4 Nov 2022 20:10:59 -0500
Subject: [PATCH] =?UTF-8?q?=F0=9F=A9=B9=20MAX=20Thermocouple=20followup?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Followup to #24898
---
Marlin/src/inc/Conditionals_LCD.h | 7 +++++--
Marlin/src/module/temperature.cpp | 14 ++++++++------
2 files changed, 13 insertions(+), 8 deletions(-)
diff --git a/Marlin/src/inc/Conditionals_LCD.h b/Marlin/src/inc/Conditionals_LCD.h
index b21eca30b29..c1b43d2fc0c 100644
--- a/Marlin/src/inc/Conditionals_LCD.h
+++ b/Marlin/src/inc/Conditionals_LCD.h
@@ -1020,8 +1020,11 @@
#endif
// Helper macros for extruder and hotend arrays
-#define EXTRUDER_LOOP() for (int8_t e = 0; e < EXTRUDERS; e++)
-#define HOTEND_LOOP() for (int8_t e = 0; e < HOTENDS; e++)
+#define _EXTRUDER_LOOP(E) for (int8_t E = 0; E < EXTRUDERS; E++)
+#define EXTRUDER_LOOP() _EXTRUDER_LOOP(e)
+#define _HOTEND_LOOP(H) for (int8_t H = 0; H < HOTENDS; H++)
+#define HOTEND_LOOP() _HOTEND_LOOP(e)
+
#define ARRAY_BY_EXTRUDERS(V...) ARRAY_N(EXTRUDERS, V)
#define ARRAY_BY_EXTRUDERS1(v1) ARRAY_N_1(EXTRUDERS, v1)
#define ARRAY_BY_HOTENDS(V...) ARRAY_N(HOTENDS, V)
diff --git a/Marlin/src/module/temperature.cpp b/Marlin/src/module/temperature.cpp
index 8843582f4e6..37996a80ead 100644
--- a/Marlin/src/module/temperature.cpp
+++ b/Marlin/src/module/temperature.cpp
@@ -2374,7 +2374,7 @@ void Temperature::updateTemperaturesFromRawValues() {
TERN_(HAS_POWER_MONITOR, power_monitor.capture_values());
#if HAS_HOTEND
- static constexpr int8_t temp_dir[] = {
+ static constexpr int8_t temp_dir[HOTENDS] = {
#if TEMP_SENSOR_IS_ANY_MAX_TC(0)
0
#else
@@ -2386,19 +2386,21 @@ void Temperature::updateTemperaturesFromRawValues() {
#else
, TEMPDIR(1)
#endif
+ #endif
+ #if HOTENDS > 2
#if TEMP_SENSOR_IS_ANY_MAX_TC(2)
, 0
#else
, TEMPDIR(2)
#endif
- #if HOTENDS > 3
- #define _TEMPDIR(N) , TEMPDIR(N)
- REPEAT_S(3, HOTENDS, _TEMPDIR)
- #endif
+ #endif
+ #if HOTENDS > 3
+ #define _TEMPDIR(N) , TEMPDIR(N)
+ REPEAT_S(3, HOTENDS, _TEMPDIR)
#endif
};
- LOOP_L_N(e, COUNT(temp_dir)) {
+ HOTEND_LOOP() {
const raw_adc_t r = temp_hotend[e].getraw();
const bool neg = temp_dir[e] < 0, pos = temp_dir[e] > 0;
if ((neg && r < temp_range[e].raw_max) || (pos && r > temp_range[e].raw_max))