DTMF信息禁止进入子菜单

This commit is contained in:
wu58430 2024-01-11 21:38:54 +08:00
parent 00747f7ed5
commit 2139b18865
2 changed files with 6 additions and 4 deletions

View file

@ -1401,12 +1401,13 @@ static void MENU_Key_MENU(const bool bKeyPressed, const bool bKeyHeld) {
gAnotherVoiceID = MenuList[gMenuCursor].voice_id; gAnotherVoiceID = MenuList[gMenuCursor].voice_id;
#endif #endif
#if 1
if (UI_MENU_GetCurrentMenuId() == MENU_DEL_CH || UI_MENU_GetCurrentMenuId() == MENU_MEM_NAME) if (UI_MENU_GetCurrentMenuId() == MENU_DEL_CH || UI_MENU_GetCurrentMenuId() == MENU_MEM_NAME)
if (!RADIO_CheckValidChannel(gSubMenuSelection, false, 0)) if (!RADIO_CheckValidChannel(gSubMenuSelection, false, 0))
return; // invalid channel return; // invalid channel
#endif
if (UI_MENU_GetCurrentMenuId() == MENU_ANI_ID || UI_MENU_GetCurrentMenuId() == MENU_UPCODE|| UI_MENU_GetCurrentMenuId() == MENU_DWCODE)
return; // invalid
gAskForConfirmation = 0; gAskForConfirmation = 0;
gIsInSubMenu = true; gIsInSubMenu = true;

View file

@ -175,9 +175,10 @@ void UI_PrintStringSmall(const char *pString, uint8_t Start, uint8_t End, uint8_
uint8_t gFontSmall_More[12] = {0}; uint8_t gFontSmall_More[12] = {0};
for (int j = 0; j < 12; ++j) { for (int j = 0; j < 12; ++j) {
if (j < 6) { if (j < 6) {
gFontSmall_More[j] = (gFontSmall[index][j] & 31) << 3;//00011111 gFontSmall_More[j] = (gFontSmall[index][j] & 0x1F) << 3;//00011111
} else { } else {
gFontSmall_More[j] = (gFontSmall[index][j - 6] & 224) >> 5;//11100000 gFontSmall_More[j] = (gFontSmall[index][j - 6] & 0XE0) >> 5|(0xFB& *(pFb1+ now_pixel + 1+j-6));//11100000
//
} }
} }
memcpy(pFb + now_pixel + 1, &gFontSmall_More[0], 6); memcpy(pFb + now_pixel + 1, &gFontSmall_More[0], 6);