zhyinch
2020-04-21 eed71b230e2dae7fa190a84f7a60cb83646674f6
Ô´Âë/ºËÐİå/Src/application/dw_app.c
@@ -240,7 +240,7 @@
      for(i=0;i<255;i++)
      {
         g_flag_Taggetdist[i]++;
         if(g_flag_Taggetdist[i]>=20)
         if(g_flag_Taggetdist[i]>=2)
         {
            g_Tagdist[i]=0xffff;
         }
@@ -326,19 +326,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);
@@ -437,12 +442,14 @@
            LED0_BLINK;
            
               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(hex_dist2!=0xffff)
               {
               g_Tagdist[anc_id_recv]=   hex_dist2;
               g_flag_Taggetdist[anc_id_recv]=0;
               
               if(!g_com_map[MODBUS_MODE]&&hex_dist2!=0xffff)
               if(!g_com_map[MODBUS_MODE])
               {
               hex_dist2 = hex_dist2+(int16_t)g_com_map[DIST_OFFSET];
               hex_dist2 = hex_dist2;
               usart_send[2] = 1;//正常模式
               usart_send[3] = 17;//数据段长度
               usart_send[4] = frame_seq_nb;//数据段长度
@@ -450,12 +457,13 @@
               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);
               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)