目前成功的是基站端原代码rx写法帧间隔500，延时550，标签那边帧间隔500 基站default为600，成功低功耗帧间隔版本（标签常开）

chen

2024-12-25 345e9e9ae770e3ef884568a96a95e141236c5968

 keil/uwb_app.c

@@ -9,11 +9,17 @@
#include "dw_app_anchor.h"
#include "global_param.h"
#include "board.h"

#include "lib_aoa.h"

extern int simple_main(void);
extern int temp_main(void);
void Calibration_Time(void);
void TagListUpdate(void);
void TagListUpdate_person_num(void);
void Uwb_init(void);
void OpenUWB(void);
void CloseUWB(void);
int Anchor_App(void);
extern void IO_LED_control_change(uint8_t data);
extern void IO_control_init(void);

@@ -50,18 +56,29 @@
uint32_t temp_count1=0;
uint32_t temp_count2=0;
uint32_t temp_count3=0;
uint32_t temp_count7=0;
uint32_t temp_internal=0;
int16_t elevation = 0;
int16_t azimuth = 0;
uint8_t fom = 0;
int32_t distance;
uint8_t taglist_num;
float *sts_rssi=NULL;
extern uint8_t recev_error_num;

uint8_t uwb_rx_flag;
extern Operation_step UWB_work_state;
extern int16_t first_search_flag;
typedef enum 
{
      SEARCH,
    CLOSE,
    RANGE,
}enumwltagstate;
/* Ranging period */
#define RANGING_PERIOD_MS (1000)

/* This is the delay from Frame RX POLL frame to send RESP Frame */
#define POLL_RX_TO_RESP_TX_DLY_US 670U //yuan450
#define POLL_RX_TO_RESP_TX_DLY_US 550U //yuan600 success 并且不卡busy

#define RESP_TX_TO_FINAL_RX_DLY_US 500U

@@ -80,7 +97,7 @@
/* RX window open in advance */
#define RX_WIN_IN_ADVANCE_US (150)

#define DELAY_BETWEEN_TWO_FRAME_UUS 600 //yuan1400
#define DELAY_BETWEEN_TWO_FRAME_UUS 500 //yuan1400

/* Field index in frame */
#define MSG_SEQ_NUM_IDX 2
@@ -99,17 +116,7 @@
    uint8_t phy_work_mode; /* PHY_TX / PHY_RX / PHT_TX|PHY_RX */
    struct UWB_CONFIG_T phy_cfg;
};
/* Use the default key and IV specified in the IEEE 802.15.4z attachment */
static struct UWB_STS_KEY_CONFIG_T sts_iv_key = {
    .sts_vcounter = 0x1F9A3DE4,
    .sts_vupper0 = 0xD37EC3CA,
    .sts_vupper1 = 0xC44FA8FB,
    .sts_vupper2 = 0x362EEB34,
    .sts_key0 = 0x14EB220F,
    .sts_key1 = 0xF86050A8,
    .sts_key2 = 0xD1D336AA,
    .sts_key3 = 0x14148674,
};

///* Default communication configuration. */
//static struct mk_uwb_configure config = {//原来的基站非110k代码
//    .phy_work_mode = (uint8_t)(PHY_TX | PHY_RX),
@@ -126,7 +133,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                       */
//};
#ifndef STS_MODE
#ifdef DW1000
static struct mk_uwb_configure config = {
    .phy_work_mode = (uint8_t)(PHY_TX | PHY_RX),
    .phy_cfg.ch_num = 5,                      /* Channel number.                           */
@@ -142,7 +149,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                       */
};
#else
#elif defined STS_MODE
static struct mk_uwb_configure config = {
    .phy_work_mode = (uint8_t)(PHY_TX | PHY_RX),
    .phy_cfg.ch_num = 5,                      /* Channel number.                           */
@@ -158,7 +165,39 @@
    .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                       */
};
/* Use the default key and IV specified in the IEEE 802.15.4z attachment */
static struct UWB_STS_KEY_CONFIG_T sts_iv_key = {
    .sts_vcounter = 0x1F9A3DE4,
    .sts_vupper0 = 0xD37EC3CA,
    .sts_vupper1 = 0xC44FA8FB,
    .sts_vupper2 = 0x362EEB34,
    .sts_key0 = 0x14EB220F,
    .sts_key1 = 0xF86050A8,
    .sts_key2 = 0xD1D336AA,
    .sts_key3 = 0x14148674,
};
#elif defined MK_MODE
static struct mk_uwb_configure config = {
    .phy_work_mode = (uint8_t)(PHY_TX | PHY_RX),
    .phy_cfg.ch_num = 9,                      /* Channel number.                           */
    .phy_cfg.code_index = 9,                  /* TX preamble code.                         */
    .phy_cfg.mean_prf = MEAN_PRF_64M,         /* Data rate 6.8M                            */
    .phy_cfg.data_bit_rate = DATA_BR_6M8,     /* data rate 6.8M.                           */
    .phy_cfg.sync_sym = PREAM_LEN_128,        /* Preamble duration, length of preamble 128 */
    .phy_cfg.sfd_sym = BPRF_NSFD2_8,          /* Identifier for SFD sequence               */
    .phy_cfg.ranging_bit = 1,                 /* ranging bit set.                          */
    .phy_cfg.trx_mode = TRX_MODE_15_4Z_BPRF,  /* IEEE802.15.4z - BPRF mode                 */
    .phy_cfg.sts_pkt_cfg = STS_PKT_CFG_0,     /* SP0 Frame                                 */
    .phy_cfg.sts_segnum = STS_SEGNUM_BPRF_1,  /* Number of STS segments in the frame       */
    .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                       */
};
#endif

