手环V1.6，增加心跳包功能逻辑，增加第一次30sgps开启逻辑

chen

2025-01-09 5f2e20f7984c0f09a9c2721b63381a1a17536ed1

 keil/include/src/TCPClient.c

@@ -73,34 +73,55 @@
char applyid[10];
uint16_t receive_id;
uint16_t g_com_position;
uint16_t g_com_num;

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;
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,6 +191,16 @@
        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);
        }
    }
    return HIDO_OK;
@@ -218,10 +249,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 +279,10 @@
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;

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 +297,32 @@
//                               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,%02u%%,%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);
	
		
   if(gps_open_flag||userkey_state){
      Socket_Send(l_i32TCPClientID, (HIDO_UINT8 *)acHeart, u32HeartLen);
   }else{
//     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 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 TCPHeartBeatUpload(void)
{
    HIDO_CHAR acHeart[200];
    HIDO_CHAR acHeart1[200];
    HIDO_UINT32 u32HeartLen;
    ave_sp = g_spsum/g_snum;
    g_spsum = 0;
@@ -287,9 +335,12 @@
//        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,0\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);
}
void TCPReceiveMessageReply(void)
{
@@ -343,13 +394,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]);