yang
/
uv-k5-firmware-chinese-lts
mirror of https://github.com/silenty4ng/uv-k5-firmware-chinese-lts
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

修复侧键与MDC联系人冲突

This commit is contained in:
wu58430 2024-01-13 21:56:25 +08:00
parent 2b1acd6a3a
commit e8dd6f2522
7 changed files with 54 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

77
.idea/workspace.xml
View File

@ -20,23 +20,15 @@
</configurations>
</component>
<component name="ChangeListManager">
<list default="true" id="cea36e80-e289-4d69-9030-7186d540ac0e" name="更改" comment="赞助">
<change afterPath="$PROJECT_DIR$/uv-k5font/font_new/.idea/deployment.xml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/uv-k5font/font_new/.idea/font_new.iml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/uv-k5font/font_new/.idea/modules.xml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/uv-k5font/font_new/.idea/vcs.xml" afterDir="false" />
<list default="true" id="cea36e80-e289-4d69-9030-7186d540ac0e" name="更改" comment="修改侧键">
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Makefile" beforeDir="false" afterPath="$PROJECT_DIR$/Makefile" afterDir="false" />
<change beforePath="$PROJECT_DIR$/chinese.h" beforeDir="false" afterPath="$PROJECT_DIR$/chinese.h" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ui/menu.c" beforeDir="false" afterPath="$PROJECT_DIR$/ui/menu.c" afterDir="false" />
<change beforePath="$PROJECT_DIR$/uv-k5font/cmake-build-debug/CMakeFiles/clion-Debug-log.txt" beforeDir="false" afterPath="$PROJECT_DIR$/uv-k5font/cmake-build-debug/CMakeFiles/clion-Debug-log.txt" afterDir="false" />
<change beforePath="$PROJECT_DIR$/uv-k5font/cmake-build-debug/CMakeFiles/uv_k5font.dir/main.cpp.obj" beforeDir="false" afterPath="$PROJECT_DIR$/uv-k5font/cmake-build-debug/CMakeFiles/uv_k5font.dir/main.cpp.obj" afterDir="false" />
<change beforePath="$PROJECT_DIR$/uv-k5font/cmake-build-debug/CMakeFiles/uv_k5font.dir/objects.a" beforeDir="false" afterPath="$PROJECT_DIR$/uv-k5font/cmake-build-debug/CMakeFiles/uv_k5font.dir/objects.a" afterDir="false" />
<change beforePath="$PROJECT_DIR$/uv-k5font/cmake-build-debug/Testing/Temporary/LastTest.log" beforeDir="false" afterPath="$PROJECT_DIR$/uv-k5font/cmake-build-debug/Testing/Temporary/LastTest.log" afterDir="false" />
<change beforePath="$PROJECT_DIR$/uv-k5font/cmake-build-debug/uv_k5font.exe" beforeDir="false" afterPath="$PROJECT_DIR$/uv-k5font/cmake-build-debug/uv_k5font.exe" afterDir="false" />
<change beforePath="$PROJECT_DIR$/uv-k5font/name.txt" beforeDir="false" afterPath="$PROJECT_DIR$/uv-k5font/name.txt" afterDir="false" />
<change beforePath="$PROJECT_DIR$/uv-k5font/name_out.txt" beforeDir="false" afterPath="$PROJECT_DIR$/uv-k5font/name_out.txt" afterDir="false" />
<change beforePath="$PROJECT_DIR$/uv-k5font/name_tmp.txt" beforeDir="false" afterPath="$PROJECT_DIR$/uv-k5font/name_tmp.txt" afterDir="false" />
<change beforePath="$PROJECT_DIR$/CMakeLists.txt" beforeDir="false" afterPath="$PROJECT_DIR$/CMakeLists.txt" afterDir="false" />
<change beforePath="$PROJECT_DIR$/cmake-build-debug/CMakeFiles/clion-Debug-log.txt" beforeDir="false" afterPath="$PROJECT_DIR$/cmake-build-debug/CMakeFiles/clion-Debug-log.txt" afterDir="false" />
<change beforePath="$PROJECT_DIR$/cmake-build-debug/CMakeFiles/uv_k5_firmware_custom_0_17.dir/includes_C.rsp" beforeDir="false" afterPath="$PROJECT_DIR$/cmake-build-debug/CMakeFiles/uv_k5_firmware_custom_0_17.dir/includes_C.rsp" afterDir="false" />
<change beforePath="$PROJECT_DIR$/cmake-build-debug/CMakeFiles/uv_k5_firmware_custom_0_17.dir/includes_CXX.rsp" beforeDir="false" afterPath="$PROJECT_DIR$/cmake-build-debug/CMakeFiles/uv_k5_firmware_custom_0_17.dir/includes_CXX.rsp" afterDir="false" />
<change beforePath="$PROJECT_DIR$/cmake-build-debug/uv_k5_firmware_custom_0_17.cbp" beforeDir="false" afterPath="$PROJECT_DIR$/cmake-build-debug/uv_k5_firmware_custom_0_17.cbp" afterDir="false" />
<change beforePath="$PROJECT_DIR$/main.c" beforeDir="false" afterPath="$PROJECT_DIR$/main.c" afterDir="false" />
<change beforePath="$PROJECT_DIR$/settings.c" beforeDir="false" afterPath="$PROJECT_DIR$/settings.c" afterDir="false" />
</list>
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
@ -115,7 +107,23 @@
<recent name="C:\Users\RUPC\Desktop\UV-K6\uv-k5-firmware-chinese\app" />
</key>
</component>
<component name="RunManager" selected="Makefile 目标.build">
<component name="RunManager" selected="Shell Script.win docker">
<configuration name="uv_k5_firmware_custom_0_17" type="CLionNativeAppRunConfigurationType" nameIsGenerated="true" REDIRECT_INPUT="false" ELEVATE="false" USE_EXTERNAL_CONSOLE="false" PASS_PARENT_ENVS_2="true" PROJECT_NAME="uv_k5_firmware_custom_0_17" TARGET_NAME="uv_k5_firmware_custom_0_17" CONFIG_NAME="Debug" version="1" RUN_TARGET_PROJECT_NAME="uv_k5_firmware_custom_0_17" RUN_TARGET_NAME="uv_k5_firmware_custom_0_17">
<method v="2">
<option name="CLION.COMPOUND.BUILD" enabled="true" />
</method>
</configuration>
<configuration default="true" type="CMakeRunConfiguration" factoryName="Application" REDIRECT_INPUT="false" ELEVATE="false" USE_EXTERNAL_CONSOLE="false" PASS_PARENT_ENVS_2="true">
<method v="2">
<option name="com.jetbrains.cidr.execution.CidrBuildBeforeRunTaskProvider$BuildBeforeRunTask" enabled="true" />
</method>
</configuration>
<configuration name="Makefile" type="MAKEFILE_TARGET_RUN_CONFIGURATION" factoryName="Makefile">
<makefile filename="$PROJECT_DIR$/Makefile" target="" workingDirectory="" arguments="">
<envs />
</makefile>
<method v="2" />
</configuration>
<configuration name="all" type="MAKEFILE_TARGET_RUN_CONFIGURATION" factoryName="Makefile" temporary="true">
<makefile filename="$PROJECT_DIR$/Makefile" target="all" workingDirectory="" arguments="">
<envs />
@ -140,12 +148,6 @@
</makefile>
<method v="2" />
</configuration>
<configuration name="flash" type="MAKEFILE_TARGET_RUN_CONFIGURATION" factoryName="Makefile" temporary="true">
<makefile filename="$PROJECT_DIR$/Makefile" target="flash" workingDirectory="" arguments="">
<envs />
</makefile>
<method v="2" />
</configuration>
<configuration name="full" type="MAKEFILE_TARGET_RUN_CONFIGURATION" factoryName="Makefile" temporary="true">
<makefile filename="$PROJECT_DIR$/Makefile" target="full" workingDirectory="" arguments="">
<envs />
@ -198,23 +200,23 @@
<method v="2" />
</configuration>
<list>
<item itemvalue="Makefile 应用程序.uv_k5_firmware_custom_0_17" />
<item itemvalue="Makefile 目标.Makefile" />
<item itemvalue="Makefile 目标.both" />
<item itemvalue="Makefile 目标.full" />
<item itemvalue="Makefile 目标.build" />
<item itemvalue="Makefile 目标.clean" />
<item itemvalue="Makefile 目标.all" />
<item itemvalue="Makefile 目标.flash" />
<item itemvalue="Shell Script.win docker" />
<item itemvalue="Shell Script.linux docker" />
<item itemvalue="Shell Script.win" />
</list>
<recent_temporary>
<list>
<item itemvalue="Makefile 目标.build" />
<item itemvalue="Makefile 目标.clean" />
<item itemvalue="Makefile 目标.build" />
<item itemvalue="Makefile 目标.full" />
<item itemvalue="Makefile 目标.all" />
<item itemvalue="Makefile 目标.flash" />
</list>
</recent_temporary>
</component>
@ -298,14 +300,8 @@
<workItem from="1704940032053" duration="4985000" />
<workItem from="1705070925031" duration="721000" />
<workItem from="1705072019086" duration="184000" />
<workItem from="1705123936006" duration="1376000" />
</task>
<task id="LOCAL-00076" summary="Makefile">
<created>1702009532422</created>
<option name="number" value="00076" />
<option name="presentableId" value="LOCAL-00076" />
<option name="project" value="LOCAL" />
<updated>1702009532422</updated>
<workItem from="1705123936006" duration="13772000" />
<workItem from="1705149583084" duration="4224000" />
</task>
<task id="LOCAL-00077" summary="readme add">
<created>1702026692058</created>
@ -643,7 +639,14 @@
<option name="project" value="LOCAL" />
<updated>1704956580565</updated>
</task>
<option name="localTasksCounter" value="125" />
<task id="LOCAL-00125" summary="修改侧键">
<created>1705147244740</created>
<option name="number" value="00125" />
<option name="presentableId" value="LOCAL-00125" />
<option name="project" value="LOCAL" />
<updated>1705147244740</updated>
</task>
<option name="localTasksCounter" value="126" />
<servers />
</component>
<component name="TypeScriptGeneratedFilesManager">
@ -670,7 +673,6 @@
</option>
</component>
<component name="VcsManagerConfiguration">
<MESSAGE value="MDC联系人" />
<MESSAGE value="MDC PY" />
<MESSAGE value="110" />
<MESSAGE value="中英文字符对齐" />
@ -695,7 +697,8 @@
<MESSAGE value="4M TEST" />
<MESSAGE value="信道长度" />
<MESSAGE value="赞助" />
<option name="LAST_COMMIT_MESSAGE" value="赞助" />
<MESSAGE value="修改侧键" />
<option name="LAST_COMMIT_MESSAGE" value="修改侧键" />
</component>
<component name="XDebuggerManager">
<breakpoint-manager>

