zhangbo
3 天以前 cb4eea8657ebe941b635da648f0d56d260c50664
keil/include/main/main.c
@@ -680,8 +680,8 @@
            } else {
                powerled = RED;
            }
            if(DBG_GetMode() == DBG_MODE_SHELL)
            {
//            if(DBG_GetMode() == DBG_MODE_SHELL)
//            {
                if(ota_flag==1)
                {
                    //                            OTA_Poll();
@@ -709,7 +709,7 @@
                led_offtask();
                UserKeyTask();
            }
//            }
            UART_CheckReceive();
            if(flag_secondtask)
            {
@@ -729,7 +729,7 @@
            }
            else
            {
                Set4LEDColor(0,0,0,powerled);
//                Set4LEDColor(0,0,0,powerled);
            }
            if(input5v_time)
            {
@@ -855,52 +855,52 @@
uint32_t elapsed_time_jibu;
extern uint8_t uwb_OpenClose_flag;
uint8_t uwb_close_count,uwb_close_count1;
void upload_apppoll()
{
//void upload_apppoll()
//{
    if(current_state==STATE_NORMAL&&uwb_OpenClose_flag==1)
    {
        if(g_com_map[UWBFrequency]>1)
        {
            elapsed_time_jibu = uwb_time_count - state_start_time;
            if(elapsed_time_jibu==1)
            {
                CloseUWB();
//                UWBSendUDPTask();
            }
            else if(elapsed_time_jibu==g_com_map[UWBFrequency])
            {
                taglist_num = 0;
                CloseUWB();
                Uwb_init();
                OpenUWB();
                state_start_time = uwb_time_count;
            }
        }
        else
        {}
    }
    else if(current_state==STATE_SLEEP&&uwb_OpenClose_flag==1)
    {
        elapsed_time_jibu = uwb_time_count - state_start_time;
        switch(elapsed_time_jibu)
        {
        case UWB_OPEN_COUNT:
            CloseUWB();
//            UWBSendUDPTask();
//            uwb_close_count++;
            break;
//    if(current_state==STATE_NORMAL&&uwb_OpenClose_flag==1)
//    {
//        if(g_com_map[UWBFrequency]>1)
//        {
//            elapsed_time_jibu = uwb_time_count - state_start_time;
//            if(elapsed_time_jibu==1)
//            {
//                CloseUWB();
////                UWBSendUDPTask();
//            }
//            else if(elapsed_time_jibu==g_com_map[UWBFrequency])
//            {
//                taglist_num = 0;
//                CloseUWB();
//                Uwb_init();
//                OpenUWB();
//                state_start_time = uwb_time_count;
//            }
//        }
//        else
//        {}
//    }
//    else if(current_state==STATE_SLEEP&&uwb_OpenClose_flag==1)
//    {
//        elapsed_time_jibu = uwb_time_count - state_start_time;
//        switch(elapsed_time_jibu)
//        {
//        case UWB_OPEN_COUNT:
//            CloseUWB();
////            UWBSendUDPTask();
////            uwb_close_count++;
//            break;
        case UWB_MEASUREMENT_INTERVAL_SLEEP:
            taglist_num = 0;
            CloseUWB();
            Uwb_init();
            OpenUWB();
            state_start_time = uwb_time_count;
//            uwb_close_count1++;
            break;
        }
    }
//        case UWB_MEASUREMENT_INTERVAL_SLEEP:
//            taglist_num = 0;
//            CloseUWB();
//            Uwb_init();
//            OpenUWB();
//            state_start_time = uwb_time_count;
////            uwb_close_count1++;
//            break;
//        }
//    }
//    switch (current_state)
//    {
////#ifdef UWB_1_5HZ
@@ -945,7 +945,7 @@
//            break;
//    }
}
//}
//uint8_t flag_4guart_needinit=0;
//uint8_t index1,index2,index3;