Selaa lähdekoodia

ignore some battery error

Signed-off-by: FuangCao <cavan.cao@foxmail.com>
FuangCao 5 vuotta sitten
vanhempi
commit
6ad9bc4dd0
4 muutettua tiedostoa jossa 10 lisäystä ja 7 poistoa
  1. 1 1
      Project/version.txt
  2. 5 5
      Source/app_rs485_1.c
  3. 3 0
      Source/common.h
  4. 1 1
      Source/sw_build_info.h

+ 1 - 1
Project/version.txt

@@ -1 +1 @@
-PS100XX_V11_13231623
+PS100XX_V11_13231759

+ 5 - 5
Source/app_rs485_1.c

@@ -351,6 +351,7 @@ void Sub_BMS_1_Initial(void)
 static shark_battery_exit_t shark_battery_is_normal_raw(SUB_BMS_INFO *info, shark_battery_power_t power)
 {
 	u16 work_status;
+	u16 work_mask;
 
 	if (info->define_error != D_BMS_ERROR_NO) {
 		return SHARK_BATT_EXIT_ERROR;
@@ -360,15 +361,14 @@ static shark_battery_exit_t shark_battery_is_normal_raw(SUB_BMS_INFO *info, shar
 		return SHARK_BATT_EXIT_ERROR;
 	}
 
-	work_status = info->packet_common.work_status;
-	work_status &= ~(ST_CHRG_CUR | ST_DISCHRG_CUR | ST_OVRDISCHRG_CUR | ST_SMALL_CURRENT_OVER);
-
 	if (shark_charger_state == SHARK_CHG_INSERT) {
-		work_status &= ~(ST_OVRDISCHRG_VOL | ST_PDOWN | ST_UDR_TEMPE_DISCHRG | ST_OVR_TEMPE_DISCHRG);
+		work_mask = BATT_CHARGE_ERRORS;
 	} else {
-		work_status &= ~(ST_OVRCHRG_VOL | ST_OVR_TEMPE_CHRG | ST_UDR_TEMPE_CHRG);
+		work_mask = BATT_DISCHARGE_ERRORS;
 	}
 
+	work_status = info->packet_common.work_status & work_mask;
+
 	if (work_status != 0) {
 		info->work_error = work_status;
 		return SHARK_BATT_EXIT_ERROR;

+ 3 - 0
Source/common.h

@@ -114,6 +114,9 @@ extern uint32_t g_event;
 #define ST_OVR_TEMPE_CHRG				(0x4000u)
 #define ST_OVR_TEMPE_DISCHRG			(0x8000u)
 
+#define BATT_CHARGE_ERRORS				(ST_OVRCHRG_VOL | ST_OVR_TEMPE_CHRG | ST_UDR_TEMPE_CHRG | ST_SHORT_CUR)
+#define BATT_DISCHARGE_ERRORS			(ST_OVRDISCHRG_VOL | ST_UDR_TEMPE_DISCHRG | ST_OVR_TEMPE_DISCHRG | ST_SHORT_CUR)
+
 uint8_t Get_RS485_CRC(uint8_t *data,uint16_t size);
 
 void Writer_SN(uint8_t *data);

+ 1 - 1
Source/sw_build_info.h

@@ -1,3 +1,3 @@
 #pragma once
 
-#define CONFIG_VERSION "PS100XX_V11_13231623"
+#define CONFIG_VERSION "PS100XX_V11_13231759"