Browse Source

MGMLX:2.3.0.14 增加了三轴信息上传,测试版

CHENJIE-PC\QiXiang_CHENJIE 3 years ago
parent
commit
9d212faf79
3 changed files with 10 additions and 2 deletions
  1. 3 1
      inc/TcpTask.h
  2. 1 1
      inc/app.h
  3. 6 0
      src/TcpTask.c

+ 3 - 1
inc/TcpTask.h

@@ -106,7 +106,9 @@ typedef struct _GPSInfoType
 	UINT8   AccMileage[4];
 	UINT8   Tac[2];
 	UINT8 	CellId[4];
-	
+	UINT8   xData[2];
+	UINT8   yData[2];
+	UINT8	zData[2];
 }GPSInfoType;
 typedef struct GPSMsgtoTcpType
 {

+ 1 - 1
inc/app.h

@@ -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		0x0203000D
+#define	APPSWVERSION		0x0203000E
 //#define	APPSWVERSION		0x0201000E
 //--------------------------------------------------------------------------------
 

+ 6 - 0
src/TcpTask.c

@@ -470,6 +470,12 @@ static void TcpDataInfoAssembleSend()
         GpsToTcpInfo.gpsInfo.CellId[1] = CellId>>16;
         GpsToTcpInfo.gpsInfo.CellId[2] = CellId>>8;
         GpsToTcpInfo.gpsInfo.CellId[3] = CellId;
+        GpsToTcpInfo.gpsInfo.xData[0] =  xzyDataSend[0]>>8;
+        GpsToTcpInfo.gpsInfo.xData[1] =  xzyDataSend[0];
+        GpsToTcpInfo.gpsInfo.yData[0] =  xzyDataSend[1]>>8;
+        GpsToTcpInfo.gpsInfo.yData[1] =  xzyDataSend[1];
+        GpsToTcpInfo.gpsInfo.zData[0] =  xzyDataSend[2]>>8;
+        GpsToTcpInfo.gpsInfo.zData[1] =  xzyDataSend[2];
         GpsToTcpInfo.CRC = bcc_chk((UINT8 *)&GpsToTcpInfo, sizeof(GPSMsgtoTcpType)-1 );
         osMutexRelease(GpsMutex);
         //if(GpsToTcpInfo.gpsInfo.locateMark==0x01)