master-250125

.idea/workspace.xml

@@ -20,35 +20,21 @@
     </configurations>
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="01ce1271-fbf8-4e14-b10b-a2875bdb8cd4" name="更改" comment="master-250117">
+    <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/Inc/ffx_master.h" beforeDir="false" afterPath="$PROJECT_DIR$/Core/Inc/ffx_master.h" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Core/Inc/main.h" beforeDir="false" afterPath="$PROJECT_DIR$/Core/Inc/main.h" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Core/Inc/modbus_slave.h" beforeDir="false" afterPath="$PROJECT_DIR$/Core/Inc/modbus_slave.h" 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/iwdg.c" beforeDir="false" afterPath="$PROJECT_DIR$/Core/Src/iwdg.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/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/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/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/CMakeFiles/gmv-gateway-board.elf.dir/Middlewares/Third_Party/FreeRTOS/Source/portable/MemMang/heap_4.c.obj" beforeDir="false" afterPath="$PROJECT_DIR$/cmake-build-debug-mingw/CMakeFiles/gmv-gateway-board.elf.dir/Middlewares/Third_Party/FreeRTOS/Source/portable/MemMang/heap_4.c.obj" 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$/doc/gateway.png" beforeDir="false" afterPath="$PROJECT_DIR$/doc/gateway.png" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/gmv-gateway-board.ioc" beforeDir="false" afterPath="$PROJECT_DIR$/gmv-gateway-board.ioc" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/readme.md" beforeDir="false" afterPath="$PROJECT_DIR$/readme.md" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -97,28 +83,28 @@
     <option name="hideEmptyMiddlePackages" value="true" />
     <option name="showLibraryContents" value="true" />
   </component>
