From 28f37df5dd32d6630dbcc23dca88f6a3ae063d7f Mon Sep 17 00:00:00 2001
From: zhangbo <zhangbo@qq.com>
Date: 星期五, 23 五月 2025 18:03:21 +0800
Subject: [PATCH] 移植了国产加速度计的计步逻辑，逻辑是30s没有步数进入休眠模式1分钟上传一次
---
keil/include/src/TCPClient.c | 607 ++++++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 463 insertions(+), 144 deletions(-)
diff --git a/keil/include/src/TCPClient.c b/keil/include/src/TCPClient.c
index 879d542..e5762d7 100644
--- a/keil/include/src/TCPClient.c
+++ b/keil/include/src/TCPClient.c
@@ -22,6 +22,10 @@
#include "dw_app_anchor.h"
#include "PCA9555.h"
#include "WS2812.h"
+#include "PCA9555.h"
+#include "mk_flash.h"
+#include <serial_at_cmd_app.h>
+#include "DBG.h"
/*******************************************************************************
* Macro *
*******************************************************************************/
@@ -45,7 +49,7 @@
static HIDO_UINT32 l_u32HeartBeatTick = 0;
static HIDO_UINT8 l_au8CmdBuff[1024];
-static uint8_t TCPfail_flag = 0,flag_first_TCPconnect=1;
+uint8_t TCPfail_flag = 0,flag_first_TCPconnect=0;
static uint32_t TCPfailetimer;
uint16_t ip0,ip1,ip2,ip3,port;
@@ -54,7 +58,7 @@
*******************************************************************************/
static HIDO_INT32 TCPClient_Heartbeat(HIDO_VOID);
void TCPHeartBeatUpload(void);
-void UDPClient_UploadGPS(void);
+void UDPClient_UploadGPS(HIDO_CHAR *_pcGGA);
void TCPReceiveMessageReply(void);
/*******************************************************************************
* Local Function *
@@ -69,6 +73,7 @@
* Modified Date: : 2021年1月9日
*******************************************************************************/
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;
@@ -76,124 +81,358 @@
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_CHAR acResponse[200];
- HIDO_CHAR temp_acResponse[200];
- HIDO_CHAR acReadponse[200];
- HIDO_UINT32 datalenth;
- HIDO_UINT32 u32ResponseLen;
- HIDO_UINT32 u32ReadResponseLen;
- LOG_INFO(TRACE_MODULE_APP, "收到数据\r\n");
+
+ HIDO_UINT32 u32Len = 0;
+// HIDO_Debug("%s\r\n", l_au8CmdBuff);
-
- if(STRCMP(_u8Data, "$setpara,") == 0)
+ /* $config,id,gps_hz,ip,port */
+ if(STRCMP(_u8Data, "$config,") == 0)
{
- u32ResponseLen = snprintf(acResponse, sizeof(acResponse), "$setparaok,%s\r\n", \
- _u8Data);
- memcpy(temp_acResponse,acResponse,sizeof(acResponse));
-
u32SplitCnt = HIDO_UtilStrSplit((HIDO_CHAR *)_u8Data, ',', apcSplitStr, HIDO_ARRARY_COUNT(apcSplitStr));
- receive_id = HIDO_UtilHexStrToInt(apcSplitStr[1]);
-
- if(g_com_map[DEV_ID]==receive_id)
+
+ if(u32SplitCnt < 5)
{
- g_com_position=HIDO_UtilStrToInt(apcSplitStr[2]);
- if(g_com_position!=CNT_RESTART&&g_com_position!=0&&g_com_position!=CNT_UPDATE)
- {
- Socket_Send(l_i32TCPClientID, (HIDO_UINT8 *)temp_acResponse, u32ResponseLen);
- g_com_map[g_com_position]=HIDO_UtilStrToInt(apcSplitStr[3]);
- }
- if(g_com_map[SEND_4G_SECOND]<30)
- {
- gps_open_flag=0;
- gps_wait_count=0;
- gps_wait_count2=0;
- gps_need_data_flag=1;//切换状态
- }else{
- gps_open_flag=1;
- gps_wait_count=0;
- gps_wait_count2=0;
- gps_need_data_flag=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, "$readpara,") == 0)
- {
- u32SplitCnt = HIDO_UtilStrSplit((HIDO_CHAR *)_u8Data, ',', apcSplitStr, HIDO_ARRARY_COUNT(apcSplitStr));
- receive_id = HIDO_UtilHexStrToInt(apcSplitStr[1]);
- if(g_com_map[DEV_ID]==receive_id)
+
+ /* 设备ID检查 */
+ if(HIDO_UtilHexStrToInt(apcSplitStr[1]) == g_com_map[DEV_ID])
{
- g_com_position=HIDO_UtilStrToInt(apcSplitStr[2]);
- g_com_num= HIDO_UtilStrToInt(apcSplitStr[3]);
- u32ReadResponseLen = snprintf(acReadponse, sizeof(acReadponse), "$replypara,%04x,%d", \
- receive_id,g_com_position);
- for(uint16_t i=0;i<g_com_num;i++)
+ 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])
{
- datalenth = sprintf((HIDO_CHAR *)&acReadponse[u32ReadResponseLen],",%d",g_com_map[g_com_position+i]);
- u32ReadResponseLen += datalenth;
+ g_com_map[GPS_HZ] = u32Temp;
+ bChange = HIDO_TRUE;
}
- Socket_Send(l_i32TCPClientID, (HIDO_UINT8 *)acReadponse, u32ReadResponseLen);
+
+ /* 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);
+ uint16_t tmp = 0xCCCC;
+ uint8_t flag = 0;
+ __disable_irq();
+ result=flash_open(FLASH_ID0,NULL);
+ if(!result)
+ {
+ flash_erase(FLASH_ID0, APP_CONFIG_IAPFLAG_SECTOR_ADDR, FLASH_SECTOR_SIZE);//擦除APPFLAG
+ flash_write_nbytes(FLASH_ID0, APP_CONFIG_IAPFLAG_MAP, (uint8_t*)&tmp, sizeof(tmp));
+ flash_erase(FLASH_ID0, APP_CONFIG_IAP_PARAM_MAP, FLASH_SECTOR_SIZE);//擦除APPFLAG
+ flash_write_nbytes(FLASH_ID0, APP_CONFIG_IAP_PARAM_MAP, (HIDO_UINT8 *)&flag, 1);
+ flash_write_nbytes(FLASH_ID0, APP_CONFIG_IAP_PARAM_MAP+1, (HIDO_UINT8*)apcSplitStr[2], strlen(apcSplitStr[2]) + 1);
+ }
+ __enable_irq();
+ 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]);
+ if(templen>10)
+ templen=10;
+ 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);
+ }
+ }
+ /* $download_audio,http://39.106.210.13:8080/hfs/xxx.bin */
+ else if (STRCMP(_u8Data, "$download_audio,") == 0)
+ {
+ u32SplitCnt = HIDO_UtilStrSplit((HIDO_CHAR *)_u8Data, ',', apcSplitStr, HIDO_ARRARY_COUNT(apcSplitStr));
+
+ if (u32SplitCnt < 3)
+ {
+ return HIDO_ERR;
+ }
+ if (HIDO_UtilHexStrToInt(apcSplitStr[1]) == g_com_map[DEV_ID])
+ {
+ uint16_t tmp = 0xCCCC;
+ uint8_t flag = 1;
+
+ __disable_irq();
+ result = flash_open(FLASH_ID0, NULL);
+ if (!result)
+ {
+ flash_erase(FLASH_ID0, APP_CONFIG_IAPFLAG_SECTOR_ADDR, FLASH_SECTOR_SIZE); // 擦除APPFLAG
+ flash_write_nbytes(FLASH_ID0, APP_CONFIG_IAPFLAG_MAP, (uint8_t *)&tmp, sizeof(tmp));
+ flash_erase(FLASH_ID0, APP_CONFIG_IAP_PARAM_MAP, FLASH_SECTOR_SIZE); // 擦除APPFLAG
+ flash_write_nbytes(FLASH_ID0, APP_CONFIG_IAP_PARAM_MAP, (HIDO_UINT8 *)&flag, 1);
+ flash_write_nbytes(FLASH_ID0, APP_CONFIG_IAP_PARAM_MAP + 1, (HIDO_UINT8 *)apcSplitStr[2], strlen(apcSplitStr[2]) + 1);
+ }
+ __enable_irq();
+ NVIC_SystemReset(); // 软复位回到bootloader
+ }
+ }
+ /* $play_audio,0-9 */
+ else if (STRCMP(_u8Data, "$play_audio,") == 0)
+ {
+ u32SplitCnt = HIDO_UtilStrSplit((HIDO_CHAR *)_u8Data, ',', apcSplitStr, HIDO_ARRARY_COUNT(apcSplitStr));
+
+ if (u32SplitCnt < 3)
+ {
+ return HIDO_ERR;
+ }
+ if (HIDO_UtilHexStrToInt(apcSplitStr[1]) == g_com_map[DEV_ID])
+ {
+ PCA9555_Set_One_Value_Output(TTS_ENABLE,1);//输出高电平切换为5V输入
+ delay_ms(100);
+ WT588E_PLAY(atoi(apcSplitStr[2]));
+ }
+ }
+ else if (STRCMP(_u8Data, "$set_gpsuwbpara,") == 0)
+ {
+ u32SplitCnt = HIDO_UtilStrSplit((HIDO_CHAR *)_u8Data, ',', apcSplitStr, HIDO_ARRARY_COUNT(apcSplitStr));
+ uint16_t buffer_len,datalen;
+ char send_buffer[20]={"ERROR\r\n"};
+ if (u32SplitCnt < 6)
+ {
+ return HIDO_ERR;
+ }
+ if (HIDO_UtilHexStrToInt(apcSplitStr[1]) == g_com_map[DEV_ID])
+ {
+ HIDO_INT32 gpskaiguan,uwbkaiguan,gpspinlv,uwbpinlv,gpsbaudrate1;
+ gpskaiguan= HIDO_UtilStrToInt(apcSplitStr[2]);
+ g_com_map[GPSENBLE] = gpskaiguan;
+ uwbkaiguan= HIDO_UtilStrToInt(apcSplitStr[3]);
+ g_com_map[UWBENBLE] = uwbkaiguan;
+ gpspinlv= HIDO_UtilStrToInt(apcSplitStr[4]);
+ g_com_map[GPSFrequency] = gpspinlv;
+ uwbpinlv= HIDO_UtilStrToInt(apcSplitStr[5]);
+ g_com_map[UWBFrequency] = uwbpinlv;
+ gpsbaudrate1= HIDO_UtilStrToInt(apcSplitStr[6]);
+ g_com_map[GPSBAUDRATE1_INDEX] = gpsbaudrate1>>16;
+ g_com_map[GPSBAUDRATE2_INDEX] = gpsbaudrate1;
+
+
+ if((g_com_map[GPSENBLE]||g_com_map[GPSENBLE]==0)
+ &&(g_com_map[UWBENBLE]||g_com_map[UWBENBLE]==0)
+ &&(g_com_map[GPSFrequency]<65535&&g_com_map[GPSFrequency]>0)
+ &&(g_com_map[UWBFrequency]==1||g_com_map[UWBFrequency]==3||g_com_map[UWBFrequency]==5||g_com_map[UWBFrequency]==10)
+ &&(gpsbaudrate1==9600||gpsbaudrate1==115200)
+ )
+ {
+ save_com_map_to_flash();
+// Socket_Send(l_i32TCPClientID,(uint8_t*)send_buffer,buffer_len);
+ g_com_map[CNT_RESTART] = 1;
+ }
+ else
+ {
+ Socket_Send(l_i32TCPClientID,(uint8_t*)send_buffer,10);
+ }
+ }
+ }
+ else if (STRCMP(_u8Data, "$read_gpsuwbpara,") == 0)
+ {
+ u32SplitCnt = HIDO_UtilStrSplit((HIDO_CHAR *)_u8Data, ',', apcSplitStr, HIDO_ARRARY_COUNT(apcSplitStr));
+ uint16_t buffer_len,datalen;
+ char send_buffer[200]={"ERROR\r\n"};
+ if (u32SplitCnt < 1)
+ {
+ return HIDO_ERR;
+ }
+ if (HIDO_UtilHexStrToInt(apcSplitStr[1]) == g_com_map[DEV_ID])
+ {
+ uint16_t checksum = 0;
+ send_buffer[0] = 0x55;
+ send_buffer[1] = 0xAA;
+ send_buffer[2] = 0x03;
+ send_buffer[3] = 160+5;
+ send_buffer[4] = CMD_REPLY;
+ send_buffer[5] = 0;
+ send_buffer[6] = 160;
+ memcpy(&send_buffer[7], &g_com_map, 160);
+ for(uint8_t i = 0; i<(160+5); i++)
+ {
+ checksum += send_buffer[2+i];
+ }
+ checksum = Checksum_u16(&send_buffer[2],5+160);
+ memcpy(&send_buffer[7+160],&checksum,2);
+
+ Socket_Send(l_i32TCPClientID,send_buffer,9+160);
+ }
+ }
+
return HIDO_OK;
}
@@ -275,26 +514,41 @@
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)
+uint8_t uwbsendnum,gpssendnum;
+extern uint8_t exercise_state;
+extern uint32_t step_count;
+void UDPClient_UploadGPS(HIDO_CHAR *_pcGGA)
{
- 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 = 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);
+ if(TCP_CLIENT_STATE_CONNECTED == l_eTCPClientState)
+ {
+
+
+#ifdef JIBU_XIUMIAN
+ HIDO_UINT32 u32Len = HIDO_UtilSnprintf((HIDO_CHAR *)l_au8CmdBuff, sizeof(l_au8CmdBuff), "%s,%X,%02x,%x,%d,%d,%d%\r\n",
+ _pcGGA, g_com_map[DEV_ID], bat_percent,ave_sp,0,step_count,exercise_state);
+#else
+ HIDO_UINT32 u32Len = HIDO_UtilSnprintf((HIDO_CHAR *)l_au8CmdBuff, sizeof(l_au8CmdBuff), "%s,%X,%02x,%x,%d,%d,%d%\r\n",
+ _pcGGA, g_com_map[DEV_ID], bat_percent,ave_sp,0,0,0);
+#endif
+
+// if((l_u32UploadBuffLen + u32Len) < sizeof(l_acUploadBuff))
+// {
+// memcpy(l_acUploadBuff + l_u32UploadBuffLen, l_au8CmdBuff, u32Len);
+// l_u32UploadBuffLen += u32Len;
+// }
+ //memcpy(l_acUploadBuff + l_u32UploadBuffLen, l_au8CmdBuff, 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_au8CmdBuff, u32Len);
+ gpssendnum++;
+// l_u32UploadBuffLen = 0;
+ }
+
+
+ }
}
char senddata[2048];
void HexToAsciiSendUDP(uint8_t* data,uint8_t len)
@@ -324,6 +578,7 @@
// {
// l_u32UdpsendTick = HIDO_TimerGetTick();
Socket_Send(l_i32TCPClientID, (HIDO_UINT8 *)l_acUploadBuff, l_u32UploadBuffLen);
+ uwbsendnum++;
l_u32UploadBuffLen = 0;
// }
@@ -332,22 +587,31 @@
}
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);
+ HIDO_UINT32 u32Len = 0;
+ if(TCP_CLIENT_STATE_CONNECTED == l_eTCPClientState)
+ {
+
+ if(g_com_map[RTCMMODE_INDEX] == RTCMMODE_TCP)
+ { u32Len = HIDO_UtilSnprintf((HIDO_CHAR *)l_au8CmdBuff, sizeof(l_au8CmdBuff), "$XTB,%X,%02u%%,%d.%d,%s,%d,3:%d.%d.%d.%d:%d.,1",
+ g_com_map[DEV_ID], bat_percent, g_com_map[VERSION]>>8,g_com_map[VERSION]&0xff, Module_GetCCID(),\
+ userkey_state,g_com_map[TCP_IP_0],g_com_map[TCP_IP_1],g_com_map[TCP_IP_2],g_com_map[TCP_IP_3],g_com_map[TCP_PORT]);
+ } else if(g_com_map[RTCMMODE_INDEX] == RTCMMODE_NTRIP)
+ {
+ u32Len = HIDO_UtilSnprintf((HIDO_CHAR *)l_au8CmdBuff, sizeof(l_au8CmdBuff), "$XTB,%X,%02u%%,%d.%d,%s,%d,2%s %s,1",
+ g_com_map[DEV_ID], bat_percent, g_com_map[VERSION]>>8,g_com_map[VERSION]&0xff, Module_GetCCID(),\
+ userkey_state,(char *)&g_com_map[NTRIP_HOST_INDEX],(char *)&g_com_map[NTRIP_USERNANME_INDEX]);
+ } else if(g_com_map[RTCMMODE_INDEX] == RTCMMODE_NONE)
+ {
+ u32Len = HIDO_UtilSnprintf((HIDO_CHAR *)l_au8CmdBuff, sizeof(l_au8CmdBuff), "$XTB,%X,%02u%%,%d.%d,%s,%d,1.,1",
+ g_com_map[DEV_ID], bat_percent, g_com_map[VERSION]>>8,g_com_map[VERSION]&0xff, Module_GetCCID(),\
+ userkey_state,g_com_map[TCP_IP_0],g_com_map[TCP_IP_1],g_com_map[TCP_IP_2],g_com_map[TCP_IP_3],g_com_map[TCP_PORT]);
+ }
+ userkey_state=0;
+ Socket_Send(l_i32TCPClientID, (HIDO_UINT8 *)l_au8CmdBuff, u32Len);
+ }
+// 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);
}
@@ -365,6 +629,7 @@
alarm_type = 0;
}
extern uint32_t uwbled,rtkled,led4g,powerled;
+extern uint8_t heartbeasend_flag;
HIDO_INT32 TCPClient_Poll(void)
{
if (Internet_IsIPReady() == HIDO_TRUE)
@@ -401,9 +666,10 @@
else if (TCP_CLIENT_STATE_CONNECTED == l_eTCPClientState)
{
led4g=GREEN;
- if ((u32CurTick - l_u32HeartBeatTick) >= HIDO_TIMER_TICK_S(60)||flag_first_TCPconnect)
+ if ((u32CurTick - l_u32HeartBeatTick) >= HIDO_TIMER_TICK_S(60)||flag_first_TCPconnect||heartbeasend_flag)
//if ((u32CurTick - l_u32HeartBeatTick) >= HIDO_TIMER_TICK_S(g_com_map[SEND_4G_SECOND])||flag_first_TCPconnect)
{
+ heartbeasend_flag=0;
flag_first_TCPconnect = 0;
l_u32HeartBeatTick = u32CurTick;
// 这里是自定义心跳
@@ -490,6 +756,7 @@
return HIDO_OK;
}
+#ifdef _GPS_115200
char str[19]= {"AT+IPR=115200;&W\r\n"};
void AIR780E_Reset(void)
{
@@ -497,11 +764,63 @@
delay_ms(1500);
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);
-
+// uart_send(UART_ID0, str,17, NULL);
+// Uart_ReConfigBaudRate(UART_ID_4G,9600);
+}
+void AIR780E_Reset_usart(void)
+{
+ PCA9555_Set_One_Value_Output(AIR780E_ENBALE,0);//关闭4G
+ delay_ms(1500);
+ 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);
+ delay_ms(200);
+ rtkled=GREEN;
+ uwbled=GREEN;
+ led4g=GREEN;
+ powerled=GREEN;
+ Set4LEDColor(uwbled,rtkled,led4g,powerled);
+ PCA9555_Set_One_Value_Output(AIR780E_ENBALE,0);
+ delay_ms(1500);
+ PCA9555_Set_One_Value_Output(AIR780E_ENBALE,1);
+ NVIC_SystemReset();
}
+#else
+char str[17]= {"AT+IPR=9600;&W\r\n"};
+void AIR780E_Reset(void)
+{
+ PCA9555_Set_One_Value_Output(AIR780E_ENBALE,0);//关闭4G
+ delay_ms(1500);
+ PCA9555_Set_One_Value_Output(AIR780E_ENBALE,1);//打开4G
+ delay_ms(3000);
+// Uart_ReConfigBaudRate(UART_ID_4G,115200);
+// uart_send(UART_ID0, str,17, NULL);
+// Uart_ReConfigBaudRate(UART_ID_4G,9600);
+}
+void AIR780E_Reset_usart(void)
+{
+ PCA9555_Set_One_Value_Output(AIR780E_ENBALE,0);//关闭4G
+ delay_ms(1500);
+ PCA9555_Set_One_Value_Output(AIR780E_ENBALE,1);//打开4G
+ delay_ms(3000);
+ Uart_ReConfigBaudRate(UART_ID_4G,115200);
+ uart_send(UART_ID0, str,17, NULL);
+ Uart_ReConfigBaudRate(UART_ID_4G,9600);
+ delay_ms(200);
+ rtkled=GREEN;
+ uwbled=GREEN;
+ led4g=GREEN;
+ powerled=GREEN;
+ Set4LEDColor(uwbled,rtkled,led4g,powerled);
+ PCA9555_Set_One_Value_Output(AIR780E_ENBALE,0);
+ delay_ms(1500);
+ PCA9555_Set_One_Value_Output(AIR780E_ENBALE,1);
+ NVIC_SystemReset();
+}
+#endif
uint8_t IfTCPConnected(void)
{
if(TCP_CLIENT_STATE_CONNECTED == l_eTCPClientState)
--
Gitblit v1.9.3