🚸 Optional thermistors in Info Menu (#27303)

MarlinFirmware · Jul 23, 2024 · ca4248b · ca4248b
1 parent 4a5d8ba
commit ca4248b
Show file tree

Hide file tree

Showing 2 changed files with 102 additions and 78 deletions.
diff --git a/Marlin/src/lcd/menu/menu_info.cpp b/Marlin/src/lcd/menu/menu_info.cpp
@@ -95,96 +95,114 @@
 //
 // About Printer > Thermistors
 //
-void menu_info_thermistors() {
-  if (ui.use_click()) return ui.go_back();
+#if HAS_TEMP_SENSOR
+  void menu_info_thermistors() {
+    if (ui.use_click()) return ui.go_back();
 
-  START_SCREEN();
+    START_SCREEN();
 
-  #define THERM_ITEMS(LBL,HTR,WAT) \
-    STATIC_ITEM_F(F(LBL ": " THERMISTOR_NAME), SS_INVERT); \
-    PSTRING_ITEM(MSG_INFO_MIN_TEMP, STRINGIFY(HTR##_MINTEMP), SS_FULL); \
-    PSTRING_ITEM(MSG_INFO_MAX_TEMP, STRINGIFY(HTR##_MAXTEMP), SS_FULL); \
-    STATIC_ITEM(TERN(WAT, MSG_INFO_RUNAWAY_ON, MSG_INFO_RUNAWAY_OFF), SS_FULL) \
-
-  #if HAS_EXTRUDERS
-    #define THERMISTOR_ID TEMP_SENSOR_0
-    #include "../thermistornames.h"
-    #undef THERMISTOR_ID
-    THERM_ITEMS(STR_E0, HEATER_0, WATCH_HOTENDS);
-  #endif
+    #define THERM_ITEM_NAME(LBL) \
+      STATIC_ITEM_F(F(LBL ": " THERMISTOR_NAME), SS_INVERT);
 
-  #if TEMP_SENSOR_1 != 0
-    #define THERMISTOR_ID TEMP_SENSOR_1
-    #include "../thermistornames.h"
-    #undef THERMISTOR_ID
-    THERM_ITEMS(STR_E1, HEATER_1, WATCH_HOTENDS);
-  #endif
+    #define THERM_ITEMS(LBL,HTR,WAT) \
+      THERM_ITEM_NAME(LBL) \
+      PSTRING_ITEM(MSG_INFO_MIN_TEMP, STRINGIFY(HTR##_MINTEMP), SS_FULL); \
+      PSTRING_ITEM(MSG_INFO_MAX_TEMP, STRINGIFY(HTR##_MAXTEMP), SS_FULL); \
+      STATIC_ITEM(TERN(WAT, MSG_INFO_RUNAWAY_ON, MSG_INFO_RUNAWAY_OFF), SS_FULL) \
 
-  #if TEMP_SENSOR_2 != 0
-    #define THERMISTOR_ID TEMP_SENSOR_2
-    #include "../thermistornames.h"
-    #undef THERMISTOR_ID
-    THERM_ITEMS(STR_E2, HEATER_2, WATCH_HOTENDS);
-  #endif
+    #if TEMP_SENSOR_0 != 0
+      #define THERMISTOR_ID TEMP_SENSOR_0
+      #include "../thermistornames.h"
+      THERM_ITEMS(STR_E0, HEATER_0, WATCH_HOTENDS);
+    #endif
 
-  #if TEMP_SENSOR_3 != 0
-    #define THERMISTOR_ID TEMP_SENSOR_3
-    #include "../thermistornames.h"
-    #undef THERMISTOR_ID
-    THERM_ITEMS(STR_E3, HEATER_3, WATCH_HOTENDS);
-  #endif
+    #if TEMP_SENSOR_1 != 0
+      #define THERMISTOR_ID TEMP_SENSOR_1
+      #include "../thermistornames.h"
+      THERM_ITEMS(STR_E1, HEATER_1, WATCH_HOTENDS);
+    #endif
 
-  #if TEMP_SENSOR_4 != 0
-    #define THERMISTOR_ID TEMP_SENSOR_4
-    #include "../thermistornames.h"
-    #undef THERMISTOR_ID
-    THERM_ITEMS(STR_E4, HEATER_4, WATCH_HOTENDS);
-  #endif
+    #if TEMP_SENSOR_2 != 0
+      #define THERMISTOR_ID TEMP_SENSOR_2
+      #include "../thermistornames.h"
+      THERM_ITEMS(STR_E2, HEATER_2, WATCH_HOTENDS);
+    #endif
 
-  #if TEMP_SENSOR_5 != 0
-    #define THERMISTOR_ID TEMP_SENSOR_5
-    #include "../thermistornames.h"
-    #undef THERMISTOR_ID
-    THERM_ITEMS(STR_E5, HEATER_5, WATCH_HOTENDS);
-  #endif
+    #if TEMP_SENSOR_3 != 0
+      #define THERMISTOR_ID TEMP_SENSOR_3
+      #include "../thermistornames.h"
+      THERM_ITEMS(STR_E3, HEATER_3, WATCH_HOTENDS);
+    #endif
 
-  #if TEMP_SENSOR_6 != 0
-    #define THERMISTOR_ID TEMP_SENSOR_6
-    #include "../thermistornames.h"
-    #undef THERMISTOR_ID
-    THERM_ITEMS(STR_E6, HEATER_6, WATCH_HOTENDS);
-  #endif
+    #if TEMP_SENSOR_4 != 0
+      #define THERMISTOR_ID TEMP_SENSOR_4
+      #include "../thermistornames.h"
+      THERM_ITEMS(STR_E4, HEATER_4, WATCH_HOTENDS);
+    #endif
 
-  #if TEMP_SENSOR_7 != 0
-    #define THERMISTOR_ID TEMP_SENSOR_7
-    #include "../thermistornames.h"
-    #undef THERMISTOR_ID
-    THERM_ITEMS(STR_E7, HEATER_7, WATCH_HOTENDS);
-  #endif
+    #if TEMP_SENSOR_5 != 0
+      #define THERMISTOR_ID TEMP_SENSOR_5
+      #include "../thermistornames.h"
+      THERM_ITEMS(STR_E5, HEATER_5, WATCH_HOTENDS);
+    #endif
 
-  #if HAS_HEATED_BED
-    #define THERMISTOR_ID TEMP_SENSOR_BED
-    #include "../thermistornames.h"
-    #undef THERMISTOR_ID
-    THERM_ITEMS("BED", BED, WATCH_BED);
-  #endif
+    #if TEMP_SENSOR_6 != 0
+      #define THERMISTOR_ID TEMP_SENSOR_6
+      #include "../thermistornames.h"
+      THERM_ITEMS(STR_E6, HEATER_6, WATCH_HOTENDS);
+    #endif
 
-  #if HAS_HEATED_CHAMBER
-    #define THERMISTOR_ID TEMP_SENSOR_CHAMBER
-    #include "../thermistornames.h"
-    #undef THERMISTOR_ID
-    THERM_ITEMS("CHAM", CHAMBER, WATCH_CHAMBER);
-  #endif
+    #if TEMP_SENSOR_7 != 0
+      #define THERMISTOR_ID TEMP_SENSOR_7
+      #include "../thermistornames.h"
+      THERM_ITEMS(STR_E7, HEATER_7, WATCH_HOTENDS);
+    #endif
 
-  #if HAS_COOLER
-    #define THERMISTOR_ID TEMP_SENSOR_COOLER
-    #include "../thermistornames.h"
-    #undef THERMISTOR_ID
-    THERM_ITEMS("COOL", COOLER, WATCH_COOLER);
-  #endif
+    #if HAS_HEATED_BED
+      #define THERMISTOR_ID TEMP_SENSOR_BED
+      #include "../thermistornames.h"
+      THERM_ITEMS("BED", BED, WATCH_BED);
+    #endif
 
-  END_SCREEN();
-}
+    #if HAS_HEATED_CHAMBER
+      #define THERMISTOR_ID TEMP_SENSOR_CHAMBER
+      #include "../thermistornames.h"
+      THERM_ITEMS("CHAM", CHAMBER, WATCH_CHAMBER);
+    #endif
+
+    #if HAS_COOLER
+      #define THERMISTOR_ID TEMP_SENSOR_COOLER
+      #include "../thermistornames.h"
+      THERM_ITEMS("COOL", COOLER, WATCH_COOLER);
+    #endif
+
+    #if TEMP_SENSOR_PROBE != 0
+      #define THERMISTOR_ID TEMP_SENSOR_PROBE
+      #include "../thermistornames.h"
+      THERM_ITEM_NAME("PROBE");
+    #endif
+
+    #if TEMP_SENSOR_BOARD != 0
+      #define THERMISTOR_ID TEMP_SENSOR_BOARD
+      #include "../thermistornames.h"
+      THERM_ITEM_NAME("BOARD");
+    #endif
+
+    #if TEMP_SENSOR_SOC != 0
+      #define THERMISTOR_ID TEMP_SENSOR_SOC
+      #include "../thermistornames.h"
+      THERM_ITEM_NAME("SOC");
+    #endif
+
+    #if TEMP_SENSOR_REDUNDANT != 0
+      #define THERMISTOR_ID TEMP_SENSOR_REDUNDANT
+      #include "../thermistornames.h"
+      THERM_ITEM_NAME("REDUNDANT");
+    #endif
+
+    END_SCREEN();
+  }
+#endif // HAS_TEMP_SENSOR
 
 //
 // About Printer > Board Info
@@ -256,7 +274,7 @@ void menu_info() {
   #else
     SUBMENU(MSG_INFO_PRINTER_MENU, menu_info_printer);           // Printer Info >
     SUBMENU(MSG_INFO_BOARD_MENU, menu_info_board);               // Board Info >
-    #if HAS_EXTRUDERS
+    #if HAS_TEMP_SENSOR
       SUBMENU(MSG_INFO_THERMISTOR_MENU, menu_info_thermistors);  // Thermistors >
     #endif
   #endif

diff --git a/Marlin/src/lcd/thermistornames.h b/Marlin/src/lcd/thermistornames.h
@@ -171,4 +171,10 @@
 #elif THERMISTOR_ID == 1000
   #define THERMISTOR_NAME "Custom"
 
+// SOC thermistor`
+#elif THERMISTOR_ID == 100
+  #define THERMISTOR_NAME "SOC"
+
 #endif // THERMISTOR_ID
+
+#undef THERMISTOR_ID