From 0c90f6590661444505b46b707cccc185eb744f0c Mon Sep 17 00:00:00 2001 From: wu58430 Date: Sun, 17 Dec 2023 18:27:47 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=AD=E8=8B=B1=E6=96=87=E5=AD=97=E7=AC=A6?= =?UTF-8?q?=E5=AF=B9=E9=BD=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .idea/workspace.xml | 29 ++++++++++++----------------- ui/helper.c | 22 ++++++++++++++++++---- version.c | 2 +- 版本说明.txt | 43 ------------------------------------------- 4 files changed, 31 insertions(+), 65 deletions(-) delete mode 100644 版本说明.txt diff --git a/.idea/workspace.xml b/.idea/workspace.xml index b995b71..dc10d31 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -20,12 +20,7 @@ - - - - - - + @@ -592,7 +587,6 @@ - @@ -617,6 +611,7 @@ - \ No newline at end of file diff --git a/ui/helper.c b/ui/helper.c index 39e9ce1..7738fd2 100644 --- a/ui/helper.c +++ b/ui/helper.c @@ -110,11 +110,15 @@ void UI_PrintStringSmall(const char *pString, uint8_t Start, uint8_t End, uint8_ size_t i; uint8_t sum_pixel = 0; uint8_t chn_flag[Length]; + bool flag_move = 0; for (size_t j = 0; j < Length; j++) { chn_flag[j] = is_chn(pString[j]); if (chn_flag[j] == 255 && pString[j] != '\n' && pString[j] != '\0')sum_pixel += 7; - else if (chn_flag[j] != 255)sum_pixel += 12; + else if (chn_flag[j] != 255) { + flag_move = 1; + sum_pixel += 12; + } } if (End > Start) @@ -128,7 +132,19 @@ void UI_PrintStringSmall(const char *pString, uint8_t Start, uint8_t End, uint8_ if (pString[i] > ' ') { const unsigned int index = (unsigned int) pString[i] - ' ' - 1; if (index < ARRAY_SIZE(gFontSmall)) { - memcpy(pFb + now_pixel + 1, &gFontSmall[index], 6); + if (flag_move) { + 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 + } else { + gFontSmall_More[j] = (gFontSmall[index][j - 6] & 224) >> 5;//11100000 + } + } + memcpy(pFb + now_pixel + 1, &gFontSmall_More[0], 6); + memcpy(pFb1 + now_pixel + 1, &gFontSmall_More[6], 6); + } else + memcpy(pFb + now_pixel + 1, &gFontSmall[index], 6); } now_pixel += 7; } else if (pString[i] == ' ') @@ -153,8 +169,6 @@ void UI_PrintStringSmall(const char *pString, uint8_t Start, uint8_t End, uint8_ } memcpy(pFb + now_pixel + 1, &gFontChinese[0], 11); memcpy(pFb1 + now_pixel + 1, &gFontChinese[11], 11); - - now_pixel += 12; } } diff --git a/version.c b/version.c index 7a97d4f..fb47be5 100644 --- a/version.c +++ b/version.c @@ -4,7 +4,7 @@ #ifdef GIT_HASH #define VER GIT_HASH #else - #define VER "110" + #define VER "111" #endif #ifndef ONE_OF_ELEVEN_VER diff --git a/版本说明.txt b/版本说明.txt deleted file mode 100644 index a0148a6..0000000 --- a/版本说明.txt +++ /dev/null @@ -1,43 +0,0 @@ -#0.10.7 - 修复“搜索恢复模式设置失效” - 修复“MDC ID菜单项无法输入数字切换菜单项” - 修复"MDC解码失败问题"(应该是修复了) - -#0.10.6 - 纠正MDC信令 -#0.10.4 - 在解锁全部频段下允许200M,350M,500M，删除对应菜单 - 修复“按键音开机后失效“ - 修复“宽窄带开机后失效“ - 频谱图增加AM-FIX - 增加MDC1200信令(收/发、修改ID) - 删除开机显示(没flash了) -#0.10.3 - 修复“长按菜单切换调制模式（AM/FM/USB）再切回FM亚音消失问题” - 锁定按键改成原来的逻辑，以后这种操作逻辑相关的都不来改了，众口难调 -#0.10.2 - 修复命名信道时频率会变化的bug - 锁定按键时只允许发射/接收按键，与官方中文版逻辑一致 -#0.10.1 - 重构代码，菜单名使用中文（是的，中文宏定义，感谢现代编译器，中文见/ui/menu.c） - 优化代码，节省了1.4KB - 修复扫描时“频差”翻译错误，纠正为“频率” - 修复开机显示菜单选项错误问题 - （哥们比较空，所以更新的快，其实不用天天升级，跟着大版本升级就好了） -# 0.10 -* 版本为egcn变种，旨在精简固件植入更多功能，如MDC1200信令 -* egcn更新至191，结束:https://github.com/losehu/uv-k5-firmware-egcn/tree/main -# 操作更新 - * 删除开启背光菜单，发射/接收时将自动开启背光 - * 删除按键自动功能，要锁自己长按F锁定键盘 - * 麦克风条默认开启 - * 删除开机电压显示，集成在信息显示中 - * 删除长按M键菜单、长短、按侧键1、2按键菜单、调制模式菜单、按键音菜单、发射功率菜单、搜索列表 - * **长按M切换调制模式** - * **F+M ，按键音开关切换** - * **短按侧键1是监听** - * **长按侧键1是DTMF解码开关** - * **短按侧键2是设置宽窄带** - * **长按侧键2是手电筒** - * **长按6切换发射功率** - * **长按5切换搜索列表**