Merge branch 'MK大工卡-低精度GPS-1/5HZ' of http://47.108.70.204:60062/r/ChinaUWBP...

WXK

2025-05-06 8217c70984ac4feb7bfc952e4f6e944bf824527d

 keil/include/main/main.c

@@ -114,7 +114,7 @@
    .flow = UART_FLOW_CONTROL_NONE,
    .rx_level = UART_RXFIFO_CHAR_1,
    .tx_level = UART_TXFIFO_EMPTY,
    .baud = BAUD_115200,
    .baud = BAUD_9600,
#if (TEST_UART_MODE == TEST_UART_POLL_MODE)
    .dma_en = false,
    .int_rx = false,
@@ -336,9 +336,9 @@
        input5v_time=1;
        if(taglist_num==0)
        {
        CloseUWB();
        Uwb_init();
        OpenUWB();
//        CloseUWB();
//        Uwb_init();
//        OpenUWB();
        }
       upload_apppoll();
    }else{
@@ -431,7 +431,7 @@
      }
    g_com_map[MODBUS_MODE] = 0;
      log_4g_enable_flag=g_com_map[LOG_4G_ENABLE];
    g_com_map[VERSION] = (1<<8)|8;
    g_com_map[VERSION] = (1<<8)|10;
         
        
    LOG_INFO(TRACE_MODULE_APP,"设备ID: %x .\r\n",dev_id);
@@ -624,14 +624,14 @@
                  {
                     case UWB_OPEN_COUNT:
                            CloseUWB();
                            uwbled = LEDOFF;
//                            uwbled = LEDOFF;
                          UWBSendUDPTask();
                          GPS_UPLOAD_FLAG=1;
                     break;
                     
                     case UWB_MEASUREMENT_INTERVAL:
                            OpenUWB();
                            uwbled = BLUE;							
//                            uwbled = WHITE;							
                   state_start_time = uwb_time_count;   
                     
                     break;                  
@@ -711,6 +711,7 @@
    IIC2_Init();
    Accelerometer_Init();
    PCA9555_init();
    WT588E02B_Init();
    adc_open(&usr_adc_cfg);
    uart_receive(UART_ID1,m_EUART_DMA_RXBuf,EUART_RX_BUF_SIZE,uart_receive_callback);
    power_init();
@@ -756,7 +757,7 @@
            flag_secondtask = 0;
            SecondTask();
        }
      IMUTask();
          IMUTask();
        IdleTask();
    }
}