diff --git a/.idea/.gitignore b/.idea/.gitignore deleted file mode 100644 index 35410ca..0000000 --- a/.idea/.gitignore +++ /dev/null @@ -1,8 +0,0 @@ -# 默认忽略的文件 -/shelf/ -/workspace.xml -# 基于编辑器的 HTTP 客户端请求 -/httpRequests/ -# Datasource local storage ignored files -/dataSources/ -/dataSources.local.xml diff --git a/.idea/.name b/.idea/.name deleted file mode 100644 index 8829405..0000000 --- a/.idea/.name +++ /dev/null @@ -1 +0,0 @@ -uv_k5_firmware_custom_0_17 \ No newline at end of file diff --git a/.idea/deployment.xml b/.idea/deployment.xml deleted file mode 100644 index 508379c..0000000 --- a/.idea/deployment.xml +++ /dev/null @@ -1,14 +0,0 @@ - - -  -  -  -  -  -  -  -  -  -  -  - \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml deleted file mode 100644 index 79b3c94..0000000 --- a/.idea/misc.xml +++ /dev/null @@ -1,4 +0,0 @@ - - -  - \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml deleted file mode 100644 index 49c64ec..0000000 --- a/.idea/modules.xml +++ /dev/null @@ -1,8 +0,0 @@ - - -  -  -  -  -  - \ No newline at end of file diff --git a/.idea/uv-k5-firmware-chinese.iml b/.idea/uv-k5-firmware-chinese.iml deleted file mode 100644 index f08604b..0000000 --- a/.idea/uv-k5-firmware-chinese.iml +++ /dev/null @@ -1,2 +0,0 @@ - - \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml deleted file mode 100644 index 35eb1dd..0000000 --- a/.idea/vcs.xml +++ /dev/null @@ -1,6 +0,0 @@ - - -  -  -  - \ No newline at end of file diff --git a/firmware.packed.cn_all.bin b/firmware.packed.cn_all.bin new file mode 100644 index 0000000..5077f87 Binary files /dev/null and b/firmware.packed.cn_all.bin differ diff --git a/firmware.packed_antikay.bin b/firmware.packed_antikay.bin new file mode 100644 index 0000000..298c688 Binary files /dev/null and b/firmware.packed_antikay.bin differ diff --git a/ui/menu.c b/ui/menu.c index c696266..fbcaef5 100644 --- a/ui/menu.c +++ b/ui/menu.c @@ -318,14 +318,10 @@ const char gSubMenu_PONMSG[][5] =//8 "\xE9\xA6\xA7" };  -const char gSubMenu_ROGER[][9] = +const char gSubMenu_ROGER[][6] = { -// "OFF", -// "ROGER", -// "MDC" - "\xD9\xDF\xB5\xB6\x0E", - "ROGER\xB5\xB6\x0E", + "\xA9\xB4\xB5\xB6\x0E", "\x4D\x44\x43\xEF\xF0" };  diff --git a/ui/menu.h b/ui/menu.h index 535c3c7..7215ff0 100644 --- a/ui/menu.h +++ b/ui/menu.h @@ -146,7 +146,7 @@ extern const char gSubMenu_AL_MOD[2][5]; extern const char gSubMenu_D_RSP[4][10];//11 extern const char* gSubMenu_PTT_ID[5]; extern const char gSubMenu_PONMSG[4][5];//8 -extern const char gSubMenu_ROGER[3][9]; +extern const char gSubMenu_ROGER[3][6]; extern const char gSubMenu_RESET[2][6];//4 extern const char* gSubMenu_F_LOCK[F_LOCK_LEN]; extern const char gSubMenu_BACKLIGHT[8][5];//7 diff --git a/ui/scanner.c b/ui/scanner.c index 431cd09..d5584bb 100644 --- a/ui/scanner.c +++ b/ui/scanner.c @@ -34,65 +34,44 @@ void UI_DisplayScanner(void)  memset(String, 0, sizeof(String)); if (gScanSingleFrequency || (gScanCssState != SCAN_CSS_STATE_OFF && gScanCssState != SCAN_CSS_STATE_FAILED)) -// - - sprintf(String, "\x03\x04:%u.%05u", gScanFrequency / 100000, gScanFrequency % 100000); - else - -// strcpy(String, "FREQ:**.*****"); - - strcpy(String, "\x03\x04:**.*****"); + sprintf(String, "FREQ:%u.%05u", gScanFrequency / 100000, gScanFrequency % 100000); + else + strcpy(String, "FREQ:**.*****"); UI_PrintStringSmall(String, 2, 0, 1);  memset(String, 0, sizeof(String)); if (gScanCssState < SCAN_CSS_STATE_FOUND || !gScanUseCssResult) -// strcpy(String, "CTC:******"); - - strcpy(String, "\x0F\x10\x0D\x0E:******"); - + strcpy(String, "CTC:******"); else if (gScanCssResultType == CODE_TYPE_CONTINUOUS_TONE) -// sprintf(String, "CTC:%u.%uHz", CTCSS_Options[gScanCssResultCode] / 10, CTCSS_Options[gScanCssResultCode] % 10); - sprintf(String, "\x0F\x10\x0D\x0E:%u.%uHz", CTCSS_Options[gScanCssResultCode] / 10, CTCSS_Options[gScanCssResultCode] % 10); + sprintf(String, "CTC:%u.%uHz", CTCSS_Options[gScanCssResultCode] / 10, CTCSS_Options[gScanCssResultCode] % 10); else -// sprintf(String, "DCS:D%03oN", DCS_Options[gScanCssResultCode]); - - sprintf(String, "\x0B\x0C\x0D\x0E:D%03oN", DCS_Options[gScanCssResultCode]); + sprintf(String, "DCS:D%03oN", DCS_Options[gScanCssResultCode]); UI_PrintStringSmall(String, 2, 0, 3);  memset(String, 0, sizeof(String)); if (gScannerSaveState == SCAN_SAVE_CHANNEL) { -// strcpy(String, "SAVE?"); + strcpy(String, "SAVE?");  - strcpy(String, "\x19\x88?"); Start = 0; bCentered = 1; } else { if (gScannerSaveState == SCAN_SAVE_CHAN_SEL) { -// strcpy(String, "SAVE:"); -// \x88\x19 -// UI_GenerateChannelStringEx(String + 5, gShowChPrefix, gScanChannel); - strcpy(String, "\x19\x88:"); - - UI_GenerateChannelStringEx(String + 3, gShowChPrefix, gScanChannel); + strcpy(String, "SAVE:"); + UI_GenerateChannelStringEx(String + 5, gShowChPrefix, gScanChannel); } else if (gScanCssState < SCAN_CSS_STATE_FOUND) { - //strcpy(String, "SCAN"); - //memset(String + 4, '.', (gScanProgressIndicator & 7) + 1); - strcpy(String, "\x8F\x90"); - memset(String + 2, '.', (gScanProgressIndicator & 7) + 1); + strcpy(String, "SCAN"); + memset(String + 4, '.', (gScanProgressIndicator & 7) + 1); } else if (gScanCssState == SCAN_CSS_STATE_FOUND) - //strcpy(String, "SCAN CMP."); - strcpy(String, "\x8F\x90 OK."); - + strcpy(String, "SCAN CMP."); + else + strcpy(String, "SCAN FAIL.");  - else -// strcpy(String, "SCAN FAIL."); - strcpy(String, "\x8F\x90 FAIL."); Start = 2; bCentered = 0; }