V1.35 大连电牵，测试版本。配置回复变成立即回复，收到数据才不重启

zhyinch

2020-11-17 c8fa9e7b73d663fd1ee78632d38cea1b49c14d39

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

@@ -1,11 +1,12 @@
#include "dw_app.h"
#include "ADC.h"
#define TDFILTER
enum enumtagstate
{
   DISCPOLL,
   GETNEARMSG,
   NEARPOLL,
}tag_state=GETNEARMSG;
}tag_state=NEARPOLL;
static dwt_config_t config = {
   2,               /* Channel number. */
   DWT_PRF_64M,     /* Pulse repetition frequency. */
@@ -448,6 +449,7 @@
                           memcpy(&rec_tagpos_binary,&rx_buffer[NEARMSG_EMPTYSLOTPOS_INDEX],4);
                        if(temp_dist!=0x1ffff)
                           {
                              g_Resttimer=0;
                              #ifndef USART_INTEGRATE_OUTPUT
                              usart_send[2] = 1;//正常模式
                              usart_send[3] = 17;//数据段长度
@@ -553,7 +555,7 @@
//            }
            tagslotpos=GetRandomSlotPos(rec_tagpos_binary|tagpos_binary);
            tyncpoll_time = (tagslotpos--%max_slotpos)*slottime;
      tag_state=GETNEARMSG;		
      tag_state=NEARPOLL;		
         }
      //   tyncpoll_time=0;
         next_nearbase_num=0;
@@ -686,13 +688,19 @@
         tyncpoll_time = (tagslotpos--%max_slotpos)*slottime;
   }
   
            #ifdef USART_INTEGRATE_OUTPUT		
            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
}

void Tag_App(void)//发送模式(TAG标签)
{
   //LED0_ON;
   dwt_forcetrxoff();
   g_Resttimer=0;
      GPIO_WriteBit(GPIOA, GPIO_Pin_10, Bit_SET);   
   switch(tag_state)
   {
@@ -816,7 +824,7 @@
            dwt_write32bitreg(SYS_STATUS_ID, SYS_STATUS_ALL_RX_ERR);
         }
}
u8 misdist_num[TAG_NUM_IN_SYS],seize_anchor;
u8 misdist_num[TAG_NUM_IN_SYS],seize_anchor,getrange_success=0;
u8 Anchor_RecNearPoll(u8 ancrec_nearbasepos) //0 mainbase  1 first near_base
{
   u8 motorstate;
@@ -910,22 +918,30 @@
               tof = tof_dtu * DWT_TIME_UNITS;
               distance = tof * SPEED_OF_LIGHT;//距离=光速*飞行时间
               dist_no_bias = distance - dwt_getrangebias(config.chan, (float)distance, config.prf); //距离减去矫正系数
               dist_cm = dist_no_bias * 100; //dis ä¸ºå•ä½ä¸ºcm的距离				
               dist_cm = dist_no_bias * 1000; //dis ä¸ºå•ä½ä¸ºcm的距离				
               /*--------------------------以下为非测距逻辑------------------------*/
               //dist_cm=33000;
					
               getrange_success = 1;
               g_Resttimer=0;
               LED0_BLINK; //每成功一次通讯则闪烁一次
               dis_after_filter=dist_cm;
               hex_dist = dist_cm+(int16_t)g_com_map[DIST_OFFSET];
               hex_dist = dist_cm+(int16_t)g_com_map[DIST_OFFSET]*10;
               g_flag_Taggetdist[taglist_pos]=0;
               if(hex_dist>-1000&&hex_dist<100000)
               if(hex_dist>-10000&&hex_dist<2000000)
               {
               if(abs(hex_dist-his_dist[taglist_pos])<1500||misdist_num[taglist_pos]>3)
               if(abs(hex_dist-his_dist[taglist_pos])<15000||misdist_num[taglist_pos]>3)
               {
                  int32_t filter_dist;
                  #ifdef TDFILTER
                  NewTrackingDiffUpdate(taglist_pos, (float)hex_dist);
                  filter_dist=pos_predict[taglist_pos]/10;
                  #else
                  filter_dist=hex_dist/10;
                  #endif
                  misdist_num[taglist_pos]=0;
               tagdist_list[taglist_pos] = hex_dist;	
               tagdist_list[taglist_pos] = filter_dist;	
               his_dist[taglist_pos]=hex_dist;   
                  g_Tagdist[taglist_pos]=hex_dist;	
                  g_Tagdist[taglist_pos]=filter_dist;	
            #ifndef USART_INTEGRATE_OUTPUT
               usart_send[2] = 1;//正常模式 
               usart_send[3] = 17;//数据段长度
@@ -973,6 +989,7 @@
//   GPIO_WriteBit(GPIOA, GPIO_Pin_10, Bit_SET);   
   while (!((status_reg = dwt_read32bitreg(SYS_STATUS_ID)) & (SYS_STATUS_RXFCG | SYS_STATUS_ALL_RX_ERR))&&!g_start_send_flag&&!g_start_sync_flag)//不断查询芯片状态直到接收成功或者出现错误
   { 
		
      IdleTask();
   };
//GPIO_WriteBit(GPIOA, GPIO_Pin_10, Bit_RESET);   
@@ -980,7 +997,7 @@
   { u16 tag_recv_interval;
      float temp_tagpos;
   
      g_Resttimer=0;

      dwt_write32bitreg(SYS_STATUS_ID, SYS_STATUS_RXFCG);//清除标志位
      frame_len = dwt_read32bitreg(RX_FINFO_ID) & RX_FINFO_RXFL_MASK_1023;//获得接收数据长度
      dwt_readrxdata(rx_buffer, frame_len, 0);//读取接收数据
@@ -993,7 +1010,7 @@
//            if (anchor_type == rx_buffer[ANC_TYPE_IDX])
//            Anchor_RecPoll();
//            break;
         case SYNC:			
         case SYNC:					
            memcpy(&rec_syncid,&rx_buffer[ANCHOR_ID_IDX],4);
            if(rec_syncid<current_syncid)
            {
@@ -1034,7 +1051,7 @@
            }
            break;
      
         case NEAR_POLL:			
         case NEAR_POLL:						
            memcpy(&tag_id_recv,&rx_buffer[TAG_ID_IDX],2);
            taglist_pos=CmpTagInList(tag_id_recv);
            if(taglist_pos==taglist_num)