From 2139b18865421b7f8a614f95c0cf1ef44fdecdef Mon Sep 17 00:00:00 2001 From: wu58430 Date: Thu, 11 Jan 2024 21:38:54 +0800 Subject: [PATCH] =?UTF-8?q?DTMF=E4=BF=A1=E6=81=AF=E7=A6=81=E6=AD=A2?= =?UTF-8?q?=E8=BF=9B=E5=85=A5=E5=AD=90=E8=8F=9C=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/menu.c | 5 +++-- ui/helper.c | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/app/menu.c b/app/menu.c index 79be216..1eda5de 100644 --- a/app/menu.c +++ b/app/menu.c @@ -1401,12 +1401,13 @@ static void MENU_Key_MENU(const bool bKeyPressed, const bool bKeyHeld) { gAnotherVoiceID = MenuList[gMenuCursor].voice_id; #endif -#if 1 + if (UI_MENU_GetCurrentMenuId() == MENU_DEL_CH || UI_MENU_GetCurrentMenuId() == MENU_MEM_NAME) if (!RADIO_CheckValidChannel(gSubMenuSelection, false, 0)) 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; gIsInSubMenu = true; diff --git a/ui/helper.c b/ui/helper.c index c182cd8..c8abb42 100644 --- a/ui/helper.c +++ b/ui/helper.c @@ -175,9 +175,10 @@ void UI_PrintStringSmall(const char *pString, uint8_t Start, uint8_t End, uint8_ uint8_t gFontSmall_More[12] = {0}; for (int j = 0; j < 12; ++j) { if (j < 6) { - gFontSmall_More[j] = (gFontSmall[index][j] & 31) << 3;//00011111 + gFontSmall_More[j] = (gFontSmall[index][j] & 0x1F) << 3;//00011111 } 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);