From fc78430a35be252a1cd5a29b5b66290a68cd9ca3 Mon Sep 17 00:00:00 2001
From: yincheng.zhong <634916154@qq.com>
Date: 星期二, 27 八月 2024 17:21:18 +0800
Subject: [PATCH] Merge branch '安邦测距手环' of http://47.108.70.204:60062/r/ChinaUWBProject into 安邦测距手环
---
keil/include/src/TCPClient.c | 191 ++++++++++++++++-------------------------------
1 files changed, 67 insertions(+), 124 deletions(-)
diff --git a/keil/include/src/TCPClient.c b/keil/include/src/TCPClient.c
index 00f7bb9..8dd8e67 100644
--- a/keil/include/src/TCPClient.c
+++ b/keil/include/src/TCPClient.c
@@ -17,7 +17,9 @@
#include "HIDO_Util.h"
#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];
@@ -57,139 +60,56 @@
* Author : www.hido-studio.com
* Modified Date: : 2021年1月9日
*******************************************************************************/
+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)
{
-#if 0
HIDO_CHAR *apcSplitStr[12];
HIDO_UINT32 u32SplitCnt = 0;
- HIDO_Debug("%s\r\n", l_au8CmdBuff);
+ LOG_INFO(TRACE_MODULE_APP, "收到数据\r\n");
- /* $config,id,gps_hz,ip,port */
- if(STRCMP(_u8Data, "$config,") == 0)
+
+
+ if(STRCMP(_u8Data, "$instruct,") == 0)
{
u32SplitCnt = HIDO_UtilStrSplit((HIDO_CHAR *)_u8Data, ',', apcSplitStr, HIDO_ARRARY_COUNT(apcSplitStr));
-
- if(u32SplitCnt < 5)
+ TCP_command.tagId = HIDO_UtilHexStrToInt(apcSplitStr[3]);
+ if(g_com_map[DEV_ID]==TCP_command.tagId)
{
- return HIDO_ERR;
- }
+ TCP_command.type = HIDO_UtilHexStrToInt(apcSplitStr[1]);
- /* 设备ID检查 */
- if(HIDO_UtilHexStrToInt(apcSplitStr[1]) == g_com_map[DEV_ID])
- {
- HIDO_UINT32 u32Temp = 0;
- HIDO_BOOL bChange = HIDO_FALSE;
- HIDO_UINT8 au8IP[4];
-
- /* GPS HZ */
- u32Temp = HIDO_UtilStrToInt(apcSplitStr[2]);
- if(u32Temp != g_com_map[GPS_HZ])
+ switch(TCP_command.type)
{
- g_com_map[GPS_HZ] = u32Temp;
- bChange = HIDO_TRUE;
- }
-
- /* IP=192.168.1.1 */
- HIDO_UtilIPStringToByteArrary(apcSplitStr[3], au8IP);
- /* IP变化 */
- if((au8IP[0] != g_com_map[IP_0]) || (au8IP[1] != g_com_map[IP_1])
- || (au8IP[2] != g_com_map[IP_2]) || (au8IP[3] != g_com_map[IP_3]))
+ case BIND_SUCCESS:
{
- bChange = HIDO_TRUE;
- g_com_map[IP_0] = au8IP[0];
- g_com_map[IP_1] = au8IP[1];
- g_com_map[IP_2] = au8IP[2];
- g_com_map[IP_3] = au8IP[3];
-
- l_eUDPCLientState = UDP_CLIENT_STATE_IDLE;
- }
-
- /* 端口=0-65535 */
- if( g_com_map[PORT] != HIDO_UtilStrToInt(apcSplitStr[4]))
- {
- g_com_map[PORT] = HIDO_UtilStrToInt(apcSplitStr[4]);
- bChange = HIDO_TRUE;
- }
-
- if(bChange)
- {
+ 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;
save_com_map_to_flash();
- g_com_map[CNT_RESTART] = 1;
+ }
+ 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_FREQUENCY]=TCP_command.frequency;
+ break;
}
}
}
- /* $update,id,url,version */
- else if(STRCMP(_u8Data, "$update,") == 0)
- {
- u32SplitCnt = HIDO_UtilStrSplit((HIDO_CHAR *)_u8Data, ',', apcSplitStr, HIDO_ARRARY_COUNT(apcSplitStr));
-
- if(u32SplitCnt < 4)
- {
- return HIDO_ERR;
- }
-
- /* 设备ID检查 */
- if(HIDO_UtilHexStrToInt(apcSplitStr[1]) == g_com_map[DEV_ID])
- {
- /* 版本号比较,“大”才升级 */
- if(strcmp(apcSplitStr[3], APP_CONFIG_VERSION) > 0)
- {
- /* 重启进入OTA模式升级 */
- uint16_t tmp = 0xCCCC;
-
- HIDO_Debug("goto OTA Application\r\n");
- SPIFlash_Erase(SPI_FLASH_ID_0, APP_CONFIG_IAPFLAG_MAP, 2, SPI_FLASH_SECTOR_ERASE_MODE_4K);
- SPIFlash_Write(SPI_FLASH_ID_0, APP_CONFIG_IAPFLAG_MAP, (HIDO_UINT8*)&tmp, sizeof(tmp));
- SPIFlash_Erase(SPI_FLASH_ID_0, APP_CONFIG_IAP_PARAM_MAP, 256, SPI_FLASH_SECTOR_ERASE_MODE_4K);
- SPIFlash_Write(SPI_FLASH_ID_0, APP_CONFIG_IAP_PARAM_MAP, (HIDO_UINT8*)apcSplitStr[2], strlen(apcSplitStr[2]) + 1);
-
- delay_ms(10);
- Reboot(0);
- }
- }
- }
- /* $getlog,id,url */
- else if(STRCMP(_u8Data, "$getlog,") == 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])
- {
- Log_Upload(apcSplitStr[2]);
- }
- } /* $control,id,bepper,time */
- else 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)
- {
-
- beepontime = HIDO_UtilStrToInt(apcSplitStr[3]);
-
- }
- }
- }else if(STRCMP(_u8Data, "$userdata,") == 0)
- {
- if(DBG_GetMode() == DBG_MODE_CFG)
- HIDO_Debug2("%s\r\n", l_au8CmdBuff);
-
- }
-#endif
return HIDO_OK;
}
@@ -259,7 +179,7 @@
* Author : www.hido-studio.com
* Modified Date: : 2021?1?9?
*******************************************************************************/
-uint8_t TCPfail_flag = 0;
+uint8_t TCPfail_flag = 0,flag_first_TCPconnect=1;
uint32_t TCPfailetimer;
HIDO_INT32 TCPClient_Poll(void)
{
@@ -276,14 +196,16 @@
// 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);
+ TCPfail_flag = 1;
}
else
{
- if (u32CurTick - TCPfailetimer > 60000)
+ if (u32CurTick - TCPfailetimer > HIDO_TIMER_TICK_S(5))
{
+ TCPfailetimer = u32CurTick;
TCPfail_flag = 0;
}
}
@@ -291,10 +213,14 @@
else if (TCP_CLIENT_STATE_CONNECTED == l_eTCPClientState)
{
- if ((u32CurTick - l_u32HeartBeatTick) >= 10000)
+ if ((u32CurTick - l_u32HeartBeatTick) >= HIDO_TIMER_TICK_S(15)||flag_first_TCPconnect)
{
+ flag_first_TCPconnect = 0;
l_u32HeartBeatTick = u32CurTick;
- l_eTCPClientState = TCP_CLIENT_STATE_IDLE;
+ // 这里是自定义心跳
+ 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);
}
}
}
@@ -336,10 +262,27 @@
l_eTCPClientState = TCP_CLIENT_STATE_IDLE;
Socket_Create(&l_i32TCPClientID, SOCKET_TYPE_TCP, TCPClient_SocketEventProc, HIDO_NULL);
+ // 这里是固定的心跳，由4G自行发送
+#if 0
HIDO_CHAR acHeart[64];
-
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(gps_power_state,0);//开启gps，4G
+ delay_us(1500000);
+ gps_air780_power_change(gps_power_state,1);//开启gps，4G
+}
+uint8_t IfTCPConnected(void)
+{
+ if(TCP_CLIENT_STATE_CONNECTED == l_eTCPClientState)
+ {
+ return 1;
+ } else {
+ return 0;
+ }
+}
\ No newline at end of file
--
Gitblit v1.9.3