fix bug

.idea/workspace.xml

@@ -23,9 +23,12 @@
     <list default="true" id="01ce1271-fbf8-4e14-b10b-a2875bdb8cd4" name="更改" comment="fix bug">
       <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/iwdg.c" beforeDir="false" afterPath="$PROJECT_DIR$/Core/Src/iwdg.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/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" />
@@ -78,28 +81,28 @@
     <option name="hideEmptyMiddlePackages" value="true" />
     <option name="showLibraryContents" value="true" />
   </component>
-  <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",
-    "last_opened_file_path": "C:/Users/DELL/Desktop/gmv-gateway-board-v/Core/Src",
-    "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 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;Run&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&quot;,
+    &quot;last_opened_file_path&quot;: &quot;C:/Users/DELL/Desktop/gmv-gateway-board-v/Core/Src&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>
+}</component>
   <component name="RecentsManager">
     <key name="CopyFile.RECENT_KEYS">
       <recent name="C:\Users\DELL\Desktop\gmv-gateway-board-v\Core\Src" />
@@ -194,6 +197,20 @@
       <workItem from="1731403162409" duration="24000" />
       <workItem from="1731406158794" duration="174000" />
       <workItem from="1731460525141" duration="4917000" />
+      <workItem from="1731479484085" duration="2772000" />
+      <workItem from="1731547061181" duration="623000" />
+      <workItem from="1732008251121" duration="1484000" />
+      <workItem from="1732257641195" duration="1908000" />
+      <workItem from="1732500067604" duration="5644000" />
+      <workItem from="1732605063751" duration="1285000" />
+      <workItem from="1732671350941" duration="8229000" />
+      <workItem from="1733194560809" duration="5587000" />
+      <workItem from="1733274376458" duration="11164000" />
+      <workItem from="1733533873037" duration="6577000" />
+      <workItem from="1733811785442" duration="4091000" />
+      <workItem from="1734571208873" duration="749000" />
+      <workItem from="1735957783607" duration="1737000" />
+      <workItem from="1736125716627" duration="6000" />
     </task>
     <task id="LOCAL-00001" summary="更新和功能">
       <option name="closed" value="true" />
@@ -259,7 +276,15 @@
       <option name="project" value="LOCAL" />
       <updated>1731382293232</updated>
     </task>
-    <option name="localTasksCounter" value="9" />
+    <task id="LOCAL-00009" summary="fix bug">
+      <option name="closed" value="true" />
+      <created>1731493470629</created>
+      <option name="number" value="00009" />
+      <option name="presentableId" value="LOCAL-00009" />
+      <option name="project" value="LOCAL" />
+      <updated>1731493470629</updated>
+    </task>
+    <option name="localTasksCounter" value="10" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">

Core/Src/ffx_master.c

@@ -55,8 +55,6 @@ bool get_ffx_status(ffx_status_t *ffxStatus) {
         ffxStatus->power = ffx_ststus[0];
         ffxStatus->mode = ffx_ststus[1];
         ffxStatus->fresh_air_system = ffx_ststus[2];
-    } else {
-        return false;
     }
     uint16_t data;
     err = nmbs_read_holding_registers(&nmbs, INNER_NUM_FFX_ADDRESS, 1, &data);
@@ -78,6 +76,8 @@ bool get_ffx_status(ffx_status_t *ffxStatus) {
     err = nmbs_read_holding_registers(&nmbs, HUMP_OFF_FFX_ADDRESS, 1, &data);
     if (err == NMBS_ERROR_NONE) {
         ffxStatus->humidity_off = data;
+    }else {
+        return false;
     }
     return true;
 }
