From 6a54fd6dd7b40c274b68b0f27bedb7b71b7a21c5 Mon Sep 17 00:00:00 2001
From: yincheng.zhong <634916154@qq.com>
Date: 星期一, 26 八月 2024 09:39:41 +0800
Subject: [PATCH] 调试4G唤醒，和服务器下发解析
---
keil/include/src/TCPClient.c | 17 ++++++++++++++---
1 files changed, 14 insertions(+), 3 deletions(-)
diff --git a/keil/include/src/TCPClient.c b/keil/include/src/TCPClient.c
index 07d3e73..d67aa40 100644
--- a/keil/include/src/TCPClient.c
+++ b/keil/include/src/TCPClient.c
@@ -18,6 +18,7 @@
#include "global_param.h"
#include "Uart.h"
#include "mk_4G.h"
+#include "mk_trace.h"
/*******************************************************************************
* Macro *
*******************************************************************************/
@@ -60,12 +61,21 @@
Commend_Datestruct TCP_command;
static HIDO_INT32 TCPClient_DataProc(HIDO_UINT8 *_u8Data, HIDO_UINT32 _u32Len)
{
- LOG_INFO(TRACE_MODULE_APP, "收到数据\r\n");
+ HIDO_CHAR *apcSplitStr[12];
+ HIDO_UINT32 u32SplitCnt = 0;
+
+ LOG_INFO(TRACE_MODULE_APP, "收到数据\r\n");
+
+
+
if(STRCMP(_u8Data, "$instruct,") == 0)
{
- sscanf(_u8Data,"$%*[^,],%d,%d,%d,%d,%lf,%lf,%d",TCP_command.type,TCP_command.applyID,TCP_command.tagId,
- TCP_command.gunLableId,TCP_command.warnDistance,TCP_command.alarmDistance,TCP_command.frequency);
+ u32SplitCnt = HIDO_UtilStrSplit((HIDO_CHAR *)_u8Data, ',', apcSplitStr, HIDO_ARRARY_COUNT(apcSplitStr));
+ TCP_command.tagId = HIDO_UtilHexStrToInt(apcSplitStr[3]);
if(g_com_map[DEV_ID]==TCP_command.tagId)
+ {
+ TCP_command.type = HIDO_UtilHexStrToInt(apcSplitStr[1]);
+
switch(TCP_command.type)
{
case BIND_SUCCESS:
@@ -89,6 +99,7 @@
g_com_map[SEND_4G_FREQUENCY]=TCP_command.frequency;
break;
}
+ }
}
--
Gitblit v1.9.3