3
CMakeLists.txt
View File

@ -2,6 +2,7 @@ cmake_minimum_required(VERSION 3.25)
project(uv_k5_firmware_custom_0_17)
set(CMAKE_CXX_STANDARD 14)
include_directories(Makefile)
include_directories(.)
include_directories(app)
@ -816,4 +817,4 @@ add_executable(uv_k5_firmware_custom_0_17
sram-overlay.c
sram-overlay.h
version.c
version.h chinese.h app/mdc1200.c app/mdc1200.c app/mdc1200.c app/mdc1200.c app/mdc1200.c app/mdc1200.c driver/timer.c bsp/dp32g030/timer.h)
version.h chinese.h app/mdc1200.c app/mdc1200.c app/mdc1200.c app/mdc1200.c app/mdc1200.c app/mdc1200.c driver/timer.c bsp/dp32g030/timer.h Makefile)

2
cmake-build-debug/CMakeFiles/uv_k5_firmware_custom_0_17.dir/includes_C.rsp
View File

File diff suppressed because one or more lines are too long

2
cmake-build-debug/CMakeFiles/uv_k5_firmware_custom_0_17.dir/includes_CXX.rsp
View File

File diff suppressed because one or more lines are too long

5
cmake-build-debug/uv_k5_firmware_custom_0_17.cbp
View File

