From 385e42e51f493edb1db7948339a8316634987286 Mon Sep 17 00:00:00 2001
From: yincheng.zhong <634916154@qq.com>
Date: 星期三, 28 八月 2024 15:26:41 +0800
Subject: [PATCH] 调各种逻辑
---
keil/include/src/TCPClient.c | 132 ++++++++++++++++++++-----------------------
1 files changed, 62 insertions(+), 70 deletions(-)
diff --git a/keil/include/src/TCPClient.c b/keil/include/src/TCPClient.c
index d67aa40..4cfe533 100644
--- a/keil/include/src/TCPClient.c
+++ b/keil/include/src/TCPClient.c
@@ -19,6 +19,7 @@
#include "Uart.h"
#include "mk_4G.h"
#include "mk_trace.h"
+#include "dw_app_anchor.h"
/*******************************************************************************
* Macro *
*******************************************************************************/
@@ -37,6 +38,7 @@
* Local Variable *
*******************************************************************************/
HIDO_INT32 l_i32TCPClientID = 0;
+extern uint8_t gps_power_state;
static E_TCPClientState l_eTCPClientState = TCP_CLIENT_STATE_IDLE;
static HIDO_UINT32 l_u32HeartBeatTick = 0;
static HIDO_UINT8 l_au8CmdBuff[1024];
@@ -52,87 +54,66 @@
/*******************************************************************************
* Function Name : TCPClient_DataProc
* Description :
- * Input :
+ * Input :
* Output :
* Return :
* 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)
{
HIDO_CHAR *apcSplitStr[12];
HIDO_UINT32 u32SplitCnt = 0;
-
+
LOG_INFO(TRACE_MODULE_APP, "收到数据\r\n");
-
- if(STRCMP(_u8Data, "$instruct,") == 0)
- {
+
+ 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]);
-
+ 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:
- {
- 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:
- // vibration_close();
- case QUARY_INFORMATION:
- //??
- 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)
+ case BIND_SUCCESS:
{
-
- beepontime = HIDO_UtilStrToInt(apcSplitStr[3]);
-
+ 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 = SEARCH_DEV;
+ 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 CHANGE_POLL_FREQUENCY:
+ g_com_map[SEND_4G_SECOND]=TCP_command.frequency*60;
+ break;
}
}
- }else if(STRCMP(_u8Data, "$userdata,") == 0)
- {
- if(DBG_GetMode() == DBG_MODE_CFG)
- HIDO_Debug2("%s\r\n", l_au8CmdBuff);
-
}
-#endif
return HIDO_OK;
}
@@ -202,8 +183,19 @@
* 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;
+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\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,taglist_num);
+ 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)
@@ -215,13 +207,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]);
-
- HIDO_UtilSnprintf((HIDO_CHAR *) l_au8CmdBuff, sizeof(l_au8CmdBuff), "111.198.60.6");
- Socket_Connect(l_i32TCPClientID, (HIDO_CHAR *) l_au8CmdBuff, 1234);
+ 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);
TCPfail_flag = 1;
}
else
@@ -236,8 +228,8 @@
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)
+ {
flag_first_TCPconnect = 0;
l_u32HeartBeatTick = u32CurTick;
// 这里是自定义心跳
@@ -291,21 +283,21 @@
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)
{
- gps_air780_power_change(0,0);//开启gps，4G
+ gps_air780_power_change(gps_power_state,0);//开启gps，4G
delay_us(1500000);
- gps_air780_power_change(0,1);//开启gps，4G
+ gps_air780_power_change(gps_power_state,1);//开启gps，4G
}
uint8_t IfTCPConnected(void)
{
if(TCP_CLIENT_STATE_CONNECTED == l_eTCPClientState)
{
return 1;
- }else{
+ } else {
return 0;
}
}
\ No newline at end of file
--
Gitblit v1.9.3