CMS/Marlin
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Renaming _SCRIPT_RETURN to get to status screen

Browse Source 
Pro/ProXT return script changed  to match the return screen for other machines
This commit is contained in:
Brian Kahl 2021-08-26 08:41:07 -05:00
parent 3d76d4ba95
commit 058ef8908b
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/custom_user_menus.cpp
View File

@ -33,7 +33,7 @@ using namespace Theme;
#define _USER_DESC(N) MAIN_MENU_ITEM_##N##_DESC #define _USER_DESC(N) MAIN_MENU_ITEM_##N##_DESC
#define _USER_GCODE(N) MAIN_MENU_ITEM_##N##_GCODE #define _USER_GCODE(N) MAIN_MENU_ITEM_##N##_GCODE
#define _USER_ITEM(N) .tag(_ITEM_TAG(N)).button(USER_ITEM_POS(N), _USER_DESC(N)) #define _USER_ITEM(N) .tag(_ITEM_TAG(N)).button(USER_ITEM_POS(N), _USER_DESC(N))
#define _USER_ACTION(N) case _ITEM_TAG(N): injectCommands_P(PSTR(_USER_GCODE(N))); TERN_(USER_SCRIPT_RETURN, GOTO_SCREEN(StatusScreen)); break; #define _USER_ACTION(N) case _ITEM_TAG(N): injectCommands_P(PSTR(_USER_GCODE(N))); TERN_(CUSTOM_MENU_MAIN_SCRIPT_RETURN, GOTO_SCREEN(StatusScreen)); break;
void CustomUserMenus::onRedraw(draw_mode_t what) { void CustomUserMenus::onRedraw(draw_mode_t what) {
if (what & BACKGROUND) { if (what & BACKGROUND) {
@ -150,31 +150,31 @@ bool CustomUserMenus::onTouchEnd(uint8_t tag) {
switch (tag) { switch (tag) {
#if defined(MAIN_MENU_ITEM_3_DESC) #if defined(MAIN_MENU_ITEM_3_DESC)
//_USER_ACTION(1) //_USER_ACTION(1)
case _ITEM_TAG(11): injectCommands_P(PSTR(MAIN_MENU_ITEM_3_GCODE)); TERN_(USER_SCRIPT_RETURN, GOTO_SCREEN(StatusScreen)); break; case _ITEM_TAG(11): injectCommands_P(PSTR(MAIN_MENU_ITEM_3_GCODE)); TERN_(CUSTOM_MENU_MAIN_SCRIPT_RETURN, GOTO_SCREEN(StatusScreen));sound.play(chimes, PLAY_ASYNCHRONOUS); break;
#endif #endif
#if defined(MAIN_MENU_ITEM_4_DESC) #if defined(MAIN_MENU_ITEM_4_DESC)
//_USER_ACTION(2) //_USER_ACTION(2)
case _ITEM_TAG(12): injectCommands_P(PSTR(MAIN_MENU_ITEM_4_GCODE)); TERN_(USER_SCRIPT_RETURN, GOTO_SCREEN(StatusScreen)); break; case _ITEM_TAG(12): injectCommands_P(PSTR(MAIN_MENU_ITEM_4_GCODE)); TERN_(CUSTOM_MENU_MAIN_SCRIPT_RETURN, GOTO_SCREEN(StatusScreen));sound.play(chimes, PLAY_ASYNCHRONOUS); break;
#endif #endif
#if defined(MAIN_MENU_ITEM_5_DESC) #if defined(MAIN_MENU_ITEM_5_DESC)
//_USER_ACTION(3) //_USER_ACTION(3)
case _ITEM_TAG(13): injectCommands_P(PSTR(MAIN_MENU_ITEM_5_GCODE)); TERN_(USER_SCRIPT_RETURN, GOTO_SCREEN(StatusScreen)); break; case _ITEM_TAG(13): injectCommands_P(PSTR(MAIN_MENU_ITEM_5_GCODE)); TERN_(CUSTOM_MENU_MAIN_SCRIPT_RETURN, GOTO_SCREEN(StatusScreen));sound.play(chimes, PLAY_ASYNCHRONOUS); break;
#endif #endif
#if defined(MAIN_MENU_ITEM_6_DESC) #if defined(MAIN_MENU_ITEM_6_DESC)
//_USER_ACTION(4) //_USER_ACTION(4)
case _ITEM_TAG(14): injectCommands_P(PSTR(MAIN_MENU_ITEM_6_GCODE)); TERN_(USER_SCRIPT_RETURN, GOTO_SCREEN(StatusScreen)); break; case _ITEM_TAG(14): injectCommands_P(PSTR(MAIN_MENU_ITEM_6_GCODE)); TERN_(CUSTOM_MENU_MAIN_SCRIPT_RETURN, GOTO_SCREEN(StatusScreen));sound.play(chimes, PLAY_ASYNCHRONOUS); break;
#endif #endif
#if defined(MAIN_MENU_ITEM_7_DESC) #if defined(MAIN_MENU_ITEM_7_DESC)
//_USER_ACTION(5) //_USER_ACTION(5)
case _ITEM_TAG(15): injectCommands_P(PSTR(MAIN_MENU_ITEM_7_GCODE)); TERN_(USER_SCRIPT_RETURN, GOTO_SCREEN(StatusScreen)); break; case _ITEM_TAG(15): injectCommands_P(PSTR(MAIN_MENU_ITEM_7_GCODE)); TERN_(CUSTOM_MENU_MAIN_SCRIPT_RETURN, GOTO_SCREEN(StatusScreen));sound.play(chimes, PLAY_ASYNCHRONOUS); break;
#endif #endif
#if defined(MAIN_MENU_ITEM_8_DESC) #if defined(MAIN_MENU_ITEM_8_DESC)
//_USER_ACTION(6) //_USER_ACTION(6)
case _ITEM_TAG(16): injectCommands_P(PSTR(MAIN_MENU_ITEM_8_GCODE)); TERN_(USER_SCRIPT_RETURN, GOTO_SCREEN(StatusScreen)); break; case _ITEM_TAG(16): injectCommands_P(PSTR(MAIN_MENU_ITEM_8_GCODE)); TERN_(CUSTOM_MENU_MAIN_SCRIPT_RETURN, GOTO_SCREEN(StatusScreen));sound.play(chimes, PLAY_ASYNCHRONOUS); break;
#endif #endif
#if defined(MAIN_MENU_ITEM_9_DESC) #if defined(MAIN_MENU_ITEM_9_DESC)
//_USER_ACTION(7) //_USER_ACTION(7)
case _ITEM_TAG(17): injectCommands_P(PSTR(MAIN_MENU_ITEM_9_GCODE)); TERN_(USER_SCRIPT_RETURN, GOTO_SCREEN(StatusScreen)); break; case _ITEM_TAG(17): injectCommands_P(PSTR(MAIN_MENU_ITEM_9_GCODE)); TERN_(CUSTOM_MENU_MAIN_SCRIPT_RETURN, GOTO_SCREEN(StatusScreen));sound.play(chimes, PLAY_ASYNCHRONOUS); break;
#endif #endif
#if HAS_USER_ITEM(8) #if HAS_USER_ITEM(8)
_USER_ACTION(8) _USER_ACTION(8)