Parcourir la source

don't check voltage

Signed-off-by: FuangCao <cavan.cao@foxmail.com>
FuangCao il y a 5 ans
Parent
commit
98c9bcd260
4 fichiers modifiés avec 11 ajouts et 8 suppressions
  1. 1 1
      Project/version.txt
  2. 6 0
      Source/app.c
  3. 3 6
      Source/app.h
  4. 1 1
      Source/sw_build_info.h

+ 1 - 1
Project/version.txt

@@ -1 +1 @@
-PS100XX_V11_13031522
+PS100XX_V11_13091048

+ 6 - 0
Source/app.c

@@ -363,6 +363,7 @@ static shark_bool shark_battery_series_enabled(void)
 		return shark_false;
 	}
 
+#ifdef SERIES_PROTECT_VOL
 	if (shark_battery_get_voltage1() < SERIES_PROTECT_VOL) {
 		return shark_false;
 	}
@@ -370,6 +371,7 @@ static shark_bool shark_battery_series_enabled(void)
 	if (shark_battery_get_voltage2() < SERIES_PROTECT_VOL) {
 		return shark_false;
 	}
+#endif
 #endif
 
 	return shark_true;
@@ -662,6 +664,7 @@ uint8_t Check_CB_BAT1_BAT2_SERIES(void)
 	}
 
 #ifndef CONFIG_SOUTH_KOREA
+#ifdef CHECK_SERIES_PROTECT_VOL
 	if (shark_battery_get_voltage1() < CHECK_SERIES_PROTECT_VOL || shark_battery_get_voltage2() < CHECK_SERIES_PROTECT_VOL)
 	{
 		if(Series_delay.set == 0)
@@ -682,6 +685,7 @@ uint8_t Check_CB_BAT1_BAT2_SERIES(void)
 		shark_battery_series_locked = shark_true;
 		return CB_BAT1_BAT2_AUTO;
 	}
+#endif
 
 	if(sub_bms_info_1.packet_common.m_percent < SERIES_EXIT_PERCENT || sub_bms_info_2.packet_common.m_percent < SERIES_EXIT_PERCENT)
 	{
@@ -871,8 +875,10 @@ uint8_t Change_Mode_Sub_BMS_SERIES(void)
 	}*/
 
 #ifndef CONFIG_SOUTH_KOREA
+#ifdef SERIES_PROTECT_VOL
 	if(shark_battery_get_voltage1() < SERIES_PROTECT_VOL || shark_battery_get_voltage2() < SERIES_PROTECT_VOL )
 		return 0;
+#endif
 
 	if(sub_bms_info_1.packet_common.m_percent < SERIES_ENTER_PERCENT || sub_bms_info_2.packet_common.m_percent < SERIES_ENTER_PERCENT)
 		return 0;

+ 3 - 6
Source/app.h

@@ -111,15 +111,12 @@ __inline void Check_CB_Oper_Sta_Delay(void)
 		
 }
 
-#define CHECK_SERIES_VOL  (80000)
-#define CHECK_SERIES_PROTECT_VOL  (40000)
+// #define CHECK_SERIES_PROTECT_VOL  (40000)
+// #define SERIES_PROTECT_VOL  (CHECK_SERIES_PROTECT_VOL + 3000)
 
-#define SERIES_PROTECT_VOL  (CHECK_SERIES_PROTECT_VOL + 3000)
 #define SERIES_UNDER_VOL_TIME_OUT  (4000)
-#define NEXT_SERIES_TIME_OUT  (5000)
-#define SELECT_ONE_BATTERY_VOL  (60000)
 #define SINGLE_VOLTAGE_MIN  (30000)
-#define SERIES_VOLTAGE_MIN  (80000)
+#define SERIES_VOLTAGE_MIN  (SINGLE_VOLTAGE_MIN * 2)
 
 #define SERIES_EXIT_PERCENT		2
 #define SERIES_ENTER_PERCENT	(SERIES_EXIT_PERCENT + 1)

+ 1 - 1
Source/sw_build_info.h

@@ -1,3 +1,3 @@
 #pragma once
 
-#define CONFIG_VERSION "PS100XX_V11_13031522"
+#define CONFIG_VERSION "PS100XX_V11_13091048"