static struct anchor_id_car{
 uint16_t anchor_new_id;
 uint16_t change_num;
};
/* Buffer to store received frame */

/*     Frames used in the ranging process
@@ -240,8 +279,11 @@

/* RX done process handler. */
int8_t rssi;
uint32_t range_timeout_us = 2000000;//yuan5000
uint8_t flag_temp2,flag_temp1;
uint16_t uwb_losttimer;
static void rx_int_callback(struct MAC_HW_REPORT_T *rx_report)
{
{      uint8_t valid_sts=0;
    // Power off radio
    power_off_radio();

@@ -259,7 +301,22 @@
        poll_rx_num++;
        rssi = rx_report->rssi;
        receive_flag=1;
        
            Anchor_App();
         #ifdef STS_MODE
            valid_sts= sts_valid_check();
      if (valid_sts)
      {
            aoa_calculate(&elevation, &azimuth);
            aoa_fom_get(NULL, &fom);
//            float pdoa[3];
//            pdoa[0] = pdoa_select_get(0, 3);
//            pdoa[1] = pdoa_select_get(1, 3);
//            pdoa[2] = pdoa_select_get(2, 3);
//            LOG_INFO(TRACE_MODULE_APP, "PDOA: %f %f %f\r\n", pdoa[0], pdoa[1], pdoa[2]);

               sts_rssi = sts_rssi_output_get();
         }
         #endif
    }
    else
    {
@@ -272,8 +329,9 @@
                 temp_count= phy_timer_count_get();
        memcpy(&rx_rpt, rx_report, sizeof(struct MAC_HW_REPORT_T));
        rx_length = 0;

         //   OpenUWB();//再次开启UWB接收
    }
   OpenUWB();//再次开启UWB接收
}

/* TX done process handler. */
@@ -288,11 +346,12 @@
        temp_count= phy_timer_count_get();
        temp_internal=temp_count;
        resp_tx_num++;
      //      OpenUWB();//再次开启UWB接收
        //LOG_INFO(TRACE_MODULE_APP, "poll_rx_num is %d,resp_tx_num is %d\r\n",poll_rx_num,resp_tx_num);
    }
}
uint32_t start_receive_count,end_receive_count,poll_timeout,current_count,temp_resp;
static uint16_t anchordata_id[TAG_NUM_IN_SYS],anchordata_dist[TAG_NUM_IN_SYS];
 uint16_t anchordata_id[TAG_NUM_IN_SYS],anchordata_dist[TAG_NUM_IN_SYS];
static uint8_t anchordata_bat[TAG_NUM_IN_SYS];
uint8_t anchordata_num = 0;
static int32_t tagdist_list[TAG_NUM_IN_SYS];
@@ -318,17 +377,20 @@
            anchordata_num++;
    }
    anchordata_id[i] = ancid;//与之通信的标签id存入当前表中
      distance=dist*0.5+(int16_t)anchordata_dist[i]*0.5;
    anchordata_dist[i] = dist;
    anchordata_bat[i] = battary;
    tagofflinetime[i]=0;//不断更新当前TAG对应离线时间
      dist_temp=dist;
//    if(dist>0)
      if(temp_recdist_before_offset!=0&&distance!=0x1ffff)
      {
    distance=dist*0.5+distance*0.5;
      }else{
         distance=dist;
      }
		
//      if(temp_recdist_before_offset!=0&&distance!=0x1ffff)
//      {
//    distance=dist*0.5+distance*0.5;
//      }else{
//         distance=dist;
//      }
		
}
uint16_t CmpTagInList(uint16_t tagid)
{   uint16_t i;
@@ -339,6 +401,19 @@
    }
    if(i==taglist_num)
        return taglist_num;
    //tagofflinetime[i] = 0;
    return i;
}

