From 5f9ce742caf296fe786af133507ed94c2fb83ba5 Mon Sep 17 00:00:00 2001
From: chen <15335560115@163.com>
Date: 星期六, 28 九月 2024 17:26:51 +0800
Subject: [PATCH] 修改4G上传15s对应V1.8
---
keil/include/src/TCPClient.c | 104 +++++++++++++++++++++++++++++-----------------------
1 files changed, 58 insertions(+), 46 deletions(-)
diff --git a/keil/include/src/TCPClient.c b/keil/include/src/TCPClient.c
index e01e46a..ea4c6dc 100644
--- a/keil/include/src/TCPClient.c
+++ b/keil/include/src/TCPClient.c
@@ -43,6 +43,10 @@
static HIDO_UINT32 l_u32HeartBeatTick = 0;
static HIDO_UINT8 l_au8CmdBuff[1024];
+uint8_t TCPfail_flag = 0,flag_first_TCPconnect=1;
+uint32_t TCPfailetimer;
+uint16_t ip0,ip1,ip2,ip3,port;
+
/*******************************************************************************
* Local Function Declaration *
*******************************************************************************/
@@ -55,7 +59,7 @@
/*******************************************************************************
* Function Name : TCPClient_DataProc
* Description :
- * Input :
+ * Input :
* Output :
* Return :
* Author : www.hido-studio.com
@@ -79,77 +83,77 @@
{
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_UtilStrToInt(apcSplitStr[1]);
memcpy(&applyid,apcSplitStr[2],8);
- // TCP_command.applyID = HIDO_UtilStrToInt(apcSplitStr[2]);
+ // TCP_command.applyID = HIDO_UtilStrToInt(apcSplitStr[2]);
TCP_command.gunLableId = HIDO_UtilHexStrToInt(apcSplitStr[4]);
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;
-
+ result = 1;
+
switch(TCP_command.type)
{
case BIND_SUCCESS:
{
-
- g_com_map[ALARM_DISTANCE1]= TCP_command.warnDistance;
+
+ 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;
+ // g_com_map[SEND_4G_FREQUENCY]=1000/TCP_command.frequency;
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;
-
-
- break;
+
+
+ break;
// bind_resetbreak();
case OPEN_GNSS:
gps_4g_flag = 1;
-
- break;
+
+ break;
case CLOSE_VIBRATION:
g_com_map[MOTOR_ENABLE]=0;
-
-
- break;
+
+
+ break;
case OPEN_VIBRATION:
g_com_map[MOTOR_ENABLE]=1;
-
-
- break;
+
+
+ break;
case QUARY_INFORMATION:
//??
-
- break;
+
+ 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;
+ save_com_map_to_flash();
+ result = 0;
memset(&applyid,0,8);
}
- }else if(STRCMP(_u8Data, "$message_reply,") == 0)
+ } 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]);
@@ -177,6 +181,7 @@
{
if(l_eTCPClientState == TCP_CLIENT_STATE_CONNECTING)
{
+ TCPfail_flag = 0;
l_eTCPClientState = TCP_CLIENT_STATE_IDLE;
}
@@ -192,6 +197,7 @@
}
case SOCKET_EVENT_CLOSED:
{
+ TCPfail_flag = 0;
l_eTCPClientState = TCP_CLIENT_STATE_IDLE;
break;
}
@@ -234,15 +240,14 @@
{
HIDO_CHAR acHeart[200];
HIDO_UINT32 u32HeartLen;
- if(alarm_type)
+ if(alarm_type==1)
{
- 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);
-}
-// LOG_INFO(TRACE_MODULE_APP, "电量为%lf\r\n",bat_percent);//测试电量
+ 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);
}
@@ -259,9 +264,7 @@
if(alarm_type == 2)
alarm_type = 0;
}
-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)
@@ -273,14 +276,17 @@
{
l_eTCPClientState = TCP_CLIENT_STATE_CONNECTING;
-
+
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), "123.57.87.125");
// Socket_Connect(l_i32TCPClientID, (HIDO_CHAR *) l_au8CmdBuff, 8888);
- TCPfail_flag = 1;
+
+// 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
{
@@ -294,10 +300,11 @@
else if (TCP_CLIENT_STATE_CONNECTED == l_eTCPClientState)
{
-
-
-// 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)
+
+
+
+ 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)
{
flag_first_TCPconnect = 0;
l_u32HeartBeatTick = u32CurTick;
@@ -333,6 +340,11 @@
return HIDO_OK;
}
+HIDO_BOOL TCPClient_IsSendOver(HIDO_VOID)
+{
+ return Socket_IsSendQueueEmpty(l_i32TCPClientID);
+}
+
/*******************************************************************************
* Function Name : TCPClient_Init
* Description : TCP客户端初始化
@@ -356,7 +368,7 @@
return HIDO_OK;
}
-char str[17]={"AT+IPR=9600;&W\r\n"};
+char str[17]= {"AT+IPR=9600;&W\r\n"};
void AIR780E_Reset(void)
{
gps_air780_power_change(gps_power_state,0);//开启gps，4G
--
Gitblit v1.9.3