Browse Source

上位机控制更改,新增循环次数

CHENJIE-PC\QiXiang_CHENJIE 3 years ago
parent
commit
4d56228d39

+ 3 - 2
System/Vehicle/AppFunc.c

@@ -23,7 +23,7 @@ void LockAndUnlockCtrl()
 	{
 		static uint16 Delay = 0;
 		Delay = Delay + 10;
-		if (Delay > 10000)
+		if (Delay > 5000)
 		{
 			PSwtDrv_Interface(_PSWT_INDEX_HBAK1_CHAN, 0);
 		}
@@ -31,8 +31,9 @@ void LockAndUnlockCtrl()
 		{
 			PSwtDrv_Interface(_PSWT_INDEX_HBAK1_CHAN, 1);
 		}
-		if (Delay > 20000)
+		if (Delay > 10000)
 		{
+			Control_Times++;
 			Delay = 0;
 		}
 	}

+ 14 - 0
System/Vehicle/Communication/CANNet.c

@@ -248,6 +248,20 @@ void CAN2Net_Manage1ms(void)
 		infoMsgS.datMsgUBA[7] = ebcd_T_plugin[3];
 		MCANDrv_SendMsg(infoMsgS);
 	}
+	else if (Can2TimerCounter % 100 == 2)
+	{
+		CANNet_infoMsgTxConfSA[2].infoMsgIDUI = 0x1CEE00F1;
+		infoMsgS.infoConfS = CANNet_infoMsgTxConfSA[2];
+		infoMsgS.datMsgUBA[0] = Control_Times;
+		infoMsgS.datMsgUBA[1] = Control_Times>>8;
+		infoMsgS.datMsgUBA[2] = Control_Times>>16;
+		infoMsgS.datMsgUBA[3] = Control_Times>>24;
+		infoMsgS.datMsgUBA[4] = 0;
+		infoMsgS.datMsgUBA[5] = 0;
+		infoMsgS.datMsgUBA[6] = 0;
+		infoMsgS.datMsgUBA[7] = 0;
+		MCANDrv_SendMsg(infoMsgS);
+	}
 #endif
 #ifdef _APP_TEST_MOTOR_CODE
 	if (Can2TimerCounter % 100 == 1)

+ 1 - 0
System/Vehicle/Communication/CanVar.c

@@ -732,6 +732,7 @@ uint8 ebcd_st_unlockSensor;			 //
 uint8 ebcd_st_unlockSucJug;			 //解锁完成判断:0-完全未解锁,1-完全解锁,2-未完全解锁
 #define EEPDATA_START_SEC_VAR
 #include "MemMap.h"
+uint32 Control_Times = 0;
 uint8 ebcd_flg_ebcEolDone = 0;		 // EBC下线检测状态完成标志位
 #define EEPDATA_STOP_SEC_VAR
 #include "MemMap.h"

+ 1 - 0
System/Vehicle/Communication/CanVar.h

@@ -561,6 +561,7 @@ extern uint8 ebdc_st_ConnecState; //
 #define EEPDATA_START_SEC_VAR
 #include "MemMap.h"
 extern uint8 ebcd_flg_ebcEolDone;		 // EBC下线检测状态完成标志位
+extern uint32 Control_Times;
 #define EEPDATA_STOP_SEC_VAR
 #include "MemMap.h"
 extern const uint8 T_table[240];