zhyinch
2019-11-08 ae557c6657c578b26ec6280b89bffc66f40b9877
Ô´Âë/ºËÐİå/Src/application/dw_app.c
@@ -27,7 +27,7 @@
#include "filters.h"
#include <stdio.h>
#include "beep.h"
#include "modbus.h"
/*------------------------------------ Marcos ------------------------------------------*/
/* Inter-ranging delay period, in milliseconds. */
@@ -375,12 +375,12 @@
       * As the sequence number field of the frame is not relevant, it is cleared to simplify the validation of the frame. */
      
      if (rx_buffer[MESSAGE_TYPE_IDX] == RESPONSE&&!memcmp(&rx_buffer[TAG_ID_IDX],&dev_id,4)) //判断接收到的数据是否是response数据
      {
      { u16 anc_id_recv;
         /* Retrieve poll transmission and response reception timestamp. */
         poll_tx_ts = get_tx_timestamp_u64();                              //获得POLL发送时间T1
         resp_rx_ts = get_rx_timestamp_u64();                              //获得RESPONSE接收时间T4
         
         if(getsync_flag==0)
         if(getsync_flag==0&&g_com_map[DEV_ROLE])
         {
            getsync_flag=1;
         memcpy(&sync_timer,&rx_buffer[ANCTIMEMS],2);
@@ -418,21 +418,26 @@
         tag_succ_times++;
         
            LED0_BLINK;
            hex_dist = anchor_dist_last_frm[0];
               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])
               {
               usart_send[2] = 1;//正常模式
               usart_send[3] = 17;//数据段长度
               usart_send[4] = frame_seq_nb;//数据段长度
               memcpy(&usart_send[5],&dev_id,2);
               memcpy(&usart_send[7],&rx_buffer[ANCHOR_ID_IDX],2);
               hex_dist = anchor_dist_last_frm[0]+(int16_t)g_com_map[DIST_OFFSET];
               memcpy(&usart_send[9],&hex_dist,4);
               usart_send[13] = battary;
               usart_send[14] = button;
               checksum = Checksum_u16(&usart_send[2],17);
               memcpy(&usart_send[19],&checksum,2);
               UART_PushFrame(usart_send,21);
               }
      //         memcpy(&Modbus_HoldReg[anc_id_recv*2],&hex_dist,4);
         /* Poll DW1000 until TX frame sent event set. See NOTE 8 below. */
         if(result==0)
         {while (!(dwt_read32bitreg(SYS_STATUS_ID) & SYS_STATUS_TXFRS))//不断查询芯片状态直到发送完成
@@ -613,20 +618,25 @@
                  anchor_dist_last_frm[tag_id_recv-TAG_ID_START] = hex_dist;
               }
               his_dist[tag_id_recv-TAG_ID_START]=hex_dist;
               g_Tagdist[tag_id_recv]=   hex_dist;
               g_flag_Taggetdist[tag_id_recv]=0;
               if(!g_com_map[MODBUS_MODE])
               {
                  usart_send[2] = 1;//正常模式
                  usart_send[3] = 17;//数据段长度
                  usart_send[4] = frame_seq_nb;//数据段长度
                  memcpy(&usart_send[5],&tag_id_recv,2);
                  memcpy(&usart_send[7],&dev_id,2);
                  
               usart_send[2] = 1;//正常模式
               usart_send[3] = 17;//数据段长度
               usart_send[4] = frame_seq_nb;//数据段长度
               memcpy(&usart_send[5],&tag_id_recv,2);
               memcpy(&usart_send[7],&dev_id,2);
                  memcpy(&usart_send[9],&anchor_dist_last_frm[tag_id_recv-TAG_ID_START],4);
                  usart_send[13] = battary;
                  usart_send[14] = button;
                  checksum = Checksum_u16(&usart_send[2],17);
                  memcpy(&usart_send[19],&checksum,2);
                  UART_PushFrame(usart_send,21);
               }
                  memcpy(&Modbus_HoldReg[tag_id_recv*2],&anchor_dist_last_frm[tag_id_recv-TAG_ID_START],4);
               
               memcpy(&usart_send[9],&anchor_dist_last_frm[tag_id_recv-TAG_ID_START],4);
               usart_send[13] = battary;
               usart_send[14] = button;
               checksum = Checksum_u16(&usart_send[2],17);
               memcpy(&usart_send[19],&checksum,2);
               UART_PushFrame(usart_send,21);
               
               //dis_after_filter = LP_Frac_Update(p_Dis_Filter, dist_cm);