Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

rework ui displayed features #25712

Merged
merged 2 commits into from
Apr 22, 2023
Merged

rework ui displayed features #25712

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4db96a3
rework tft displayed features
filimonic Apr 4, 2023
ebd8aed
simplify with an enum
thinkyhead Apr 19, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions Marlin/src/lcd/tft/ui_1024x600.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
Expand Down
14 changes: 7 additions & 7 deletions Marlin/src/lcd/tft/ui_320x240.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
Expand Down
14 changes: 7 additions & 7 deletions Marlin/src/lcd/tft/ui_480x320.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
Expand Down
41 changes: 12 additions & 29 deletions Marlin/src/lcd/tft/ui_common.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
};