瀏覽代碼

版本号为:2.0.0.9-test测试版,测试gps

CHENJIE-PC\QiXiang_CHENJIE 3 年之前
父節點
當前提交
3e3860be9b
共有 3 個文件被更改,包括 10 次插入11 次删除
  1. 2 2
      inc/TcpTask.h
  2. 1 1
      inc/app.h
  3. 7 8
      src/TcpTask.c

+ 2 - 2
inc/TcpTask.h

@@ -18,8 +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 CHRG_END_DELAY    (300)
+#define RUN_END_DELAY    (100)
 
 #define QX_TCP_IPADRRES				"47.97.127.222"
 #define QX_TCP_PORT					8712

+ 1 - 1
inc/app.h

@@ -44,7 +44,7 @@ extern "C" {
 #define	BLSWVERSION		0x01020000    //BootLoader版本号V1.2.0.0
 #define	DRVSWVERSION		0x01040000     //驱动层版本号V1.4.0.0
 //#define	APPSWVERSION		0x01020208     
-#define	APPSWVERSION		0x02000008
+#define	APPSWVERSION		0x0200000B
 //--------------------------------------------------------------------------------
 
 #define APP_CONFIG_FILE_LATEST_VERSION 0

+ 7 - 8
src/TcpTask.c

@@ -234,23 +234,23 @@ static void TcpDataInfoAssembleSend()
     UINT8 temp=0;
 
     UINT16 DataLen=0;
-    UINT8 BattSendFreq=0;
-    UINT8 GpsSendFreq=0;
+    UINT8 BattSendFreq=6;
+    UINT8 GpsSendFreq=1;
     UINT8 WorkState=0;
-    static UINT8 WorkFlag;
+    static UINT8 WorkFlag=0;
 	int i = 0;
 	INT8 len = -1;
     WorkState = battWorkState;
     if(WorkState==0x00 && WorkFlag==0x01)
     {
-        if(send_counter%RUN_END_DELAY==0)
+        if(send_counter%(RUN_END_DELAY/5)==0)
         {
             WorkFlag=0x00;
         }
     }
     else if(WorkState==0x00 && WorkFlag==0x02)
     {
-        if(send_counter%CHRG_END_DELAY==0)
+        if(send_counter%(CHRG_END_DELAY/5)==0)
         {
             WorkFlag=0x00;
         }
@@ -266,12 +266,10 @@ static void TcpDataInfoAssembleSend()
             GpsSendFreq = AppDataInfo.GpsChrgInfoSendFreq/5;
             break;
         case 0x01:
-            BattSendFreq = AppDataInfo.BmsDisChrgInfoSendFreq/5;
             GpsSendFreq = AppDataInfo.GpsDisChrgInfoSendFreq/5;
             break;
         case 0x02:
             BattSendFreq = AppDataInfo.BmsChrgInfoSendFreq/5;
-            GpsSendFreq = AppDataInfo.GpsChrgInfoSendFreq/5;
             break;
         default:
             BattSendFreq = AppDataInfo.BmsDisChrgInfoSendFreq/5;
@@ -391,7 +389,8 @@ static void TcpDataInfoAssembleSend()
         memcpy((UINT8 *)&GpsToTcpInfo.gpsInfo.locateMark, GpsData,sizeof(GpsData));
         GpsToTcpInfo.CRC = bcc_chk((UINT8 *)&GpsToTcpInfo, sizeof(GPSMsgtoTcpType)-1 );
         osMutexRelease(GpsMutex);
-        if(GpsToTcpInfo.gpsInfo.locateMark==0x01)
+        //if(GpsToTcpInfo.gpsInfo.locateMark==0x01)
+        if(1)
         {
             len = tcpipConnectionSend(socContext.id, (UINT8 *)&GpsToTcpInfo, sizeof(GpsToTcpInfo), 0, 0, 0);
             if(len>0)