修改室内外判断逻辑现在的根据卫星强度，卫星数量以及是否有固定解判断在室内还是在室外

zhangbo

2025-04-02 652158f9e454819fc17364f90d727706e298d4f1

 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);
@@ -330,24 +330,16 @@

    }
}
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);
		
    
    
}
@@ -360,7 +352,7 @@
void _4GAlarmUpload(uint8_t alarm)
{
    alarm_type = alarm;
    TCPHeartBeatUpload();
//    TCPHeartBeatUpload();
    if(alarm_type == 2)
        alarm_type = 0;
}
@@ -407,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]);
@@ -490,18 +482,34 @@

    return HIDO_OK;
}
char str[19]= {"AT+IPR=115200;&W\r\n"};
//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)
{
      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);

//    uart_send(UART_ID0, str,17, NULL);
//    Uart_ReConfigBaudRate(UART_ID_4G,9600);
}

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