From b4a3dfd45831f0db1e19f74beb685027e8dbc564 Mon Sep 17 00:00:00 2001
From: yincheng.zhong <634916154@qq.com>
Date: 星期四, 29 八月 2024 12:04:09 +0800
Subject: [PATCH] 修改部分状态逻辑判断
---
keil/include/src/TCPClient.c | 57 +++++++++++++++++++++++++++++++++++++++++----------------
1 files changed, 41 insertions(+), 16 deletions(-)
diff --git a/keil/include/src/TCPClient.c b/keil/include/src/TCPClient.c
index 8dd8e67..571e7a4 100644
--- a/keil/include/src/TCPClient.c
+++ b/keil/include/src/TCPClient.c
@@ -54,7 +54,7 @@
/*******************************************************************************
* Function Name : TCPClient_DataProc
* Description :
- * Input :
+ * Input :
* Output :
* Return :
* Author : www.hido-studio.com
@@ -76,10 +76,14 @@
{
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]);
-
+ TCP_command.gunLableId = HIDO_UtilHexStrToInt(apcSplitStr[4]);
+ TCP_command.warnDistance = HIDO_UtilHexStrToInt(apcSplitStr[5]);
+ TCP_command.alarmDistance = HIDO_UtilHexStrToInt(apcSplitStr[6]);
+ TCP_command.frequency = HIDO_UtilHexStrToInt(apcSplitStr[7]);
switch(TCP_command.type)
{
case BIND_SUCCESS:
@@ -87,8 +91,8 @@
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;
+ // g_com_map[SEND_4G_FREQUENCY]=1000/TCP_command.frequency;
+ UWB_work_state = SEARCH_DEV;
save_com_map_to_flash();
}
break;
@@ -98,14 +102,20 @@
save_com_map_to_flash();
// bind_resetbreak();
case OPEN_GNSS:
- GpsConrol(1,1); //4Gflag, on
+ gps_4g_flag = 1;
case CLOSE_VIBRATION:
- // vibration_close();
+ g_com_map[MOTOR_ENABLE]=0;
+ save_com_map_to_flash();
+
+ case OPEN_VIBRATION:
+ g_com_map[MOTOR_ENABLE]=1;
+ save_com_map_to_flash();
+
case QUARY_INFORMATION:
//??
case CHANGE_POLL_FREQUENCY:
- g_com_map[SEND_4G_FREQUENCY]=TCP_command.frequency;
+ g_com_map[SEND_4G_SECOND]=TCP_command.frequency*60;
break;
}
}
@@ -179,8 +189,20 @@
* Author : www.hido-studio.com
* Modified Date: : 2021?1?9?
*******************************************************************************/
+extern uint8_t bat_percent,taglist_num;
+uint8_t alarm_type,applyid,result;
+extern double jd,wd;
+extern int32_t distance;
+void TCPHeartBeatUpload(void)
+{
+ HIDO_CHAR acHeart[200];
+ HIDO_UINT32 u32HeartLen = snprintf(acHeart, sizeof(acHeart), "$message,heart,%04x,%d,%04x,%d,%02u%%,%d,%d,%lf,%lf,%d,%d,%d,%d,0\r\n", \
+ g_com_map[DEV_ID],GetUWBBindState(),g_com_map[BIND_DEV_ID],alarm_type,bat_percent,g_com_map[ALARM_DISTANCE1],g_com_map[ALARM_DISTANCE2],jd,wd,applyid,result,1,distance);
+ Socket_Send(l_i32TCPClientID, (HIDO_UINT8 *)acHeart, u32HeartLen);
+}
uint8_t TCPfail_flag = 0,flag_first_TCPconnect=1;
uint32_t TCPfailetimer;
+uint16_t ip0,ip1,ip2,ip3,port;
HIDO_INT32 TCPClient_Poll(void)
{
if (Internet_IsIPReady() == HIDO_TRUE)
@@ -192,13 +214,13 @@
{
l_eTCPClientState = TCP_CLIENT_STATE_CONNECTING;
-// HIDO_UtilSnprintf((HIDO_CHAR *) l_au8CmdBuff, sizeof(l_au8CmdBuff), "%u.%u.%u.%u", g_com_map[TCP_IP_0],
-// g_com_map[TCP_IP_1], g_com_map[TCP_IP_2], g_com_map[TCP_IP_3]);
+
+ HIDO_UtilSnprintf((HIDO_CHAR *) l_au8CmdBuff, sizeof(l_au8CmdBuff), "%u.%u.%u.%u", ip0,ip1, ip2, ip3);
-// Socket_Connect(l_i32TCPClientID, (HIDO_CHAR *) l_au8CmdBuff, g_com_map[TCP_PORT]);
+ Socket_Connect(l_i32TCPClientID, (HIDO_CHAR *) l_au8CmdBuff, port);
- HIDO_UtilSnprintf((HIDO_CHAR *) l_au8CmdBuff, sizeof(l_au8CmdBuff), "111.198.60.6");
- Socket_Connect(l_i32TCPClientID, (HIDO_CHAR *) l_au8CmdBuff, 1234);
+// 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;
}
else
@@ -213,14 +235,17 @@
else if (TCP_CLIENT_STATE_CONNECTED == l_eTCPClientState)
{
- if ((u32CurTick - l_u32HeartBeatTick) >= HIDO_TIMER_TICK_S(15)||flag_first_TCPconnect)
+
+// if ((u32CurTick - l_u32HeartBeatTick) >= HIDO_TIMER_TICK_S(g_com_map[SEND_4G_SECOND])||flag_first_TCPconnect)
+ if ((u32CurTick - l_u32HeartBeatTick) >= HIDO_TIMER_TICK_S(15)||flag_first_TCPconnect)
{
flag_first_TCPconnect = 0;
l_u32HeartBeatTick = u32CurTick;
// 这里是自定义心跳
- HIDO_CHAR acHeart[128];
- HIDO_UINT32 u32HeartLen = snprintf(acHeart, sizeof(acHeart), "$message heart,%04x,00001,1,50,50,50,,,,\r\n", g_com_map[DEV_ID]);
- Socket_Send(l_i32TCPClientID, (HIDO_UINT8 *)acHeart, u32HeartLen);
+ TCPHeartBeatUpload();
+// HIDO_CHAR acHeart[128];
+// HIDO_UINT32 u32HeartLen = snprintf(acHeart, sizeof(acHeart), "$message heart,%04x,00001,1,50,50,50,,,,\r\n", g_com_map[DEV_ID]);
+// Socket_Send(l_i32TCPClientID, (HIDO_UINT8 *)acHeart, u32HeartLen);
}
}
}
--
Gitblit v1.9.3