WXK
2025-03-28 08cef3632ff59b87fcae4af71b9f7eb087a16c4c
keil/include/main/main.c
@@ -276,8 +276,6 @@
uint8_t uwb_enable_flag=0;
uint8_t input5v_time;
extern uint8_t taglist_num;
extern uint8_t ceshidata[500];
extern uint8_t ceshichangdu;
uint8_t gps_ntripsend;
static void sleep_timer_callback(void *dev, uint32_t time)
{
@@ -412,8 +410,8 @@
      }
    g_com_map[MODBUS_MODE] = 0;
      log_4g_enable_flag=g_com_map[LOG_4G_ENABLE];
    g_com_map[VERSION] = (1<<8)|3;
    g_com_map[VERSION] = (1<<8)|5;
        
    LOG_INFO(TRACE_MODULE_APP,"设备ID: %x .\r\n",dev_id);
    LOG_INFO(TRACE_MODULE_APP,"固件版本:4G-GPS定位工卡 V%d.%d. \r\n",g_com_map[VERSION]>>8,g_com_map[VERSION]&0xff);
@@ -592,9 +590,9 @@
int test1,test3;
uint32_t test4;
extern uint8_t receive_flag;
extern uint8_t YUANGPS_ParseGGA_data[256];
extern uint8_t YUANGPS_ParseGGA_changdu;
static HIDO_CHAR url[256 + 1];
//extern uint8_t YUANGPS_ParseGGA_data[256];
//extern uint8_t YUANGPS_ParseGGA_changdu;
//static HIDO_CHAR url[256 + 1];
//void OTA_MODE(void)
//{
//    if(g_com_map[OTA_FLAG])
@@ -671,11 +669,11 @@
    
    Internet_Init();
    TCPClient_Init();
    if(g_com_map[RTCMMODE_INDEX] == RTCMMODE_NTRIP)
    {
       NTRIPClient_Init();
       NTRIPApp_Init();
    }
//    if(g_com_map[RTCMMODE_INDEX] == RTCMMODE_NTRIP)
//    {
//       NTRIPClient_Init();
//       NTRIPApp_Init();
//    }
    if(g_com_map[RTCMMODE_INDEX] == RTCMMODE_TCP)
    {
        TCPClient_Init_1();
@@ -715,15 +713,7 @@
    PCA9555_Set_One_Value_Output(MCU_A,0);//输出低电平切换为GPS
    while (1)
    { 
      if(ota_flag==1)
        {
//            OTA_Poll();
//            HTTPClient_Poll();
        }
        else
        {
            uwb_app_poll();
        }
        uwb_app_poll();
        Internet_Poll();
        HIDO_TimerPoll();
        HIDO_ATLitePoll();