Browse Source

in UPS_OverTempratureMonitor() added condition (UPS.Status >> 7) & 0x01 - battery powered

Dmitry Telenkov 1 năm trước cách đây
mục cha
commit
cd5dc57429
2 tập tin đã thay đổi với 22 bổ sung23 xóa
  1. 21 21
      config/board_bt6711_v1.h
  2. 1 2
      modules/monitor/ups_monitor.c

+ 21 - 21
config/board_bt6711_v1.h

@@ -241,31 +241,31 @@ typedef enum
 } TRAP_LIST_t;
 
 typedef enum {
-	LOG_SYSTEM_BOOT = 0,			// device booted
-	LOG_SYSTEM_DEFCONFIG,	// default config applied
-	LOG_UPDATE_SOFT,
-	LOG_TURN_ON,		//
-	LOG_PSW_CHANGE,		//
-	LOG_SETTING_SAVE,		//
-	LOG_LOGIN_TELNET,		//
-	LOG_LOGIN,		//
+  LOG_SYSTEM_BOOT = 0,			// device booted
+  LOG_SYSTEM_DEFCONFIG,	// default config applied
+  LOG_UPDATE_SOFT,
+  LOG_TURN_ON,		//
+  LOG_PSW_CHANGE,		//
+  LOG_SETTING_SAVE,		//
+  LOG_LOGIN_TELNET,		//
+  LOG_LOGIN,		//
   LOG_UPS_MODE,
-	LOG_TEST_UPS,		//
-	LOG_SHUTDOWN_UPS,
-	LOG_ALARM_VAC_LOW_OUTPUT,
-	LOG_ALARM_VAC_HIGH_OUTPUT,
-	LOG_ALARM_HIGH_TEMP,
-	LOG_ALARM_LOW_TEMP,
-	LOG_ALARM_LINE,
-	LOG_ALARM_LOW_BAT,
-	LOG_ALARM_POWER,
-	LOG_ALARM_UPS,
-	LOG_ALARM_AKB,
+  LOG_TEST_UPS,		//
+  LOG_SHUTDOWN_UPS,
+  LOG_ALARM_VAC_LOW_OUTPUT,
+  LOG_ALARM_VAC_HIGH_OUTPUT,
+  LOG_ALARM_HIGH_TEMP,
+  LOG_ALARM_LOW_TEMP,
+  LOG_ALARM_LINE,
+  LOG_ALARM_LOW_BAT,
+  LOG_ALARM_POWER,
+  LOG_ALARM_UPS,
+  LOG_ALARM_AKB,
   LOG_TEST_ALARM_AKB,
   LOG_PHASE_FAIL,
   LOG_EPO_FAIL,
-	LOG_VALUE,
-	LOG_NONE,
+  LOG_VALUE,
+  LOG_NONE,
 } log_type_t;
 
 #define UPS_MODE_MONITOR

+ 1 - 2
modules/monitor/ups_monitor.c

@@ -1763,12 +1763,11 @@ void UPS_EPOMonitor(void)
 #ifdef OVERTEMPRATURE_MONITOR
 void UPS_OverTempratureMonitor(void)
 {
-    if(UPS.fault_type == 0x41 && UPS.Temp < 55) {
+    if ((UPS.fault_type == 0x41) && (UPS.Temp < 55) && ((UPS.Status >> 7) & 0x01)) {
         UPScmd(ups_remote_turn_off);
         xTimerStart(UPSRestartTimer, 0);
         UPS.fault_type = 0;
     }
-
 }
 #endif