From 9b59e87d8280de129c18421b5d12cf96d0ea904e Mon Sep 17 00:00:00 2001
From: yincheng.zhong <634916154@qq.com>
Date: 星期二, 03 九月 2024 10:28:06 +0800
Subject: [PATCH] V1.6 给客户测试
---
keil/include/src/TCPClient.c | 215 ++++++++++++++++++++++++++++++++++++-----------------
1 files changed, 146 insertions(+), 69 deletions(-)
diff --git a/keil/include/src/TCPClient.c b/keil/include/src/TCPClient.c
index 07d3e73..4b4cae8 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 *
*******************************************************************************/
@@ -36,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];
@@ -44,7 +47,8 @@
* Local Function Declaration *
*******************************************************************************/
HIDO_INT32 TCPClient_Heartbeat(HIDO_VOID);
-
+void TCPHeartBeatUpload(void);
+void TCPReceiveMessageReply(void);
/*******************************************************************************
* Local Function *
*******************************************************************************/
@@ -57,71 +61,102 @@
* Author : www.hido-studio.com
* Modified Date: : 2021年1月9日
*******************************************************************************/
- Commend_Datestruct TCP_command;
+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)
{
- 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);
- if(g_com_map[DEV_ID]==TCP_command.tagId)
- 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;
- }
- }
-
-
- //根据指令去执行
+ HIDO_CHAR *apcSplitStr[12];
+ HIDO_UINT32 u32SplitCnt = 0;
+
+ LOG_INFO(TRACE_MODULE_APP, "收到数据\r\n");
- //
-#if 0
- if(STRCMP(_u8Data, "$control,") == 0)
+
+ if(STRCMP(_u8Data, "$instruct,") == 0)
{
u32SplitCnt = HIDO_UtilStrSplit((HIDO_CHAR *)_u8Data, ',', apcSplitStr, HIDO_ARRARY_COUNT(apcSplitStr));
- if(u32SplitCnt < 3)
- {
- return HIDO_ERR;
- }
+ TCP_command.tagId = HIDO_UtilHexStrToInt(apcSplitStr[3]);
- /* ?豸ID??? */
- if(HIDO_UtilHexStrToInt(apcSplitStr[1]) == g_com_map[DEV_ID])
+ if(g_com_map[DEV_ID]==TCP_command.tagId)
{
- if(strcmp(apcSplitStr[2],"beeper")==0)
+
+ 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_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)
{
-
- beepontime = HIDO_UtilStrToInt(apcSplitStr[3]);
-
+ case BIND_SUCCESS:
+ {
+
+ 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;
+ 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;
+ // bind_resetbreak();
+ case OPEN_GNSS:
+ gps_4g_flag = 1;
+
+ break;
+
+ case CLOSE_VIBRATION:
+ g_com_map[MOTOR_ENABLE]=0;
+
+
+ break;
+ case OPEN_VIBRATION:
+ g_com_map[MOTOR_ENABLE]=1;
+
+
+ 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, "$userdata,") == 0)
+ } else if(STRCMP(_u8Data, "$message_reply,") == 0)
{
- if(DBG_GetMode() == DBG_MODE_CFG)
- HIDO_Debug2("%s\r\n", l_au8CmdBuff);
-
+ 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)
+ {
+ }
}
-#endif
return HIDO_OK;
}
@@ -191,8 +226,41 @@
* Author : www.hido-studio.com
* Modified Date: : 2021?1?9?
*******************************************************************************/
+extern uint8_t bat_percent,taglist_num;
+uint8_t alarm_type;
+extern double jd,wd;
+extern int32_t distance;
+void TCPHeartBeatUpload(void)
+{
+ HIDO_CHAR acHeart[200];
+ 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;
+uint16_t ip0,ip1,ip2,ip3,port;
HIDO_INT32 TCPClient_Poll(void)
{
if (Internet_IsIPReady() == HIDO_TRUE)
@@ -204,13 +272,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]);
-// 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);
+ 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;
}
else
@@ -225,14 +293,18 @@
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);
}
}
}
@@ -272,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
@@ -280,21 +352,26 @@
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;
}
+char str[17]= {"AT+IPR=9600;&W\r\n"};
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
+// 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)
{
if(TCP_CLIENT_STATE_CONNECTED == l_eTCPClientState)
{
return 1;
- }else{
+ } else {
return 0;
}
}
\ No newline at end of file
--
Gitblit v1.9.3