zaubentrucker/muele-marlin
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Add Tune -> Advanced Settings to FTDI EVE (#20532)

Browse source
This commit is contained in:
LinFor 2020-12-22 03:06:27 +03:00 committed by GitHub
parent 34b6bca006
commit 9b3e16cdd0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/tune_menu.cpp
View file

@ -49,7 +49,8 @@ void TuneMenu::onRedraw(draw_mode_t what) {
#define PAUSE_POS BTN_POS(1,6), BTN_SIZE(2,1) #define PAUSE_POS BTN_POS(1,6), BTN_SIZE(2,1)
#define STOP_POS BTN_POS(1,7), BTN_SIZE(2,1) #define STOP_POS BTN_POS(1,7), BTN_SIZE(2,1)
#define CASE_LIGHT_POS BTN_POS(1,8), BTN_SIZE(2,1) #define CASE_LIGHT_POS BTN_POS(1,8), BTN_SIZE(2,1)
#define BACK_POS BTN_POS(1,9), BTN_SIZE(2,1) #define ADVANCED_SETTINGS_POS BTN_POS(1,9), BTN_SIZE(1,1)
#define BACK_POS BTN_POS(2,9), BTN_SIZE(1,1)
#else #else
#define GRID_ROWS 5 #define GRID_ROWS 5
#define GRID_COLS 2 #define GRID_COLS 2
@ -61,7 +62,8 @@ void TuneMenu::onRedraw(draw_mode_t what) {
#define STOP_POS BTN_POS(2,3), BTN_SIZE(1,1) #define STOP_POS BTN_POS(2,3), BTN_SIZE(1,1)
#define FILAMENT_POS BTN_POS(1,4), BTN_SIZE(1,1) #define FILAMENT_POS BTN_POS(1,4), BTN_SIZE(1,1)
#define CASE_LIGHT_POS BTN_POS(2,4), BTN_SIZE(1,1) #define CASE_LIGHT_POS BTN_POS(2,4), BTN_SIZE(1,1)
#define BACK_POS BTN_POS(1,5), BTN_SIZE(2,1) #define ADVANCED_SETTINGS_POS BTN_POS(1,5), BTN_SIZE(1,1)
#define BACK_POS BTN_POS(2,5), BTN_SIZE(2,1)
#endif #endif
if (what & FOREGROUND) { if (what & FOREGROUND) {
@ -86,6 +88,7 @@ void TuneMenu::onRedraw(draw_mode_t what) {
.tag(8).button(STOP_POS, GET_TEXT_F(MSG_STOP_PRINT)) .tag(8).button(STOP_POS, GET_TEXT_F(MSG_STOP_PRINT))
.enabled(ENABLED(CASE_LIGHT_ENABLE)) .enabled(ENABLED(CASE_LIGHT_ENABLE))
.tag(10).button(CASE_LIGHT_POS, GET_TEXT_F(MSG_CASE_LIGHT)) .tag(10).button(CASE_LIGHT_POS, GET_TEXT_F(MSG_CASE_LIGHT))
.tag(11).button(ADVANCED_SETTINGS_POS, GET_TEXT_F(MSG_ADVANCED_SETTINGS))
.tag(1).colors(action_btn) .tag(1).colors(action_btn)
.button(BACK_POS, GET_TEXT_F(MSG_BACK)); .button(BACK_POS, GET_TEXT_F(MSG_BACK));
} }
@ -121,6 +124,7 @@ bool TuneMenu::onTouchEnd(uint8_t tag) {
#if ENABLED(CASE_LIGHT_ENABLE) #if ENABLED(CASE_LIGHT_ENABLE)
case 10: GOTO_SCREEN(CaseLightScreen); break; case 10: GOTO_SCREEN(CaseLightScreen); break;
#endif #endif
case 11: GOTO_SCREEN(AdvancedSettingsMenu); break;
default: default:
return false; return false;
} }