uint16_t CmpCarInExistList(uint16_t tagid)
{   uint16_t i;
    for(i=0; i<anchordata_num; i++)
    {
        if(memcmp(&tagid,&anchordata_id[i],2)==0)
            break;
    }
    if(i==anchordata_num)
        return anchordata_num;
    //tagofflinetime[i] = 0;
    return i;
}
@@ -367,6 +442,9 @@
    }
    anchordata_num=j;
}


uint8_t position;
uint8_t Anchor_RecNearPoll(uint8_t ancrec_nearbasepos)//根据自己是否为新基站定制消息去发送，根据是否抢占判断
{
    temp_count2=poll_rx_en_start_u32;
@@ -376,19 +454,20 @@
    memcpy(&send_buffer[TAG_ID_IDX],&tag_id_recv,2);//接受者id
    send_buffer[MESSAGE_TYPE_IDX]=MBX_RESPONSE;

    if(rec_nearbase_num == ancrec_nearbasepos)//抢占模式自己为新基站
    {
        random_time = (phy_timer_count_get()%100);//多基站抢占一个位置时避免一个也收不到的情况就每一个随机错开几十uS
        //resp_tx_time = (poll_rx_ts+((random_time+rec_nearbase_num*20 + POLL_RX_TO_RESP_TX_DLY_UUS+ancrec_nearbasepos*DELAY_BETWEEN_TWO_FRAME_UUS) * UUS_TO_DWT_TIME)) >> 8;//计算Response发送时间T3。
        // (resp_tx_en_start_u32) is the moment when TX enable
        resp_tx_en_start_u32 = poll_rx_en_start_u32+US_TO_PHY_TIMER_COUNT(20*rec_nearbase_num+POLL_RX_TO_RESP_TX_DLY_US+rec_nearbase_num*DELAY_BETWEEN_TWO_FRAME_UUS);//后面的需要根据已有基站数量进行更改，如果是抢占自己最后一个回复，要有底数
				
      } else {
        //resp_tx_time = (poll_rx_ts + ((rec_nearbase_num*20+POLL_RX_TO_RESP_TX_DLY_UUS+ancrec_nearbasepos*DELAY_BETWEEN_TWO_FRAME_UUS) * UUS_TO_DWT_TIME)) >> 8;//计算Response发送时间T3。
       resp_tx_en_start_u32 = poll_rx_en_start_u32+US_TO_PHY_TIMER_COUNT(20*rec_nearbase_num+POLL_RX_TO_RESP_TX_DLY_US+rec_nearbase_num*DELAY_BETWEEN_TWO_FRAME_UUS);//后面的需要根据已有基站数量进行更改，如果是抢占自己最后一个回复，要有底数
            //这里应该有问题问一下钟工
      }//此处设置绝对时间将poll u32改为phy_timer_count_get()

//    if(rec_nearbase_num == ancrec_nearbasepos)//抢占模式自己为新基站
//    {
//        random_time = (phy_timer_count_get()%100);//多基站抢占一个位置时避免一个也收不到的情况就每一个随机错开几十uS
//        //resp_tx_time = (poll_rx_ts+((random_time+rec_nearbase_num*20 + POLL_RX_TO_RESP_TX_DLY_UUS+ancrec_nearbasepos*DELAY_BETWEEN_TWO_FRAME_UUS) * UUS_TO_DWT_TIME)) >> 8;//计算Response发送时间T3。
//        // (resp_tx_en_start_u32) is the moment when TX enable
//        resp_tx_en_start_u32 = phy_timer_count_get()+US_TO_PHY_TIMER_COUNT(20*rec_nearbase_num+POLL_RX_TO_RESP_TX_DLY_US+rec_nearbase_num*DELAY_BETWEEN_TWO_FRAME_UUS);//后面的需要根据已有基站数量进行更改，如果是抢占自己最后一个回复，要有底数
//				
//      } else {
//        //resp_tx_time = (poll_rx_ts + ((rec_nearbase_num*20+POLL_RX_TO_RESP_TX_DLY_UUS+ancrec_nearbasepos*DELAY_BETWEEN_TWO_FRAME_UUS) * UUS_TO_DWT_TIME)) >> 8;//计算Response发送时间T3。
//       resp_tx_en_start_u32 = phy_timer_count_get()+US_TO_PHY_TIMER_COUNT(20*rec_nearbase_num+POLL_RX_TO_RESP_TX_DLY_US+ancrec_nearbasepos*DELAY_BETWEEN_TWO_FRAME_UUS);//后面的需要根据已有基站数量进行更改，如果是抢占自己最后一个回复，要有底数
//            //这里应该有问题问一下钟工
//      }//此处设置绝对时间将poll u32改为phy_timer_count_get()
      position=ancrec_nearbasepos;
      resp_tx_en_start_u32 = poll_rx_en_start_u32+US_TO_PHY_TIMER_COUNT(POLL_RX_TO_RESP_TX_DLY_US)+ancrec_nearbasepos*US_TO_PHY_TIMER_COUNT(DELAY_BETWEEN_TWO_FRAME_UUS);//加入帧间隔
    resp_tx_ts_i64 = ranging_tx_time_correct(resp_tx_en_start_u32 + phy_shr_duration());//修正时间戳
    /* Write all timestamps in the final message. See NOTE 8 below. */
    resp_msg_set_ts(&send_buffer[RESP_MSG_POLL_RX_TS_IDX], poll_rx_ts_i64);
@@ -396,27 +475,194 @@
    memcpy(&send_buffer[RESP_MSG_ANC_DISTOFFSET],&disoffset,2);//差个修正offset,修正有符号但是这个com表为无符号的,传过去直接赋给Int16_t相当于还原了
    temp_resp_i64=resp_tx_ts_i64;
    temp_count3= phy_timer_count_get();
    uwb_tx(send_buffer, 40,1 ,resp_tx_en_start_u32);//立即发送测试size大小
    temp_count1=phy_timer_count_get();
    while(mac_is_busy());
    gpio_pin_clr(SCL_PIN);
    flag_temp2=uwb_tx(send_buffer, 40,1 ,resp_tx_en_start_u32);//立即发送测试size大小
//    temp_count1=phy_timer_count_get();
    //while(mac_is_busy());
    //gpio_pin_clr(SCL_PIN);
}
uint32_t range_timeout_us = 5000;

