增加标签第一个数据不输出

zhyinch

2020-01-30 affb754b56216235932464dbaffbaf34638cd8f2

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

@@ -422,8 +422,10 @@
               memcpy(&anc_id_recv,&rx_buffer[ANCHOR_ID_IDX],2);
//               g_Tagdist[anc_id_recv]=   hex_dist;
//               g_flag_Taggetdist[anc_id_recv]=0;
               if(!g_com_map[MODBUS_MODE])
					
               if(!g_com_map[MODBUS_MODE]&&hex_dist2!=0xffff)
               {
               hex_dist2 = hex_dist2+(int16_t)g_com_map[DIST_OFFSET];		
               usart_send[2] = 1;//正常模式
               usart_send[3] = 17;//数据段长度
               usart_send[4] = frame_seq_nb;//数据段长度
@@ -543,7 +545,7 @@

         /* Write and send the response message. See NOTE 9 below.*/
         if(tag_id_recv-TAG_ID_START<=TAG_NUM_IN_SYS)
         memcpy(&tx_resp_msg[DIST_IDX], &anchor_dist_last_frm[tag_id_recv-TAG_ID_START], 4);
         memcpy(&tx_resp_msg[DIST_IDX], &g_Tagdist[tag_id_recv], 4);
      
         dwt_writetxdata(sizeof(tx_resp_msg), tx_resp_msg, 0);//写入发送数据
         dwt_writetxfctrl(sizeof(tx_resp_msg), 0);//设定发送长度
@@ -615,29 +617,24 @@
               /*--------------------------以下为非测距逻辑------------------------*/
               LED0_BLINK; //每成功一次通讯则闪烁一次
               g_UWB_com_interval = 0;
               dis_after_filter=dist_cm;
               hex_dist = dist_cm+(int16_t)g_com_map[DIST_OFFSET];
               if(hex_dist-anchor_dist_last_frm[tag_id_recv-TAG_ID_START]<15000||misdist_num>4)
					
               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<1000000&&hex_dist>-10000)
               {
                  if(tag_id_recv-TAG_ID_START<=TAG_NUM_IN_SYS)
                  {
               if(abs(hex_dist-his_dist[tag_id_recv-TAG_ID_START])<10000)
               {
                  g_Tagdist[tag_id_recv-TAG_ID_START] = hex_dist;
                  anchor_dist_last_frm[tag_id_recv-TAG_ID_START] = hex_dist;
						
               {		
                  #ifdef TDFILTER
                  TrackingDiffUpdate(pUWBDistanceTrackingDiff, (float)hex_dist);
                  filter_dist=pUWBDistanceTrackingDiff->pos_predict/10;
                  NewTrackingDiffUpdate(tag_id_recv-TAG_ID_START, (float)hex_dist);
                  filter_dist=pos_predict[tag_id_recv-TAG_ID_START]/10;
                  #else
                  filter_dist=hex_dist/10;
                  #endif
                  anchor_dist_last_frm[tag_id_recv-TAG_ID_START]=filter_dist;
                  g_Tagdist[tag_id_recv]=   anchor_dist_last_frm[tag_id_recv-TAG_ID_START];
               }
                  g_Tagdist[tag_id_recv]=   filter_dist;
					
               his_dist[tag_id_recv-TAG_ID_START]=hex_dist;
               g_flag_Taggetdist[tag_id_recv]=0;
               if(!g_com_map[MODBUS_MODE])
@@ -656,16 +653,15 @@
                  UART_PushFrame(usart_send,21);
               }   
               //   memcpy(&Modbus_HoldReg[tag_id_recv*2],&anchor_dist_last_frm[tag_id_recv-TAG_ID_START],4);
               Modbus_HoldReg[tag_id_recv*2]=anchor_dist_last_frm[tag_id_recv-TAG_ID_START]>>16;
               Modbus_HoldReg[tag_id_recv*2+1]=anchor_dist_last_frm[tag_id_recv-TAG_ID_START];
               Modbus_HoldReg[tag_id_recv*2]=g_Tagdist[tag_id_recv-TAG_ID_START]>>16;
               Modbus_HoldReg[tag_id_recv*2+1]=g_Tagdist[tag_id_recv-TAG_ID_START];
               //dis_after_filter = LP_Frac_Update(p_Dis_Filter, dist_cm);
                  }
               }
					
               }else{
                  misdist_num++;
               }
            if(anchor_dist_last_frm[tag_id_recv-TAG_ID_START]>1000)
            {anchor_dist_last_frm[tag_id_recv-TAG_ID_START]=anchor_dist_last_frm[tag_id_recv-TAG_ID_START];}
            }
            }
         }else{
            /* Clear RX error events in the DW1000 status register. */