MDC联系人

This commit is contained in:
wu58430 2023-12-10 00:06:04 +08:00
parent e8d1957a2a
commit b9edeef92c
2 changed files with 13 additions and 28 deletions

View file

@ -20,22 +20,7 @@
</configurations>
</component>
<component name="ChangeListManager">
<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$/CMakeLists.txt" beforeDir="false" afterPath="$PROJECT_DIR$/CMakeLists.txt" afterDir="false" />
<change beforePath="$PROJECT_DIR$/README.md" beforeDir="false" afterPath="$PROJECT_DIR$/README.md" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/mdc1200.c" beforeDir="false" afterPath="$PROJECT_DIR$/app/mdc1200.c" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/mdc1200.h" beforeDir="false" afterPath="$PROJECT_DIR$/app/mdc1200.h" afterDir="false" />
<change beforePath="$PROJECT_DIR$/cmake-build-debug/CMakeFiles/3.25.2/CMakeCCompiler.cmake" beforeDir="false" afterPath="$PROJECT_DIR$/cmake-build-debug/CMakeFiles/3.25.2/CMakeCCompiler.cmake" afterDir="false" />
<change beforePath="$PROJECT_DIR$/cmake-build-debug/CMakeFiles/3.25.2/CMakeCXXCompiler.cmake" beforeDir="false" afterPath="$PROJECT_DIR$/cmake-build-debug/CMakeFiles/3.25.2/CMakeCXXCompiler.cmake" afterDir="false" />
<change beforePath="$PROJECT_DIR$/cmake-build-debug/CMakeFiles/3.25.2/CMakeDetermineCompilerABI_C.bin" beforeDir="false" afterPath="$PROJECT_DIR$/cmake-build-debug/CMakeFiles/3.25.2/CMakeDetermineCompilerABI_C.bin" afterDir="false" />
<change beforePath="$PROJECT_DIR$/cmake-build-debug/CMakeFiles/3.25.2/CMakeSystem.cmake" beforeDir="false" afterPath="$PROJECT_DIR$/cmake-build-debug/CMakeFiles/3.25.2/CMakeSystem.cmake" afterDir="false" />
<change beforePath="$PROJECT_DIR$/cmake-build-debug/CMakeFiles/CMakeOutput.log" beforeDir="false" afterPath="$PROJECT_DIR$/cmake-build-debug/CMakeFiles/CMakeOutput.log" afterDir="false" />
<change beforePath="$PROJECT_DIR$/cmake-build-debug/CMakeFiles/clion-environment.txt" beforeDir="false" afterPath="$PROJECT_DIR$/cmake-build-debug/CMakeFiles/clion-environment.txt" afterDir="false" />
<change beforePath="$PROJECT_DIR$/main.c" beforeDir="false" afterPath="$PROJECT_DIR$/main.c" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ui/main.c" beforeDir="false" afterPath="$PROJECT_DIR$/ui/main.c" afterDir="false" />
<change beforePath="$PROJECT_DIR$/win_make.bat" beforeDir="false" afterPath="$PROJECT_DIR$/win_make.bat" afterDir="false" />
</list>
<list default="true" id="cea36e80-e289-4d69-9030-7186d540ac0e" name="更改" comment="MDC联系人" />
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
<option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
@ -199,14 +184,7 @@
<workItem from="1702006730071" duration="3144000" />
<workItem from="1702024305901" duration="2385000" />
<workItem from="1702049513969" duration="28027000" />
<workItem from="1702119088204" duration="9977000" />
</task>
<task id="LOCAL-00032" summary="MDC RX">
<created>1701682489155</created>
<option name="number" value="00032" />
<option name="presentableId" value="LOCAL-00032" />
<option name="project" value="LOCAL" />
<updated>1701682489155</updated>
<workItem from="1702119088204" duration="10553000" />
</task>
<task id="LOCAL-00033" summary="MDC RX">
<created>1701682811016</created>
@ -544,7 +522,14 @@
<option name="project" value="LOCAL" />
<updated>1702098575234</updated>
</task>
<option name="localTasksCounter" value="81" />
<task id="LOCAL-00081" summary="MDC联系人">
<created>1702137830893</created>
<option name="number" value="00081" />
<option name="presentableId" value="LOCAL-00081" />
<option name="project" value="LOCAL" />
<updated>1702137830894</updated>
</task>
<option name="localTasksCounter" value="82" />
<servers />
</component>
<component name="TypeScriptGeneratedFilesManager">
@ -568,7 +553,6 @@
</option>
</component>
<component name="VcsManagerConfiguration">
<MESSAGE value="create" />
<MESSAGE value="fix bug" />
<MESSAGE value="掃描下翻譯" />
<MESSAGE value="fix https://github.com/losehu/uv-k5-firmware-chinese/issues/4" />
@ -593,6 +577,7 @@
<MESSAGE value="重构" />
<MESSAGE value="clion" />
<MESSAGE value="开机音修复" />
<option name="LAST_COMMIT_MESSAGE" value="开机音修复" />
<MESSAGE value="MDC联系人" />
<option name="LAST_COMMIT_MESSAGE" value="MDC联系人" />
</component>
</project>

View file

@ -547,7 +547,7 @@ bool mdc1200_contact_find(uint16_t mdc_id, char *contact) {
uint8_t read_once[16]={0};
if ((i & 3) == 0 && i) add++;
EEPROM_ReadBuffer(MDC_ADD[add] + i * 16, read_once, 16);
if (mdc_id == (uint16_t) (read_once[0] | (read_once[1] << 8))) {
if (mdc_id == (uint16_t) (read_once[1] | (read_once[0] << 8))) {
for (int j = 0; j < 14; ++j) {
if(read_once[2+j]<' '||read_once[2+j]>'~')
return false;