sravan/Marlin-Firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

🎨 Minor code cleanup

Browse Source
This commit is contained in:
Scott Lahteine
2023-06-25 01:31:07 -05:00
parent a256e47b9c
commit f281fb473d
5 changed files with 27 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
Marlin/src/lcd/extui/ftdi_eve_touch_ui/cocoa_press/load_chocolate.cpp
View File

@@ -54,11 +54,10 @@ void LoadChocolateScreen::draw_buttons(draw_mode_t what) {
cmd.tag(3).colors(mydata.repeat_tag == 6 ? action_btn : normal_btn).button(x, y, h, v, GET_TEXT_F(MSG_LOAD)); cmd.tag(3).colors(mydata.repeat_tag == 6 ? action_btn : normal_btn).button(x, y, h, v, GET_TEXT_F(MSG_LOAD));
ui.bounds(POLY(load_screen_start_stop_btn), x, y, h, v); ui.bounds(POLY(load_screen_start_stop_btn), x, y, h, v);
if(mydata.repeat_tag == 0) { if (mydata.repeat_tag == 0)
cmd.colors(normal_btn).enabled(false); cmd.colors(normal_btn).enabled(false);
} else { else
cmd.colors(mydata.repeating ? action_btn : normal_btn).enabled(true); cmd.colors(mydata.repeating ? action_btn : normal_btn).enabled(true);
}
cmd.tag(4).button(x, y, h, v, GET_TEXT_F(MSG_START_STOP)); cmd.tag(4).button(x, y, h, v, GET_TEXT_F(MSG_START_STOP));
ui.bounds(POLY(load_screen_back_btn), x, y, h, v); ui.bounds(POLY(load_screen_back_btn), x, y, h, v);
@@ -115,24 +114,16 @@ void LoadChocolateScreen::onRedraw(draw_mode_t what) {
} }
bool LoadChocolateScreen::onTouchStart(uint8_t tag) { bool LoadChocolateScreen::onTouchStart(uint8_t tag) {
if(tag != 4) { if (tag != 4) mydata.repeating = false;
mydata.repeating = false;
}
return true; return true;
} }
bool LoadChocolateScreen::onTouchEnd(uint8_t tag) { bool LoadChocolateScreen::onTouchEnd(uint8_t tag) {
using namespace ExtUI; using namespace ExtUI;
switch (tag) { switch (tag) {
case 2: case 2: mydata.repeat_tag = 5; break;
mydata.repeat_tag = 5; case 3: mydata.repeat_tag = 6; break;
break; case 4: mydata.repeating = !mydata.repeating; break;
case 3:
mydata.repeat_tag = 6;
break;
case 4:
mydata.repeating = !mydata.repeating;
break;
case 1: GOTO_PREVIOUS(); break; case 1: GOTO_PREVIOUS(); break;
} }
return true; return true;
@@ -153,12 +144,8 @@ bool LoadChocolateScreen::onTouchHeld(uint8_t tag) {
#define UI_INCREMENT_AXIS(axis) UI_INCREMENT(AxisPosition_mm, axis); #define UI_INCREMENT_AXIS(axis) UI_INCREMENT(AxisPosition_mm, axis);
#define UI_DECREMENT_AXIS(axis) UI_DECREMENT(AxisPosition_mm, axis); #define UI_DECREMENT_AXIS(axis) UI_DECREMENT(AxisPosition_mm, axis);
switch (tag) { switch (tag) {
case 5: case 5: UI_INCREMENT_AXIS(E0); break;
UI_INCREMENT_AXIS(E0); case 6: UI_DECREMENT_AXIS(E0); break;
break;
case 6:
UI_DECREMENT_AXIS(E0);
break;
default: return false; default: return false;
} }
#undef UI_DECREMENT_AXIS #undef UI_DECREMENT_AXIS
@@ -170,10 +157,10 @@ void LoadChocolateScreen::onIdle() {
reset_menu_timeout(); reset_menu_timeout();
if (mydata.repeating) onTouchHeld(mydata.repeat_tag); if (mydata.repeating) onTouchHeld(mydata.repeat_tag);
if (refresh_timer.elapsed(STATUS_UPDATE_INTERVAL)) { if (refresh_timer.elapsed(STATUS_UPDATE_INTERVAL)) {
if (!EventLoop::is_touch_held()) if (!EventLoop::is_touch_held()) onRefresh();
onRefresh();
refresh_timer.start(); refresh_timer.start();
} }
BaseScreen::onIdle(); BaseScreen::onIdle();
} }
#endif // COCOA_LOAD_CHOCOLATE_SCREEN #endif // COCOA_LOAD_CHOCOLATE_SCREEN

6
Marlin/src/lcd/extui/ftdi_eve_touch_ui/cocoa_press/status_screen.cpp
View File

@@ -276,7 +276,8 @@ void StatusScreen::draw_file(draw_mode_t what) {
else if (isFileSelected()) { else if (isFileSelected()) {
FileList list; FileList list;
draw_text_with_ellipsis(cmd, TEXT_POS(x, y, w, h), list.filename(), OPT_CENTERY, font_small); draw_text_with_ellipsis(cmd, TEXT_POS(x, y, w, h), list.filename(), OPT_CENTERY, font_small);
} else }
else
draw_text_with_ellipsis(cmd, TEXT_POS(x, y, w, h), F("No file selected"), OPT_CENTERY, font_small); draw_text_with_ellipsis(cmd, TEXT_POS(x, y, w, h), F("No file selected"), OPT_CENTERY, font_small);
} }
} }
@@ -368,8 +369,7 @@ void StatusScreen::setStatusMessage(const char * const) {
void StatusScreen::onIdle() { void StatusScreen::onIdle() {
reset_menu_timeout(); reset_menu_timeout();
if (refresh_timer.elapsed(STATUS_UPDATE_INTERVAL)) { if (refresh_timer.elapsed(STATUS_UPDATE_INTERVAL)) {
if (!EventLoop::is_touch_held()) if (!EventLoop::is_touch_held()) onRefresh();
onRefresh();
refresh_timer.start(); refresh_timer.start();
} }
} }