@@ -88,10 +88,10 @@ _Noreturn void ffx_mater_task(void *pv) {
     uint8_t is_error_ffx[8] = {0};
     for (;;) {
         if (osMutexAcquire(ffx_mutex, osWaitForever) == osOK) {
-            ffx_status_t ffxStatus;
             bool fresh_air_flag = false;
             for (int i = 0; i < sizeof(slaves) + 1; i++) {
                 if (slaves[i] != 0) {
+                    ffx_status_t ffxStatus;
                     nmbs_set_destination_rtu_address(&nmbs, slaves[i]);
                     if (get_ffx_status(&ffxStatus) && ffxStatus.power == 1) {
                         set_reg_value(HUMP_ON_FFX_ADDRESS, ffxStatus.humidity_on);
@@ -110,6 +110,10 @@ _Noreturn void ffx_mater_task(void *pv) {
                         }
                     }
                     sync_ac_status(&ffxStatus);
+                    ffxStatus.power = 0;
+                    ffxStatus.inner_num = 0xAA;
+                    ffxStatus.mode = 0;
+                    ffxStatus.fan_speed = 0;
                     osDelay(2000);
                 }
             }

Core/Src/iwdg.c

@@ -39,7 +39,7 @@ void MX_IWDG_Init(void)
   /* USER CODE END IWDG_Init 1 */
   hiwdg.Instance = IWDG;
   hiwdg.Init.Prescaler = IWDG_PRESCALER_64; // 1/40000
-  hiwdg.Init.Reload = 6250;         // (1/40000)*64*6250=10s
+  hiwdg.Init.Reload = 4000;         // (1/40000)*64*6250=10s
   if (HAL_IWDG_Init(&hiwdg) != HAL_OK)
   {
     Error_Handler();

Core/Src/mini_gateway_master.c

@@ -90,8 +90,8 @@ _Noreturn void mini_mater_task(void *pv) {
         bool is_power_on = false;
         ffx_status_t status = {0};
         for (int i = 0; i < sizeof(coil); i++) {
-            HAL_GPIO_TogglePin(GPIOB, GPIO_PIN_13);
             if (coil[i] != 0) {
+                HAL_GPIO_TogglePin(GPIOB, GPIO_PIN_13);
                 uint16_t data[10];
                 uint8_t inner_num = i + 1;
                 nmbs_error err = nmbs_read_holding_registers(&nmbs,
@@ -144,7 +144,7 @@ _Noreturn void mini_mater_task(void *pv) {
                     }
                 }
                 DEBUG_PRINTF("Read that the slave is turned on: %d.\r\n", inner_num);
-            }
+            } else HAL_GPIO_WritePin(GPIOB, GPIO_PIN_13, GPIO_PIN_SET);
             osDelay(1000);
         }
         if ((status.power == INNER_POWER_OFF) && (is_power_on == false)) {

cmake-build-debug-mingw/.ninja_log

@@ -147,3 +147,37 @@
 7	397	7531669549773797	CMakeFiles/gmv-gateway-board.elf.dir/Core/Src/freertos.c.obj	8e78e9a3bef9dd01
 98	494	7531669550688759	CMakeFiles/gmv-gateway-board.elf.dir/Core/Src/iwdg.c.obj	a29cc9b841b3f865
 494	1213	7531669554652657	gmv-gateway-board.elf	a1cb8372200b3aef
+73	446	7537114573453526	CMakeFiles/gmv-gateway-board.elf.dir/Core/Src/iwdg.c.obj	a29cc9b841b3f865
+448	1950	7537114577197174	gmv-gateway-board.elf	a1cb8372200b3aef
+4	418	7537117262485834	CMakeFiles/gmv-gateway-board.elf.dir/Core/Src/iwdg.c.obj	a29cc9b841b3f865
+420	1196	7537117266648723	gmv-gateway-board.elf	a1cb8372200b3aef
+7	448	7537121373378513	CMakeFiles/gmv-gateway-board.elf.dir/Core/Src/mini_gateway_master.c.obj	2715bb4eda440042
+448	1111	7537121377792912	gmv-gateway-board.elf	a1cb8372200b3aef
+5	384	7537122037975495	CMakeFiles/gmv-gateway-board.elf.dir/Core/Src/mini_gateway_master.c.obj	2715bb4eda440042
+386	1025	7537122041784731	gmv-gateway-board.elf	a1cb8372200b3aef
+81	4384	7550070650709342	CMakeFiles/gmv-gateway-board.elf.dir/Core/Src/ffx_master.c.obj	bb3f9e6aaffc9871
+4385	6092	7550070693752037	gmv-gateway-board.elf	a1cb8372200b3aef
+33	487	7550071145951181	CMakeFiles/gmv-gateway-board.elf.dir/Core/Src/ffx_master.c.obj	bb3f9e6aaffc9871
+488	1212	7550071150499012	gmv-gateway-board.elf	a1cb8372200b3aef
+72	2191	7550676560330431	CMakeFiles/gmv-gateway-board.elf.dir/Core/Src/ffx_master.c.obj	bb3f9e6aaffc9871
+2192	4094	7550676581540104	gmv-gateway-board.elf	a1cb8372200b3aef
+94	2518	7550876648171102	CMakeFiles/gmv-gateway-board.elf.dir/Core/Src/ffx_master.c.obj	bb3f9e6aaffc9871
+2518	4190	7550876672416339	gmv-gateway-board.elf	a1cb8372200b3aef
+9	457	7550876822098388	CMakeFiles/gmv-gateway-board.elf.dir/Core/Src/ffx_master.c.obj	bb3f9e6aaffc9871
+458	1185	7550876826592352	gmv-gateway-board.elf	a1cb8372200b3aef
+8	492	7550944110563674	CMakeFiles/gmv-gateway-board.elf.dir/Core/Src/ffx_master.c.obj	bb3f9e6aaffc9871
+494	1211	7550944115421903	gmv-gateway-board.elf	a1cb8372200b3aef
+67	1954	7552377019788944	CMakeFiles/gmv-gateway-board.elf.dir/Core/Src/ffx_master.c.obj	bb3f9e6aaffc9871
+1955	3768	7552377038665589	gmv-gateway-board.elf	a1cb8372200b3aef
+53	2663	7552449793678432	CMakeFiles/gmv-gateway-board.elf.dir/Core/Src/ffx_master.c.obj	bb3f9e6aaffc9871
+2663	4482	7552449819778884	gmv-gateway-board.elf	a1cb8372200b3aef
+4	405	7552458775421142	CMakeFiles/gmv-gateway-board.elf.dir/Core/Src/ffx_master.c.obj	bb3f9e6aaffc9871
+405	1125	7552458779441986	gmv-gateway-board.elf	a1cb8372200b3aef
+4	362	7552462872457383	CMakeFiles/gmv-gateway-board.elf.dir/Core/Src/ffx_master.c.obj	bb3f9e6aaffc9871
+363	994	7552462876046946	gmv-gateway-board.elf	a1cb8372200b3aef
+4	403	7552471114129653	CMakeFiles/gmv-gateway-board.elf.dir/Core/Src/ffx_master.c.obj	bb3f9e6aaffc9871
+404	1078	7552471118124917	gmv-gateway-board.elf	a1cb8372200b3aef
+4	387	7552489260713427	CMakeFiles/gmv-gateway-board.elf.dir/Core/Src/ffx_master.c.obj	bb3f9e6aaffc9871
+389	1102	7552489264566188	gmv-gateway-board.elf	a1cb8372200b3aef
+59	3235	7562744167935386	CMakeFiles/gmv-gateway-board.elf.dir/Core/Src/ffx_master.c.obj	bb3f9e6aaffc9871
+3235	5277	7562744199696627	gmv-gateway-board.elf	a1cb8372200b3aef