增加了uwb_app配置

chen

2024-11-15 76dfec4622c64f983570f33588e81e63187fd809

 keil/include/main/main.c

@@ -321,37 +321,37 @@
        second_count = 0;
        MinuteTask();
    }
      if(!power_low_flag)
      Gps_change();
      else{
      gps_power_state=0;//关闭GPS
      update_led_power_state();
      //初始化GPS计数数据
      gps_need_data_flag=1;
      gps_wait_count2=0;
      gps_wait_count=0;
      }
    //UWB状态检测
if(!power_low_flag)//低供电下不需要检测重连
   {
    if(IfTCPConnected())
    {
        TCP_reconnect_timer =0;
        flag_TCP_reconnectting = 0;
    } else {
        if(TCP_reconnect_timer<30)//如果TCP没有连接，每隔10分钟尝试连接30秒
        {
            flag_TCP_reconnectting = 1;
        } else {
            flag_TCP_reconnectting = 0;
        }
        if(TCP_reconnect_timer++>600)
        {
            TCP_reconnect_timer = 0;
        }
//      if(!power_low_flag)
//      Gps_change();
//      else{
//      gps_power_state=0;//关闭GPS
//      update_led_power_state();
//      //初始化GPS计数数据
//      gps_need_data_flag=1;
//      gps_wait_count2=0;
//      gps_wait_count=0;
//      }
//    //UWB状态检测
//if(!power_low_flag)//低供电下不需要检测重连
//   {
//    if(IfTCPConnected())
//    {
//        TCP_reconnect_timer =0;
//        flag_TCP_reconnectting = 0;
//    } else {
//        if(TCP_reconnect_timer<30)//如果TCP没有连接，每隔10分钟尝试连接30秒
//        {
//            flag_TCP_reconnectting = 1;
//        } else {
//            flag_TCP_reconnectting = 0;
//        }
//        if(TCP_reconnect_timer++>600)
//        {
//            TCP_reconnect_timer = 0;
//        }

    }
   }
//    }
//   }
    HIDO_TimerTick();
      if(nomove_count<=g_com_map[NOMOVESLEEP_TIME])//防止溢出
    nomove_count++;
@@ -370,6 +370,7 @@
   green_charge_state=0;
   charge_red_on();
   }
    UWBPoll();
   charge_state_change();//充电状态判断
if(secondtask_count++%2==0)
    {
@@ -453,32 +454,32 @@

void IdleTask(void)
{
    if(gpio_pin_get_val(INPUT_5V_Pin))
    {
//    if(gpio_pin_get_val(INPUT_5V_Pin))
//    {

        if(state5v==0)
        {
            state5v=1;
            state5V_prase_flag=state5v;
            gps_prase_flag=0;//解除gps解析
            uart1_change_from_gps_to_debug();//测试
         //   uart_receive(UART_ID1,m_EUART_DMA_RXBuf,EUART_RX_BUF_SIZE,uart_receive_callback);//开启dma
            //UartInit();
        }
//        if(state5v==0)
//        {
//            state5v=1;
//            state5V_prase_flag=state5v;
//            gps_prase_flag=0;//解除gps解析
//            uart1_change_from_gps_to_debug();//测试
//         //   uart_receive(UART_ID1,m_EUART_DMA_RXBuf,EUART_RX_BUF_SIZE,uart_receive_callback);//开启dma
//            //UartInit();
//        }

        //UART_CheckSend();
    } else {
        if(state5v==1)
        {
            g_com_map[MODBUS_MODE] = 0;
            state5v=0;
            state5V_prase_flag=state5v;
            gps_prase_flag=1;//恢复gps解析
            uart1_change_from_debug_to_gps();//测试
          //  uart_receive(UART_ID1,m_EUART_DMA_RXBuf,EUART_RX_BUF_SIZE,uart_receive_callback);//开启dma
            //UartDeinit();
        }
    }
//        //UART_CheckSend();
//    } else {
//        if(state5v==1)
//        {
//            g_com_map[MODBUS_MODE] = 0;
//            state5v=0;
//            state5V_prase_flag=state5v;
//            gps_prase_flag=1;//恢复gps解析
//            uart1_change_from_debug_to_gps();//测试
//          //  uart_receive(UART_ID1,m_EUART_DMA_RXBuf,EUART_RX_BUF_SIZE,uart_receive_callback);//开启dma
//            //UartDeinit();
//        }
//    }
      UART_CheckReceive();
}
int bind_check(void)
@@ -557,8 +558,8 @@

    // TODO 4G
    Uart_Register(UART_ID_4G, UART_ID0);
    Internet_Init();
    TCPClient_Init();
//    Internet_Init();
//    TCPClient_Init();

    gpio_open();
      board_output_init();//配置adcGND引脚
@@ -598,40 +599,40 @@
    while (1)
    { test4=gpio_pin_get_val(SCL_PIN);
      
         if(!power_low_flag)//确认是否休眠下才开启功能
         {
        if(flag_TCP_reconnectting||IfTCPConnected())
        {
        //    LOG_INFO(TRACE_MODULE_APP, "处理4G任务\r\n");
           
//            if(flag_4guart_needinit)
//         if(!power_low_flag)//确认是否休眠下才开启功能
//         {
//        if(flag_TCP_reconnectting||IfTCPConnected())
//        {
//        //    LOG_INFO(TRACE_MODULE_APP, "处理4G任务\r\n");
//           
////            if(flag_4guart_needinit)
////            {
////                flag_4guart_needinit = 0;
////                AIR780EUartInit();
////            }//yuan
//                 if(flag_4G_recdata==1)
//            {
//                flag_4guart_needinit = 0;
//                AIR780EUartInit();
//            }//yuan
                 if(flag_4G_recdata==1)
            {
                flag_4G_recdata = 2;
               
                //LOG_INFO(TRACE_MODULE_APP, "运行Socket_RecvAll tt2 %d\r\n",tt2);
                Socket_RecvAll();
            }
//                  air780_led_on();
            Internet_Poll();
            HIDO_ATLitePoll();
            HIDO_TimerPoll();
            TCPClient_Poll();
//            air780_led_off();
        }
      }
//                flag_4G_recdata = 2;
//               
//                //LOG_INFO(TRACE_MODULE_APP, "运行Socket_RecvAll tt2 %d\r\n",tt2);
//                Socket_RecvAll();
//            }
////                  air780_led_on();
//            Internet_Poll();
//            HIDO_ATLitePoll();
//            HIDO_TimerPoll();
//            TCPClient_Poll();
////            air780_led_off();
//        }
//      }
        if(flag_secondtask)
        {
            flag_secondtask = 0;
            SecondTask();
               
        }
            UserKeyTask();
            IMUTask();
//            UserKeyTask();
//            IMUTask();
        IdleTask();
#ifndef DEBUG_MODE
//if(flag_sleeptimer)