浏览代码

版本号:2.3.0.18 调试数据上传通过

CHENJIE-PC\QiXiang_CHENJIE 3 年之前
父节点
当前提交
d65866e3c0
共有 2 个文件被更改,包括 8 次插入13 次删除
  1. 0 5
      src/Signal.c
  2. 8 8
      src/TcpTask.c

+ 0 - 5
src/Signal.c

@@ -51,11 +51,6 @@ UINT8	bmsSwVersion = 0xFF;
 UINT8	bmsHwVersion = 0xFF;
 UINT8	battMOSSwitchState = 0xFF;
 UINT8	battHeatEnableState = 0xFF;
-
-UINT8	reservedSignal5 = 0x00;
-UINT8	reservedSignal6 = 0x00;
-UINT8	reservedSignal7 = 0x00;
-UINT8	reservedSignal8 = 0x00;
 UINT8   RelayControlState = 0x00;
 UINT8	BuzzerControl = 0x00;
 UINT8   CanMsgFlag = 0x00;

+ 8 - 8
src/TcpTask.c

@@ -603,13 +603,14 @@ static void TcpDataInfoAssembleSend()
             }
         }
     }
-    if(send_counter%60==0)//发送调试信息,此处发送参数信息
+    if(send_counter%12==0 && send_counter!=0)//发送调试信息,此处发送参数信息/60s一次
     {
         DebugMsgtoTcpType DebugMsgInfo;
         UINT8 *SendBuffer = NULL;
-        UINT16 BufferLen = 20;
-        UINT8 rbuf[BufferLen];
-        sprintf((char *)rbuf,"%d,%d,%x",AppDataInfo.AccMileage,BattRemainCap,battProtectState);//累计里程,剩余容量,循环次数
+        UINT8 BufferLen = 0;
+        UINT8 rbuf[20];
+        sprintf((char *)rbuf,"%d,%d,%x",AppDataInfo.AccMileage,BattRemainCap,battProtectState);//累计里程,剩余容量,保护状态
+        BufferLen  = strlen(rbuf);
         SendBuffer = malloc(BufferLen+sizeof(DebugMsgInfo));
         memcpy(SendBuffer+sizeof(DebugMsgInfo)-1, rbuf,BufferLen);
         appGetSystemTimeUtcSync(&TimeStracture);
@@ -643,15 +644,14 @@ static void TcpDataInfoAssembleSend()
         memcpy(SendBuffer+BufferLen+sizeof(DebugMsgInfo)-1,&DebugMsgInfo.CRC,1);
         len = tcpipConnectionSend(socContext.id, SendBuffer, BufferLen+sizeof(DebugMsgInfo), 0, 0, 0);
         #ifdef USING_PRINTF1
-            printf("DebugMsgInfo!\n");
+            printf("\nDebugData!-%d-%s\n",len,rbuf);
             UINT8* p = SendBuffer;
             for(i =0 ;i<BufferLen+sizeof(DebugMsgInfo);i++)
                 printf("%x ",*(p+i));
         #endif
-        Debug_Del_Logfile();
         free(SendBuffer);
     }
-        if(send_counter==0)//发送本次文件中的调试信息,此处发送文件信息
+    if(send_counter==0)//发送本次文件中的调试信息,此处发送文件信息
     {
         DebugMsgtoTcpType DebugMsgInfo;
         UINT8 *SendBuffer = NULL;
@@ -703,7 +703,7 @@ static void TcpDataInfoAssembleSend()
             printf("DebugMsgInfo!\n");
             UINT8* p = SendBuffer;
             for(i =0 ;i<BufferLen+sizeof(DebugMsgInfo);i++)
-                printf("%x ",*(p+i));
+                printf("%x",*(p+i));
         #endif
         Debug_Del_Logfile();
         free(SendBuffer);