修改GPS4G灯充电灯闪灯逻辑，修改发送逻辑，处理4G立即关闭无法发送心跳包逻辑，完成3连击单击长按按钮逻辑，初步测试成功版本

chen

2025-04-20 38c1a38c08b6dfbc4632def361ddf8398a9f2107

 keil/include/src/TCPClient.c

@@ -20,6 +20,8 @@
#include "mk_4G.h"
#include "mk_trace.h"
#include "dw_app_anchor.h"
#include "mk_flash.h"
#include <serial_at_cmd_app.h>
/*******************************************************************************
 *                                  Macro                                      *
 *******************************************************************************/
@@ -51,7 +53,7 @@
 *                        Local Function Declaration                           *
 *******************************************************************************/
HIDO_INT32 TCPClient_Heartbeat(HIDO_VOID);
void TCPHeartBeatUpload(void);
void TCPHeartBeatUpload();
void UDPClient_UploadGPS(void);
void TCPReceiveMessageReply(void);
/*******************************************************************************
@@ -73,34 +75,56 @@
char applyid[10];
uint16_t receive_id;
uint16_t g_com_position;
uint16_t g_com_num;
int16_t beepontime;
HIDO_UINT8 *_u8Data_temp1=NULL;
HIDO_UINT32 _u32Len_temp;
extern int32_t distance;
extern uint8_t GPS_GGAmessage[150],userkey_state,gps_timeout_flag;
extern uint16_t g_spsum,g_snum,ave_sp;
extern uint32_t u32GGaLenth;
extern char GGA_Final_message[1024];
extern uint32_t gga_num;
uint8_t beep_start_flag;
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];
      _u8Data_temp1=_u8Data;
      _u32Len_temp=_u32Len;
      HIDO_CHAR acReadponse[200];
      HIDO_UINT32 datalenth;
      HIDO_UINT32 u32ResponseLen;
      HIDO_UINT32 u32ReadResponseLen;
    LOG_INFO(TRACE_MODULE_APP, "收到数据\r\n");


						
    if(STRCMP(_u8Data, "$setpara,") == 0)
    {
            u32ResponseLen = snprintf(acResponse, sizeof(acResponse), "$setparaok,%s\r\n", \
            u32ResponseLen = snprintf(acResponse, 12+_u32Len, "$setparaok,%s\r\n", \
                              _u8Data);
            Socket_Send(l_i32TCPClientID, (HIDO_UINT8 *)acResponse, u32ResponseLen);
            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)
        {
           g_com_position=HIDO_UtilStrToInt(apcSplitStr[2]);
                  g_com_map[g_com_position]=HIDO_UtilStrToInt(apcSplitStr[3]);
                if(g_com_map[SEND_4G_SECOND]<30)
                  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;//切换状态
                     memset(GGA_Final_message, 0, sizeof(GGA_Final_message));//清空接收到的用完的数组
                     u32GGaLenth=0;
                     gga_num=0;//清0有效次数
                     }else{
                     gps_open_flag=1;
                     gps_wait_count=0;
@@ -170,8 +194,72 @@
        receive_id = HIDO_UtilHexStrToInt(apcSplitStr[1]);
        if(g_com_map[DEV_ID]==receive_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++)
            {
                datalenth = sprintf((HIDO_CHAR *)&acReadponse[u32ReadResponseLen],",%d",g_com_map[g_com_position+i]);
                u32ReadResponseLen += datalenth;
            }
               Socket_Send(l_i32TCPClientID, (HIDO_UINT8 *)acReadponse, u32ReadResponseLen);
        }
    }else if(STRCMP(_u8Data, "$control,") == 0)
      {
          u32SplitCnt = HIDO_UtilStrSplit((HIDO_CHAR *)_u8Data, ',', apcSplitStr, HIDO_ARRARY_COUNT(apcSplitStr));
        receive_id = HIDO_UtilHexStrToInt(apcSplitStr[1]);
       /* 设备ID开启震动 */
        if(receive_id == g_com_map[DEV_ID])
        {
            if(strcmp(apcSplitStr[2],"beeper")==0)
            {
										   
                   beepontime = HIDO_UtilStrToInt(apcSplitStr[3]);
                    if(beepontime>0)
                              beep_start_flag=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;
            __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*)apcSplitStr[2], strlen(apcSplitStr[2]) + 1);
            }
            __enable_irq();
            NVIC_SystemReset(); //软复位回到bootloader
        }
    }

    return HIDO_OK;
}

@@ -218,10 +306,12 @@
        HIDO_UINT32 u32RecvLen = 0;

        i32Ret = Socket_Recv(l_i32TCPClientID, l_au8CmdBuff, sizeof(l_au8CmdBuff) - 1, &u32RecvLen);
				
        if(HIDO_OK == i32Ret)
        {
            TCPClient_DataProc(l_au8CmdBuff, u32RecvLen);
        }
            memset(l_au8CmdBuff,0,sizeof(l_au8CmdBuff));
        break;
    }
    default:
@@ -246,11 +336,11 @@
extern uint8_t bat_percent,taglist_num;
uint8_t alarm_type;
extern double jd,wd;
extern int32_t distance;
extern uint8_t GPS_GGAmessage[150],userkey_state,gps_timeout_flag;
extern uint16_t g_spsum,g_snum,ave_sp;
extern char GGA_Format_message[200];
void UDPClient_UploadGPS(void)
{      air780_led_on();
{	
//   if(gps_open_flag||userkey_state)
//   air780_led_on();
    HIDO_CHAR acHeart[200];
    HIDO_UINT32 u32HeartLen;
    ave_sp = g_spsum/g_snum;
@@ -265,16 +355,41 @@
//                               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", \
   u32HeartLen = snprintf(acHeart, sizeof(acHeart), "%s,%04x,%x,%d,%d,0,0\r\n", \
                               GPS_GGAmessage,g_com_map[DEV_ID],bat_percent,userkey_state,gps_timeout_flag);
      userkey_state = 0;
    Socket_Send(l_i32TCPClientID, (HIDO_UINT8 *)acHeart, u32HeartLen);
   air780_led_off();
   memset(GPS_GGAmessage, 0, sizeof(GPS_GGAmessage));
		
//   if(userkey_state!=1){
      Socket_Send(l_i32TCPClientID, (HIDO_UINT8 *)acHeart, u32HeartLen);
//   }
//   if (userkey_state){
//      TCPHeartBeatUpload();//立即上传心跳包
//     Socket_Send(l_i32TCPClientID, (HIDO_UINT8 *)GGA_Final_message, u32GGaLenth);
//      memset(GGA_Final_message, 0, sizeof(GGA_Final_message));//清空接收到的用完的数组
//      u32GGaLenth=0;
//      gga_num=0;//清0有效次数
//   }
   //userkey_state = 0;
//   air780_led_off();
}

void TCPHeartBeatUpload(void)
void UDPClient_UploadGPS_10pack(void)//10包发送功能
{      air780_led_on();
     Socket_Send(l_i32TCPClientID, (HIDO_UINT8 *)GGA_Final_message, u32GGaLenth);
      memset(GGA_Final_message, 0, sizeof(GGA_Final_message));//清空接收到的用完的数组
      u32GGaLenth=0;
      gga_num=0;//清0有效次数
      air780_led_off();
}
void UDPClient_UploadGPS_1pack(void)//单包发送功能
{      air780_led_on();
     Socket_Send(l_i32TCPClientID, (HIDO_UINT8 *)GGA_Format_message, sizeof(GGA_Format_message));
      memset(GGA_Format_message, 0, sizeof(GGA_Format_message));//清空接收到的用完的数组
      gga_num=0;//清0有效次数
      air780_led_off();
}
void TCPHeartBeatUpload()
{
    HIDO_CHAR acHeart[200];
    HIDO_CHAR acHeart1[200];
    HIDO_UINT32 u32HeartLen;
    ave_sp = g_spsum/g_snum;
    g_spsum = 0;
@@ -287,9 +402,13 @@
//        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%%\r\n", \
                               GPS_GGAmessage,g_com_map[DEV_ID],bat_percent);
    Socket_Send(l_i32TCPClientID, (HIDO_UINT8 *)acHeart, u32HeartLen);
   //         u32Len = HIDO_UtilSnprintf((HIDO_CHAR *)l_au8CmdBuff, sizeof(l_au8CmdBuff), "$XTB,%X,%02u%%,%d.%d,%s,%d,1.",
//                    g_com_map[DEV_ID], bat_percent2, g_com_map[VERSION]>>8,g_com_map[VERSION]&0xff, Module_GetCCID(),userkey_state4g,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]);   

   u32HeartLen = snprintf(acHeart1, sizeof(acHeart1), "$XTB,%04x,%02u%%,%d.%d,%s,%d,1\r\n", \
                               g_com_map[DEV_ID],bat_percent,g_com_map[VERSION]>>8,g_com_map[VERSION]&0xff,Module_GetCCID(),userkey_state);
    Socket_Send(l_i32TCPClientID, (HIDO_UINT8 *)acHeart1, u32HeartLen);
   userkey_state=0;
}
void TCPReceiveMessageReply(void)
{
@@ -297,13 +416,13 @@
    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;
}
//void _4GAlarmUpload(uint8_t alarm)
//{
//    alarm_type = alarm;
//    TCPHeartBeatUpload();
//    if(alarm_type == 2)
//        alarm_type = 0;
//}

HIDO_INT32 TCPClient_Poll(void)
{
@@ -343,13 +462,14 @@


           
           //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(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();
                     if(g_com_map[HEARTBEAT])
                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]);