-  <component name="PropertiesComponent">{
-  &quot;keyToString&quot;: {
-    &quot;CMake 应用程序.gmv-gateway-board.elf.executor&quot;: &quot;Run&quot;,
-    &quot;OpenOCD 下载并运行.OCD gmv-gateway-board.executor&quot;: &quot;Debug&quot;,
-    &quot;RunOnceActivity.ShowReadmeOnStart&quot;: &quot;true&quot;,
-    &quot;RunOnceActivity.cidr.known.project.marker&quot;: &quot;true&quot;,
-    &quot;RunOnceActivity.readMode.enableVisualFormatting&quot;: &quot;true&quot;,
-    &quot;SHARE_PROJECT_CONFIGURATION_FILES&quot;: &quot;true&quot;,
-    &quot;cf.first.check.clang-format&quot;: &quot;false&quot;,
-    &quot;cidr.known.project.marker&quot;: &quot;true&quot;,
-    &quot;git-widget-placeholder&quot;: &quot;master-250106&quot;,
-    &quot;last_opened_file_path&quot;: &quot;C:/Users/DELL/Desktop/gmv-gateway-board-v/Core/Inc&quot;,
-    &quot;node.js.detected.package.eslint&quot;: &quot;true&quot;,
-    &quot;node.js.detected.package.tslint&quot;: &quot;true&quot;,
-    &quot;node.js.selected.package.eslint&quot;: &quot;(autodetect)&quot;,
-    &quot;node.js.selected.package.tslint&quot;: &quot;(autodetect)&quot;,
-    &quot;nodejs_package_manager_path&quot;: &quot;npm&quot;,
-    &quot;settings.editor.selected.configurable&quot;: &quot;fileTemplates&quot;,
-    &quot;structure.view.defaults.are.configured&quot;: &quot;true&quot;,
-    &quot;vue.rearranger.settings.migration&quot;: &quot;true&quot;
+  <component name="PropertiesComponent"><![CDATA[{
+  "keyToString": {
+    "CMake 应用程序.gmv-gateway-board.elf.executor": "Run",
+    "OpenOCD 下载并运行.OCD gmv-gateway-board.executor": "Debug",
+    "RunOnceActivity.ShowReadmeOnStart": "true",
+    "RunOnceActivity.cidr.known.project.marker": "true",
+    "RunOnceActivity.readMode.enableVisualFormatting": "true",
+    "SHARE_PROJECT_CONFIGURATION_FILES": "true",
+    "cf.first.check.clang-format": "false",
+    "cidr.known.project.marker": "true",
+    "git-widget-placeholder": "master-250106",
+    "last_opened_file_path": "C:/Users/DELL/Desktop/gmv-gateway-board-v/Core/Inc",
+    "node.js.detected.package.eslint": "true",
+    "node.js.detected.package.tslint": "true",
+    "node.js.selected.package.eslint": "(autodetect)",
+    "node.js.selected.package.tslint": "(autodetect)",
+    "nodejs_package_manager_path": "npm",
+    "settings.editor.selected.configurable": "fileTemplates",
+    "structure.view.defaults.are.configured": "true",
+    "vue.rearranger.settings.migration": "true"
   }
-}</component>
+}]]></component>
   <component name="RecentsManager">
     <key name="CopyFile.RECENT_KEYS">
       <recent name="C:\Users\DELL\Desktop\gmv-gateway-board-v\Core\Inc" />
@@ -239,7 +225,7 @@
       <workItem from="1737510036576" duration="2366000" />
       <workItem from="1737681402539" duration="14545000" />
       <workItem from="1737704556929" duration="6190000" />
-      <workItem from="1737767532243" duration="7727000" />
+      <workItem from="1737767532243" duration="11941000" />
     </task>
     <task id="LOCAL-00001" summary="更新和功能">
       <option name="closed" value="true" />
@@ -329,7 +315,23 @@
       <option name="project" value="LOCAL" />
       <updated>1737097148709</updated>
     </task>
-    <option name="localTasksCounter" value="12" />
+    <task id="LOCAL-00012" summary="master-250125">
+      <option name="closed" value="true" />
+      <created>1737786283031</created>
+      <option name="number" value="00012" />
+      <option name="presentableId" value="LOCAL-00012" />
+      <option name="project" value="LOCAL" />
+      <updated>1737786283031</updated>
+    </task>
+    <task id="LOCAL-00013" summary="master-250125">
+      <option name="closed" value="true" />
+      <created>1737786548908</created>
+      <option name="number" value="00013" />
+      <option name="presentableId" value="LOCAL-00013" />
+      <option name="project" value="LOCAL" />
+      <updated>1737786548908</updated>
+    </task>
+    <option name="localTasksCounter" value="14" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -357,7 +359,8 @@
     <MESSAGE value="更新241106" />
     <MESSAGE value="fix bug" />
     <MESSAGE value="master-250117" />
-    <option name="LAST_COMMIT_MESSAGE" value="master-250117" />
+    <MESSAGE value="master-250125" />
+    <option name="LAST_COMMIT_MESSAGE" value="master-250125" />
   </component>
   <component name="XDebuggerManager">
     <watches-manager>

Core/Inc/ffx_master.h

@@ -8,7 +8,7 @@
 #include "main.h"
 
 #define SLAVE_ADDRESS_START 1       // 从机地址起始
-#define SLAVE_ADDRESS_END 5         // 从机地址结束
+#define SLAVE_ADDRESS_END 8         // 从机地址结束
 
 #define POWER_FFX_ADDRESS 0             //开关机状态
 #define SET_TEMP_FFX_ADDRESS 0x0E       //设定温度

Core/Src/freertos.c

@@ -124,8 +124,8 @@ void StartDefaultTask(void *argument)
     for (;;)
     {
         HAL_GPIO_TogglePin(LED_STATE_GPIO_Port, LED_STATE_Pin);
-        if(iwdg_count >= 8){
-            HAL_IWDG_Refresh(&hiwdg);         // 喂狗
+        if(iwdg_count >= 10){
+//            HAL_IWDG_Refresh(&hiwdg);         // 喂狗
             iwdg_count = 0;
 //            DEBUG_PRINTF("IWDG feeding.\r\n");
         }

Core/Src/iwdg.c

@@ -38,7 +38,7 @@ void MX_IWDG_Init(void)
 
   /* USER CODE END IWDG_Init 1 */
   hiwdg.Instance = IWDG;
-  hiwdg.Init.Prescaler = IWDG_PRESCALER_64;
+  hiwdg.Init.Prescaler = IWDG_PRESCALER_128;
   hiwdg.Init.Reload = 3750;
   if (HAL_IWDG_Init(&hiwdg) != HAL_OK)
   {

Core/Src/main.c

@@ -101,7 +101,7 @@ int main(void)
   MX_USART3_UART_Init();
   MX_TIM2_Init();
   MX_USART1_UART_Init();
-  MX_IWDG_Init();
+//  MX_IWDG_Init();
   /* USER CODE BEGIN 2 */
 //    EventGroupHandle_t MyEvent01Handle = xEventGroupCreate();//创建事件
     ffx_master_init();

cmake-build-debug-mingw/.ninja_log

@@ -115,3 +115,23 @@
 100	526	7594897187155187	CMakeFiles/gmv-gateway-board.elf.dir/Core/Src/ffx_master.c.obj	bb3f9e6aaffc9871
 211	624	7594897188266291	CMakeFiles/gmv-gateway-board.elf.dir/Core/Src/mini_gateway_master.c.obj	2715bb4eda440042
 624	1153	7594897192393132	gmv-gateway-board.elf	5207b332c9260086
+4	348	7594913048407317	CMakeFiles/gmv-gateway-board.elf.dir/Core/Src/freertos.c.obj	8e78e9a3bef9dd01
+348	998	7594913051831996	gmv-gateway-board.elf	5207b332c9260086
+5	422	7594914124208115	CMakeFiles/gmv-gateway-board.elf.dir/Core/Src/freertos.c.obj	8e78e9a3bef9dd01
+97	481	7594914125128090	CMakeFiles/gmv-gateway-board.elf.dir/Core/Src/main.c.obj	55f34e283414df62
+481	1068	7594914128965716	gmv-gateway-board.elf	5207b332c9260086
+4	493	7594918567326910	CMakeFiles/gmv-gateway-board.elf.dir/Core/Src/freertos.c.obj	8e78e9a3bef9dd01
+98	519	7594918568268165	CMakeFiles/gmv-gateway-board.elf.dir/Core/Src/iwdg.c.obj	a29cc9b841b3f865
+218	616	7594918569472012	CMakeFiles/gmv-gateway-board.elf.dir/Core/Src/main.c.obj	55f34e283414df62
+616	1179	7594918573450176	gmv-gateway-board.elf	5207b332c9260086
+5	401	7594918913090035	CMakeFiles/gmv-gateway-board.elf.dir/Core/Src/iwdg.c.obj	a29cc9b841b3f865
+402	1049	7594918917066993	gmv-gateway-board.elf	5207b332c9260086
+5	399	7594934924744842	CMakeFiles/gmv-gateway-board.elf.dir/Core/Src/main.c.obj	55f34e283414df62
+399	1058	7594934928677895	gmv-gateway-board.elf	5207b332c9260086
+6	416	7594935368817771	CMakeFiles/gmv-gateway-board.elf.dir/Core/Src/freertos.c.obj	8e78e9a3bef9dd01
+417	1137	7594935372929227	gmv-gateway-board.elf	5207b332c9260086
+87	542	7594943314358974	CMakeFiles/gmv-gateway-board.elf.dir/Core/Src/ffx_master.c.obj	bb3f9e6aaffc9871
+5	567	7594943313534212	CMakeFiles/gmv-gateway-board.elf.dir/Core/Src/constants_is_three.c.obj	c2114c418650d431
+180	583	7594943315285017	CMakeFiles/gmv-gateway-board.elf.dir/Core/Src/main.c.obj	55f34e283414df62
+277	674	7594943316262518	CMakeFiles/gmv-gateway-board.elf.dir/Core/Src/mini_gateway_master.c.obj	2715bb4eda440042
+674	1271	7594943320231232	gmv-gateway-board.elf	5207b332c9260086