master-250208

.idea/workspace.xml

@@ -20,23 +20,7 @@
     </configurations>
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="01ce1271-fbf8-4e14-b10b-a2875bdb8cd4" name="更改" comment="master-250125">
-      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Core/Src/ffx_master.c" beforeDir="false" afterPath="$PROJECT_DIR$/Core/Src/ffx_master.c" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Core/Src/freertos.c" beforeDir="false" afterPath="$PROJECT_DIR$/Core/Src/freertos.c" 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/mini_gateway_master.c" beforeDir="false" afterPath="$PROJECT_DIR$/Core/Src/mini_gateway_master.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/gmv-gateway-board.elf.dir/Core/Src/ffx_master.c.obj" beforeDir="false" afterPath="$PROJECT_DIR$/cmake-build-debug-mingw/CMakeFiles/gmv-gateway-board.elf.dir/Core/Src/ffx_master.c.obj" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/cmake-build-debug-mingw/CMakeFiles/gmv-gateway-board.elf.dir/Core/Src/freertos.c.obj" beforeDir="false" afterPath="$PROJECT_DIR$/cmake-build-debug-mingw/CMakeFiles/gmv-gateway-board.elf.dir/Core/Src/freertos.c.obj" 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/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" />
-    </list>
+    <list default="true" id="01ce1271-fbf8-4e14-b10b-a2875bdb8cd4" name="更改" comment="master-250208" />
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
     <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
@@ -229,7 +213,7 @@
       <workItem from="1737767532243" duration="13614000" />
       <workItem from="1738717379793" duration="5997000" />
       <workItem from="1738912981925" duration="685000" />
-      <workItem from="1738981317737" duration="2000" />
+      <workItem from="1738981317737" duration="311000" />
     </task>
     <task id="LOCAL-00001" summary="更新和功能">
       <option name="closed" value="true" />
@@ -343,7 +327,15 @@
       <option name="project" value="LOCAL" />
       <updated>1737793907530</updated>
     </task>
-    <option name="localTasksCounter" value="15" />
+    <task id="LOCAL-00015" summary="master-250208">
+      <option name="closed" value="true" />
+      <created>1738981603315</created>
+      <option name="number" value="00015" />
+      <option name="presentableId" value="LOCAL-00015" />
+      <option name="project" value="LOCAL" />
+      <updated>1738981603315</updated>
+    </task>
+    <option name="localTasksCounter" value="16" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -372,7 +364,8 @@
     <MESSAGE value="fix bug" />
     <MESSAGE value="master-250117" />
     <MESSAGE value="master-250125" />
-    <option name="LAST_COMMIT_MESSAGE" value="master-250125" />
+    <MESSAGE value="master-250208" />
+    <option name="LAST_COMMIT_MESSAGE" value="master-250208" />
   </component>
   <component name="XDebuggerManager">
     <watches-manager>

readme.md

@@ -7,20 +7,20 @@
 ### 外设说明
 
 * 分风箱主板通讯：uart2
-* 五恒主板通讯：uart3
+* 五恒主板通讯/三恒通讯：uart3
 * mini_gateway_board：uart4
 * 调试串口：uart1
 
 ### 通讯从站配置
 
-| 模块名称               | 从站地址 | 通讯口   |
-|--------------------|------|-------|
-| 分风箱主板              | 1~15 | uart2 |
-| mini_gateway_board | 1    | uart4 |         | 10   | uart3 |
+| 模块名称               | 从站地址   | 通讯口   |
+|--------------------|--------|-------|
+| 分风箱主板              | 1~8    | uart2 |
+| mini_gateway_board | 1（拨码1） | uart4 |     
 
 ### 运行逻辑
 
-主板上电后，首先判断拨码位号，拨码=0则执行五恒控制；如果拨码=8，则执行三恒控制；
+主板上电后，首先判断拨码位号，拨码=0则执行三恒控制；如果拨码=8，则执行五恒控制；
 搜索各内机是否存在，如果存在，则读取各内机从站站号，并写入寄存器中；
 读取内机信息包括：开关机状态、模式、风速、内机编码、故障码。
 轮询mini_gateway_board，读出对应故障码，用于维护和调试；湿度下限：40018，湿度上限：40019。
@@ -29,7 +29,8 @@
 
 ### 故障码逻辑
 
-1、读取mini_gateway_board故障码，如果故障码为0，则认为无故障，否则认为有故障，并记录故障码，并写入寄存器40020，40021，40022，40023，40024，40025，40026，40027，40028，40029，40030，40031，40032，40033，40034，40035，40036，40037，40038，40039，40040，40041，40042，40043，40044，40045，40046，40047，40048，40049，40050，40051，40052，40053，40054，对应故障码为0，则表示无故障，对应故障码为1，则表示有故障
+1、读取mini_gateway_board故障码，如果故障码为0，则认为无故障，否则认为有故障，并记录故障码，并写入寄存器40023，对应故障码为0，则表示无故障，对应故障码为1，则表示有故障
+2、读取新风机故障信息，如果故障码为0，则认为无故障，否则认为有故障，并记录故障码，并写入寄存器40024，对应故障码为0，则表示无故障，对应故障码为1，则表示有故障
 
 ### 485通讯协议