From 00c96dc3cd267ca81db94f048f95dbc4b5fd79c3 Mon Sep 17 00:00:00 2001
From: "Alexey D. Filimonov" <alexey@filimonic.net>
Date: Sat, 22 Apr 2023 12:06:19 +0300
Subject: [PATCH] =?UTF-8?q?=F0=9F=8E=A8=20Clean=20up=20TFT=20Color=20UI=20?=
=?UTF-8?q?display=20items=20(#25712)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com>
---
Marlin/src/lcd/tft/ui_1024x600.cpp | 14 +++++-----
Marlin/src/lcd/tft/ui_320x240.cpp | 14 +++++-----
Marlin/src/lcd/tft/ui_480x320.cpp | 14 +++++-----
Marlin/src/lcd/tft/ui_common.h | 41 +++++++++---------------------
4 files changed, 33 insertions(+), 50 deletions(-)
diff --git a/Marlin/src/lcd/tft/ui_1024x600.cpp b/Marlin/src/lcd/tft/ui_1024x600.cpp
index aa266d6b87d..08d6b51fdbb 100644
--- a/Marlin/src/lcd/tft/ui_1024x600.cpp
+++ b/Marlin/src/lcd/tft/ui_1024x600.cpp
@@ -228,25 +228,25 @@ void MarlinUI::draw_status_screen() {
for (i = 0 ; i < ITEMS_COUNT; i++) {
x = (TFT_WIDTH / ITEMS_COUNT - 80) / 2 + (TFT_WIDTH * i / ITEMS_COUNT);
switch (i) {
- #ifdef ITEM_E0
+ #if HAS_EXTRUDERS
case ITEM_E0: draw_heater_status(x, y, H_E0); break;
#endif
- #ifdef ITEM_E1
+ #if HAS_MULTI_HOTEND
case ITEM_E1: draw_heater_status(x, y, H_E1); break;
#endif
- #ifdef ITEM_E2
+ #if HOTENDS > 2
case ITEM_E2: draw_heater_status(x, y, H_E2); break;
#endif
- #ifdef ITEM_BED
+ #if HAS_HEATED_BED
case ITEM_BED: draw_heater_status(x, y, H_BED); break;
#endif
- #ifdef ITEM_CHAMBER
+ #if HAS_TEMP_CHAMBER
case ITEM_CHAMBER: draw_heater_status(x, y, H_CHAMBER); break;
#endif
- #ifdef ITEM_COOLER
+ #if HAS_TEMP_COOLER
case ITEM_COOLER: draw_heater_status(x, y, H_COOLER); break;
#endif
- #ifdef ITEM_FAN
+ #if HAS_FAN
case ITEM_FAN: draw_fan_status(x, y, blink); break;
#endif
}
diff --git a/Marlin/src/lcd/tft/ui_320x240.cpp b/Marlin/src/lcd/tft/ui_320x240.cpp
index bb48b5e1650..9014d4ed121 100644
--- a/Marlin/src/lcd/tft/ui_320x240.cpp
+++ b/Marlin/src/lcd/tft/ui_320x240.cpp
@@ -228,25 +228,25 @@ void MarlinUI::draw_status_screen() {
for (i = 0 ; i < ITEMS_COUNT; i++) {
x = (320 / ITEMS_COUNT - 64) / 2 + (320 * i / ITEMS_COUNT);
switch (i) {
- #ifdef ITEM_E0
+ #if HAS_EXTRUDERS
case ITEM_E0: draw_heater_status(x, y, H_E0); break;
#endif
- #ifdef ITEM_E1
+ #if HAS_MULTI_HOTEND
case ITEM_E1: draw_heater_status(x, y, H_E1); break;
#endif
- #ifdef ITEM_E2
+ #if HOTENDS > 2
case ITEM_E2: draw_heater_status(x, y, H_E2); break;
#endif
- #ifdef ITEM_BED
+ #if HAS_HEATED_BED
case ITEM_BED: draw_heater_status(x, y, H_BED); break;
#endif
- #ifdef ITEM_CHAMBER
+ #if HAS_TEMP_CHAMBER
case ITEM_CHAMBER: draw_heater_status(x, y, H_CHAMBER); break;
#endif
- #ifdef ITEM_COOLER
+ #if HAS_TEMP_COOLER
case ITEM_COOLER: draw_heater_status(x, y, H_COOLER); break;
#endif
- #ifdef ITEM_FAN
+ #if HAS_FAN
case ITEM_FAN: draw_fan_status(x, y, blink); break;
#endif
}
diff --git a/Marlin/src/lcd/tft/ui_480x320.cpp b/Marlin/src/lcd/tft/ui_480x320.cpp
index 682ea3e380e..22c3a3fc19c 100644
--- a/Marlin/src/lcd/tft/ui_480x320.cpp
+++ b/Marlin/src/lcd/tft/ui_480x320.cpp
@@ -228,25 +228,25 @@ void MarlinUI::draw_status_screen() {
for (i = 0 ; i < ITEMS_COUNT; i++) {
x = (TFT_WIDTH / ITEMS_COUNT - 80) / 2 + (TFT_WIDTH * i / ITEMS_COUNT);
switch (i) {
- #ifdef ITEM_E0
+ #if HAS_EXTRUDERS
case ITEM_E0: draw_heater_status(x, y, H_E0); break;
#endif
- #ifdef ITEM_E1
+ #if HAS_MULTI_HOTEND
case ITEM_E1: draw_heater_status(x, y, H_E1); break;
#endif
- #ifdef ITEM_E2
+ #if HOTENDS > 2
case ITEM_E2: draw_heater_status(x, y, H_E2); break;
#endif
- #ifdef ITEM_BED
+ #if HAS_HEATED_BED
case ITEM_BED: draw_heater_status(x, y, H_BED); break;
#endif
- #ifdef ITEM_CHAMBER
+ #if HAS_TEMP_CHAMBER
case ITEM_CHAMBER: draw_heater_status(x, y, H_CHAMBER); break;
#endif
- #ifdef ITEM_COOLER
+ #if HAS_TEMP_COOLER
case ITEM_COOLER: draw_heater_status(x, y, H_COOLER); break;
#endif
- #ifdef ITEM_FAN
+ #if HAS_FAN
case ITEM_FAN: draw_fan_status(x, y, blink); break;
#endif
}
diff --git a/Marlin/src/lcd/tft/ui_common.h b/Marlin/src/lcd/tft/ui_common.h
index 7329c31a52a..2a81ee2114b 100644
--- a/Marlin/src/lcd/tft/ui_common.h
+++ b/Marlin/src/lcd/tft/ui_common.h
@@ -57,32 +57,15 @@ void menu_item(const uint8_t row, bool sel = false);
#define ABSOLUTE_ZERO -273.15
-#if HAS_TEMP_CHAMBER && HAS_MULTI_HOTEND
- #define ITEM_E0 0
- #define ITEM_E1 1
- #define ITEM_BED 2
- #define ITEM_CHAMBER 3
- #define ITEM_FAN 4
- #define ITEMS_COUNT 5
-#elif HAS_TEMP_CHAMBER
- #define ITEM_E0 0
- #define ITEM_BED 1
- #define ITEM_CHAMBER 2
- #define ITEM_FAN 3
- #define ITEMS_COUNT 4
-#elif HAS_TEMP_COOLER
- #define ITEM_COOLER 0
- #define ITEM_FAN 1
- #define ITEMS_COUNT 2
-#elif HAS_MULTI_HOTEND
- #define ITEM_E0 0
- #define ITEM_E1 1
- #define ITEM_BED 2
- #define ITEM_FAN 3
- #define ITEMS_COUNT 4
-#else
- #define ITEM_E0 0
- #define ITEM_BED 1
- #define ITEM_FAN 2
- #define ITEMS_COUNT 3
-#endif
+enum {
+ OPTITEM(HAS_EXTRUDERS, ITEM_E0)
+ OPTITEM(HAS_MULTI_HOTEND, ITEM_E1)
+ #if HOTENDS > 2
+ ITEM_E2,
+ #endif
+ OPTITEM(HAS_HEATED_BED, ITEM_BED)
+ OPTITEM(HAS_TEMP_CHAMBER, ITEM_CHAMBER)
+ OPTITEM(HAS_TEMP_COOLER, ITEM_COOLER)
+ OPTITEM(HAS_FAN, ITEM_FAN)
+ ITEMS_COUNT
+};