|
|
@ -564,6 +564,15 @@ void lcdml_menu_control(void) |
|
|
|
#endif |
|
|
|
#endif |
|
|
|
//LCDML.BT_quit();
|
|
|
|
//LCDML.BT_quit();
|
|
|
|
encoderDir[ENC_R].ButtonLong(true); |
|
|
|
encoderDir[ENC_R].ButtonLong(true); |
|
|
|
|
|
|
|
#if defined(PATCH_MENU_ID2) |
|
|
|
|
|
|
|
if (LCDML.FUNC_getID() != PATCH_MENU_ID1 && LCDML.FUNC_getID() != PATCH_MENU_ID2) |
|
|
|
|
|
|
|
#else |
|
|
|
|
|
|
|
if (LCDML.FUNC_getID() != PATCH_MENU_ID1) |
|
|
|
|
|
|
|
#endif |
|
|
|
|
|
|
|
{ |
|
|
|
|
|
|
|
last_cursor = get_current_cursor_id(); |
|
|
|
|
|
|
|
LCDML.OTHER_jumpToFunc(UI_func_voice_select); |
|
|
|
|
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
else if ((millis() - g_LCDML_CONTROL_button_press_time[ENC_R]) >= g_LCDML_CONTROL_button_short_press) |
|
|
|
else if ((millis() - g_LCDML_CONTROL_button_press_time[ENC_R]) >= g_LCDML_CONTROL_button_short_press) |
|
|
|
{ |
|
|
|
{ |
|
|
@ -680,6 +689,8 @@ void lcdml_menu_control(void) |
|
|
|
#endif |
|
|
|
#endif |
|
|
|
if (last_cursor == 0) |
|
|
|
if (last_cursor == 0) |
|
|
|
LCDML.MENU_goRoot(); |
|
|
|
LCDML.MENU_goRoot(); |
|
|
|
|
|
|
|
else |
|
|
|
|
|
|
|
LCDML.OTHER_setCursorToID(last_cursor); |
|
|
|
break; |
|
|
|
break; |
|
|
|
default: |
|
|
|
default: |
|
|
|
LCDML.BT_quit(); |
|
|
|
LCDML.BT_quit(); |
|
|
|