修改了新的上传逻辑现在gps和uwb互不影响

zhangbo

2025-05-08 f82a6f224019b2eaee1e546d67c54ebbf921d590

 keil/include/main/main.c

@@ -315,13 +315,13 @@
        flag_secondtask = 1;
           #ifdef UWB_1_5HZ
           uwb_time_count++;
           uwb_offtime_count++;
           if(uwb_offtime_count>30)
        #endif
            uwb_offtime_count++;
           if(uwb_offtime_count>60)
            {
             uwb_offtime_count=0;
             current_state = STATE_SLEEP;
            }
              #endif
        if(!read_5v_input_pca())
        {
        if(bat_percent>15)
@@ -615,11 +615,10 @@
void upload_apppoll()
{   
   uint32_t elapsed_time_jibu;
#ifdef UWB_1_5HZ
	  

    switch (current_state) 
         {
#ifdef UWB_1_5HZ
        case STATE_NORMAL:
            elapsed_time_jibu = uwb_time_count - state_start_time;
                switch(elapsed_time_jibu)
@@ -628,7 +627,7 @@
                            CloseUWB();
//                            uwbled = LEDOFF;
                          UWBSendUDPTask();
                          GPS_UPLOAD_FLAG=1;

                     break;
                     
                     case UWB_MEASUREMENT_INTERVAL:
@@ -640,13 +639,14 @@
                     break;                  
                  }
            break;
#endif
        case STATE_SLEEP:
            elapsed_time_jibu = uwb_time_count - state_start_time;
                switch(elapsed_time_jibu)
                  {
                     case UWB_OPEN_COUNT:
                            CloseUWB();
                   UWBSendUDPTask();							
                   UWBSendUDPTask();						
                     break;
                     
                     case UWB_MEASUREMENT_INTERVAL_SLEEP:
@@ -656,7 +656,7 @@
                  }
            break;
         }   
#endif

}

uint8_t flag_4guart_needinit=0;