uint16_t uwb_searchcount;
uint8_t flag_recsuccess;
uint8_t flag_temp2,flag_temp1;
 uint8_t valid_sts = 0;
int16_t elevation = 0;
int16_t azimuth = 0;
uint8_t fom = 0;

uint32_t start_receive_count_calibration;
uint32_t current_count_calibration;
uint32_t get_in_num,get_out_num;
struct anchor_id_car anchor_id_in_car[TAG_NUM_IN_SYS],anchor_id_out_car[TAG_NUM_IN_SYS];
int16_t change_count[TAG_NUM_IN_SYS];
uint16_t anchor_id_in[TAG_NUM_IN_SYS],anchor_id_out[TAG_NUM_IN_SYS];
uint8_t secondtask_search_count,secondtask_search_flag;
extern uint8_t g_start_send_flag,search_open_flag = 1,link_success_flag,flag_secondtask;
enumwltagstate wltag_state=RANGE;
uint32_t wltag_statetimer,wltag_uwbtimer;
uint32_t uwbtasktimer=0,uwbtagsendtimer=0;

uint16_t CmpCarInTable(uint16_t tagid)
{   uint16_t i;
    for(i=0; i<get_in_num; i++)
    {
        if(memcmp(&tagid,&anchor_id_in[i],2)==0)
            break;
    }
    if(i==get_in_num)
        return get_in_num;
    //tagofflinetime[i] = 0;
    return i;
}
void Calibration_Time(void)
{	
   current_count_calibration=phy_timer_count_get();
   if((current_count_calibration-start_receive_count_calibration>=MS_TO_PHY_TIMER_COUNT(500)||current_count_calibration+(UINT32_MAX-start_receive_count_calibration)>=MS_TO_PHY_TIMER_COUNT(500))
      &&!((end_receive_count-current_count_calibration<=MS_TO_PHY_TIMER_COUNT(200))||(end_receive_count+(UINT32_MAX-current_count_calibration)<=MS_TO_PHY_TIMER_COUNT(200))))
   {
      start_receive_count_calibration=current_count_calibration;//更新开始时间
//      MotorPoll();
		
      if(secondtask_search_count++%2==0)
    {
        secondtask_search_flag = 1;
    }else{
        secondtask_search_flag = 0;
    }
      if(secondtask_search_flag)//更新S时间TICK
      {
      HIDO_TimerTick();
      TagListUpdate();
//    GPS_Poll();
//      if(nomove_count<=g_com_map[NOMOVESLEEP_TIME])//防止溢出
//    nomove_count++;
//      else{
//      nomove_count=g_com_map[NOMOVESLEEP_TIME]+1;
//      }
      }
//      update_led_power_state();//更新等状态防止震动卡死在搜索
   }
}
uint16_t g_com_receive_id;
void CloseUWB(void)
{
      uwb_rx_force_off(1);
      uwb_rx_flag=0;
   LOG_INFO(TRACE_MODULE_APP,"关闭uwb_rx\r\n");
}
void OpenUWB(void)
{
      flag_temp1=uwb_rx(0, 0,range_timeout_us);//提交接收请求
      uwb_rx_flag=1;
      LOG_INFO(TRACE_MODULE_APP,"打开uwb_rx\r\n");
}	
void UWBOneSecondTask(void)
{
 TagListUpdate();//更新标签数
 uwb_losttimer++;
 if(uwb_losttimer>g_com_map[UWB_RNAGE_TIME])
 uwb_losttimer=g_com_map[UWB_RNAGE_TIME]+1;//防止溢出
}
void UWBIdleTask(void)
{

   if(HIDO_TimerGetTick()-uwbtasktimer >=1)
   {
      uwbtasktimer = HIDO_TimerGetTick();
      UWBOneSecondTask();
   }
}
int uwb_app_poll(void)
{
//   switch(wltag_state)
//   {
//   case RANGE:
//   if(HIDO_TimerGetTick()-wltag_uwbtimer>0&&uwb_rx_flag==0)
//      {
//            wltag_uwbtimer = HIDO_TimerGetTick();
//            OpenUWB();
//      }
//   else if(HIDO_TimerGetTick()-wltag_uwbtimer>2&&uwb_rx_flag==1)
//      {
//            wltag_uwbtimer = HIDO_TimerGetTick();
//            CloseUWB();
//      }
////      if(uwb_losttimer>g_com_map[UWB_RNAGE_TIME])
////      { 
////       wltag_statetimer = HIDO_TimerGetTick();
////         if(uwb_rx_flag==0)//若要切换到搜索模式时没有开启则开启UWB
////         {
////            OpenUWB();
////         }
////     wltag_state = SEARCH;
////      }
//      break;
////   case SEARCH:
////      if(HIDO_TimerGetTick()-wltag_statetimer>1)
////      {
////      wltag_statetimer = HIDO_TimerGetTick();
////    wltag_state = CLOSE;
////    CloseUWB();
////      }
////      break;
////   case CLOSE:
////      if(HIDO_TimerGetTick()-wltag_statetimer>g_com_map[UWB_WAIT_TIME])
////      {
////      wltag_statetimer = HIDO_TimerGetTick();
////    wltag_state = SEARCH;
////    OpenUWB();
////      }
////      break;
//   }
    UWBIdleTask();
}
int Anchor_App(void)
{
            uint8_t i;
            uint16_t tempid;
         if(group_id==rx_buf[GROUP_ID_IDX]&&rx_buf[MESSAGE_TYPE_IDX] == MBX_POLL)//判断是否是和自己是同一组通讯的且为poll包
        {    flag_recsuccess = 1;
                  wltag_state=RANGE;//成功后从search切换为range
                  memcpy(&g_com_receive_id,&rx_buf[TAG_ID_IDX],2);
                 //temp_count2=phy_timer_count_get();
                  uwb_losttimer=0;//成功测距清0 lost时间
            frame_seq_nb2 = rx_buf[SEQUENCE_IDX];//获取包序
            battary = rx_buf[BATTARY_IDX];
            rec_nearbase_num=rx_buf[FZ_NEARBASENUM_INDEX];  //标签传过来的他与基站交互的基站id数目
            memcpy(&tag_id_recv,&rx_buf[TAG_ID_IDX],2);
            memcpy(rec_ancidlist,&rx_buf[FZ_NEARBASEID_INDEX],2*rec_nearbase_num);
            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);
            for(i=0; i<rec_nearbase_num; i++)
            {
                if(rec_ancidlist[i] == dev_id)
                {      temp_recdist_before_offset=rec_ancdistlist[i];
                    rec_ancdistlist[i]+=(int16_t)g_com_map[DIST_OFFSET];
                    PushAnchorDataArray(tag_id_recv,rec_ancdistlist[i],battary);
                }
            }
            for(i=0; i<rec_nearbase_num; i++)
            {
                memcpy(&tempid,&rx_buf[FZ_NEARBASEID_INDEX+i*2],2);
                if(tempid==dev_id)//也是比id如果有就更新没有就抢占
                {
                    seize_anchor=0;  //非抢占。已存在列表中
                    Anchor_RecNearPoll(i);
                    break;
                }
            }

            if(i==rec_nearbase_num)
            {
                seize_anchor=1;   //抢占anchor
                Anchor_RecNearPoll(i);
            }
            }else{
         //   OpenUWB();//接收到不是自己的包再次开启UWB接收
            }
				
}
int UwbRange(void)
{
    uint8_t i;
    uint16_t tempid;
    // The following peripherals will be initialized in the uwb_open function
    // phy/mac/aes/lsp/phy timers initialized
    uwb_open();
    //uwb_open();

//    // Set calibration parameters
//    uwb_calibration_params_set(config.phy_cfg.ch_num);
@@ -436,12 +682,13 @@
//    ranging_frame_type_set(config.phy_cfg.sts_pkt_cfg);

    // Register rx interrupt callback function
    mac_register_process_handler(tx_int_callback, rx_int_callback);
    //mac_register_process_handler(tx_int_callback, rx_int_callback);

    receive_flag = 0;
      flag_recsuccess = 0;
    temp_count3=phy_timer_count_get();
    gpio_pin_set(SCL_PIN);
      sts_lsp_store();
    flag_temp1=uwb_rx(0, 0, range_timeout_us);//开启接收
   
   // while(mac_is_busy());
@@ -457,6 +704,7 @@
         current_count=phy_timer_count_get();
         while(mac_is_busy())
        {
                  Calibration_Time();
            IdleTask();
            current_count=phy_timer_count_get();
            if(current_count>end_receive_count&&current_count<end_receive_count+HALF_SECOND_TIME)
@@ -464,13 +712,17 @@
                    break;
            }
        }
         sts_lsp_store_stop();
			
         
    if(receive_flag==1)//成功接收
    {

        if(group_id==rx_buf[GROUP_ID_IDX]&&rx_buf[MESSAGE_TYPE_IDX] == MBX_POLL&&!memcmp(&rx_buf[TAG_ID_IDX],&g_com_map[BIND_DEV_ID],2))//判断是否是和自己是同一组通讯的且为poll包
        //if(group_id==rx_buf[GROUP_ID_IDX]&&rx_buf[MESSAGE_TYPE_IDX] == MBX_POLL&&!memcmp(&rx_buf[TAG_ID_IDX],&g_com_map[BIND_DEV_ID],2))//判断是否是和自己是同一组通讯的且为poll包
         if(group_id==rx_buf[GROUP_ID_IDX]&&rx_buf[MESSAGE_TYPE_IDX] == MBX_POLL)//判断是否是和自己是同一组通讯的且为poll包
        {    flag_recsuccess = 1;
                sleep_timer_start(__MS_TO_32K_CNT(UWB_DELAY_TIME_US));//测试
               memcpy(&g_com_receive_id,&rx_buf[TAG_ID_IDX],2);
//                sleep_timer_start(__MS_TO_32K_CNT(UWB_DELAY_TIME_US));//测试
                 temp_count2=phy_timer_count_get();
            frame_seq_nb2 = rx_buf[SEQUENCE_IDX];//获取包序
            battary = rx_buf[BATTARY_IDX];
@@ -504,36 +756,88 @@
                Anchor_RecNearPoll(i);
            }
                  recev_error_num=0;
              range_timeout_us=5000;//恢复为5000进入range后
            LOG_INFO(TRACE_MODULE_APP,"标签ID：%X,距离: %d 信号强度：%d.\r\n",g_com_map[BIND_DEV_ID],distance,rssi);
              //range_timeout_us=5000;//恢复为5000进入range后
           //LOG_INFO(TRACE_MODULE_APP,"标签ID：%X,距离: %d 包序%d\r\n",g_com_receive_id,distance,frame_seq_nb2);
					
					
                  gpio_pin_clr(SCL_PIN);
        break;
        //break;去掉break变为一对多
            }
    } 
         sts_lsp_store();
			
         break;
      //失败或者接受被高发射机打断都会再次开启接收
         flag_temp1=uwb_rx(0, 0, range_timeout_us);
         //flag_temp1=uwb_rx(0, 0, range_timeout_us);
   }
      delay_us(1);
      sts_lsp_store_stop();
      uwb_rx_force_off(1);
      if(!flag_recsuccess)
      {
         sleep_timer_start(__MS_TO_32K_CNT(UWB_DELAY_TIME_US-3));//测试
        LOG_INFO(TRACE_MODULE_APP,"测距失败，计数：%d\r\n",recev_error_num);
        if(recev_error_num++>5)
        {
            recev_error_num=0;
            UWB_work_state=SEARCH_DEV;
            uwb_searchcount = 0;
            search_open_flag = 1;
        }
         }

