Revert "powerdown前先reset一次，确保powerdown正确的"

This reverts commit 2e7c937a3b748e3eec42554168d08c3ed4509353.

Application/app/sox/health.c

@@ -1,6 +1,5 @@
 #include "bsp/gpio.h"
 #include "bsp/ml5238.h"
-#include "bsp/shark_rtc.h" 
 #include "libs/logger.h"
 #include "state.h"
 #include "iostate.h"
@@ -235,7 +234,6 @@ static int _can_powerdown(void){
 
 
 void check_voltage_state(void) {
-	static int no_pd_count = 0;
 	if (bms_state_get()->charging){ //check sigle cell's voltage for charger
 		_health.discharger_shutpower_voltage = 0;
 		_health.sigle_cell_lower_voltage = 0;
@@ -304,7 +302,6 @@ void check_voltage_state(void) {
 
 	/* check for power down */
 	if (_can_powerdown()){
-		no_pd_count = 0;
 		if (judge_debounce(!_health.powerdown_lower_voltage, &_power_down_voltage)) {
 			/*
 			 * no need to clear powerdown(bms is shutdown), when charger insert, 
@@ -312,10 +309,6 @@ void check_voltage_state(void) {
 			*/			
 			_health.powerdown_lower_voltage = 1;
 		}
-	}else {
-		if (no_pd_count ++ == 2) {
-			shark_rtc_set_pd_magic(0);
-		}
 	}
 	debug_health();
 }

Application/app/sox/soc.c

@@ -251,9 +251,6 @@ static void _force_capacity_full(void){
 }
 
 static int _soc_is_under_voltage(void) {
-	if (bms_health()->powerdown_lower_voltage && bms_is_reset_befor_pd()){//如果先做reset处理，不修改最小容量
-		return 0;
-	}
 	return (bms_health()->powerdown_lower_voltage || bms_health()->sigle_cell_lower_voltage || 
 		bms_health()->discharger_lower_voltage);
 }

Application/app/sox/state.c

@@ -2,7 +2,6 @@
 #include "bsp/ml5238.h"
 #include "bsp/cs1180.h"
 #include "bsp/uart.h"
-#include "bsp/shark_rtc.h"
 #include "bsp/mcu_power_sleep.h"
 #include "app/sox/measure.h"
 #include "app/sox/measure_task.h"
@@ -19,8 +18,6 @@
 #define ALLOW_POWER_DOWN 1 //disable power down for debug
 #define ALLOW_5238_BALANCE 1
 #define IGNORE_DISCHARGER_LOW_VOL 0 //忽略放电欠压
-#define ALLOW_RESET_BEFORE_PD   1 //在powerdown之间先做一个reset
-#define PD_MAGIC 0x13EF5AA5
 extern uint32_t bsp_get_rst_reson(void);
 extern uint32_t bsp_get_backup(void);
 static void _current_notify(void);
@@ -31,7 +28,6 @@ static void _debug_timer_handler(shark_timer_t *t);
 static void _process_power_down(void);
 static uint8_t calc_cell_voltage(void);
 static int _can_close_mos_no_hall(void);
-extern void system_reboot(void);
 
 static bms_state_t _bms_state;
 static int pcb_temp = 100;
@@ -132,7 +128,7 @@ void bms_state_log(void){
 	state_debug("ml5238 cali: %d\n", ml5238_cali_count);
 	state_debug("ps charger mask:in %d, %d\n", _bms_state.ps_charger_mask, _bms_state.ps_charger_in);
 	state_debug("open dfet %d - %d - 0x%x - %d\n", open_dfet, open_dfet_failt, close_dfet_reson, close_dfet_no_hall);
-	state_debug("Reset Reson 0x%x, 0x%x\n", bsp_get_rst_reson(), shark_rtc_get_pd_flags());
+	state_debug("Reset Reson 0x%x\n", bsp_get_rst_reson());
 	state_debug("BackUp value 0x%x\n", bsp_get_backup());
 	state_debug("Debug: %d, %d. uart reinit=%d\n", shark_uart_timeout(), io_state()->hall_detect, uart_reinit_count);
 	log_no_hall_time();
@@ -344,18 +340,9 @@ static void _process_user_request(s32 health){
 	}
 }
 
-int bms_is_reset_befor_pd(void) {
-	return (shark_rtc_get_pd_magic() != PD_MAGIC);
-}
-
 static void _process_power_down(void){
 #if (ALLOW_POWER_DOWN==1)	
 	if (bms_health()->powerdown_lower_voltage){
-		if (shark_rtc_get_pd_magic() != PD_MAGIC) {
-			shark_rtc_set_pd_magic(PD_MAGIC);
-			nv_save_all_soc();
-			system_reboot();
-		}
 		state_debug("BMS System PowerDown!!\n");
 
 		if (bms_work_is_normal() && soc_update_by_ocv()) {

Application/app/sox/state.h

@@ -98,7 +98,6 @@ void start_aux_power(int start);
 void bms_set_ps_charger_in(uint16_t mask, uint16_t in);
 int bms_is_ps_charger_in(void);
 void system_power_down(void);
-int bms_is_reset_befor_pd(void);
 void bms_state_log(void);
 
 #endif /* _BMS_STATE_H__ */

Application/bsp/bsp.c

@@ -75,7 +75,6 @@ char* bsp_get_fversion(void){
 
 void system_reboot(void){
 	NVIC_SystemReset();
-	while(1);
 }
 
 

Application/bsp/shark_rtc.c

@@ -103,19 +103,6 @@ uint32_t shark_rtc_get_backup(void){
 	return RTC_BKP0;
 }
 
-void shark_rtc_set_pd_magic(uint32_t v) {
-	RTC_BKP1 = v;
-	RTC_BKP2 = 0x5aa5aa55;
-}
-
-uint32_t shark_rtc_get_pd_magic(void){
-	return RTC_BKP1;
-}
-
-uint32_t shark_rtc_get_pd_flags(void) {
-	return RTC_BKP2;
-}
-
 void shark_rtc_stop_alarm(void){
 	rtc_alarm_disable();
 	rtc_flag_clear(RTC_STAT_ALRM0F);

Application/bsp/shark_rtc.h

@@ -13,8 +13,5 @@ int shark_rtc_get_second(void);
 int shark_rtc_update_alarm(uint32_t sencod);
 void shark_rtc_set_backup(uint32_t v);
 uint32_t shark_rtc_get_backup(void);
-void shark_rtc_set_pd_magic(uint32_t v);
-uint32_t shark_rtc_get_pd_magic(void);
-uint32_t shark_rtc_get_pd_flags(void);
 
 #endif /* _Shark_Rtc_h__ */