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 | 305 +++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 259 insertions(+), 46 deletions(-)
diff --git a/keil/include/src/TCPClient.c b/keil/include/src/TCPClient.c
index fa8123e..e5762d7 100644
--- a/keil/include/src/TCPClient.c
+++ b/keil/include/src/TCPClient.c
@@ -23,6 +23,9 @@
#include "PCA9555.h"
#include "WS2812.h"
#include "PCA9555.h"
+#include "mk_flash.h"
+#include <serial_at_cmd_app.h>
+#include "DBG.h"
/*******************************************************************************
* Macro *
*******************************************************************************/
@@ -46,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;
@@ -55,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 *
@@ -155,19 +158,31 @@
/* 设备ID检查 */
if(HIDO_UtilHexStrToInt(apcSplitStr[1]) == g_com_map[DEV_ID])
{
- ota_flag=1;
+// 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
+ 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 */
@@ -283,6 +298,8 @@
}
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;
@@ -297,6 +314,122 @@
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);
}
}
@@ -381,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)
@@ -430,6 +578,7 @@
// {
// l_u32UdpsendTick = HIDO_TimerGetTick();
Socket_Send(l_i32TCPClientID, (HIDO_UINT8 *)l_acUploadBuff, l_u32UploadBuffLen);
+ uwbsendnum++;
l_u32UploadBuffLen = 0;
// }
@@ -438,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);
}
@@ -471,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)
@@ -507,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;
// 这里是自定义心跳
@@ -596,18 +756,71 @@
return HIDO_OK;
}
+#ifdef _GPS_115200
char str[19]= {"AT+IPR=115200;&W\r\n"};
void AIR780E_Reset(void)
{
PCA9555_Set_One_Value_Output(AIR780E_ENBALE,0);//关闭4G
- delay_ms(100);
+ 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);
+ 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,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