Parcourir la source

update series percent

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

+ 1 - 1
Project/version.txt

@@ -1 +1 @@
-PS100XX_V10_11081651
+PS100XX_V10_11081742

+ 4 - 6
Source/app.c

@@ -317,11 +317,11 @@ static shark_bool shark_battery_series_enabled(void)
 		}
 	}
 
-	if (sub_bms_info_1.packet_common.m_percent < SERIES_UNDER_XX_PERCENT) {
+	if (sub_bms_info_1.packet_common.m_percent < SERIES_ENTER_PERCENT) {
 		return shark_false;
 	}
 
-	if (sub_bms_info_2.packet_common.m_percent < SERIES_UNDER_XX_PERCENT) {
+	if (sub_bms_info_2.packet_common.m_percent < SERIES_ENTER_PERCENT) {
 		return shark_false;
 	}
 
@@ -1280,8 +1280,7 @@ uint8_t Check_CB_BAT1_BAT2_SERIES(void)
 		return temp_op;
 	}
 
-	if(sub_bms_info_1.packet_common.m_percent < SERIES_UNDER_XX_PERCENT\
-		|| sub_bms_info_2.packet_common.m_percent < SERIES_UNDER_XX_PERCENT)
+	if(sub_bms_info_1.packet_common.m_percent < SERIES_EXIT_PERCENT || sub_bms_info_2.packet_common.m_percent < SERIES_EXIT_PERCENT)
 	{
 		temp_op = Select_One_BAT();
 		return temp_op;
@@ -1646,8 +1645,7 @@ uint8_t Change_Mode_Sub_BMS_SERIES(void)
 			||m_2_total_vol <= SERIES_PROTECT_VOL )
 		return 0;
 
-	if(sub_bms_info_1.packet_common.m_percent < SERIES_UNDER_XX_PERCENT\
-		|| sub_bms_info_2.packet_common.m_percent < SERIES_UNDER_XX_PERCENT)
+	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;
 #endif	
 	return 1;

+ 3 - 1
Source/app.h

@@ -121,7 +121,9 @@ __inline void Check_CB_Oper_Sta_Delay(void)
 #define SELECT_ONE_BATTERY_VOL  (60000)
 #define SINGLE_VOLTAGE_MIN  (30000)
 #define SERIES_VOLTAGE_MIN  (80000)
-#define SERIES_UNDER_XX_PERCENT  (2)
+
+#define SERIES_EXIT_PERCENT		2
+#define SERIES_ENTER_PERCENT	(SERIES_EXIT_PERCENT + 1)
 
 enum
 {

+ 1 - 1
Source/sw_build_info.h

@@ -1,3 +1,3 @@
 #pragma once
 
-#define CONFIG_VERSION "PS100XX_V10_11081651"
+#define CONFIG_VERSION "PS100XX_V10_11081742"