master-250211

.idea/workspace.xml

@@ -20,7 +20,16 @@
     </configurations>
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="01ce1271-fbf8-4e14-b10b-a2875bdb8cd4" name="更改" comment="master-250208" />
+    <list default="true" id="01ce1271-fbf8-4e14-b10b-a2875bdb8cd4" name="更改" comment="master-250208">
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" 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/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>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
     <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
@@ -54,6 +63,9 @@
     </option>
     <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
   </component>
+  <component name="PerforceDirect.Settings">
+    <option name="CHARSET" value="无" />
+  </component>
   <component name="ProjectApplicationVersion">
     <option name="ide" value="CLion" />
     <option name="majorVersion" value="2024" />
@@ -213,7 +225,12 @@
       <workItem from="1737767532243" duration="13614000" />
       <workItem from="1738717379793" duration="5997000" />
       <workItem from="1738912981925" duration="685000" />
-      <workItem from="1738981317737" duration="311000" />
+      <workItem from="1738981317737" duration="830000" />
+      <workItem from="1738994761639" duration="638000" />
+      <workItem from="1739159180536" duration="830000" />
+      <workItem from="1739178738993" duration="1254000" />
+      <workItem from="1739183660790" duration="8000" />
+      <workItem from="1739236681413" duration="3541000" />
     </task>
     <task id="LOCAL-00001" summary="更新和功能">
       <option name="closed" value="true" />
@@ -335,7 +352,15 @@
       <option name="project" value="LOCAL" />
       <updated>1738981603315</updated>
     </task>
-    <option name="localTasksCounter" value="16" />
+    <task id="LOCAL-00016" summary="master-250208">
+      <option name="closed" value="true" />
+      <created>1738982142423</created>
+      <option name="number" value="00016" />
+      <option name="presentableId" value="LOCAL-00016" />
+      <option name="project" value="LOCAL" />
+      <updated>1738982142423</updated>
+    </task>
+    <option name="localTasksCounter" value="17" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">

Core/Src/mini_gateway_master.c

@@ -104,6 +104,8 @@ _Noreturn void mini_mater_task(void *pv) {
                         status.set_temp = data[2] / 10;
                     } else
                         status.power = 0;
+                    if ((status.fan_speed == 0) || (status.fan_speed >= 6))
+                        status.power = 0;
                     if((get_reg_value(POWER_REG_ADDRESS) == 0)){
                         DEBUG_PRINTF("The INER_POWER_REG_ADDRESS_1 is 0.\r\n");
                     }

cmake-build-debug-mingw/.ninja_log

@@ -142,3 +142,14 @@
 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
+54	1937	7609401828502543	CMakeFiles/gmv-gateway-board.elf.dir/Core/Src/mini_gateway_master.c.obj	2715bb4eda440042
+48	1940	7609401828440139	CMakeFiles/gmv-gateway-board.elf.dir/Core/Src/main.c.obj	55f34e283414df62
+1940	3311	7609401847362639	gmv-gateway-board.elf	5207b332c9260086
+52	280	7609412435699754	CMakeFiles/gmv-gateway-board.elf.dir/Core/Src/mini_gateway_master.c.obj	2715bb4eda440042
+281	1328	7609412437981202	gmv-gateway-board.elf	5207b332c9260086
+8	246	7609416066043895	CMakeFiles/gmv-gateway-board.elf.dir/Core/Src/mini_gateway_master.c.obj	2715bb4eda440042
+248	605	7609416068438606	gmv-gateway-board.elf	5207b332c9260086
+16	208	7609416530578314	CMakeFiles/gmv-gateway-board.elf.dir/Core/Src/mini_gateway_master.c.obj	2715bb4eda440042
+209	592	7609416532497017	gmv-gateway-board.elf	5207b332c9260086
+15	207	7609417403777300	CMakeFiles/gmv-gateway-board.elf.dir/Core/Src/mini_gateway_master.c.obj	2715bb4eda440042
+207	584	7609417405706698	gmv-gateway-board.elf	5207b332c9260086