浏览代码

update battery check logic

Signed-off-by: FuangCao <cavan.cao@foxmail.com>
FuangCao 5 年之前
父节点
当前提交
7e64ba6a0b
共有 3 个文件被更改,包括 14 次插入4 次删除
  1. 1 1
      Project/version.txt
  2. 12 2
      Source/app_rs485_1.c
  3. 1 1
      Source/sw_build_info.h

+ 1 - 1
Project/version.txt

@@ -1 +1 @@
-PS100XX_V10_11081642
+PS100XX_V10_11081651

+ 12 - 2
Source/app_rs485_1.c

@@ -494,9 +494,19 @@ static shark_battery_exit_t shark_battery_is_normal_raw(SUB_BMS_INFO *info)
 	}
 
 	if (info->conn_state != SUB_BMS_CONT_HV485) {
-		if (end_ctr_self_ss_new.xl_sta == 0 || info->state == SHARK_BATT_STATE_IDLE) {
+		if (info->state == SHARK_BATT_STATE_IDLE) {
 			return SHARK_BATT_EXIT_485;
-		} else if (cb_operate_state == CB_BAT1_BAT2_SERIES) {
+		}
+
+		if (end_ctr_self_ss_new.xl_sta == 0) {
+			return SHARK_BATT_EXIT_485;
+		}
+
+		if (QD_Dect() == 0) {
+			return SHARK_BATT_EXIT_485;
+		}
+
+		if (cb_operate_state == CB_BAT1_BAT2_SERIES) {
 			if (Measure_Vol() < SERIES_VOLTAGE_MIN) {
 				return SHARK_BATT_EXIT_485;
 			}

+ 1 - 1
Source/sw_build_info.h

@@ -1,3 +1,3 @@
 #pragma once
 
-#define CONFIG_VERSION "PS100XX_V10_11081642"
+#define CONFIG_VERSION "PS100XX_V10_11081651"