V1.31 标签有点bug

zhyinch

2020-10-29 613cb918c5d9d0c7bef84514c21dcca216d7b334

 Ô´Âë/ºËÐÄ°å/Src/application/dw_app.c

@@ -5,7 +5,7 @@
   DISCPOLL,
   GETNEARMSG,
   NEARPOLL,
}tag_state=GETNEARMSG;
}tag_state=NEARPOLL;
static dwt_config_t config = {
   2,               /* Channel number. */
   DWT_PRF_64M,     /* Pulse repetition frequency. */
@@ -553,7 +553,7 @@
//            }
            tagslotpos=GetRandomSlotPos(rec_tagpos_binary|tagpos_binary);
            tyncpoll_time = (tagslotpos--%max_slotpos)*slottime;
      tag_state=GETNEARMSG;		
      tag_state=NEARPOLL;		
         }
      //   tyncpoll_time=0;
         next_nearbase_num=0;
@@ -823,7 +823,7 @@
            dwt_write32bitreg(SYS_STATUS_ID, SYS_STATUS_ALL_RX_ERR);
         }
}
u8 misdist_num[TAG_NUM_IN_SYS],seize_anchor;
u8 misdist_num[TAG_NUM_IN_SYS],seize_anchor,getrange_success=0;
u8 Anchor_RecNearPoll(u8 ancrec_nearbasepos) //0 mainbase  1 first near_base
{
   u8 motorstate;
@@ -920,7 +920,7 @@
               dist_cm = dist_no_bias * 100; //dis ä¸ºå•ä½ä¸ºcm的距离            
               /*--------------------------以下为非测距逻辑------------------------*/
               //dist_cm=33000;
					
               getrange_success = 1;
               LED0_BLINK; //每成功一次通讯则闪烁一次
               dis_after_filter=dist_cm;
               hex_dist = dist_cm+(int16_t)g_com_map[DIST_OFFSET];
@@ -980,6 +980,7 @@
//   GPIO_WriteBit(GPIOA, GPIO_Pin_10, Bit_SET);   
   while (!((status_reg = dwt_read32bitreg(SYS_STATUS_ID)) & (SYS_STATUS_RXFCG | SYS_STATUS_ALL_RX_ERR))&&!g_start_send_flag&&!g_start_sync_flag)//不断查询芯片状态直到接收成功或者出现错误
   { 
		
      IdleTask();
   };
//GPIO_WriteBit(GPIOA, GPIO_Pin_10, Bit_RESET);   
@@ -987,7 +988,7 @@
   { u16 tag_recv_interval;
      float temp_tagpos;
   
      g_Resttimer=0;

      dwt_write32bitreg(SYS_STATUS_ID, SYS_STATUS_RXFCG);//清除标志位
      frame_len = dwt_read32bitreg(RX_FINFO_ID) & RX_FINFO_RXFL_MASK_1023;//获得接收数据长度
      dwt_readrxdata(rx_buffer, frame_len, 0);//读取接收数据
@@ -1000,7 +1001,8 @@
//            if (anchor_type == rx_buffer[ANC_TYPE_IDX])
//            Anchor_RecPoll();
//            break;
         case SYNC:			
         case SYNC:		
            g_Resttimer=0;				
            memcpy(&rec_syncid,&rx_buffer[ANCHOR_ID_IDX],4);
            if(rec_syncid<current_syncid)
            {
@@ -1041,7 +1043,8 @@
            }
            break;
      
         case NEAR_POLL:			
         case NEAR_POLL:		
            g_Resttimer=0;				
            memcpy(&tag_id_recv,&rx_buffer[TAG_ID_IDX],2);
            taglist_pos=CmpTagInList(tag_id_recv);
            if(taglist_pos==taglist_num)