V1.10 去掉基站标识，改输出模式

zhyinch

2020-04-16 7db378e2b93702b98ffe7f7b6ab9a4d20aaabb20

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

@@ -247,6 +247,7 @@
   uint32_t final_tx_time;
   u32 start_poll;
   u8 i,j,getsync_flag=0,timeout;
//   printf("%d",sync_timer);
      dwt_forcetrxoff();
    dwt_setrxaftertxdelay(POLL_TX_TO_RESP_RX_DLY_UUS);         //设置发送后开启接收，并设定延迟时间
    dwt_setrxtimeout(RESP_RX_TIMEOUT_UUS);      
@@ -324,20 +325,20 @@
                        if(rec_nearbaseid==nearbaseid_list[0])
                        {
                           //////////////////////////////////时间同步
//                           memcpy(&sync_timer,&rx_buffer[ANCTIMEMS],2);
//                           memcpy(&tmp_time,&rx_buffer[ANCTIMEUS],2);
//                           exsistbase_list[0]=1;
                           memcpy(&sync_timer,&rx_buffer[ANCTIMEMS],2);
                           memcpy(&tmp_time,&rx_buffer[ANCTIMEUS],2);
                           exsistbase_list[0]=1;
////                           memcpy(&tagslotpos,&rx_buffer[TAGSLOTPOS],2);      
//                           
//                           tmp_time=tmp_time+450;
//                           if(tmp_time>999)
//                           {
//                              tmp_time-=999;
//                              sync_timer++;
//                              if(sync_timer>=1010)
//                                 {sync_timer=0;}
//                           }
//                           TIM3->CNT=tmp_time;
                           tmp_time=tmp_time+450;
                           if(tmp_time>999)
                           {
                              tmp_time-=999;
                              sync_timer++;
                              if(sync_timer>=1010)
                                 {sync_timer=0;}
                           }
                           TIM3->CNT=tmp_time;
                           
//                           if(tagslotpos>max_slotpos)
//                              tagslotpos=tagslotpos%(max_slotpos+1);
@@ -466,16 +467,17 @@
            nearbase_distlist[i]=true_nearbase_distlist[i];
            if(nearbase_distlist[i]!=0x1ffff)
            {
               memcpy(&usart_send[3+6*report_num],&nearbaseid_list[i],2);
               memcpy(&usart_send[5+6*report_num],&nearbase_distlist[i],4);
               memcpy(&usart_send[4+6*report_num],&nearbaseid_list[i],2);
               memcpy(&usart_send[6+6*report_num],&nearbase_distlist[i],4);
               report_num++;
            }
         }
         #ifdef USART_INTEGRATE_OUTPUT      
            usart_send[2] = report_num;//正常模式
            checksum = Checksum_u16(&usart_send[2],report_num*6+1);
            memcpy(&usart_send[3+report_num*6],&checksum,2);
            UART_PushFrame(usart_send,5+report_num*6);
            usart_send[2] = 4;//正常模式
            usart_send[3] = report_num*6+2;//正常模式
            checksum = Checksum_u16(&usart_send[2],report_num*6+2);
            memcpy(&usart_send[4+report_num*6],&checksum,2);
            UART_PushFrame(usart_send,6+report_num*6);
         #endif
//         if(mainbase_lost_count>5)
//         {
@@ -540,7 +542,6 @@
void Tag_App(void)//发送模式(TAG标签)
{
   //LED0_ON;
   dwt_forcetrxoff();
   g_Resttimer=0;
   NearPoll();
}
@@ -748,8 +749,8 @@
               memcpy(&usart_send[19],&checksum,2);
               UART_PushFrame(usart_send,21);
            #else      
               memcpy(&usart_send[3+6*anc_report_num],&tag_id_recv,2);
               memcpy(&usart_send[5+6*anc_report_num],&tagdist_list[taglist_pos],4);
               memcpy(&usart_send[4+6*anc_report_num],&tag_id_recv,2);
               memcpy(&usart_send[6+6*anc_report_num],&tagdist_list[taglist_pos],4);
               anc_report_num++;
            #endif
               }else{