Merge remote-tracking branch 'origin/master' into dev

Signed-off-by: huhui <huhui@sharkgulf.com>

Application/app/event_record.h

@@ -25,6 +25,7 @@ typedef enum {
 	Cell_Under_Vol2,    //19
 	Cell_Over_Vol2,     //20
 	Cell_balance,
+	Min_Cap_For_DisCharger2,
 }event_id_t;
 
 typedef struct {

Application/app/sox/soc.c

@@ -372,7 +372,7 @@ static int _soc_update_by_ocv(uint8_t prev_charge_status){
 				_soc.coulomb_now = _soc.coulomb_min;
 			}
 			u32 cap_x10 = (u32)(_soc.coulomb_now / 3600.0f * 10);
-			push_event(Min_Cap_For_DisCharger, (bms_state_get()->pack_voltage << 16) | (cap_x10 & 0xFFFF));
+			push_event(Min_Cap_For_DisCharger2, (bms_state_get()->pack_voltage << 16) | (cap_x10 & 0xFFFF));
 			force_empty_ts = shark_get_seconds();
 			_soc.capacity = 0;
 			return 1;

Application/app/sox/state.c

@@ -244,17 +244,11 @@ static s32 _process_unheath(void){
 	}
 	if (bms_health()->charger_over_current || bms_health()->charger_over_temp || bms_health()->charger_lower_temp ||
 				bms_health()->charger_over_voltage || bms_health()->sigle_cell_over_voltage){
-		if (_bms_state.ps_charger_mask && !_bms_state.ps_charger_in){
-
-		}else {
-			charger_open(0); //disable charger mosfet
-			unhealth |= Health_charger_Fault;
-		}
+		charger_open(0); //disable charger mosfet
+		unhealth |= Health_charger_Fault;
 	}
 	if (bms_health()->over_temp_deny_charger|| bms_health()->lower_temp_deny_charger) {
-		if (_bms_state.ps_charger_mask && !_bms_state.ps_charger_in){
-
-		}else if (_bms_state.charging) {
+		if (_bms_state.charging) {
 			charger_open(0); //disable charger mosfet
 			unhealth |= Health_charger_Fault;
 		}