🎨 Clean up TFT Color UI display items (MarlinFirmware#25712)

Co-authored-by: Scott Lahteine <[email protected]>
Andy-Big · Jul 14, 2023 · 4d133b1 · 4d133b1
1 parent 3c2984e
commit 4d133b1
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 18 deletions.
diff --git 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
@@ -230,25 +230,25 @@ void MarlinUI::draw_status_screen() {
  for (i = 0 ; i < ITEMS_COUNT; i++) {
  x = (TFT_WIDTH / ITEMS_COUNT - 64) / 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_480x320.cpp b/Marlin/src/lcd/tft/ui_480x320.cpp
@@ -397,10 +397,10 @@ void MarlinUI::draw_status_screen() {
  x += sw + ITEM_WIDTH1;
  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
@@ -409,10 +409,10 @@ void MarlinUI::draw_status_screen() {
  x += sw + ITEM_WIDTH1;
  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