@ -24,6 +24,7 @@
<Option type="1"/>
<Option compiler="gcc"/>
<Compiler>
<Add directory="C:/Users/RUPC/Desktop/UV-K6/uv-k5-firmware-chinese/Makefile"/>
<Add directory="C:/Users/RUPC/Desktop/UV-K6/uv-k5-firmware-chinese/."/>
<Add directory="C:/Users/RUPC/Desktop/UV-K6/uv-k5-firmware-chinese/app"/>
<Add directory="C:/Users/RUPC/Desktop/UV-K6/uv-k5-firmware-chinese/bsp"/>
@ -160,6 +161,7 @@
<Option type="1"/>
<Option compiler="gcc"/>
<Compiler>
<Add directory="C:/Users/RUPC/Desktop/UV-K6/uv-k5-firmware-chinese/Makefile"/>
<Add directory="C:/Users/RUPC/Desktop/UV-K6/uv-k5-firmware-chinese/."/>
<Add directory="C:/Users/RUPC/Desktop/UV-K6/uv-k5-firmware-chinese/app"/>
<Add directory="C:/Users/RUPC/Desktop/UV-K6/uv-k5-firmware-chinese/bsp"/>
@ -310,6 +312,9 @@
</MakeCommands>
</Target>
</Build>
<Unit filename="C:/Users/RUPC/Desktop/UV-K6/uv-k5-firmware-chinese/Makefile">
<Option target="uv_k5_firmware_custom_0_17"/>
</Unit>
<Unit filename="C:/Users/RUPC/Desktop/UV-K6/uv-k5-firmware-chinese/am_fix.c">
<Option target="uv_k5_firmware_custom_0_17"/>
</Unit>

8
main.c
View File

@ -312,9 +312,9 @@ void Main(void) {
// BootMode != BOOT_MODE_NORMAL)
// { // keys are pressed
// UI_DisplayReleaseKeys(BootMode);
while (KEYBOARD_Poll() != KEY_INVALID) // 500ms
{
}
// while (KEYBOARD_Poll() != KEY_INVALID) // 500ms
// {
// }
gKeyReading0 = KEY_INVALID;
gKeyReading1 = KEY_INVALID;
gDebounceCounter = 0;
@ -365,7 +365,7 @@ void Main(void) {
boot_counter_10ms = 250;
while (boot_counter_10ms > 0) {
while (boot_counter_10ms > 0||(KEYBOARD_Poll() != KEY_INVALID)) {
if (KEYBOARD_Poll() == KEY_EXIT
#if ENABLE_CHINESE_FULL==4

2
settings.c
View File

@ -563,7 +563,7 @@ void SETTINGS_SaveSettings(void)
State[5] = 0;
State[6] = 0;
State[7] = 0;
EEPROM_WriteBuffer(0x1FF8, State, 8);
EEPROM_WriteBuffer(0x1FF8, State, 5);
#endif
memset(Password, 0xFF, sizeof(Password));