开发差不多完成，等新板子来了测一下充电跟休眠那块的逻辑。目前4g跟gps上传那块跟urtf4的差不多。

WXK

2025-02-24 cc919e4e5e2395b61b86f922a07440f47ae2ad0a

 keil/include/src/TCPClient.c

@@ -20,6 +20,8 @@
#include "mk_4G.h"
#include "mk_trace.h"
#include "dw_app_anchor.h"
#include "PCA9555.h"
#include "WS2812.h"
/*******************************************************************************
 *                                  Macro                                      *
 *******************************************************************************/
@@ -38,7 +40,7 @@
 *                             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];
@@ -267,10 +269,14 @@
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  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)
{      air780_led_on();
{
    HIDO_CHAR acHeart[200];
    HIDO_UINT32 u32HeartLen;
    ave_sp = g_spsum/g_snum;
@@ -285,11 +291,10 @@
//                               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_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();
//   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);
}

void TCPHeartBeatUpload(void)
@@ -307,9 +312,11 @@
//        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);
   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)
{
@@ -324,7 +331,7 @@
    if(alarm_type == 2)
        alarm_type = 0;
}

extern uint32_t uwbled,rtkled,led4g,powerled;
HIDO_INT32 TCPClient_Poll(void)
{
    if (Internet_IsIPReady() == HIDO_TRUE)
@@ -332,6 +339,7 @@
        HIDO_UINT32 u32CurTick = HIDO_TimerGetTick();
        if (TCP_CLIENT_STATE_IDLE == l_eTCPClientState)
        {
            led4g=RED;
            if (!TCPfail_flag)
            {
                l_eTCPClientState = TCP_CLIENT_STATE_CONNECTING;
@@ -359,17 +367,14 @@
        }
        else if (TCP_CLIENT_STATE_CONNECTED == l_eTCPClientState)
        {



           
           //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)
           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]);
@@ -379,6 +384,7 @@
    }
    else
    {
        led4g=RED;
        l_eTCPClientState = TCP_CLIENT_STATE_IDLE;
    }

@@ -432,13 +438,14 @@
char str[17]= {"AT+IPR=9600;&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);
      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);

}
uint8_t IfTCPConnected(void)
{