//      if(!flag_recsuccess)
//      {
//         //sleep_timer_start(__MS_TO_32K_CNT(UWB_DELAY_TIME_US-3));//测试
//        //LOG_INFO(TRACE_MODULE_APP,"测距失败，计数：%d\r\n",recev_error_num);
//        if(recev_error_num++>5)
//        {
//            recev_error_num=0;
//            UWB_work_state=SEARCH_DEV;
//            uwb_searchcount = 0;
//            search_open_flag = 1;
//        }
         //}

   
         
         return 0;
}
void Uwb_init(void)
{
      uwb_open();
   #ifdef STS_MODE
 // Set STS key and IV
    phy_sts_key_configure(&sts_iv_key);
	
   // which RX ports will be used for AoA/PDoA
    phy_rx_ant_mode_set(RX_ANT_PORTS_COMBINATION);
   #endif
    // Set calibration parameters
    uwb_calibration_params_set(config.phy_cfg.ch_num);
   #ifndef STS_MODE
   // set advanced parameters
    struct PHY_ADV_CONFIG_T adv_config = {
        .thres_fap_detect = 40,
        .nth_scale_factor = 4,
        .ranging_performance_mode = 0,
        .skip_weakest_port_en = 0,
    };
   #else
    // set advanced parameters
    struct PHY_ADV_CONFIG_T adv_config = {
        .thres_fap_detect = 40,
        .nth_scale_factor = 4,
        .ranging_performance_mode = 3,
        .skip_weakest_port_en = 0,
    };
   #endif
    phy_adv_params_configure(&adv_config);

    // uwb configure
    uwb_configure(config.phy_work_mode, board_param.tx_power_fcc[CALIB_CH(config.phy_cfg.ch_num)], &config.phy_cfg);
      #if (defined STS_MODE) || (defined MK_MODE)
      ranging_lib_init();
      #endif
    ranging_frame_type_set(config.phy_cfg.sts_pkt_cfg);
      #ifdef STS_MODE
      aoa_aux_info_set(AOA_AUX_ANT_IQ_RSSI_PDOA_AOA_FOM);
    aoa_steering_vector_set((const float *)((uint32_t)((config.phy_cfg.ch_num == 9) ? svec_ch9_ptr : svec_ch5_ptr) | SRAM_BASE));

    aoa_param_config();
		
      phy_rx_sts_switch_mode_set(config.phy_cfg.sts_pkt_cfg, STS_SWITCH_EVERY_4SYM, 0, 0);
      #endif
      mac_register_process_handler(tx_int_callback, rx_int_callback);//初始化回调
}
//主函数绑定接受逻辑
int UwbSearch(void)
{
@@ -542,42 +846,58 @@
    // The following peripherals will be initialized in the uwb_open function
    // phy/mac/aes/lsp/phy timers initialized
    uwb_open();
   #ifdef STS_MODE
  // Set STS key and IV
    phy_sts_key_configure(&sts_iv_key);
   
   // which RX ports will be used for AoA/PDoA
    phy_rx_ant_mode_set(RX_ANT_PORTS_COMBINATION);

   #endif
    // Set calibration parameters
    uwb_calibration_params_set(config.phy_cfg.ch_num);

   #ifndef STS_MODE
   // set advanced parameters
    struct PHY_ADV_CONFIG_T adv_config = {
        .thres_fap_detect = 40,
        .nth_scale_factor = 4,
        .ranging_performance_mode = 0,
        .skip_weakest_port_en = 0,
    };
      #else
        // set advanced parameters
    struct PHY_ADV_CONFIG_T adv_config = {
        .thres_fap_detect = 40,
        .nth_scale_factor = 4,
        .ranging_performance_mode = 3,
        .skip_weakest_port_en = 0,
    };
      #endif
    phy_adv_params_configure(&adv_config);

    // uwb configure
    uwb_configure(config.phy_work_mode, board_param.tx_power_fcc[CALIB_CH(config.phy_cfg.ch_num)], &config.phy_cfg);
      
      #ifdef STS_MODE
      ranging_lib_init();
      #endif
    ranging_frame_type_set(config.phy_cfg.sts_pkt_cfg);
      
      #ifdef STS_MODE
      aoa_aux_info_set(AOA_AUX_ANT_IQ_RSSI_PDOA_AOA_FOM);
    aoa_steering_vector_set((const float *)((uint32_t)((config.phy_cfg.ch_num == 9) ? svec_ch9_ptr : svec_ch5_ptr) | SRAM_BASE));

    aoa_param_config();
      
      phy_rx_sts_switch_mode_set(config.phy_cfg.sts_pkt_cfg, STS_SWITCH_EVERY_4SYM, 0, 0);
      #endif
    // Register rx interrupt callback function
    mac_register_process_handler(tx_int_callback, rx_int_callback);
      
    receive_flag = 0;
    temp_count3=phy_timer_count_get();
    gpio_pin_set(SCL_PIN);
      sts_lsp_store();
    flag_temp2=uwb_rx(0, 0, RX_SYNC_WIN_US_TEMP);//开启接收
    start_receive_count=phy_timer_count_get();
    poll_timeout=US_TO_PHY_TIMER_COUNT(2000000);//多一个多0.4ms默认0.4ms计算为0.125*4*100000,默认开启1mss
@@ -598,12 +918,15 @@
                    break;
            }
        }

            sts_lsp_store_stop();
				
				
        temp_count2=phy_timer_count_get();
        if(receive_flag==1)//成功接收
        {
            if(group_id==rx_buf[GROUP_ID_IDX]&&rx_buf[MESSAGE_TYPE_IDX] == MBX_POLL&&!memcmp(&rx_buf[TAG_ID_IDX],&g_com_map[BIND_DEV_ID],2))//判断是否是和自己是同一组通讯的且为poll包
            {   
//            if(group_id==rx_buf[GROUP_ID_IDX]&&rx_buf[MESSAGE_TYPE_IDX] == MBX_POLL&&!memcmp(&rx_buf[TAG_ID_IDX],&g_com_map[BIND_DEV_ID],2))//判断是否是和自己是同一组通讯的且为poll包
            if(group_id==rx_buf[GROUP_ID_IDX]&&rx_buf[MESSAGE_TYPE_IDX] == MBX_POLL)//判断是否是和自己是同一组通讯的且为poll包
                  {   
                       sleep_timer_start(__MS_TO_32K_CNT(UWB_DELAY_TIME_US-13));//测试
                        range_timeout_us=20000;//将下次range开启后超时时间设为20ms之后再range里恢复
                        temp_count2=phy_timer_count_get();
@@ -641,15 +964,17 @@
                }
                
                gpio_pin_clr(SCL_PIN);//测试
                        LOG_INFO(TRACE_MODULE_APP,"标签ID：%X,距离: %d 信号强度：%d.\r\n",g_com_map[BIND_DEV_ID],distance,rssi);
                        LOG_INFO(TRACE_MODULE_APP,"标签ID：%X,距离: %d 信号强度ANT0:%f,信号强度ANT2: %f\r\n",g_com_map[BIND_DEV_ID],distance,sts_rssi[0],sts_rssi[2]);
                return 1;//返回发送成功标志
            }

        }
            temp_count3=phy_timer_count_get();
            sts_lsp_store();
        flag_temp2=uwb_rx(0, 0, RX_SYNC_WIN_US_TEMP);//再次开启接收
    }
      delay_us(2);
      sts_lsp_store_stop();
      uwb_rx_force_off(1);
    // LOG_INFO(TRACE_MODULE_APP,"超时定时器：%x,%x,%x\r\n",start_receive_count,end_receive_count,current_count);
    gpio_pin_clr(SCL_PIN);//测试
