charger && soc update

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

Application/app/bms_message.c

@@ -153,7 +153,6 @@ void process_bms_message(can_frame_t *frame, int len){
 			soc.c_now = get_soc()->coulomb_now/36.0f;
 			soc.c_discharger = get_soc()->dischrger_coulomb/36.0f;
 			soc.c_charger = get_soc()->charger_coulomb/36.0f;
-			soc.c_totol = soc_get_cycle();
 			soc.cycle = soc_get_cycle();
 			soc.calibrated = (get_soc()->flags & SOC_FLAG_CALIBRATED) != 0;			
 			data = (uint8_t *)&soc;

Application/app/protocol.h

@@ -111,7 +111,6 @@ typedef struct {
 	int c_now;
 	int c_charger;
 	int c_discharger;
-	int   c_totol;
 	uint32_t cycle; //³ä·ÅµçÑ­»·´ÎÊý
 	uint32_t  calibrated;	
 }soc_info_t;

Application/app/sox/iostate.c

@@ -142,6 +142,7 @@ static void io_timer_handler(shark_timer_t *t){
 
 static void charger_detect_irq_timer_handler(shark_timer_t *t){
 	_io_state.charger_detect_irq = 0;
+	io_warning("clear charger detect irq\n");
 }
 
 static void small_current_irq_timer_handler(shark_timer_t *t){
@@ -165,7 +166,8 @@ void small_current_short_irq_handler(void){
 void charger_detect_irq_handler(void){
 	mcu_sleep_set_wakeup_source(WAKEUP_SOURCE_CHARGER);
 	_io_state.charger_detect_irq = 1;
-	shark_timer_post(&_charger_detect_irq_timer, 2000);//延时2s给充电判断充足的时间
+	shark_timer_post(&_charger_detect_irq_timer, CHARGER_DETECT_IRQ_CLEAR_TIMEOUT);//延时一段时间给充电判断充足的时间
+	io_warning("charger detect irq\n");
 }
 
 void hall1_detect_irq_handler(void){

Application/app/sox/soc.c

@@ -13,6 +13,7 @@ static float     soc_delta_time = 0;
 static float     max_soc_delta_time = 0;
 static float _charger_coefficient = 1.0f;
 static float _discharger_coefficient = 1.0f;
+static uint8_t is_force_full = 0;
 uint32_t charger_remain_time = 0;
 #define DEFALUT_MAX_COULOMB (MAX_HA * 3600.0f)
 
@@ -43,6 +44,7 @@ void soc_init(void){
 #define TOHA(x) (float)(x/3600.0f)
 
 void soc_log(void){
+	soc_debug("C flags 0x%x\n", _soc.flags);
 	soc_debug("C now: %.4f\n", TOHA(_soc.coulomb_now));
 	soc_debug("C min: %.4f\n", TOHA(_soc.coulomb_min));
 	soc_debug("C max: %.4f\n", TOHA(_soc.coulomb_max));
@@ -94,7 +96,7 @@ static __inline__ float _delta_time(void){
 }
 
 int soc_update_by_ocv(void){
-	static int cali_full_count = 0;
+	
 	int changed = 0;
 	if (_soc.flags & SOC_FLAG_CALIBRATED){
 		if (!chargering && bms_health()->powerdown_lower_voltage){
@@ -104,29 +106,36 @@ int soc_update_by_ocv(void){
 			changed = 1;
 		}
 		if (chargering){
-			if (bms_state_get()->pack_voltage >= (54000)){
+			if (bms_state_get()->pack_voltage >= (54000) || ((measure_value()->load_current > 0.0f) && (measure_value()->load_current <= 500.0f))){
 				_soc.capacity = 100;
 				changed = 1;
 			}
 		}
-	}else {
+	}
+	return changed;
+}
+
+
+static void soc_calibrate(uint8_t prev_charge_status){
+	static int cali_full_count = 0;
+	if (!(_soc.flags & SOC_FLAG_CALIBRATED)){
 		if (chargering){//用ocv进行严格校准
-			if (measure_value()->load_current <= 400.0f){				
-				//判断总电压
-				if (bms_state_get()->pack_voltage >= 53000){
-					cali_full_count ++;
-					if (cali_full_count == 10) {
-						soc_debug("measure_value()->load_current %d\n", measure_value()->load_current);
-						_soc.capacity = 100;
-						changed = 1;
-					}
-					return changed;
+			if ((measure_value()->load_current <= 500.0f) && (bms_state_get()->pack_voltage >= 53500)){				
+				cali_full_count ++;
+				if (cali_full_count == 10) {
+					soc_debug("calibrate Capacity to 100, measure_value()->load_current %d\n", measure_value()->load_current);
+					_soc.capacity = 100;
+					is_force_full = 1;
 				}
 			}
+		}else if (prev_charge_status){
+			if(bms_state_get()->pack_voltage >= 54000){
+				soc_debug("calibrate Capacity to 100\n");
+				_soc.capacity = 100;
+				is_force_full = 1;
+			}
 		}
-		cali_full_count = 0;
 	}
-	return changed;
 }
 
 static void soc_update_charger_remain_time(void){
@@ -154,7 +163,7 @@ uint32_t soc_get_charger_remain_time(void){
 	return charger_remain_time;
 }
 
-static void soc_update_by_current_and_time(float current_now, float delta_time){
+static void soc_update_by_current_and_time(float current_now, float delta_time, uint8_t prev_charge_status){
 	double current = current_now / 1000.0f; //A
 	double delta_q = current * delta_time;
 	if (chargering){
@@ -166,9 +175,7 @@ static void soc_update_by_current_and_time(float current_now, float delta_time){
 	}
 	_soc.coulomb_now = _soc.coulomb_now + delta_q; //充电加, 放电减
 
-	if (_soc.coulomb_now > _soc.coulomb_max){
-		_soc.coulomb_now = _soc.coulomb_max;
-	}else if (_soc.coulomb_now < _soc.coulomb_min){
+	if (_soc.coulomb_now < _soc.coulomb_min){
 		_soc.coulomb_now = _soc.coulomb_min;
 	}
 	uint8_t old_cap = _soc.capacity;
@@ -176,13 +183,14 @@ static void soc_update_by_current_and_time(float current_now, float delta_time){
 	if (_soc.capacity > 100){
 		_soc.capacity = 100;
 	}
-	if (chargering && (_soc.capacity == 100)){
-		_soc.capacity = 99;//充电的时候必须通过ovc才能把电量校准到100
+	if (chargering && (_soc.capacity == 100) && (!is_force_full)){
+		_soc.capacity = 99;//充电的时候必须通过ocv才能把电量校准到100
 	}else if (!chargering && (_soc.capacity == 0)){
 		_soc.capacity = 1;
 	}
 	//通过电压校准SOC，只能在电压范围的两端校准
 	soc_update_by_ocv();
+	soc_calibrate(prev_charge_status);
 
 	//如果没有校准过，充电过程中，电量100%后，设置校准标志位
 	if (chargering && (_soc.capacity == 100)){
@@ -206,25 +214,32 @@ static void soc_update_by_current_and_time(float current_now, float delta_time){
 }
 
 void soc_update_for_deepsleep(float sleep_time){
-	soc_update_by_current_and_time(-1.0f, sleep_time);
+	soc_update_by_current_and_time(-1.0f, sleep_time, 0);
 }
 
 void soc_update(void){
+	uint8_t pre_chargering = chargering;
 	if (!chargering && bms_state_get()->charging){
 		_soc.pre_charger_coulomb = _soc.charger_coulomb;
 		_soc.charger_coulomb = 0;//clear charing
 		_soc.total_coulomb += _soc.pre_charger_coulomb / 3600.0f;
 		chargering = 1;
+		if (_soc.capacity < 100) {
+			is_force_full = 0;
+		}
 		soc_warning("changed to chargering, current = %d\n", measure_value()->load_current);
 	}else if (chargering && !bms_state_get()->charging){
 		_soc.pre_discharger_coulomb = _soc.dischrger_coulomb;
 		_soc.dischrger_coulomb = 0; //clear discharger
 		_soc.total_coulomb += _soc.pre_discharger_coulomb / 3600.0f;
 		chargering = 0;
+		if (_soc.capacity < 100) {
+			is_force_full = 0;
+		}
 		soc_warning("changed to dischargering, current = %d\n", measure_value()->load_current);
 	}
 
-	soc_update_by_current_and_time(measure_value()->load_current, _delta_time());
+	soc_update_by_current_and_time(measure_value()->load_current, _delta_time(), pre_chargering);
 	soc_update_charger_remain_time();
 }
 

Application/app/sox/state.c

@@ -380,7 +380,7 @@ static int _min_current_for_both_mos_count = 0;
 static void _check_mos_stat(void){
 	if (abs(measure_value()->load_current) >= MIN_CURRENT_FOR_BOTH_MOS_OPEN){
 		_min_current_for_both_mos_count ++;
-		if (_min_current_for_both_mos_count == 2){
+		if (_min_current_for_both_mos_count >= 2){
 			int dmos = ml5238_is_discharging();
 			int cmos = ml5238_is_charging();
 			if (dmos + cmos == 0){

Application/bsp/shark_bsp.h

@@ -31,6 +31,9 @@
 #define GD32_ADC (1<<0)
 #define CS1180_ADC (1<<1)
 
+#define UART_TIMEOUT 3000
+#define CHARGER_DETECT_IRQ_CLEAR_TIMEOUT (UART_TIMEOUT + 2 * 1000)
+
 void bsp_init(void);
 void wdog_start(int timeout);
 void wdog_reload(void);

Application/bsp/uart.c

@@ -78,7 +78,7 @@ static void shark_uart_rx(shark_uart_t *uart){
 				}
 			}
 			
-			if (shark_get_mseconds() >= (5000 + _rx_time)){
+			if (shark_get_mseconds() >= (UART_TIMEOUT + _rx_time)){
 				uart_no_data = true;
 
 			}else {