功耗不对，基本逻辑实现

zhangbo

2025-03-28 2a1115b77100f6bfeca9031d9a9c82b07e130d32

 keil/include/src/TCPClient.c

@@ -45,14 +45,14 @@
static HIDO_UINT32 l_u32HeartBeatTick = 0;
static HIDO_UINT8 l_au8CmdBuff[1024];

uint8_t TCPfail_flag = 0,flag_first_TCPconnect=1;
uint32_t TCPfailetimer;
static uint8_t TCPfail_flag = 0,flag_first_TCPconnect=1;
static uint32_t TCPfailetimer;
uint16_t ip0,ip1,ip2,ip3,port;

/*******************************************************************************
 *                        Local Function Declaration                           *
 *******************************************************************************/
HIDO_INT32 TCPClient_Heartbeat(HIDO_VOID);
static HIDO_INT32 TCPClient_Heartbeat(HIDO_VOID);
void TCPHeartBeatUpload(void);
void UDPClient_UploadGPS(void);
void TCPReceiveMessageReply(void);
@@ -296,25 +296,50 @@
//      userkey_state = 0;
    Socket_Send(l_i32TCPClientID, (HIDO_UINT8 *)GPS_ParseGGA_data, GPS_ParseGGA_changdu);
}
char senddata[2048];
void HexToAsciiSendUDP(uint8_t* data,uint8_t len)
{
    static HIDO_CHAR l_acUploadBuff[2048];
    static HIDO_UINT32 l_u32UploadBuffLen = 0;
    static HIDO_UINT32 l_u32UdpsendTick = 0;
   uint8_t i,temp;
	
   for(i=0;i<len;i++)
   {
      temp = *data++;
      sprintf(&senddata[2*i],"%x",temp>>4);
      sprintf(&senddata[2*i+1],"%x",temp&0xf);
   }
    senddata[2*len] = 0x0d;
    senddata[2*len+1] = 0x0a;
//    if(DBG_GetMode() == DBG_MODE_CFG)
//    Uart_Send(0, (HIDO_UINT8 *) senddata, 2*len+2);
//    UDPClient_Uploadhex(senddata,2*len+2);
    if(TCP_CLIENT_STATE_CONNECTED == l_eTCPClientState)
    {
        memcpy(l_acUploadBuff + l_u32UploadBuffLen, senddata, 2*len+2);
        l_u32UploadBuffLen += 2*len+2;
       // if((l_u32UploadBuffLen + u32Len )> sizeof(l_acUploadBuff))
//        if((HIDO_TimerGetTick() - l_u32UdpsendTick) >= 200)
//        {
//            l_u32UdpsendTick = HIDO_TimerGetTick();
            Socket_Send(l_i32TCPClientID, (HIDO_UINT8 *)l_acUploadBuff, l_u32UploadBuffLen);
            l_u32UploadBuffLen = 0;
//        }


    }
}
extern uint8_t lounei_flag;
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()); 

      u32HeartLen = HIDO_UtilSnprintf((HIDO_CHAR *)acHeart, sizeof(acHeart), "$XTB,%X,%02u%%,%d,%d,%d,%d.%d,%s",
                    g_com_map[DEV_ID], bat_percent,lounei_flag,0,0,g_com_map[VERSION]>>8,g_com_map[VERSION]&0xff, Module_GetCCID()); 
    Socket_Send(l_i32TCPClientID, (HIDO_UINT8 *)acHeart, u32HeartLen);
		
    
    
}
@@ -327,7 +352,7 @@
void _4GAlarmUpload(uint8_t alarm)
{
    alarm_type = alarm;
    TCPHeartBeatUpload();
//    TCPHeartBeatUpload();
    if(alarm_type == 2)
        alarm_type = 0;
}
@@ -345,9 +370,9 @@
                l_eTCPClientState = TCP_CLIENT_STATE_CONNECTING;


               HIDO_UtilSnprintf((HIDO_CHAR *) l_au8CmdBuff, sizeof(l_au8CmdBuff), "%u.%u.%u.%u", ip0,ip1, ip2, ip3);
               HIDO_UtilSnprintf((HIDO_CHAR *) l_au8CmdBuff, sizeof(l_au8CmdBuff), "%u.%u.%u.%u", g_com_map[IP_0], g_com_map[IP_1], g_com_map[IP_2], g_com_map[IP_3]);

                Socket_Connect(l_i32TCPClientID, (HIDO_CHAR *) l_au8CmdBuff, port);
                Socket_Connect(l_i32TCPClientID, (HIDO_CHAR *) l_au8CmdBuff, g_com_map[PORT]);

//             HIDO_UtilSnprintf((HIDO_CHAR *) l_au8CmdBuff, sizeof(l_au8CmdBuff), "123.57.87.125");
//                Socket_Connect(l_i32TCPClientID, (HIDO_CHAR *) l_au8CmdBuff, 8888);
@@ -374,7 +399,7 @@
                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]);
@@ -406,7 +431,29 @@

    return HIDO_OK;
}
HIDO_INT32 TCPClient_Uploadhex(uint8_t *_pcGGA,uint16_t u32Len)
{
    static HIDO_CHAR l_acUploadBuff[1024];
    static HIDO_UINT32 l_u32UploadBuffLen = 0;
    static HIDO_UINT32 l_u32UdpsendTick = 0;
    
    if(TCP_CLIENT_STATE_CONNECTED == l_eTCPClientState)
    {
        memcpy(l_acUploadBuff + l_u32UploadBuffLen, _pcGGA, 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_acUploadBuff, l_u32UploadBuffLen);
            l_u32UploadBuffLen = 0;
        }


    }

    return HIDO_OK;
}
HIDO_BOOL TCPClient_IsSendOver(HIDO_VOID)
{
    return Socket_IsSendQueueEmpty(l_i32TCPClientID);
@@ -435,6 +482,22 @@

    return HIDO_OK;
}
//char str[19]= {"AT+IPR=115200;&W\r\n"};
////char str1[16]={"AT+IPR?;&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,9600);
//	
//    uart_send(UART_ID0,str,19, NULL);


//    Uart_ReConfigBaudRate(UART_ID_4G,115200);
//}
char str[17]= {"AT+IPR=9600;&W\r\n"};
void AIR780E_Reset(void)
{
@@ -442,11 +505,11 @@
    delay_ms(1500);
    PCA9555_Set_One_Value_Output(AIR780E_ENBALE,1);//打开4G
    delay_ms(3000);
//     Uart_ReConfigBaudRate(UART_ID_4G,115200);
//    Uart_ReConfigBaudRate(UART_ID_4G,115200);
//    uart_send(UART_ID0, str,17, NULL);
//    Uart_ReConfigBaudRate(UART_ID_4G,9600);

}

uint8_t IfTCPConnected(void)
{
    if(TCP_CLIENT_STATE_CONNECTED == l_eTCPClientState)