@@ -672,19 +997,22 @@
    }
    break;
    case SEARCH_DEV:
    {   //接包不成功或者通讯失败进入搜索模式
        if(search_open_flag)
        {
            LOG_INFO(TRACE_MODULE_APP,"开启搜索\r\n");
            search_open_flag=0;
            uwb_led_on();
            link_success_flag=UwbSearch();//第一次开启接收2s绑定失败后则进行下面1分钟后重新开启2s绑定流程
            uwb_led_off();
            if(link_success_flag)
                UWB_work_state=LINK_SUCCESS;
        }else{
            LOG_INFO(TRACE_MODULE_APP,"等待进入搜索模式：%d\r\n",SEARCH_TIMESTEMP-uwb_searchcount);
        }
    {   
         UWB_work_state=LINK_SUCCESS;
         Uwb_init();
//         //接包不成功或者通讯失败进入搜索模式
//        if(search_open_flag)
//        {
//            LOG_INFO(TRACE_MODULE_APP,"开启搜索\r\n");
//            search_open_flag=0;
//            uwb_led_on();
//            link_success_flag=UwbSearch();//第一次开启接收2s绑定失败后则进行下面1分钟后重新开启2s绑定流程
//            uwb_led_off();
//            if(link_success_flag)
//                UWB_work_state=LINK_SUCCESS;
//        }else{
//            LOG_INFO(TRACE_MODULE_APP,"等待进入搜索模式：%d\r\n",SEARCH_TIMESTEMP-uwb_searchcount);
//        }

    }
    break;
@@ -713,7 +1041,7 @@
        //link_error_count=0;
       // update_led_power_state();//更新灯状态
    }
     LOG_INFO(TRACE_MODULE_APP,"UWB状态：%d\r\n",UWB_work_state);
     //LOG_INFO(TRACE_MODULE_APP,"UWB状态：%d\r\n",UWB_work_state);
}

uint8_t GetUWBBindState(void)