美顺保护板测试软件

inc/TcpTask.h

@@ -18,6 +18,8 @@ extern UINT32 TcpService;
 #define QMSG_ID_SOCK_EXIT       	(QMSG_ID_BASE + 6)
 #define APP_EVENT_QUEUE_SIZE    (10)
 
+#define CHRG_END_DELAY    (1800)
+#define RUN_END_DELAY    (60)
 
 #define QX_TCP_IPADRRES				"47.97.127.222"
 #define QX_TCP_PORT					8712

inc/app.h

@@ -13,9 +13,9 @@
 extern "C" {
 #endif
 //全局定义声明区
-#define BMS_MANUFACTURE (1) //BMS制造商表示1-超力源，2-美顺
+#define BMS_MANUFACTURE (2) //BMS制造商表示1-超力源，2-美顺
 #define DATA_MODULE_TYPE (1) //1表示NB模块，2表示4G cat1
-#define BMS_INFO  (2)       //1-1表示超力源4830，1-2表示超力源6060，2-1表示美顺6455
+#define BMS_INFO  (1)       //1-1表示超力源4830，1-2表示超力源6060，2-1表示美顺6455
 
 #if  BMS_MANUFACTURE==1
     #if BMS_INFO==1

src/MainTask.c

@@ -32,6 +32,9 @@
 #include "Fota.h"
 #include "UartTask.h"
 #include "sensor.h"
+
+#define EOLSTATE (1) //1标识下线检测跳过，使用默认值
+
 extern UINT8 	UDSSwitch;
 extern volatile bool NB_Fota_update_flag;
 extern volatile bool BMS_Fota_update_flag;
@@ -624,7 +627,7 @@ static void setDefaultAppDataValue(void)
     AppNVMData.BLSwVersion = BLSWVERSION;
     AppNVMData.DrvSwVersion = DRVSWVERSION;
     AppNVMData.AppSwVersion = APPSWVERSION;
-    AppNVMData.EOLState = 0; //未进行下线配置，北京电池测试默认进行下线测试
+    AppNVMData.EOLState = EOLSTATE; //未进行下线配置，北京电池测试默认进行下线测试
     return;
 }
 

src/TcpTask.c

@@ -243,14 +243,14 @@ static void TcpDataInfoAssembleSend()
     WorkState = battWorkState;
     if(WorkState==0x00 && WorkFlag==0x01)
     {
-        if(send_counter%20==0)
+        if(send_counter%RUN_END_DELAY==0)
         {
             WorkFlag=0x00;
         }
     }
     else if(WorkState==0x00 && WorkFlag==0x02)
     {
-        if(send_counter%60==0)
+        if(send_counter%CHRG_END_DELAY==0)
         {
             WorkFlag=0x00;
         }
@@ -462,7 +462,7 @@ static void TcpDataInfoAssembleSend()
         VerMsgToTcpInfo.VerInfo.BmsInfo = BMS_INFO;
         VerMsgToTcpInfo.VerInfo.DataModuleType = DATA_MODULE_TYPE;
         VerMsgToTcpInfo.CRC = bcc_chk((UINT8 *)&VerMsgToTcpInfo, sizeof(VerMsgToTcpInfo)-1 );
-        if(1)
+        if(UartBattInfoRecvFlag)
         {
             len = tcpipConnectionSend(socContext.id, (UINT8 *)&VerMsgToTcpInfo, sizeof(VerMsgToTcpInfo), 0, 0, 0);
             if(len>0)

src/UartTask.c

@@ -149,9 +149,6 @@ static void UartTask(void* arg)
 				{
 					uartReadSuccessFlag = false;
 				}
-				#ifdef USING_PRINTF
-					printf("uartReadSuccessFlag = %d\n",uartReadSuccessFlag);
-				#endif
 				if(Timer_count-currentTimerCount >= 1)
 				{
 					if(AppNVMData.isBattLocked != 0)
@@ -225,7 +222,7 @@ static void UartTask(void* arg)
                 {
                     BattChrgEndFlag=FALSE;
                 }
-				#ifdef USING_PRINTF
+				#ifdef USING_PRINTF1
 					printf("\nUart_Recv_buffer:  ");
 					for(int i=0;i<Uart_Recv_LEN;i++)
 					{
@@ -1040,7 +1037,7 @@ UINT8 Uart_Encrypt_Send()
 	UartEncryptBuffer[15] = CRC_chk_buffer;
 	UartEncryptBuffer[16] = CRC_chk_buffer>>8;
 	USARTdrv->Send(UartEncryptBuffer,17);
-	USARTdrv->Receive(UartDecryptBuffer,5); 	
+	USARTdrv->Receive(UartDecryptBuffer,5); 
 	while((isRecvTimeout == false) && (isRecvComplete == false))
 	{
 		timeCount++;
@@ -1052,6 +1049,13 @@ UINT8 Uart_Encrypt_Send()
 			break;
 		}
 	}
+	#ifdef USING_PRINTF
+		printf("Uart_Rece_buffer: ");
+		for(int i=0;i<5;i++)
+		{
+		printf("%x ",UartDecryptBuffer[i]);
+		}
+    #endif	
 	if (isRecvComplete == true)
 	{
 		isRecvComplete = false;

src/bsp_custom.c

@@ -120,7 +120,7 @@ static void PMU_WakeupPadInit(void)
 {
     const padWakeupSettings_t cfg =
     {
-        true, false,             // group0 posedge, negedge
+        false, true,             // group0 posedge, negedge
         true, true,             // group1 posedge, negedge
         true, true,             // group2 posedge, negedge
     };
@@ -166,7 +166,7 @@ void BSP_CustomInit(void)
 	slpManGetPMUSettings();				
 
 	PMU_WakeupPadInit();
-	NVIC_DisableIRQ(PadWakeup0_IRQn);//can
+	NVIC_EnableIRQ(PadWakeup0_IRQn);//can
 	NVIC_EnableIRQ(PadWakeup1_IRQn);//rx
 	NVIC_EnableIRQ(PadWakeup2_IRQn);//lock
 	NVIC_EnableIRQ(PadWakeup3_IRQn);//gsensor