|
@@ -20,32 +20,8 @@
|
|
|
</configurations>
|
|
|
</component>
|
|
|
<component name="ChangeListManager">
|
|
|
- <list default="true" id="01ce1271-fbf8-4e14-b10b-a2875bdb8cd4" name="更改" comment="master-250211">
|
|
|
+ <list default="true" id="01ce1271-fbf8-4e14-b10b-a2875bdb8cd4" name="更改" comment="master-250311">
|
|
|
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
|
|
|
- <change beforePath="$PROJECT_DIR$/Core/Inc/stm32f1xx_it.h" beforeDir="false" afterPath="$PROJECT_DIR$/Core/Inc/stm32f1xx_it.h" afterDir="false" />
|
|
|
- <change beforePath="$PROJECT_DIR$/Core/Src/main.c" beforeDir="false" afterPath="$PROJECT_DIR$/Core/Src/main.c" afterDir="false" />
|
|
|
- <change beforePath="$PROJECT_DIR$/Core/Src/modbus_slave.c" beforeDir="false" afterPath="$PROJECT_DIR$/Core/Src/modbus_slave.c" afterDir="false" />
|
|
|
- <change beforePath="$PROJECT_DIR$/Core/Src/stm32f1xx_it.c" beforeDir="false" afterPath="$PROJECT_DIR$/Core/Src/stm32f1xx_it.c" afterDir="false" />
|
|
|
- <change beforePath="$PROJECT_DIR$/Core/Src/usart.c" beforeDir="false" afterPath="$PROJECT_DIR$/Core/Src/usart.c" afterDir="false" />
|
|
|
- <change beforePath="$PROJECT_DIR$/cmake-build-debug-mingw/.ninja_deps" beforeDir="false" afterPath="$PROJECT_DIR$/cmake-build-debug-mingw/.ninja_deps" afterDir="false" />
|
|
|
- <change beforePath="$PROJECT_DIR$/cmake-build-debug-mingw/.ninja_log" beforeDir="false" afterPath="$PROJECT_DIR$/cmake-build-debug-mingw/.ninja_log" afterDir="false" />
|
|
|
- <change beforePath="$PROJECT_DIR$/cmake-build-debug-mingw/CMakeFiles/3.28.1/CMakeDetermineCompilerABI_C.bin" beforeDir="false" afterPath="$PROJECT_DIR$/cmake-build-debug-mingw/CMakeFiles/3.28.1/CMakeDetermineCompilerABI_C.bin" afterDir="false" />
|
|
|
- <change beforePath="$PROJECT_DIR$/cmake-build-debug-mingw/CMakeFiles/3.28.1/CMakeDetermineCompilerABI_CXX.bin" beforeDir="false" afterPath="$PROJECT_DIR$/cmake-build-debug-mingw/CMakeFiles/3.28.1/CMakeDetermineCompilerABI_CXX.bin" afterDir="false" />
|
|
|
- <change beforePath="$PROJECT_DIR$/cmake-build-debug-mingw/CMakeFiles/3.28.1/CMakeSystem.cmake" beforeDir="false" afterPath="$PROJECT_DIR$/cmake-build-debug-mingw/CMakeFiles/3.28.1/CMakeSystem.cmake" afterDir="false" />
|
|
|
- <change beforePath="$PROJECT_DIR$/cmake-build-debug-mingw/CMakeFiles/CMakeConfigureLog.yaml" beforeDir="false" afterPath="$PROJECT_DIR$/cmake-build-debug-mingw/CMakeFiles/CMakeConfigureLog.yaml" afterDir="false" />
|
|
|
- <change beforePath="$PROJECT_DIR$/cmake-build-debug-mingw/CMakeFiles/clion-Debug-MinGW-log.txt" beforeDir="false" afterPath="$PROJECT_DIR$/cmake-build-debug-mingw/CMakeFiles/clion-Debug-MinGW-log.txt" afterDir="false" />
|
|
|
- <change beforePath="$PROJECT_DIR$/cmake-build-debug-mingw/CMakeFiles/gmv-gateway-board.elf.dir/Core/Src/main.c.obj" beforeDir="false" afterPath="$PROJECT_DIR$/cmake-build-debug-mingw/CMakeFiles/gmv-gateway-board.elf.dir/Core/Src/main.c.obj" afterDir="false" />
|
|
|
- <change beforePath="$PROJECT_DIR$/cmake-build-debug-mingw/CMakeFiles/gmv-gateway-board.elf.dir/Core/Src/mini_gateway_master.c.obj" beforeDir="false" afterPath="$PROJECT_DIR$/cmake-build-debug-mingw/CMakeFiles/gmv-gateway-board.elf.dir/Core/Src/mini_gateway_master.c.obj" afterDir="false" />
|
|
|
- <change beforePath="$PROJECT_DIR$/cmake-build-debug-mingw/CMakeFiles/gmv-gateway-board.elf.dir/Core/Src/modbus_slave.c.obj" beforeDir="false" afterPath="$PROJECT_DIR$/cmake-build-debug-mingw/CMakeFiles/gmv-gateway-board.elf.dir/Core/Src/modbus_slave.c.obj" afterDir="false" />
|
|
|
- <change beforePath="$PROJECT_DIR$/cmake-build-debug-mingw/CMakeFiles/gmv-gateway-board.elf.dir/Core/Src/stm32f1xx_it.c.obj" beforeDir="false" afterPath="$PROJECT_DIR$/cmake-build-debug-mingw/CMakeFiles/gmv-gateway-board.elf.dir/Core/Src/stm32f1xx_it.c.obj" afterDir="false" />
|
|
|
- <change beforePath="$PROJECT_DIR$/cmake-build-debug-mingw/CMakeFiles/gmv-gateway-board.elf.dir/Core/Src/usart.c.obj" beforeDir="false" afterPath="$PROJECT_DIR$/cmake-build-debug-mingw/CMakeFiles/gmv-gateway-board.elf.dir/Core/Src/usart.c.obj" afterDir="false" />
|
|
|
- <change beforePath="$PROJECT_DIR$/cmake-build-debug-mingw/CMakeFiles/rules.ninja" beforeDir="false" afterPath="$PROJECT_DIR$/cmake-build-debug-mingw/CMakeFiles/rules.ninja" afterDir="false" />
|
|
|
- <change beforePath="$PROJECT_DIR$/cmake-build-debug-mingw/build.ninja" beforeDir="false" afterPath="$PROJECT_DIR$/cmake-build-debug-mingw/build.ninja" afterDir="false" />
|
|
|
- <change beforePath="$PROJECT_DIR$/cmake-build-debug-mingw/gmv-gateway-board.bin" beforeDir="false" afterPath="$PROJECT_DIR$/cmake-build-debug-mingw/gmv-gateway-board.bin" afterDir="false" />
|
|
|
- <change beforePath="$PROJECT_DIR$/cmake-build-debug-mingw/gmv-gateway-board.elf" beforeDir="false" afterPath="$PROJECT_DIR$/cmake-build-debug-mingw/gmv-gateway-board.elf" afterDir="false" />
|
|
|
- <change beforePath="$PROJECT_DIR$/cmake-build-debug-mingw/gmv-gateway-board.hex" beforeDir="false" afterPath="$PROJECT_DIR$/cmake-build-debug-mingw/gmv-gateway-board.hex" afterDir="false" />
|
|
|
- <change beforePath="$PROJECT_DIR$/cmake-build-debug-mingw/gmv-gateway-board.map" beforeDir="false" afterPath="$PROJECT_DIR$/cmake-build-debug-mingw/gmv-gateway-board.map" afterDir="false" />
|
|
|
- <change beforePath="$PROJECT_DIR$/gmv-gateway-board.ioc" beforeDir="false" afterPath="$PROJECT_DIR$/gmv-gateway-board.ioc" afterDir="false" />
|
|
|
</list>
|
|
|
<option name="SHOW_DIALOG" value="false" />
|
|
|
<option name="HIGHLIGHT_CONFLICTS" value="true" />
|
|
@@ -255,7 +231,8 @@
|
|
|
<workItem from="1740031656733" duration="1312000" />
|
|
|
<workItem from="1740121996529" duration="2143000" />
|
|
|
<workItem from="1740296388874" duration="1850000" />
|
|
|
- <workItem from="1741655086149" duration="1000" />
|
|
|
+ <workItem from="1741655086149" duration="3266000" />
|
|
|
+ <workItem from="1744008332548" duration="3000" />
|
|
|
</task>
|
|
|
<task id="LOCAL-00001" summary="更新和功能">
|
|
|
<option name="closed" value="true" />
|
|
@@ -393,7 +370,23 @@
|
|
|
<option name="project" value="LOCAL" />
|
|
|
<updated>1739261457049</updated>
|
|
|
</task>
|
|
|
- <option name="localTasksCounter" value="18" />
|
|
|
+ <task id="LOCAL-00018" summary="master-250211">
|
|
|
+ <option name="closed" value="true" />
|
|
|
+ <created>1741655115840</created>
|
|
|
+ <option name="number" value="00018" />
|
|
|
+ <option name="presentableId" value="LOCAL-00018" />
|
|
|
+ <option name="project" value="LOCAL" />
|
|
|
+ <updated>1741655115840</updated>
|
|
|
+ </task>
|
|
|
+ <task id="LOCAL-00019" summary="master-250311">
|
|
|
+ <option name="closed" value="true" />
|
|
|
+ <created>1741655166942</created>
|
|
|
+ <option name="number" value="00019" />
|
|
|
+ <option name="presentableId" value="LOCAL-00019" />
|
|
|
+ <option name="project" value="LOCAL" />
|
|
|
+ <updated>1741655166942</updated>
|
|
|
+ </task>
|
|
|
+ <option name="localTasksCounter" value="20" />
|
|
|
<servers />
|
|
|
</component>
|
|
|
<component name="TypeScriptGeneratedFilesManager">
|
|
@@ -424,7 +417,8 @@
|
|
|
<MESSAGE value="master-250125" />
|
|
|
<MESSAGE value="master-250208" />
|
|
|
<MESSAGE value="master-250211" />
|
|
|
- <option name="LAST_COMMIT_MESSAGE" value="master-250211" />
|
|
|
+ <MESSAGE value="master-250311" />
|
|
|
+ <option name="LAST_COMMIT_MESSAGE" value="master-250311" />
|
|
|
</component>
|
|
|
<component name="XDebuggerManager">
|
|
|
<breakpoint-manager>
|