From 1cf09c6c4a137d29f63fd8df3c0ca16b9329079e Mon Sep 17 00:00:00 2001
From: WXK <287788329@qq.com>
Date: 星期四, 17 四月 2025 16:25:52 +0800
Subject: [PATCH] 适配最新boot，适配4g工卡
---
keil/include/src/TCPClient.c | 439 +++++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 333 insertions(+), 106 deletions(-)
diff --git a/keil/include/src/TCPClient.c b/keil/include/src/TCPClient.c
index 9b56381..fa8123e 100644
--- a/keil/include/src/TCPClient.c
+++ b/keil/include/src/TCPClient.c
@@ -20,6 +20,9 @@
#include "mk_4G.h"
#include "mk_trace.h"
#include "dw_app_anchor.h"
+#include "PCA9555.h"
+#include "WS2812.h"
+#include "PCA9555.h"
/*******************************************************************************
* Macro *
*******************************************************************************/
@@ -38,20 +41,21 @@
* Local Variable *
*******************************************************************************/
HIDO_INT32 l_i32TCPClientID = 0;
-extern uint8_t gps_power_state;
+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];
-uint8_t TCPfail_flag = 0,flag_first_TCPconnect=1;
-uint32_t TCPfailetimer;
+static uint8_t TCPfail_flag = 0,flag_first_TCPconnect=1;
+static uint32_t TCPfailetimer;
uint16_t ip0,ip1,ip2,ip3,port;
/*******************************************************************************
* Local Function Declaration *
*******************************************************************************/
-HIDO_INT32 TCPClient_Heartbeat(HIDO_VOID);
+static HIDO_INT32 TCPClient_Heartbeat(HIDO_VOID);
void TCPHeartBeatUpload(void);
+void UDPClient_UploadGPS(void);
void TCPReceiveMessageReply(void);
/*******************************************************************************
* Local Function *
@@ -65,102 +69,237 @@
* Author : www.hido-studio.com
* Modified Date: : 2021年1月9日
*******************************************************************************/
-extern uint8_t gps_4g_flag,search_open_flag;
+extern uint8_t gps_4g_flag,search_open_flag,gps_open_flag,gps_wait_count,gps_need_data_flag,gps_wait_count2;
+uint8_t ota_flag;
extern Operation_step UWB_work_state;
Commend_Datestruct TCP_command;
uint8_t result;
char applyid[10];
+uint16_t receive_id;
+uint16_t g_com_position;
+uint16_t g_com_num;
+uint8_t testdata[100];
static HIDO_INT32 TCPClient_DataProc(HIDO_UINT8 *_u8Data, HIDO_UINT32 _u32Len)
{
HIDO_CHAR *apcSplitStr[12];
HIDO_UINT32 u32SplitCnt = 0;
+
+ HIDO_UINT32 u32Len = 0;
- LOG_INFO(TRACE_MODULE_APP, "收到数据\r\n");
+// HIDO_Debug("%s\r\n", l_au8CmdBuff);
-
-
- if(STRCMP(_u8Data, "$instruct,") == 0)
+ /* $config,id,gps_hz,ip,port */
+ if(STRCMP(_u8Data, "$config,") == 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)
+ if(u32SplitCnt < 5)
{
-
- 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)
- {
- 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);
+ return HIDO_ERR;
}
- } 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)
+
+ /* 设备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])
+ {
+ 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]))
+ {
+ 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_eTCPClientState = TCP_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)
+ {
+ save_com_map_to_flash();
+ g_com_map[CNT_RESTART] = 1;
+ }
}
}
+ /* $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])
+ {
+ ota_flag=1;
+// LOG_INFO(TRACE_MODULE_APP,"OTA文件地址名称:%s.\r\n",(char *)&apcSplitStr[2]);
+// uart_send(UART_ID1, (char *)&apcSplitStr[2],strlen(apcSplitStr[3]), NULL);
+// memcpy(testdata,(HIDO_UINT8*)apcSplitStr[2],strlen(apcSplitStr[2]) + 1);
+// OTA_Start((HIDO_UINT8*)apcSplitStr[2]);
+
+
+// g_com_map[OTA_FLAG]=1;
+// g_com_map[OTA_URL_CHANGDU]=strlen(apcSplitStr[2]) + 1;
+// memcpy(g_com_map+OTA_URL_INDEX,(HIDO_UINT8*)apcSplitStr[2],strlen(apcSplitStr[2]) + 1);
+// save_com_map_to_flash();
+// delay_us(100000);
+// NVIC_SystemReset(); //软复位回到bootloader
+ }
+ }
+ /* $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])
+ {
+#if 0
+ Log_Upload(apcSplitStr[2]);
+#endif
+ }
+ } /* $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]);
+
+ }
+
+ if(strcmp(apcSplitStr[2],"TTS")==0)
+ {
+ PCA9555_Set_One_Value_Output(TTS_ENABLE,1); //打开TTS电源
+ delay_ms(800); //再短一点，会丢失语音的第一个字，不是不读，而是就像没有下发第一个字
+
+// TTS_Play((HIDO_UINT8 *)apcSplitStr[3], strlen(apcSplitStr[3])); //服务器语音播报
+
+
+ u32Len = HIDO_UtilSnprintf((HIDO_CHAR *)l_au8CmdBuff, sizeof(l_au8CmdBuff), "$Receivevoice,%X\r\n",
+ g_com_map[DEV_ID]);
+
+ Socket_Send(l_i32TCPClientID, (HIDO_UINT8 *)l_au8CmdBuff, u32Len);
+
+
+ }
+
+ }
+ }
+ else if(STRCMP(_u8Data, "$userdata,") == 0)
+ {
+// if(DBG_GetMode() == DBG_MODE_CFG)
+// HIDO_Debug2("%s\r\n", l_au8CmdBuff);
+ }
+ else if(STRCMP(_u8Data, "$settone,") == 0)
+ {
+ HIDO_DataStruct stData;
+ HIDO_DataStruct stId;
+
+ if(HIDO_UtilParseFormat(_u8Data, _u32Len, "$settone,%p,%p\r\n", &stId, &stData) == 2)
+ {
+ ((char *)stId.m_pData)[stId.m_u32Len] = '\0';
+ if(g_com_map[DEV_ID] == HIDO_UtilHexStrToInt((char *)stId.m_pData))
+ {
+// TONE_Play((HIDO_UINT8 *)stData.m_pData, stData.m_u32Len);
+
+ u32Len = HIDO_UtilSnprintf((HIDO_CHAR *)l_au8CmdBuff, sizeof(l_au8CmdBuff), "$Receivevoice,%X\r\n",
+ g_com_map[DEV_ID]); //TTS收到回复
+
+ Socket_Send(l_i32TCPClientID, (HIDO_UINT8 *)l_au8CmdBuff, u32Len);
+ }
+ }
+ }else if(STRCMP(_u8Data, "$setpara,") == 0)
+ {
+ uint16_t tempindex,tempval;
+ u32SplitCnt = HIDO_UtilStrSplit((HIDO_CHAR *)_u8Data, ',', apcSplitStr, HIDO_ARRARY_COUNT(apcSplitStr));
+ if(HIDO_UtilHexStrToInt(apcSplitStr[1]) == g_com_map[DEV_ID])
+ {
+ if(u32SplitCnt < 2)
+ {
+ return HIDO_ERR;
+ }
+ tempindex = HIDO_UtilStrToInt(apcSplitStr[2]);
+ tempval = HIDO_UtilStrToInt(apcSplitStr[3]);
+ if(tempindex == MOTOR_ONTIME_INDEX)
+ {
+// beepontime = tempval;
+ }else{
+ if(tempindex < COM_MAP_SIZE)
+ g_com_map[tempindex] = tempval;
+ save_com_map_to_flash();
+ g_com_map[CNT_RESTART] = 1;
+ }
+ }
+ }
+ else if(STRCMP(_u8Data, "$readpara,") == 0)
+ {
+ uint16_t tempindex,templen,buffer_len,datalen;
+ char send_buffer[500];
+ u32SplitCnt = HIDO_UtilStrSplit((HIDO_CHAR *)_u8Data, ',', apcSplitStr, HIDO_ARRARY_COUNT(apcSplitStr));
+ if(HIDO_UtilHexStrToInt(apcSplitStr[1]) == g_com_map[DEV_ID])
+ {
+ if(u32SplitCnt < 2)
+ {
+ return HIDO_ERR;
+ }
+ tempindex = HIDO_UtilStrToInt(apcSplitStr[2]);
+ templen = HIDO_UtilStrToInt(apcSplitStr[3]);
+ buffer_len = sprintf(send_buffer,"$replypara,");
+ datalen = sprintf(&send_buffer[buffer_len],"%x,",g_com_map[DEV_ID]);
+ buffer_len += datalen;
+ for(uint16_t i=tempindex;i<templen+tempindex;i++)
+ {
+ datalen = sprintf(&send_buffer[buffer_len],"%d,",g_com_map[i]);
+ buffer_len += datalen;
+ }
+ send_buffer[buffer_len++] = 'e';
+ send_buffer[buffer_len++] = 'n';
+ send_buffer[buffer_len++] = 'd';
+ send_buffer[buffer_len++] = 0x0d;
+ send_buffer[buffer_len++] = 0x0a;
+ Socket_Send(l_i32TCPClientID,(uint8_t*)send_buffer,buffer_len);
+ }
+ }
+
return HIDO_OK;
}
@@ -236,11 +375,20 @@
uint8_t alarm_type;
extern double jd,wd;
extern int32_t distance;
-void TCPHeartBeatUpload(void)
+extern uint8_t userkey_state;
+uint8_t gps_timeout_flag;
+extern uint8_t GPS_GGAmessage[150];
+uint16_t g_spsum,g_snum,ave_sp;
+extern uint8_t GPS_ParseGGA_data[256];
+extern uint8_t GPS_ParseGGA_changdu;
+void UDPClient_UploadGPS(void)
{
HIDO_CHAR acHeart[200];
HIDO_UINT32 u32HeartLen;
-// if(alarm_type)
+ ave_sp = g_spsum/g_snum;
+ g_spsum = 0;
+ g_snum = 0;
+// 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);
@@ -248,12 +396,67 @@
// 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);
// }
- u32HeartLen = snprintf(acHeart, sizeof(acHeart), "$message,GPS,%04x,%lf,%lf\r\n", \
- g_com_map[DEV_ID],jd,wd);
-
- Socket_Send(l_i32TCPClientID, (HIDO_UINT8 *)acHeart, u32HeartLen);
+
+// u32HeartLen = snprintf(acHeart, sizeof(acHeart), "%s,%04x,%02u%%,%d,%d\r\n",
+// GPS_ParseGGA_data,g_com_map[DEV_ID],bat_percent,userkey_state,gps_timeout_flag);
+// userkey_state = 0;
+ Socket_Send(l_i32TCPClientID, (HIDO_UINT8 *)GPS_ParseGGA_data, GPS_ParseGGA_changdu);
}
+char senddata[2048];
+void HexToAsciiSendUDP(uint8_t* data,uint8_t len)
+{
+ static HIDO_CHAR l_acUploadBuff[2048];
+ static HIDO_UINT32 l_u32UploadBuffLen = 0;
+ static HIDO_UINT32 l_u32UdpsendTick = 0;
+ uint8_t i,temp;
+
+ for(i=0;i<len;i++)
+ {
+ temp = *data++;
+ sprintf(&senddata[2*i],"%x",temp>>4);
+ sprintf(&senddata[2*i+1],"%x",temp&0xf);
+ }
+ senddata[2*len] = 0x0d;
+ senddata[2*len+1] = 0x0a;
+// if(DBG_GetMode() == DBG_MODE_CFG)
+// Uart_Send(0, (HIDO_UINT8 *) senddata, 2*len+2);
+// UDPClient_Uploadhex(senddata,2*len+2);
+ if(TCP_CLIENT_STATE_CONNECTED == l_eTCPClientState)
+ {
+ memcpy(l_acUploadBuff + l_u32UploadBuffLen, senddata, 2*len+2);
+ l_u32UploadBuffLen += 2*len+2;
+ // if((l_u32UploadBuffLen + u32Len )> sizeof(l_acUploadBuff))
+// if((HIDO_TimerGetTick() - l_u32UdpsendTick) >= 200)
+// {
+// l_u32UdpsendTick = HIDO_TimerGetTick();
+ Socket_Send(l_i32TCPClientID, (HIDO_UINT8 *)l_acUploadBuff, l_u32UploadBuffLen);
+ l_u32UploadBuffLen = 0;
+// }
+
+ }
+}
+void TCPHeartBeatUpload(void)
+{
+ HIDO_CHAR acHeart[200];
+ HIDO_UINT32 u32HeartLen;
+ ave_sp = g_spsum/g_snum;
+ g_spsum = 0;
+ g_snum = 0;
+// 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);
+// }
+ u32HeartLen = HIDO_UtilSnprintf((HIDO_CHAR *)acHeart, sizeof(acHeart), "$XTB,%X,%02u%%,%d.%d,%s",
+ g_com_map[DEV_ID], bat_percent, g_com_map[VERSION]>>8,g_com_map[VERSION]&0xff, Module_GetCCID());
+ Socket_Send(l_i32TCPClientID, (HIDO_UINT8 *)acHeart, u32HeartLen);
+
+
+}
void TCPReceiveMessageReply(void)
{
HIDO_CHAR acHeart[200];
@@ -263,11 +466,11 @@
void _4GAlarmUpload(uint8_t alarm)
{
alarm_type = alarm;
- //TCPHeartBeatUpload();
+ TCPHeartBeatUpload();
if(alarm_type == 2)
alarm_type = 0;
}
-
+extern uint32_t uwbled,rtkled,led4g,powerled;
HIDO_INT32 TCPClient_Poll(void)
{
if (Internet_IsIPReady() == HIDO_TRUE)
@@ -275,14 +478,15 @@
HIDO_UINT32 u32CurTick = HIDO_TimerGetTick();
if (TCP_CLIENT_STATE_IDLE == l_eTCPClientState)
{
+ led4g=RED;
if (!TCPfail_flag)
{
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", g_com_map[IP_0], g_com_map[IP_1], g_com_map[IP_2], g_com_map[IP_3]);
- Socket_Connect(l_i32TCPClientID, (HIDO_CHAR *) l_au8CmdBuff, port);
+ Socket_Connect(l_i32TCPClientID, (HIDO_CHAR *) l_au8CmdBuff, g_com_map[PORT]);
// HIDO_UtilSnprintf((HIDO_CHAR *) l_au8CmdBuff, sizeof(l_au8CmdBuff), "123.57.87.125");
// Socket_Connect(l_i32TCPClientID, (HIDO_CHAR *) l_au8CmdBuff, 8888);
@@ -302,16 +506,15 @@
}
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)
+ led4g=GREEN;
+ if ((u32CurTick - l_u32HeartBeatTick) >= HIDO_TIMER_TICK_S(60)||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;
// 这里是自定义心跳
- //TCPHeartBeatUpload();
+ TCPHeartBeatUpload();
+ //UDPClient_UploadGPS();//先不弄心跳
// 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);
@@ -320,6 +523,7 @@
}
else
{
+ led4g=RED;
l_eTCPClientState = TCP_CLIENT_STATE_IDLE;
}
@@ -341,7 +545,29 @@
return HIDO_OK;
}
+HIDO_INT32 TCPClient_Uploadhex(uint8_t *_pcGGA,uint16_t u32Len)
+{
+ static HIDO_CHAR l_acUploadBuff[1024];
+ static HIDO_UINT32 l_u32UploadBuffLen = 0;
+ static HIDO_UINT32 l_u32UdpsendTick = 0;
+
+ if(TCP_CLIENT_STATE_CONNECTED == l_eTCPClientState)
+ {
+ memcpy(l_acUploadBuff + l_u32UploadBuffLen, _pcGGA, u32Len);
+ l_u32UploadBuffLen += u32Len;
+ // if((l_u32UploadBuffLen + u32Len )> sizeof(l_acUploadBuff))
+ if((HIDO_TimerGetTick() - l_u32UdpsendTick) >= 200)
+ {
+ l_u32UdpsendTick = HIDO_TimerGetTick();
+ Socket_Send(l_i32TCPClientID, (HIDO_UINT8 *)l_acUploadBuff, l_u32UploadBuffLen);
+ l_u32UploadBuffLen = 0;
+ }
+
+ }
+
+ return HIDO_OK;
+}
HIDO_BOOL TCPClient_IsSendOver(HIDO_VOID)
{
return Socket_IsSendQueueEmpty(l_i32TCPClientID);
@@ -359,7 +585,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
@@ -370,16 +596,17 @@
return HIDO_OK;
}
-char str[17]= {"AT+IPR=9600;&W\r\n"};
+char str[19]= {"AT+IPR=115200;&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);
+ PCA9555_Set_One_Value_Output(AIR780E_ENBALE,0);//关闭4G
+ delay_ms(100);
+ PCA9555_Set_One_Value_Output(AIR780E_ENBALE,1);//打开4G
+// delay_ms(3000);
// Uart_ReConfigBaudRate(UART_ID_4G,9600);
+// uart_send(UART_ID0, str,19, NULL);
+// Uart_ReConfigBaudRate(UART_ID_4G,115200);
+
}
uint8_t IfTCPConnected(void)
{
--
Gitblit v1.9.3