From fc78430a35be252a1cd5a29b5b66290a68cd9ca3 Mon Sep 17 00:00:00 2001
From: yincheng.zhong <634916154@qq.com>
Date: 星期二, 27 八月 2024 17:21:18 +0800
Subject: [PATCH] Merge branch '安邦测距手环' of http://47.108.70.204:60062/r/ChinaUWBProject into 安邦测距手环
---
keil/include/src/TCPClient.c | 101 ++++++++++++++++++++++----------------------------
1 files changed, 44 insertions(+), 57 deletions(-)
diff --git a/keil/include/src/TCPClient.c b/keil/include/src/TCPClient.c
index c9e6744..8dd8e67 100644
--- a/keil/include/src/TCPClient.c
+++ b/keil/include/src/TCPClient.c
@@ -18,6 +18,8 @@
#include "global_param.h"
#include "Uart.h"
#include "mk_4G.h"
+#include "mk_trace.h"
+#include "dw_app_anchor.h"
/*******************************************************************************
* Macro *
*******************************************************************************/
@@ -58,71 +60,56 @@
* Author : www.hido-studio.com
* Modified Date: : 2021年1月9日
*******************************************************************************/
- Commend_Datestruct TCP_command;
+extern uint8_t gps_4g_flag;
+extern Operation_step UWB_work_state;
+Commend_Datestruct TCP_command;
static HIDO_INT32 TCPClient_DataProc(HIDO_UINT8 *_u8Data, HIDO_UINT32 _u32Len)
{
- 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);
+ HIDO_CHAR *apcSplitStr[12];
+ HIDO_UINT32 u32SplitCnt = 0;
+
+ LOG_INFO(TRACE_MODULE_APP, "收到数据\r\n");
+
+
+
+ if(STRCMP(_u8Data, "$instruct,") == 0)
+ {
+ 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:
- {
- g_com_map[BIND_DEV_ID]=TCP_command.gunLableId;
- g_com_map[ALARM_DISTANCE1]=TCP_command.warnDistance;
- g_com_map[ALARM_DISTANCE2]=TCP_command.alarmDistance;//这个距离double和uint格式不符
- g_com_map[SEND_4G_FREQUENCY]=1000/TCP_command.frequency;
- save_com_map_to_flash();
- }
- break;
- case UNBIND:
- // bind_resetbreak();
- case OPEN_GNSS:
- gnss_forceopen();
- case CLOSE_VIBRATION:
+ case BIND_SUCCESS:
+ {
+ g_com_map[BIND_DEV_ID]=TCP_command.gunLableId;
+ g_com_map[ALARM_DISTANCE1]=TCP_command.warnDistance;
+ g_com_map[ALARM_DISTANCE2]=TCP_command.alarmDistance;//这个距离double和uint格式不符
+ g_com_map[SEND_4G_FREQUENCY]=1000/TCP_command.frequency;
+ UWB_work_state = UN_BIND;
+ save_com_map_to_flash();
+ }
+ break;
+ case UNBIND:
+ g_com_map[BIND_DEV_ID] = 0;
+ UWB_work_state = UN_BIND;
+ save_com_map_to_flash();
+ // bind_resetbreak();
+ case OPEN_GNSS:
+ GpsConrol(1,1); //4Gflag, on
+
+ case CLOSE_VIBRATION:
// vibration_close();
- case QUARY_INFORMATION:
+ case QUARY_INFORMATION:
//??
- case CHANGE_POLL_FREQUENCY:
+ case CHANGE_POLL_FREQUENCY:
g_com_map[SEND_4G_FREQUENCY]=TCP_command.frequency;
break;
}
- }
-
-
- //根据指令去执行
-
-
- //
-#if 0
- if(STRCMP(_u8Data, "$control,") == 0)
- {
- u32SplitCnt = HIDO_UtilStrSplit((HIDO_CHAR *)_u8Data, ',', apcSplitStr, HIDO_ARRARY_COUNT(apcSplitStr));
- if(u32SplitCnt < 3)
- {
- return HIDO_ERR;
}
-
- /* ?豸ID??? */
- if(HIDO_UtilHexStrToInt(apcSplitStr[1]) == g_com_map[DEV_ID])
- {
- if(strcmp(apcSplitStr[2],"beeper")==0)
- {
-
- beepontime = HIDO_UtilStrToInt(apcSplitStr[3]);
-
- }
- }
- }else if(STRCMP(_u8Data, "$userdata,") == 0)
- {
- if(DBG_GetMode() == DBG_MODE_CFG)
- HIDO_Debug2("%s\r\n", l_au8CmdBuff);
-
}
-#endif
return HIDO_OK;
}
@@ -209,7 +196,7 @@
// g_com_map[TCP_IP_1], g_com_map[TCP_IP_2], g_com_map[TCP_IP_3]);
// Socket_Connect(l_i32TCPClientID, (HIDO_CHAR *) l_au8CmdBuff, g_com_map[TCP_PORT]);
-
+
HIDO_UtilSnprintf((HIDO_CHAR *) l_au8CmdBuff, sizeof(l_au8CmdBuff), "111.198.60.6");
Socket_Connect(l_i32TCPClientID, (HIDO_CHAR *) l_au8CmdBuff, 1234);
TCPfail_flag = 1;
@@ -227,7 +214,7 @@
{
if ((u32CurTick - l_u32HeartBeatTick) >= HIDO_TIMER_TICK_S(15)||flag_first_TCPconnect)
- {
+ {
flag_first_TCPconnect = 0;
l_u32HeartBeatTick = u32CurTick;
// 这里是自定义心跳
@@ -281,7 +268,7 @@
HIDO_UINT32 u32HeartLen = snprintf(acHeart, sizeof(acHeart), "$message heart2,%04x\r\n", g_com_map[DEV_ID]);
Socket_HeartbeatConfig(l_i32TCPClientID, (HIDO_UINT8 *)acHeart, u32HeartLen, 180);
#endif
-
+
return HIDO_OK;
}
void AIR780E_Reset(void)
@@ -295,7 +282,7 @@
if(TCP_CLIENT_STATE_CONNECTED == l_eTCPClientState)
{
return 1;
- }else{
+ } else {
return 0;
}
}
\ No newline at end of file
--
Gitblit v1.9.3