master-250208

.idea/workspace.xml

@@ -22,15 +22,16 @@
   <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/Inc/ffx_master.h" beforeDir="false" afterPath="$PROJECT_DIR$/Core/Inc/ffx_master.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/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" />
@@ -83,28 +84,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-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 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-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>
+}</component>
   <component name="RecentsManager">
     <key name="CopyFile.RECENT_KEYS">
       <recent name="C:\Users\DELL\Desktop\gmv-gateway-board-v\Core\Inc" />
@@ -225,7 +226,10 @@
       <workItem from="1737510036576" duration="2366000" />
       <workItem from="1737681402539" duration="14545000" />
       <workItem from="1737704556929" duration="6190000" />
-      <workItem from="1737767532243" duration="11941000" />
+      <workItem from="1737767532243" duration="13614000" />
+      <workItem from="1738717379793" duration="5997000" />
+      <workItem from="1738912981925" duration="685000" />
+      <workItem from="1738981317737" duration="2000" />
     </task>
     <task id="LOCAL-00001" summary="更新和功能">
       <option name="closed" value="true" />
@@ -331,7 +335,15 @@
       <option name="project" value="LOCAL" />
       <updated>1737786548908</updated>
     </task>
-    <option name="localTasksCounter" value="14" />
+    <task id="LOCAL-00014" summary="master-250125">
+      <option name="closed" value="true" />
+      <created>1737793907530</created>
+      <option name="number" value="00014" />
+      <option name="presentableId" value="LOCAL-00014" />
+      <option name="project" value="LOCAL" />
+      <updated>1737793907530</updated>
+    </task>
+    <option name="localTasksCounter" value="15" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">

Core/Src/ffx_master.c

@@ -63,7 +63,7 @@ bool get_ffx_status(ffx_status_t *ffxStatus) {
         ffxStatus->fresh_air_system = ffx_ststus[2];
         ffxStatus->fan_speed = ffx_ststus[4];
         if((ffxStatus->power == 0)){
-//            DEBUG_PRINTF("The FFX_POWER_REG_ADDRESS is 0.\r\n");
+            DEBUG_PRINTF("The FFX_POWER_REG_ADDRESS is 0.\r\n");
         }
     }else {
         return false;

Core/Src/freertos.c

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

Core/Src/main.c

@@ -101,17 +101,17 @@ 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();
     mini_gateway_master_init();
     if (read_dip_4_number() == 8) {
+        start_485_slave(0x10);
+    } else
         constants_is_three_master_init();
 
-    } else
-        start_485_slave(0x10);
-  /* USER CODE END 2 */
+/* USER CODE END 2 */
 
   /* Init scheduler */
   osKernelInitialize();

Core/Src/mini_gateway_master.c

@@ -105,7 +105,7 @@ _Noreturn void mini_mater_task(void *pv) {
                     } else
                         status.power = 0;
                     if((get_reg_value(POWER_REG_ADDRESS) == 0)){
-//                        DEBUG_PRINTF("The INER_POWER_REG_ADDRESS_1 is 0.\r\n");
+                        DEBUG_PRINTF("The INER_POWER_REG_ADDRESS_1 is 0.\r\n");
                     }
                     switch (data[1]) {
                         case 1://制冷模式
@@ -139,7 +139,7 @@ _Noreturn void mini_mater_task(void *pv) {
                     is_error_ffx[i]++;
                     is_power_on = true;
                     if ((status.power == INNER_POWER_OFF) && is_error_ffx[i] > 10) {
-//                        DEBUG_PRINTF("The INER_POWER_REG_ADDRESS is_2 0.\r\n");
+                        DEBUG_PRINTF("The INER_POWER_REG_ADDRESS is_2 0.\r\n");
                         set_reg_value(INNER_ERROR1_REG_ADDRESS, 1);
                         set_reg_value(POWER_REG_ADDRESS, status.power);
                         error_count = 0;
@@ -151,7 +151,7 @@ _Noreturn void mini_mater_task(void *pv) {
             osDelay(1000);
         }
         if ((status.power == INNER_POWER_OFF) && (is_power_on == false)) {
-//            DEBUG_PRINTF("The INER_POWER_REG_ADDRESS is_3 0.\r\n");
+            DEBUG_PRINTF("The INER_POWER_REG_ADDRESS is_3 0.\r\n");
             set_reg_value(INNER_ERROR1_REG_ADDRESS, 0);
             set_reg_value(POWER_REG_ADDRESS, status.power);
             error_count = 0;

cmake-build-debug-mingw/.ninja_log

@@ -135,3 +135,10 @@
 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
+232	3681	7604206247936545	CMakeFiles/gmv-gateway-board.elf.dir/Core/Src/main.c.obj	55f34e283414df62
+65	3697	7604206246271595	CMakeFiles/gmv-gateway-board.elf.dir/Core/Src/freertos.c.obj	8e78e9a3bef9dd01
+3697	5531	7604206282589315	gmv-gateway-board.elf	5207b332c9260086
+62	2203	7604213201980826	CMakeFiles/gmv-gateway-board.elf.dir/Core/Src/constants_is_three.c.obj	c2114c418650d431
+400	2224	7604213205364110	CMakeFiles/gmv-gateway-board.elf.dir/Core/Src/mini_gateway_master.c.obj	2715bb4eda440042
+303	2239	7604213204399372	CMakeFiles/gmv-gateway-board.elf.dir/Core/Src/ffx_master.c.obj	bb3f9e6aaffc9871
+2239	3855	7604213223752181	gmv-gateway-board.elf	5207b332c9260086