From 48cc310c588b8ab52cffdc8f86855a05a4b20122 Mon Sep 17 00:00:00 2001
From: ellensp <530024+ellensp@users.noreply.github.com>
Date: Thu, 1 May 2025 07:37:11 +1200
Subject: [PATCH] =?UTF-8?q?=F0=9F=94=A7=20More=20thorough=20TEMP=5FSENSOR?=
 =?UTF-8?q?=5F*=20cleanup=20(#27826)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/inc/Conditionals-3-etc.h | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/Marlin/src/inc/Conditionals-3-etc.h b/Marlin/src/inc/Conditionals-3-etc.h
index e4dcdda58f..2456728554 100644
--- a/Marlin/src/inc/Conditionals-3-etc.h
+++ b/Marlin/src/inc/Conditionals-3-etc.h
@@ -42,30 +42,32 @@
 
 // Clean up unused temperature sensors and sub-options
 
-#if !TEMP_SENSOR_0
+#define UNUSED_TEMP_SENSOR(N) (!TEMP_SENSOR_##N || N >= HOTENDS)
+#if UNUSED_TEMP_SENSOR(0)
   #undef TEMP_SENSOR_0
 #endif
-#if !TEMP_SENSOR_1
+#if UNUSED_TEMP_SENSOR(1)
   #undef TEMP_SENSOR_1
 #endif
-#if !TEMP_SENSOR_2
+#if UNUSED_TEMP_SENSOR(2)
   #undef TEMP_SENSOR_2
 #endif
-#if !TEMP_SENSOR_3
+#if UNUSED_TEMP_SENSOR(3)
   #undef TEMP_SENSOR_3
 #endif
-#if !TEMP_SENSOR_4
+#if UNUSED_TEMP_SENSOR(4)
   #undef TEMP_SENSOR_4
 #endif
-#if !TEMP_SENSOR_5
+#if UNUSED_TEMP_SENSOR(5)
   #undef TEMP_SENSOR_5
 #endif
-#if !TEMP_SENSOR_6
+#if UNUSED_TEMP_SENSOR(6)
   #undef TEMP_SENSOR_6
 #endif
-#if !TEMP_SENSOR_7
+#if UNUSED_TEMP_SENSOR(7)
   #undef TEMP_SENSOR_7
 #endif
+#undef UNUSED_TEMP_SENSOR
 
 #if !TEMP_SENSOR_BED
   #undef TEMP_SENSOR_BED