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

zhangbo

2025-05-08 f82a6f224019b2eaee1e546d67c54ebbf921d590

 keil/uwb_app.c

@@ -11,6 +11,8 @@
#include "board.h"
#include "lib_aoa.h"
#include "WS2812.h"
#include "TCPClient.h"

extern int simple_main(void);
extern int temp_main(void);
void Calibration_Time(void);
@@ -141,7 +143,7 @@
//    .phy_cfg.sts_seglen = STS_SEGLEN_BPRF_64, /* Number of symbols in an STS segment       */
//    .phy_cfg.rx_ant_id = UWB_RX_ANT_3,    /* UWB RX antenna port                       */
//};
#ifdef UWB_DW1000_XB
#ifdef UWB_MK8000_XB
static struct mk_uwb_configure config = {
    .phy_work_mode = (uint8_t)(PHY_TX | PHY_RX),
    .phy_cfg.ch_num = 5,                      /* Channel number.                           */
@@ -158,7 +160,7 @@
    .phy_cfg.rx_ant_id = UWB_RX_ANT_3,    /* UWB RX antenna port                       */
};
#endif
#ifdef UWB_DW1000_MBXJZ
#ifdef UWB_DW1000_MBXJZ_OLD
static struct mk_uwb_configure config = {
    .phy_work_mode = (uint8_t)(PHY_TX | PHY_RX),
    .phy_cfg.ch_num = 5,                      /* Channel number.                           */
@@ -734,7 +736,7 @@
               checksum = Checksum_u16(&usart_send[2],15+5*taglist_num);
               memcpy(&usart_send[17+5*taglist_num],&checksum,2);
               HexToAsciiSendUDP(usart_send,19+5*taglist_num);
                    taglist_num = 0;                    
//                    taglist_num = 0;                    
//                    rxnum=0;
}
void UWBIdleTask(void)
@@ -754,13 +756,16 @@
   {
      uwbtasktimer = HIDO_TimerGetTick();
      UWBOneSecondTask();
//        UWBSendUDPTask();
      #ifdef UWB_CK
      UWBSendUDPTask();
      #endif
   }
}
int uwb_app_poll(void)
{
    UWBIdleTask();
}
extern uint8_t uwb_offtime_count;
int Anchor_App(void)
{
            uint8_t i;
@@ -779,6 +784,8 @@
            memcpy(rec_ancdistlist,&rx_buf[FZ_NEARBASEID_INDEX+2*rec_nearbase_num],2*rec_nearbase_num);
            memcpy(&rec_antdelay,&rx_buf[FZ_NEARBASEID_INDEX+rec_nearbase_num*4],2);
            uwbled=BLUE;
                 uwb_offtime_count=0;
                 CountState_t current_state = STATE_NORMAL;
//            for(i=0; i<rec_nearbase_num; i++)
//            {
//                if(rec_ancidlist[i] == dev_id)