MGMLX：2.3.0.5-TEST，新增基站定位信息上传

inc/TcpTask.h

@@ -104,6 +104,8 @@ typedef struct _GPSInfoType
 	UINT8	latitude[4];
 	UINT8	longitude[4];
 	UINT8   AccMileage[4];
+	UINT8   Tac[2];
+	UINT8 	CellId[4];
 	
 }GPSInfoType;
 typedef struct GPSMsgtoTcpType

inc/app.h

@@ -16,7 +16,7 @@ extern "C" {
 #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表示美顺MLS,2-2表示美顺MWL
-#define EOLSTATE (0) //1标识下线检测跳过，使用默认值
+#define EOLSTATE (1) //1标识下线检测跳过，使用默认值
 
 #if  BMS_MANUFACTURE==1
     #if BMS_INFO==1
@@ -51,7 +51,7 @@ extern "C" {
 #define	BLSWVERSION		0x01020000    //BootLoader版本号V1.2.0.0
 #define	DRVSWVERSION		0x01050000     //驱动层版本号V1.4.0.0  驱动层1.5.0.0，增加了三轴
 //#define	APPSWVERSION		0x01020209     
-#define	APPSWVERSION		0x02030004
+#define	APPSWVERSION		0x02030005
 //#define	APPSWVERSION		0x0201000E
 //--------------------------------------------------------------------------------
 

src/TcpTask.c

@@ -432,6 +432,9 @@ static void TcpDataInfoAssembleSend()
     if(send_counter%GpsSendFreq==0)
     {
         GPSMsgtoTcpType GpsToTcpInfo;
+        UINT16 Tac = 0;
+        UINT32 CellId = 0;
+        appGetLocationInfoSync(&Tac,&CellId);
         osStatus_t result = osMutexAcquire(GpsMutex, osWaitForever);
         appGetSystemTimeUtcSync(&TimeStracture);
         year=(TimeStracture.UTCtimer1&0xffff0000)>>16;
@@ -464,6 +467,12 @@ static void TcpDataInfoAssembleSend()
         GpsToTcpInfo.gpsInfo.msgCollectionTimeUTC[4] = UTC8TimeTcp.minute & 0xFF;						    //mins
         GpsToTcpInfo.gpsInfo.msgCollectionTimeUTC[5] = UTC8TimeTcp.second & 0xFF;
         memcpy((UINT8 *)&GpsToTcpInfo.gpsInfo.locateMark, GpsData,sizeof(GpsData));
+        GpsToTcpInfo.gpsInfo.Tac[0] = Tac>>8;
+        GpsToTcpInfo.gpsInfo.Tac[1] = Tac;
+        GpsToTcpInfo.gpsInfo.CellId[0] = CellId>>24;
+        GpsToTcpInfo.gpsInfo.CellId[1] = CellId>>16;
+        GpsToTcpInfo.gpsInfo.CellId[2] = CellId>>8;
+        GpsToTcpInfo.gpsInfo.CellId[3] = CellId;
         GpsToTcpInfo.CRC = bcc_chk((UINT8 *)&GpsToTcpInfo, sizeof(GPSMsgtoTcpType)-1 );
         osMutexRelease(GpsMutex);
         //if(GpsToTcpInfo.gpsInfo.locateMark==0x01)