Explorar o código

fixup xl check fault

Signed-off-by: FuangCao <cavan.cao@foxmail.com>
FuangCao %!s(int64=5) %!d(string=hai) anos
pai
achega
945054802e
Modificáronse 5 ficheiros con 5 adicións e 12 borrados
  1. 1 1
      Project/version.txt
  2. 2 2
      Source/app_end_ctr.c
  3. 1 6
      Source/app_rs485_1.c
  4. 0 2
      Source/app_rs485_1.h
  5. 1 1
      Source/sw_build_info.h

+ 1 - 1
Project/version.txt

@@ -1 +1 @@
-PS100XX_V01_11061952
+PS100XX_V01_11071600

+ 2 - 2
Source/app_end_ctr.c

@@ -788,7 +788,7 @@ void Check_End_Ctr_Status(void)
 		xl_dec_delay.count = 0;	
 		if(shield_xl.set == 0)
 		{
-			end_ctr_self_ss_new.xl_sta = (xl_count)?1:0;
+			end_ctr_self_ss_new.xl_sta = (xl_count > 0 || XL_Dect() == RESET);
 		}
 		xl_count = 0;
 	}
@@ -893,7 +893,7 @@ void ACC12_OVER_Loader_Timeout(void)
 	}
 #endif
 	
-}
+} 
 
 void ACC12_OVER_Loader_Interrupt(void)
 {

+ 1 - 6
Source/app_rs485_1.c

@@ -493,7 +493,7 @@ static shark_battery_exit_t shark_battery_is_normal_raw(SUB_BMS_INFO *info)
 	}
 
 	if (info->conn_state != SUB_BMS_CONT_HV485) {
-		if (shark_bms_check_xl() == 0 || info->state == SHARK_BATT_STATE_IDLE) {
+		if (end_ctr_self_ss_new.xl_sta == 0 || info->state == SHARK_BATT_STATE_IDLE) {
 			return SHARK_BATT_EXIT_485;
 		}
 	}
@@ -909,11 +909,6 @@ void Check_Enable_Test_Info(void)
 		test_info.ti_set = 0;
 }
 
-uint8_t shark_bms_check_xl(void)
-{
-	return end_ctr_self_ss_new.xl_sta != 0 || XL_Dect() == RESET;
-}
-
 void shark_bms_set_vgs(shark_bms_vgs_t mask, uint8_t enable)
 {
 	static uint8_t shark_bms_vgs_mask;

+ 0 - 2
Source/app_rs485_1.h

@@ -383,7 +383,6 @@ void Ca_Chu_Test_Info(void);
 
 void Check_Enable_Test_Info(void);
 
-shark_bool shark_bms_check_xl(void);
 shark_battery_exit_t shark_battery_is_normal(SUB_BMS_INFO *info);
 void shark_bms_set_vgs(shark_bms_vgs_t vgs, shark_bool enable);
 void shark_bms_set_mos(shark_bool ss, shark_bool s11, shark_bool s21);
@@ -421,7 +420,6 @@ static inline void shark_bms_set_mos_parrallel(void)
 static inline shark_bool shark_battery_is_power_full(SUB_BMS_INFO *info)
 {
 	return SHARK_BOOL((info->packet_common.bms_status & BMS_POWER_FULL) == BMS_POWER_FULL);
-
 }
 
 #endif

+ 1 - 1
Source/sw_build_info.h

@@ -1,3 +1,3 @@
 #pragma once
 
-#define CONFIG_VERSION "PS100XX_V01_11061952"
+#define CONFIG_VERSION "PS100XX_V01_11071600"