Selaa lähdekoodia

add charge voltage fuzz

Signed-off-by: FuangCao <cavan.cao@foxmail.com>
FuangCao 5 vuotta sitten
vanhempi
commit
c2abc8bc5d
5 muutettua tiedostoa jossa 10 lisäystä ja 9 poistoa
  1. 1 1
      Project/version.txt
  2. 6 6
      Source/app.c
  3. 1 0
      Source/app.h
  4. 1 1
      Source/shark_charge.h
  5. 1 1
      Source/sw_build_info.h

+ 1 - 1
Project/version.txt

@@ -1 +1 @@
-PS100XX_V11_11191521
+PS100XX_V11_11191537

+ 6 - 6
Source/app.c

@@ -360,6 +360,10 @@ static shark_bool shark_battery_check_series(u8 operate)
 
 static shark_bool shark_battery_parrallel_enabled(void)
 {
+	if (shark_xl_check()) {
+		return shark_false;
+	}
+
 	return shark_charger_detected;
 }
 
@@ -1392,10 +1396,6 @@ uint8_t Change_Mode_Sub_BMS_PARRALLEL(void)
 		return 0;
 	}
 
-	if (shark_xl_check()) {
-		return 0;
-	}
-
 	if(Is_Sub_BMS_1_Normal() != SHARK_BATT_EXIT_SUCCESS || Is_Sub_BMS_2_Normal() != SHARK_BATT_EXIT_SUCCESS) {
 		return 0;
 	}
@@ -1521,7 +1521,7 @@ void Intelligent_Management_Battery(void)
 			case CB_BAT1:
 				if (shark_charger_enabled)
 				{
-					if (shark_battery_charge_complete1() || shark_battery_get_voltage2() < shark_battery_get_voltage1())
+					if (shark_battery_charge_complete1() || shark_battery_get_voltage2() + SHARK_CHARGE_VOL_FUZZ < shark_battery_get_voltage1())
 					{
 						Battery_Change_Mode(CFG_BAT2);
 					}
@@ -1534,7 +1534,7 @@ void Intelligent_Management_Battery(void)
 			case CB_BAT2:
 				if (shark_charger_enabled)
 				{
-					if (shark_battery_charge_complete2() || shark_battery_get_voltage1() < shark_battery_get_voltage2())
+					if (shark_battery_charge_complete2() || shark_battery_get_voltage1() + SHARK_CHARGE_VOL_FUZZ < shark_battery_get_voltage2())
 					{
 						Battery_Change_Mode(CFG_BAT1);
 					}

+ 1 - 0
Source/app.h

@@ -19,6 +19,7 @@
 #define SHARK_CHARGE_CAPACITY_DELTA		2
 #define SHARK_CHARGER_VOLTAGE_MAX		60000
 
+#define SHARK_CHARGE_VOL_FUZZ			300
 #define SHARK_PARRALLEL_VOL_MIN			500
 #define SHARK_PARRALLEL_VOL_MAX			1000
 

+ 1 - 1
Source/shark_charge.h

@@ -5,7 +5,7 @@
 
 #define SHARK_CHG_DEBOUNCE			500
 #define SHARK_CHG_TIME_MIN			5000
-#define SHARK_CHG_TIME_MID			20000
+#define SHARK_CHG_TIME_MID			10000
 #define SHARK_CHG_TIME_MAX			60000
 
 #define GPIO_PORT_CHG_DET			GPIOC

+ 1 - 1
Source/sw_build_info.h

@@ -1,3 +1,3 @@
 #pragma once
 
-#define CONFIG_VERSION "PS100XX_V11_11191521"
+#define CONFIG_VERSION "PS100XX_V11_11191537"