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

Application/app/sox/iostate.c

@@ -156,7 +156,7 @@ static shark_timer_t _charger_detect_irq_timer = {.handler = charger_detect_irq_
 
 void small_current_short_irq_handler(void){
 	if (!AUX_VOL_IS_OPEN()){
-		io_debug("close aux power,cause the short irq\n");
+		//io_debug("close aux power,cause the short irq\n");
 		return;
 	}
 	mcu_sleep_set_wakeup_source(WAKEUP_SOURCE_SMALL_POWER_SHORT);

Application/app/sox/state.c

@@ -402,7 +402,7 @@ static void _process_iostate_changed(s32 unhealth){
 			close_dfet_no_hall ++;
 			open_dfet = open_dfet_failt = 0; //clear open dfet count
 		}
-		if (!AUX_VOL_IS_OPEN()){
+		if (!AUX_VOL_IS_OPEN() && !bms_health()->load_current_short && !io_state()->aux_lock_detect && !bms_health()->small_current_short){
 			start_aux_power(1);
 		}
 		if (!io_state()->charger_detect_irq && ml5238_is_charging() && (!_bms_state.charging)){