Quellcode durchsuchen

clean shake flag use can command

Signed-off-by: FuangCao <cavan.cao@foxmail.com>
FuangCao vor 5 Jahren
Ursprung
Commit
4f8e98aef1
5 geänderte Dateien mit 3 neuen und 37 gelöschten Zeilen
  1. 2 0
      Source/app_end_ctr.c
  2. 0 16
      Source/app_rs485_1.c
  3. 0 16
      Source/app_rs485_2.c
  4. 0 4
      Source/drv_io.c
  5. 1 1
      Source/sw_build_info.h

+ 2 - 0
Source/app_end_ctr.c

@@ -188,6 +188,8 @@ int8_t Handle_Can_Ctr_CMD(CAN_FRAME*can_ctr_frame)
 		case KEY_END_CTR_TEST_INFO:
 			break;
 		case KEY_END_CTR_QD:
+			shark_battery_shake_clear();
+
 			if(work_normal == 1)
 			{
 				switch(buf[2])

+ 0 - 16
Source/app_rs485_1.c

@@ -478,14 +478,6 @@ void  Sub_BMS_1_lt_State(void)
 	
 }
 
-void SetBmsErrNum1(uint8_t num)
-{
-	if (test_info.ti_bms_1.bms_err_num != num) {
-		test_info.ti_bms_1.bms_err_num = num;
-		Save_Test_Info();
-	}
-}
-
 uint8_t Is_Sub_BMS_1_Normal(void)
 {
 	uint16_t work_sta = sub_bms_info_1.packet_common.work_status;
@@ -519,44 +511,36 @@ uint8_t Is_Sub_BMS_1_Normal(void)
 		}*/
 
 		if(update_bat.ub_bat == UPDATE_BAT_1) {
-			SetBmsErrNum1(1);
 			break;
 		}
 		
 		if(define_bms_1_error != D_BMS_ERROR_NO) {
-			SetBmsErrNum1(2);
 			break;
 		}
 		
 		if((cb_operate_state == CB_BAT1_BAT2_SERIES)&&(BAT1_IS_OPEN() == 0)) {
-			SetBmsErrNum1(3);
 				break;
 		}
 
 		if(Is_Soak()) {
-			SetBmsErrNum1(4);
 			break;
 		}
 		
 		if(SUB_BMS_1_DEC() == 0) {			
-			SetBmsErrNum1(5);
 			break;
 		}
 		
 		if(work_sta)
 		{
 			bms_1_work_status = sub_bms_info_1.packet_common.work_status;			
-			SetBmsErrNum1(6);
 			break;
 		}
 
 		if(sub_bms_1_lt_state != SUB_BMS_CONT_HV485) {			
-			SetBmsErrNum1(7);
 			break;
 		}
 
 		if(bms_1_test_define_error != 0) {			
-			SetBmsErrNum1(8);
 			break;
 		}
 		

+ 0 - 16
Source/app_rs485_2.c

@@ -473,14 +473,6 @@ void  Sub_BMS_2_lt_State(void)
 	
 }
 
-void SetBmsErrNum2(uint8_t num)
-{
-	if (test_info.ti_bms_2.bms_err_num != num) {
-		test_info.ti_bms_2.bms_err_num = num;
-		Save_Test_Info();
-	}
-}
-
 uint8_t Is_Sub_BMS_2_Normal(void)
 {
 	uint16_t work_sta = sub_bms_info_2.packet_common.work_status;
@@ -514,43 +506,35 @@ uint8_t Is_Sub_BMS_2_Normal(void)
 		}*/
 
 		if(update_bat.ub_bat == UPDATE_BAT_2) {
-			SetBmsErrNum2(1);
 			break;
 		}
 		
 		if(define_bms_2_error != D_BMS_ERROR_NO) {			
-			SetBmsErrNum2(2);
 			break;
 		}
 		
 		if((cb_operate_state == CB_BAT1_BAT2_SERIES)&&(BAT2_IS_OPEN() == 0)) {			
-			SetBmsErrNum2(3);
 				break;
 		}
 		if(Is_Soak()) {
-			SetBmsErrNum2(4);
 			break;
 		}
 		
 		if(SUB_BMS_2_DEC() == 0) {
-			SetBmsErrNum2(5);
 			break;
 		}
 		
 		if(work_sta)
 		{
 			bms_2_work_status = sub_bms_info_2.packet_common.work_status;
-			SetBmsErrNum2(6);
 			break;
 		}
 
 		if(sub_bms_2_lt_state != SUB_BMS_CONT_HV485) {
-			SetBmsErrNum2(7);
 			break;
 		}
 
 		if(bms_2_test_define_error != 0) {
-			SetBmsErrNum2(8);
 			break;
 		}
 		

+ 0 - 4
Source/drv_io.c

@@ -116,10 +116,6 @@ void ACC2_Enable(uint8_t on)
 #else
 	gpio_bit_write(GPIOC,GPIO_PIN_15,(bit_status)(on));
 #endif
-
-	if (on == 0) {
-		shark_battery_shake_clear();
-	}
 }
 void E_CTR_Dec_IRQ_Initial(void)
 {

+ 1 - 1
Source/sw_build_info.h

@@ -1,3 +1,3 @@
 #pragma once
 
-#define CONFIG_VERSION "PS100XX_V01_0C301419"
+#define CONFIG_VERSION "PS100XX_V01_0C301517"