V1.28 修改MIS_NUM标志位错误

zhyinch

2020-05-31 5ab92d7ff87870ce55ecb46c86d25ae79aa834e1

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

@@ -237,12 +237,14 @@
   if(clear_judge_cnt++>1000)  //设定1S分频，每秒进一次。判断标志位大于等于2，2s没收到数据就把数据变成0xffff，不触发警报。
   {
      clear_judge_cnt=0;
      for(i=0;i<255;i++)
      for(i=0;i<100;i++)
      {
         g_flag_Taggetdist[i]++;
         if(g_flag_Taggetdist[i]>=2)
         {
            g_Tagdist[i]=0xffff;
            Modbus_HoldReg[i*2]=1;
            Modbus_HoldReg[i*2+1]=0xffff;
         }
      }
   }
@@ -326,19 +328,24 @@
int8_t tag_delaytime;
extern uint16_t sync_timer;
u16 tmp_time;
extern float dw_vbat;
void Tag_App(void)//发送模式(TAG标签)
{
   uint32_t frame_len;
   uint32_t final_tx_time;
   u32 start_poll;
   u8 i,getsync_flag=0;
   u8 bat_percent;
   //LED0_ON;
   dwt_forcetrxoff();
   g_Resttimer=0;
    dwt_setrxaftertxdelay(POLL_TX_TO_RESP_RX_DLY_UUS);         //设置发送后开启接收，并设定延迟时间
    dwt_setrxtimeout(RESP_RX_TIMEOUT_UUS);      
   tag_succ_times = 0;
   tx_poll_msg[BATTARY_IDX] = Get_Battary();
   bat_percent=(dw_vbat-2.8)/0.5*100;
   if(bat_percent>100)
      bat_percent=100;
   tx_poll_msg[BATTARY_IDX] = bat_percent;//Get_Battary();
   tx_poll_msg[BUTTON_IDX] = !READ_KEY0;
   tx_poll_msg[SEQUENCE_IDX] = frame_seq_nb++;
   GPIO_WriteBit(GPIOA, GPIO_Pin_9, Bit_RESET);
@@ -452,7 +459,7 @@
               memcpy(&usart_send[7],&rx_buffer[ANCHOR_ID_IDX],2);
            
               memcpy(&usart_send[9],&hex_dist2,4);
               usart_send[13] = battary;
               usart_send[13] = bat_percent;
               usart_send[14] = button;
               checksum = Checksum_u16(&usart_send[2],17);
               memcpy(&usart_send[19],&checksum,2);
@@ -499,11 +506,11 @@
#define TDFILTER
//#define CHECK_UID
extern uint8_t UID_ERROR;
u8 misdist_num[TAG_NUM_IN_SYS];
void Anchor_App(void)
{
   uint32_t frame_len;
   uint32_t resp_tx_time;
   static u8 misdist_num;
   /* Clear reception timeout to start next ranging process. */
   dwt_setrxtimeout(0);//设定接收超时时间，0位没有超时时间

@@ -641,9 +648,10 @@
               hex_dist = dist_cm+(int16_t)g_com_map[DIST_OFFSET]*10;
               if(tag_id_recv-TAG_ID_START<=TAG_NUM_IN_SYS)
               {
               if(hex_dist-his_dist[tag_id_recv-TAG_ID_START]<15000||misdist_num>4)
               {int32_t filter_dist;
                  misdist_num=0;
               if(hex_dist-his_dist[tag_id_recv-TAG_ID_START]<15000||misdist_num[tag_id_recv-TAG_ID_START]>4)
               {
                  int32_t filter_dist;
                  misdist_num[tag_id_recv-TAG_ID_START]=0;
               if(hex_dist<1000000&&hex_dist>-10000)
               {      
                  #ifdef TDFILTER
@@ -678,8 +686,9 @@
               //dis_after_filter = LP_Frac_Update(p_Dis_Filter, dist_cm);
                  }
               
               }else{
                  misdist_num++;
               }
               else{
                  misdist_num[tag_id_recv-TAG_ID_START]++;
               }
            }
            }