重庆测试版，修改为：

1.下线检测更改为默认不通过
2.改为正式IP地址
3.默认SN码更改
4.电池锁定逻辑更改

inc/TcpTask.h

@@ -19,11 +19,11 @@ extern UINT32 TcpService;
 #define APP_EVENT_QUEUE_SIZE    (10)
 
 
-// #define QX_TCP_IPADRRES				"47.97.127.222"
-// #define QX_TCP_PORT					8712
-/*---------------测试IP地址-----------------------------------*/
-#define QX_TCP_IPADRRES				"39.103.177.126"
+#define QX_TCP_IPADRRES				"47.97.127.222"
 #define QX_TCP_PORT					8712
+/*---------------测试IP地址-----------------------------------*/
+// #define QX_TCP_IPADRRES				"39.103.177.126"
+// #define QX_TCP_PORT					8712
 // #define QX_TCP_IPADRRES				"120.26.68.165"
 // #define QX_TCP_PORT					14319
 /*---------------测试IP地址END-----------------------------------*/

inc/app.h

@@ -34,7 +34,7 @@ extern "C" {
 #define HWVERSION		    0x0102    //硬件主版本，现为V1.2板
 #define	BLSWVERSION		0x01020000    //BootLoader版本号V1.2.0.0
 #define	DRVSWVERSION		0x01040000     //驱动层版本号V1.4.0.0
-#define	APPSWVERSION		0x01020111     
+#define	APPSWVERSION		0x01020112     
 
 //--------------------------------------------------------------------------------
 

src/MainTask.c

@@ -34,7 +34,7 @@
 extern UINT8 	UDSSwitch;
 extern volatile bool NB_Fota_update_flag;
 extern volatile bool BMS_Fota_update_flag;
-CHAR defaultBattSN[BATT_SN_LEN] = "GY606000000000001";//未进行下线检测的默认SN
+CHAR defaultBattSN[BATT_SN_LEN] = "GYTEST00000000003";//未进行下线检测的默认SN
 //全局变量
 UINT32 Timer_count;//每100ms加1
 volatile bool Sleep_flag = false;//睡眠标志位
@@ -596,7 +596,7 @@ static void setDefaultAppDataValue(void)
     AppNVMData.BLSwVersion = BLSWVERSION;
     AppNVMData.DrvSwVersion = DRVSWVERSION;
     AppNVMData.AppSwVersion = APPSWVERSION;
-    AppNVMData.EOLState = 1; //未进行下线配置，北京电池测试默认进行下线测试
+    AppNVMData.EOLState = 0; //未进行下线配置，北京电池测试默认进行下线测试
     return;
 }
 

src/UartTask.c

@@ -97,18 +97,6 @@ static void UartTask(void* arg)
         UartMutex = osMutexNew(NULL);
     }
     //上电起始控制区域
-    UartWriteData.WriteCmd = 0x01;
-    if(AppNVMData.isBattLocked)
-    {
-        UartWriteData.Data[0] = 0x00;
-        UartWriteData.Data[1] = 0x00;
-    }
-    else
-    {
-        UartWriteData.Data[0] = 0x00;
-        UartWriteData.Data[1] = 0x03;
-    }
-    osMessageQueuePut(UartWriteCmdHandle,&UartWriteData,0,1000);
     while (1)
     {
         switch (gProcess_Uart_Task)
@@ -156,6 +144,20 @@ static void UartTask(void* arg)
 				{
 					PROC_UART_STATE_SWITCH(PROCESS_UART_STATE_UPDATE);
 				}
+				if(AppNVMData.isBattLocked==TRUE && ((UartReadMsg.data[(0x09+BATT_CELL_VOL_NUM+BATT_TEMP_NUM+2)*2+1])>>1)&0x03!=0x00)
+				{
+					UartWriteData.WriteCmd = 0x01;
+					UartWriteData.Data[0] = 0x00;
+					UartWriteData.Data[1] = 0x00;
+					osMessageQueuePut(UartWriteCmdHandle,&UartWriteData,0,1000);
+				}
+				else if (AppNVMData.isBattLocked==FALSE && ((UartReadMsg.data[(0x09+BATT_CELL_VOL_NUM+BATT_TEMP_NUM+2)*2+1])>>1)&0x03==0x00)
+				{
+					UartWriteData.WriteCmd = 0x01;
+					UartWriteData.Data[0] = 0x00;
+					UartWriteData.Data[1] = 0x03;
+					osMessageQueuePut(UartWriteCmdHandle,&UartWriteData,0,1000);
+				}
                 break;
             }
             case PROCESS_UART_STATE_READ: