From dd60d4eaeb6346b7089bbc9ee5d69813eafca3ec Mon Sep 17 00:00:00 2001
From: yincheng.zhong <634916154@qq.com>
Date: 星期五, 30 八月 2024 15:36:57 +0800
Subject: [PATCH] V1.4
---
keil/include/src/TCPClient.c | 106 ++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 85 insertions(+), 21 deletions(-)
diff --git a/keil/include/src/TCPClient.c b/keil/include/src/TCPClient.c
index 571e7a4..be5b299 100644
--- a/keil/include/src/TCPClient.c
+++ b/keil/include/src/TCPClient.c
@@ -47,7 +47,8 @@
* Local Function Declaration *
*******************************************************************************/
HIDO_INT32 TCPClient_Heartbeat(HIDO_VOID);
-
+void TCPHeartBeatUpload(void);
+void TCPReceiveMessageReply(void);
/*******************************************************************************
* Local Function *
*******************************************************************************/
@@ -60,9 +61,11 @@
* Author : www.hido-studio.com
* Modified Date: : 2021年1月9日
*******************************************************************************/
-extern uint8_t gps_4g_flag;
+extern uint8_t gps_4g_flag,search_open_flag;
extern Operation_step UWB_work_state;
Commend_Datestruct TCP_command;
+uint8_t result;
+char applyid[10];
static HIDO_INT32 TCPClient_DataProc(HIDO_UINT8 *_u8Data, HIDO_UINT32 _u32Len)
{
HIDO_CHAR *apcSplitStr[12];
@@ -79,45 +82,79 @@
if(g_com_map[DEV_ID]==TCP_command.tagId)
{
- TCP_command.type = HIDO_UtilHexStrToInt(apcSplitStr[1]);
+
+ TCP_command.type = HIDO_UtilStrToInt(apcSplitStr[1]);
+ memcpy(&applyid,apcSplitStr[2],8);
+ // TCP_command.applyID = HIDO_UtilStrToInt(apcSplitStr[2]);
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]);
+ TCP_command.warnDistance = HIDO_UtilStrToInt(apcSplitStr[5]);
+ TCP_command.alarmDistance = HIDO_UtilStrToInt(apcSplitStr[6]);
+ TCP_command.frequency = HIDO_UtilStrToInt(apcSplitStr[7]);
+ if(TCP_command.type>0&&TCP_command.type<8)
+ result = 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[ALARM_DISTANCE1]= TCP_command.warnDistance;
+ g_com_map[ALARM_DISTANCE2]=TCP_command.alarmDistance;
// g_com_map[SEND_4G_FREQUENCY]=1000/TCP_command.frequency;
- UWB_work_state = SEARCH_DEV;
- save_com_map_to_flash();
+ if(g_com_map[BIND_DEV_ID]!=TCP_command.gunLableId)
+ {
+ g_com_map[BIND_DEV_ID]=TCP_command.gunLableId;
+ UWB_work_state = SEARCH_DEV;
+ search_open_flag = 1;
+ }
+
+
}
break;
case UNBIND:
g_com_map[BIND_DEV_ID] = 0;
UWB_work_state = UN_BIND;
- save_com_map_to_flash();
+
+
+ break;
// bind_resetbreak();
case OPEN_GNSS:
gps_4g_flag = 1;
+
+ break;
case CLOSE_VIBRATION:
g_com_map[MOTOR_ENABLE]=0;
- save_com_map_to_flash();
+
+ break;
case OPEN_VIBRATION:
g_com_map[MOTOR_ENABLE]=1;
- save_com_map_to_flash();
+
+ break;
case QUARY_INFORMATION:
//??
+
+ break;
case CHANGE_POLL_FREQUENCY:
+
g_com_map[SEND_4G_SECOND]=TCP_command.frequency*60;
break;
}
+ result = 1;
+ TCPHeartBeatUpload();
+ if(TCP_command.type!=QUARY_INFORMATION||TCP_command.type!=OPEN_GNSS)
+ save_com_map_to_flash();
+ result = 0;
+ memset(&applyid,0,8);
+ }
+ }else if(STRCMP(_u8Data, "$message_reply,") == 0)
+ {
+ u32SplitCnt = HIDO_UtilStrSplit((HIDO_CHAR *)_u8Data, ',', apcSplitStr, HIDO_ARRARY_COUNT(apcSplitStr));
+ TCP_command.tagId = HIDO_UtilHexStrToInt(apcSplitStr[1]);
+ if(g_com_map[DEV_ID]==TCP_command.tagId)
+ {
}
}
return HIDO_OK;
@@ -190,15 +227,36 @@
* Modified Date: : 2021?1?9?
*******************************************************************************/
extern uint8_t bat_percent,taglist_num;
-uint8_t alarm_type,applyid,result;
+uint8_t alarm_type;
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);
+ HIDO_UINT32 u32HeartLen;
+ if(alarm_type)
+ {
+ u32HeartLen = snprintf(acHeart, sizeof(acHeart), "$message,alarm,%04x,%d,%04x,%d,%02u%%,%d,%d,%lf,%lf,%s,%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,distance);
+ }else{
+ u32HeartLen = snprintf(acHeart, sizeof(acHeart), "$message,heart,%04x,%d,%04x,%d,%02u%%,%d,%d,%lf,%lf,%s,%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,distance);
+}
Socket_Send(l_i32TCPClientID, (HIDO_UINT8 *)acHeart, u32HeartLen);
+}
+
+void TCPReceiveMessageReply(void)
+{
+ HIDO_CHAR acHeart[200];
+ HIDO_UINT32 u32HeartLen = snprintf(acHeart, sizeof(acHeart), "$rec_message,%04x",g_com_map[DEV_ID]);
+ Socket_Send(l_i32TCPClientID, (HIDO_UINT8 *)acHeart, u32HeartLen);
+}
+void _4GAlarmUpload(uint8_t alarm)
+{
+ alarm_type = alarm;
+ TCPHeartBeatUpload();
+ if(alarm_type == 2)
+ alarm_type = 0;
}
uint8_t TCPfail_flag = 0,flag_first_TCPconnect=1;
uint32_t TCPfailetimer;
@@ -215,12 +273,12 @@
l_eTCPClientState = TCP_CLIENT_STATE_CONNECTING;
- HIDO_UtilSnprintf((HIDO_CHAR *) l_au8CmdBuff, sizeof(l_au8CmdBuff), "%u.%u.%u.%u", ip0,ip1, ip2, ip3);
+ 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, 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), "123.57.87.125");
+// Socket_Connect(l_i32TCPClientID, (HIDO_CHAR *) l_au8CmdBuff, 8888);
TCPfail_flag = 1;
}
else
@@ -236,6 +294,7 @@
{
+
// 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)
{
@@ -285,7 +344,7 @@
HIDO_INT32 TCPClient_Init(void)
{
l_eTCPClientState = TCP_CLIENT_STATE_IDLE;
- Socket_Create(&l_i32TCPClientID, SOCKET_TYPE_TCP, TCPClient_SocketEventProc, HIDO_NULL);
+ Socket_Create(&l_i32TCPClientID, SOCKET_TYPE_UDP, TCPClient_SocketEventProc, HIDO_NULL);
// 这里是固定的心跳，由4G自行发送
#if 0
@@ -296,11 +355,16 @@
return HIDO_OK;
}
+char str[17]={"AT+IPR=9600;&W\r\n"};
void AIR780E_Reset(void)
{
gps_air780_power_change(gps_power_state,0);//开启gps，4G
delay_us(1500000);
gps_air780_power_change(gps_power_state,1);//开启gps，4G
+// delay_us(3000000);
+// Uart_ReConfigBaudRate(UART_ID_4G,115200);
+// uart_send(UART_ID0, str,17, NULL);
+// Uart_ReConfigBaudRate(UART_ID_4G,9600);
}
uint8_t IfTCPConnected(void)
{
--
Gitblit v1.9.3