From a6e5c60a9ec30574bf7c3d584046444b15f8680f Mon Sep 17 00:00:00 2001
From: zhyinch <zhyinch@gmail.com>
Date: 星期四, 10 二月 2022 16:29:20 +0800
Subject: [PATCH] V1.61 修改成中断模式,测试不丢包。

---
 源码/核心板/Src/application/dw_app.c |  284 ++++++++++++++++++++++++++++++++++++++++++++------------
 1 files changed, 222 insertions(+), 62 deletions(-)

diff --git "a/\346\272\220\347\240\201/\346\240\270\345\277\203\346\235\277/Src/application/dw_app.c" "b/\346\272\220\347\240\201/\346\240\270\345\277\203\346\235\277/Src/application/dw_app.c"
index 2ba756b..5b14703 100644
--- "a/\346\272\220\347\240\201/\346\240\270\345\277\203\346\235\277/Src/application/dw_app.c"
+++ "b/\346\272\220\347\240\201/\346\240\270\345\277\203\346\235\277/Src/application/dw_app.c"
@@ -1,5 +1,6 @@
 #include "dw_app.h"
 #include "ADC.h"
+#include "modbus.h"
 #define TDFILTER
 enum enumtagstate
 {
@@ -14,7 +15,7 @@
 	DWT_PAC8,        /* Preamble acquisition chunk size. Used in RX only. */
 	9,               /* TX preamble code. Used in TX only. */
 	9,               /* RX preamble code. Used in RX only. */
-	0,               /* Use non-standard SFD (Boolean) */
+	1,               /* Use non-standard SFD (Boolean) */
 	DWT_BR_6M8,      /* Data rate. */
 	DWT_PHRMODE_STD, /* PHY header mode. */
 	(129 + 8 - 8)    /* SFD timeout (preamble length + 1 + SFD length - PAC size). Used in RX only. */
@@ -48,7 +49,7 @@
 uint32_t g_UWB_com_interval = 0; 
 float dis_after_filter;				//当前距离值
 LPFilter_Frac* p_Dis_Filter;		//测距用的低通滤波器
-uint16_t g_Tagdist[TAG_NUM_IN_SYS];
+int32_t g_Tagdist[TAG_NUM_IN_SYS];
 uint8_t g_flag_Taggetdist[256];
 
 static uint64_t get_tx_timestamp_u64(void)
@@ -110,11 +111,12 @@
 			g_flag_Taggetdist[i]++;
 			if(g_flag_Taggetdist[i]>=2)
 			{
-				g_Tagdist[i]=0xffff;
+				g_Tagdist[i]=0x1ffff;
 			}
 		}
 	}
 }
+extern int16_t g_commap_antdelay;
 void Dw1000_Init(void)
 {
 	/* Reset and initialise DW1000.
@@ -126,17 +128,17 @@
 
     /* Configure DW1000. See NOTE 6 below. */
     dwt_configure(&config);//配置DW1000
-	
-
-	
+	 dwt_setinterrupt(  DWT_INT_RFCG | (DWT_INT_ARFE | DWT_INT_RFSL | DWT_INT_SFDT | DWT_INT_RPHE | DWT_INT_RFCE | DWT_INT_RFTO | DWT_INT_RXPTO), 1);
+ 
     /* Apply default antenna delay value. See NOTE 1 below. */
     dwt_setrxantennadelay(RX_ANT_DLY);		//设置接收天线延迟
-    dwt_settxantennadelay(TX_ANT_DLY);		//设置发射天线延迟
+    dwt_settxantennadelay(0);		//设置发射天线延迟
 
     /* Set expected response's delay and timeout. See NOTE 4 and 5 below.
      * As this example only handles one incoming frame with always the same delay and timeout, those values can be set here once for all. */
 				//设置接收超时时间
 }
+extern u16 group_id;
 void Dw1000_App_Init(void)
 {
 //g_com_map[DEV_ID] = 0x0b;
@@ -145,6 +147,10 @@
 	tx_final_msg[MESSAGE_TYPE_IDX]=FINAL;
 	tx_sync_msg[MESSAGE_TYPE_IDX]=SYNC;
 	
+    memcpy(&tx_poll_msg[GROUP_ID_IDX], &group_id, 1);
+	memcpy(&tx_final_msg[GROUP_ID_IDX], &group_id, 1);
+	memcpy(&tx_resp_msg[GROUP_ID_IDX], &group_id, 1);
+    
 	memcpy(&tx_poll_msg[TAG_ID_IDX], &dev_id, 2);
 	memcpy(&tx_final_msg[TAG_ID_IDX], &dev_id, 2);
 	memcpy(&tx_resp_msg[ANCHOR_ID_IDX], &dev_id, 2);
@@ -176,10 +182,11 @@
 u8 g_start_sync_flag;
 void SyncPoll(u8 sync_seq,uint32_t sync_baseid)
 {u8 result;
-	g_start_sync_flag=1;   //中断模式,退出终端后,需要重新来过
+	//g_start_sync_flag=1;   //中断模式,退出终端后,需要重新来过
 	dwt_forcetrxoff();   	//关闭接收,以防在RX ON 状态
 	
 	
+	tx_sync_msg[GROUP_ID_IDX] = group_id;
 	tx_sync_msg[SYNC_SEQ_IDX]=sync_seq;
 	memcpy(&tx_sync_msg[ANCHOR_ID_IDX],&sync_baseid,4);
 	dwt_writetxdata(sizeof(tx_sync_msg), tx_sync_msg, 0);//将Poll包数据传给DW1000,将在开启发送时传出去
@@ -191,6 +198,10 @@
                 { };
 		}
 			 dwt_write32bitreg(SYS_STATUS_ID, SYS_STATUS_TXFRS);//清楚标志位
+	//	UART_CheckSend();
+	//dwt_setinterrupt(  DWT_INT_RFCG | (DWT_INT_ARFE | DWT_INT_RFSL | DWT_INT_SFDT | DWT_INT_RPHE | DWT_INT_RFCE | DWT_INT_RFTO | DWT_INT_RXPTO), 1);
+		dwt_setrxtimeout(0);//设定接收超时时间,0位没有超时时间
+	dwt_rxenable(0);//打开接收
 }
 uint16_t g_Resttimer;
 uint8_t result;
@@ -209,13 +220,13 @@
 u16 nearbaseid_list[MAX_NEARBASE_NUM],mainbase_id,true_nearbase_idlist[MAX_NEARBASE_NUM];
 int32_t mainbase_dist,nearbase_distlist[MAX_NEARBASE_NUM],true_nearbase_distlist[MAX_NEARBASE_NUM],true_exsistbase_list[MAX_NEARBASE_NUM];
 uint8_t trygetnearmsg_times;
-u16 current_slotnum,total_slotnum,target_time,last_time;
+u16 current_slotnum,total_slotnum,target_time,last_time,record_time[10],record_i;
 u32 rec_tagpos_binary;
 extern uint32_t tagpos_binary;
 void SetNextPollTime(u16 time)
 {
 	current_slotnum++;
-	if(current_slotnum==total_slotnum)
+	if(current_slotnum>=total_slotnum)
 		current_slotnum-=total_slotnum;
 	//time=5;
 	target_time=((current_slotnum*g_com_map[COM_INTERVAL])+time);
@@ -232,7 +243,11 @@
 	{target_time-=1000;}
 	if(target_time<0)
 	{target_time+=1000;}
-
+record_time[record_i++]=target_time;
+	if(record_i>=10)
+	{
+		record_i=0;
+	}
 }
 u8 FindNearBasePos(u16 baseid)
 {
@@ -333,15 +348,25 @@
 	last_nearbase_num=next_nearbase_num;
 	nearbase_num=next_nearbase_num;
 	recbase_num=0;
+    tx_nearpoll_msg[GROUP_ID_IDX] = group_id;
 	tx_nearpoll_msg[BATTARY_IDX] = Get_Battary();
 	tx_nearpoll_msg[BUTTON_IDX] = !READ_KEY0;
 	tx_nearpoll_msg[SEQUENCE_IDX] = frame_seq_nb++;
 	tx_nearpoll_msg[NEARBASENUM_INDEX] = nearbase_num;
 	memcpy(&tx_nearpoll_msg[NEARBASEID_INDEX],&nearbaseid_list,nearbase_num*2);
+    for(i=0;i<nearbase_num;i++)
+    { memcpy(&tx_nearpoll_msg[NEARBASEID_INDEX+nearbase_num*2+i*2],&nearbase_distlist[i],2);}
+    
+    memcpy(&tx_nearpoll_msg[NEARBASEID_INDEX+nearbase_num*4],&g_commap_antdelay,2);
+    
+        for(i=0;i<MAX_NEARBASE_NUM;i++)
+    {
+        nearbase_distlist[i]=0x1ffff;
+    }
 	tx_nearpoll_msg[MESSAGE_TYPE_IDX] = NEAR_POLL;	
 	memcpy(&tx_nearpoll_msg[ANCHOR_ID_IDX],&mainbase_id,2);	
-	dwt_writetxdata(13+2*nearbase_num, tx_nearpoll_msg, 0);//将Poll包数据传给DW1000,将在开启发送时传出去
-	dwt_writetxfctrl(13+2*nearbase_num, 0);//设置超宽带发送数据长度
+	dwt_writetxdata(15+4*nearbase_num, tx_nearpoll_msg, 0);//将Poll包数据传给DW1000,将在开启发送时传出去
+	dwt_writetxfctrl(15+4*nearbase_num, 0);//设置超宽带发送数据长度
 	dwt_starttx(DWT_START_TX_IMMEDIATE | DWT_RESPONSE_EXPECTED);//开启发送,发送完成后等待一段时间开启接收,等待时间在dwt_setrxaftertxdelay中设置
 	
 	flag_finalsend=0;
@@ -383,7 +408,7 @@
 							dwt_readrxdata(rx_buffer, frame_len, 0);   //读取接收数据
 							dwt_setrxtimeout(0);//DELAY_BETWEEN_TWO_FRAME_UUS*(nearbase_num+1-recbase_num)+10);//设定接收超时时间,0位没有超时时间
 							dwt_rxenable(0);//打开接收
-							if (rx_buffer[MESSAGE_TYPE_IDX] == NEAR_RESPONSE&&!memcmp(&rx_buffer[TAG_ID_IDX],&dev_id,2)) //判断接收到的数据是否是response数据
+							if (rx_buffer[MESSAGE_TYPE_IDX] == NEAR_RESPONSE&&!memcmp(&rx_buffer[TAG_ID_IDX],&dev_id,2)&&rx_buffer[GROUP_ID_IDX] == group_id) //判断接收到的数据是否是response数据
 							{	u16 rec_nearbaseid,rec_nearbasepos;
 								int32_t temp_dist;
 								poll_tx_ts = get_tx_timestamp_u64();										//获得POLL发送时间T1
@@ -405,7 +430,7 @@
 									memcpy(&tmp_time,&rx_buffer[ANCTIMEUS],2);
 									
 									
-									if(g_com_map[DEV_ROLE]!=0)
+									//if(g_com_map[DEV_ROLE]!=0)
 									{
 									sync_timer=temp_sync_timer1;
 ////									memcpy(&tagslotpos,&rx_buffer[TAGSLOTPOS],2);		
@@ -444,12 +469,15 @@
 									final_msg_set_ts(&tx_nearfinal_msg[FINAL_MSG_RESP_RX_NEARBASE_IDX], resp_rx_ts);
 									final_msg_set_ts(&tx_nearfinal_msg[FINAL_MSG_FINAL_TX_TS_IDX], final_tx_ts);
 									tx_nearfinal_msg[MESSAGE_TYPE_IDX]=NEAR_FINAL;
+                                    tx_nearfinal_msg[GROUP_ID_IDX] = group_id;
 									dwt_writetxdata(28+nearbase_num*4, tx_nearfinal_msg, 0);//将发送数据写入DW1000
 									dwt_writetxfctrl(28+nearbase_num*4, 0);//设定发送数据长度
 									memcpy(&rec_tagpos_binary,&rx_buffer[NEARMSG_EMPTYSLOTPOS_INDEX],4);
 								if(temp_dist!=0x1ffff)
 									{
-										#ifndef USART_INTEGRATE_OUTPUT
+										g_Resttimer=0;
+                    IWDG_Feed();
+										#ifdef USART_SINGLE_OUTPUT
 										usart_send[2] = 1;//正常模式
 										usart_send[3] = 17;//数据段长度
 										usart_send[4] = frame_seq_nb;//数据段长度
@@ -466,6 +494,7 @@
 										usart_send[14] = button;
 										checksum = Checksum_u16(&usart_send[2],17);
 										memcpy(&usart_send[19],&checksum,2);
+										if(g_com_map[MODBUS_MODE]!=1)
 										UART_PushFrame(usart_send,21);
 										#endif
 
@@ -499,7 +528,7 @@
 //									tagslotpos=GetRandomSlotPos(rec_tagpos_binary);
 									if(temp_dist!=0x1ffff)
 									{
-										#ifndef USART_INTEGRATE_OUTPUT
+										#ifdef USART_SINGLE_OUTPUT
 										usart_send[2] = 1;//正常模式
 										usart_send[3] = 17;//数据段长度
 										usart_send[4] = frame_seq_nb;//数据段长度
@@ -516,6 +545,7 @@
 										usart_send[14] = button;
 										checksum = Checksum_u16(&usart_send[2],17);
 										memcpy(&usart_send[19],&checksum,2);
+										if(g_com_map[MODBUS_MODE]!=1)
 										UART_PushFrame(usart_send,21);
 										#endif
 
@@ -606,10 +636,7 @@
 					report_num++;
 				}
 			}
-			for(i=0;i<MAX_NEARBASE_NUM;i++)
-			{
-				nearbase_distlist[i]=0x1ffff;
-			}
+
 			
 		//	printf("%d,%d",temp_sync_timer2,temp_sync_timer1);
 			#ifdef USART_INTEGRATE_OUTPUT		
@@ -700,7 +727,7 @@
 {
 	//LED0_ON;
 	dwt_forcetrxoff();
-	g_Resttimer=0;
+	 dwt_setinterrupt(DWT_INT_TFRS | DWT_INT_RFCG | (DWT_INT_ARFE | DWT_INT_RFSL | DWT_INT_SFDT | DWT_INT_RPHE | DWT_INT_RFCE | DWT_INT_RFTO | DWT_INT_RXPTO), 0);
 		GPIO_WriteBit(GPIOA, GPIO_Pin_10, Bit_SET);	
 	switch(tag_state)
 	{
@@ -718,12 +745,16 @@
 	SetNextPollTime(tyncpoll_time);
 	g_start_send_flag = 0;		
 	GPIO_WriteBit(GPIOA, GPIO_Pin_10, Bit_RESET);	
+	UART_CheckSend();
+	dwt_setinterrupt(  DWT_INT_RFCG | (DWT_INT_ARFE | DWT_INT_RFSL | DWT_INT_SFDT | DWT_INT_RPHE | DWT_INT_RFCE | DWT_INT_RFTO | DWT_INT_RXPTO), 1);
+		dwt_setrxtimeout(0);//设定接收超时时间,0位没有超时时间
+	dwt_rxenable(0);//打开接收
 }
 
 int8_t correction_time,new_tagid=0;
 extern uint8_t sync_seq;
 u16 taglist_num=0,taglist_pos;
-u16 tagid_list[TAG_NUM_IN_SYS];
+u16 tagid_list[TAG_NUM_IN_SYS],tagstate_list[TAG_NUM_IN_SYS];
 u8 tagofflinetime[TAG_NUM_IN_SYS];
 int32_t tagdist_list[TAG_NUM_IN_SYS];
 void TagListUpdate(void)
@@ -751,6 +782,7 @@
 uint32_t frame_len;
 uint32_t resp_tx_time;
 uint8_t rec_nearbase_num,anc_report_num;
+int16_t rec_antdelay;
 void Anchor_RecPoll(void)
 {
 			tmp_time=TIM3->CNT;
@@ -774,6 +806,8 @@
 
 			battary = rx_buffer[BATTARY_IDX];
 			button = rx_buffer[BUTTON_IDX];
+         
+            
 			frame_seq_nb2 = rx_buffer[SEQUENCE_IDX];
 			if(result==0)
 			{
@@ -824,7 +858,33 @@
 				dwt_write32bitreg(SYS_STATUS_ID, SYS_STATUS_ALL_RX_ERR);
 			}
 }
+ double firstpath_power, rx_power,rec_firstpath_power;
+  double f1, f2, r1, r2;
+uint16_t F1,F2,F3,N,C;
+double B = 131072;
+double A = 121.74;
+double min_power;
+ dwt_rxdiag_t d1;
+double LOS(dwt_rxdiag_t *dia) {
+     F1 = dia->firstPathAmp1;
+     F2 = dia->firstPathAmp2;
+     F3 = dia->firstPathAmp3;
+     N = dia->rxPreamCount;
+     C = dia->maxGrowthCIR;
+    
+    firstpath_power=10* log10((F1*F1+F2*F2+F3*F3)/(N*N))-A;
+    rx_power=10*log10(C*B/(N*N))-A;
+
+ //   min_power =  - 10 * log10((F1 *F1 + F2 * F2 + F3 * F3) / (C *B));
+    return min_power;
+  }
+u8 testt[100],testt2[100],testt3[100],testt4[100],testt6[100],ti;
+u16 testt5[100];
+u16 smallcar_idlist[10]={0x4052,0x4032,0x4055,0x4034,0x4016,0x4010,0x4036,0x4027,0x4024,0x4047};
+extern u16 dist_threshold;
 u8 misdist_num[TAG_NUM_IN_SYS],seize_anchor,getrange_success=0;
+int32_t filter_dist,filter_speed;
+u8 newmeasure,recpoll_len;
 u8 Anchor_RecNearPoll(u8 ancrec_nearbasepos) //0 mainbase  1 first near_base
 {
 	u8 motorstate;
@@ -860,6 +920,7 @@
 			}else{
 				memcpy(&tx_nearresp_msg[DIST_IDX], &tagdist_list[taglist_pos], 4);
 			}
+            tx_nearresp_msg[GROUP_ID_IDX] = group_id;
 			tx_nearresp_msg[MAINBASE_INDEX]=flag_syncbase;
 			tx_nearresp_msg[MESSAGE_TYPE_IDX]=NEAR_RESPONSE;
 			tx_nearresp_msg[MOTORSTATE_INDEX]=(remotesend_state<<4)|motorstate;
@@ -873,13 +934,11 @@
 			dwt_writetxfctrl(22, 0);//设定发送长度
 			}
 			result = dwt_starttx(DWT_START_TX_DELAYED | DWT_RESPONSE_EXPECTED);//延迟发送,等待接收
-
-			battary = rx_buffer[BATTARY_IDX];
-			button = rx_buffer[BUTTON_IDX];
-			frame_seq_nb2 = rx_buffer[SEQUENCE_IDX];
+testt2[ti]=frame_seq_nb2;
+			
 			if(result==0)
 			{
-				while (!((status_reg = dwt_read32bitreg(SYS_STATUS_ID)) & (SYS_STATUS_RXFCG | SYS_STATUS_ALL_RX_ERR))&&!g_start_sync_flag)///不断查询芯片状态直到接收成功或者出现错误
+				while (!((status_reg = dwt_read32bitreg(SYS_STATUS_ID)) & (SYS_STATUS_RXFCG | SYS_STATUS_ALL_RX_ERR)))///不断查询芯片状态直到接收成功或者出现错误
 			{ };
 		}else{
 			result++;
@@ -887,7 +946,7 @@
 	
 			if (status_reg & SYS_STATUS_RXFCG)//接收成功
 			{
-				
+				testt3[ti]=frame_seq_nb2;
 				dwt_write32bitreg(SYS_STATUS_ID, SYS_STATUS_RXFCG | SYS_STATUS_TXFRS);//清楚标志位
 				frame_len = dwt_read32bitreg(RX_FINFO_ID) & RX_FINFO_RXFLEN_MASK;//数据长度
 				dwt_readrxdata(rx_buffer, frame_len, 0);//读取接收数据
@@ -895,12 +954,13 @@
 			{
 				return 1;
 			}
-			if (rx_buffer[MESSAGE_TYPE_IDX] == NEAR_FINAL&&!memcmp(&rx_buffer[TAG_ID_IDX],&tag_id_recv,2)) //判断是否为Final包
+			if (rx_buffer[MESSAGE_TYPE_IDX] == NEAR_FINAL&&!memcmp(&rx_buffer[TAG_ID_IDX],&tag_id_recv,2)&&group_id==rx_buffer[GROUP_ID_IDX]) //判断是否为Final包
 				{
 					uint32_t poll_tx_ts, resp_rx_ts, final_tx_ts;
 					uint32_t poll_rx_ts_32, resp_tx_ts_32, final_rx_ts_32;
 					double Ra, Rb, Da, Db;
 					int64_t tof_dtu;
+                    u8 si;
 					resp_tx_ts = get_tx_timestamp_u64();//获得response发送时间T3
 					final_rx_ts = get_rx_timestamp_u64();//获得final接收时间T6
 					final_msg_get_ts(&rx_buffer[FINAL_MSG_POLL_TX_TS_IDX], &poll_tx_ts);//从接收数据中读取T1,T4,T5
@@ -918,46 +978,100 @@
 					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 * 1000; //dis 为单位为cm的距离				
+					dist_cm = dist_no_bias * 1000; //dis 为单位为cm的距离	
+					dwt_readdiagnostics(&d1);
+					LOS(&d1);					
 					/*--------------------------以下为非测距逻辑------------------------*/
 					//dist_cm=33000;
 					getrange_success = 1;
+					
 					LED0_BLINK; //每成功一次通讯则闪烁一次
 					dis_after_filter=dist_cm;
 					hex_dist = dist_cm+(int16_t)g_com_map[DIST_OFFSET]*10;
+
+                        if(recpoll_len==rec_nearbase_num*4+15)
+                        {
+                            hex_dist = dist_cm+(int16_t)g_com_map[DIST_OFFSET]*10-rec_antdelay*10;
+                        }
+                    
 					g_flag_Taggetdist[taglist_pos]=0;
-					if(hex_dist>-10000&&hex_dist<2000000)
+             testt4[ti]=frame_seq_nb2; 
+							testt5[ti] = hex_dist/10;												
+					if(hex_dist>-100000&&hex_dist<2000000)
 					{
-					if(abs(hex_dist-his_dist[taglist_pos])<15000||misdist_num[taglist_pos]>3)
-					{
-						int32_t filter_dist;
+					if(abs(hex_dist-his_dist[taglist_pos])<dist_threshold||misdist_num[taglist_pos]>3)
+					{u8 i=0;
+						
+                        g_Resttimer=0;
+                        IWDG_Feed();
 						#ifdef TDFILTER
 						NewTrackingDiffUpdate(taglist_pos, (float)hex_dist);
-						filter_dist=pos_predict[taglist_pos]/10;
+						filter_dist = pos_predict[taglist_pos]/10;
+                        filter_speed = vel_predict[taglist_pos]/10;
+                        newmeasure = 1;
 						#else
 						filter_dist=hex_dist/10;
 						#endif
 						misdist_num[taglist_pos]=0;
 					tagdist_list[taglist_pos] = filter_dist;	
 					his_dist[taglist_pos]=hex_dist;	
-						g_Tagdist[taglist_pos]=filter_dist;	
-				#ifndef USART_INTEGRATE_OUTPUT
+                        if(hex_dist>0)
+						{
+                            g_Tagdist[taglist_pos]=hex_dist/10;	
+                        }else{
+                            g_Tagdist[taglist_pos]= 1;
+                        }
+				#ifdef USART_SINGLE_OUTPUT
 					usart_send[2] = 1;//正常模式 
 					usart_send[3] = 17;//数据段长度
 					usart_send[4] = frame_seq_nb2;//数据段长度
 					memcpy(&usart_send[5],&tag_id_recv,2);
-					memcpy(&usart_send[7],&dev_id,2);				
+					memcpy(&usart_send[7],&dev_id,2);			
+                            if(tagdist_list[taglist_pos]<=0)
+                                tagdist_list[taglist_pos]=10;
 					memcpy(&usart_send[9],&tagdist_list[taglist_pos],4);
 					usart_send[13] = battary;
 					usart_send[14] = button;
+					usart_send[15] = firstpath_power;
+					usart_send[16] = rx_power;
 					checksum = Checksum_u16(&usart_send[2],17);
 					memcpy(&usart_send[19],&checksum,2);
+					if(g_com_map[MODBUS_MODE]!=1)
 					UART_PushFrame(usart_send,21);
+				//USART_puts(usart_send,21);
+					testt6[ti]=frame_seq_nb2; 
+					tagstate_list[taglist_pos] = button<<8|battary;
 				#else		
 					memcpy(&usart_send_anc[4+6*anc_report_num],&tag_id_recv,2);
 					memcpy(&usart_send_anc[6+6*anc_report_num],&tagdist_list[taglist_pos],4);
 					anc_report_num++;
 				#endif
+					for(i=0;i<taglist_num-1;i++)
+					{
+						if( tagdist_list[i]>tagdist_list[i+1]&&tagdist_list[i+1]!=0)
+						{
+							int32_t tempdist;
+							u16 tempid,tempstate;
+							tempdist = tagdist_list[i];
+							tempid = tagid_list[i];
+							tempstate = tagstate_list[i];
+							
+							tagdist_list[i] = tagdist_list[i+1];
+							tagid_list[i] = tagid_list[i+1];
+							tagstate_list[i] = tagstate_list[i+1];
+							
+							tagdist_list[i+1] = tempdist;
+							tagid_list[i+1] = tempid;
+							tagstate_list[i+1] = tempstate;
+						}
+					}
+					for(i=0;i<taglist_num;i++)
+					{
+						Modbus_HoldReg[i*4] = tagid_list[i];
+						Modbus_HoldReg[i*4+1] = tagstate_list[i];
+						memcpy(&Modbus_HoldReg[i*4+2],&tagdist_list[i],4);
+					}
+					
 					}else{
 					//	printf("%d",hex_dist);
 						misdist_num[taglist_pos]++;
@@ -972,7 +1086,21 @@
 uint32_t current_syncid=0xffffffff,synclost_timer;
 extern u8 flag_syncbase;
 u8 tagpos_rec[50],tagpos_send[50],ancidlist_num;
-u16 ancidlist_rec[20],ancidlist_send[20];
+u16 ancidlist_rec[20],ancidlist_send[20],rec_ancidlist[20],rec_ancdistlist[20];
+void Anchor_Start(void)
+{
+	
+dwt_write32bitreg(SYS_STATUS_ID, SYS_STATUS_ALL_RX_ERR| SYS_STATUS_TXFRS |SYS_STATUS_RXFCG);
+	g_start_sync_flag=0;
+dwt_setinterrupt(DWT_INT_TFRS | DWT_INT_RFCG | (DWT_INT_ARFE | DWT_INT_RFSL | DWT_INT_SFDT | DWT_INT_RPHE | DWT_INT_RFCE | DWT_INT_RFTO | DWT_INT_RXPTO), 1);
+	dwt_setrxtimeout(0);//设定接收超时时间,0位没有超时时间
+	dwt_rxenable(0);//打开接收
+//    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();
+//	};
+}
+
 void Anchor_App(void)
 {
 	
@@ -980,37 +1108,40 @@
 	u16 tempid;
 	uint32_t rec_syncid;
 	
-	dwt_write32bitreg(SYS_STATUS_ID, SYS_STATUS_ALL_RX_ERR| SYS_STATUS_TXFRS |SYS_STATUS_RXFCG);
-	g_start_sync_flag=0;
+//	dwt_write32bitreg(SYS_STATUS_ID, SYS_STATUS_ALL_RX_ERR| SYS_STATUS_TXFRS |SYS_STATUS_RXFCG);
+//	g_start_sync_flag=0;
 
-	dwt_setrxtimeout(0);//设定接收超时时间,0位没有超时时间
-	dwt_rxenable(0);//打开接收
-//	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();
-	};
+//	dwt_setrxtimeout(0);//设定接收超时时间,0位没有超时时间
+//	dwt_rxenable(0);//打开接收
+////	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();
+//	};
+	dwt_setinterrupt(DWT_INT_RFCG | (DWT_INT_ARFE | DWT_INT_RFSL | DWT_INT_SFDT | DWT_INT_RPHE | DWT_INT_RFCE | DWT_INT_RFTO | DWT_INT_RXPTO), 0);
+	status_reg = dwt_read32bitreg(SYS_STATUS_ID);
 //GPIO_WriteBit(GPIOA, GPIO_Pin_10, Bit_RESET);	
 	if (status_reg & SYS_STATUS_RXFCG)//成功接收
 	{ u16 tag_recv_interval;
 		float temp_tagpos;
-	
-
+		
 		dwt_write32bitreg(SYS_STATUS_ID, SYS_STATUS_RXFCG);//清除标志位
 		frame_len = dwt_read32bitreg(RX_FINFO_ID) & RX_FINFO_RXFL_MASK_1023;//获得接收数据长度
+        recpoll_len = frame_len;
 		dwt_readrxdata(rx_buffer, frame_len, 0);//读取接收数据
 		memcpy(&anc_id_recv,&rx_buffer[ANCHOR_ID_IDX],2);
 		//将收到的tag_id分别写入各次通讯的包中,为多标签通讯服务,防止一次通讯中接收到不同ID标签的数据
 		memcpy(&tag_id_recv,&rx_buffer[TAG_ID_IDX],2);
+       if(group_id==rx_buffer[GROUP_ID_IDX])
+       {
 		switch(rx_buffer[MESSAGE_TYPE_IDX])
 		{
 //			case POLL:
 //				if (anchor_type == rx_buffer[ANC_TYPE_IDX])
 //				Anchor_RecPoll();
 //				break;
-			case SYNC:		
-				g_Resttimer=0;				
+			case SYNC:					
 				memcpy(&rec_syncid,&rx_buffer[ANCHOR_ID_IDX],4);
 				if(rec_syncid<current_syncid)
 				{
@@ -1051,23 +1182,47 @@
 				}
 				break;
 		
-			case NEAR_POLL:		
-				g_Resttimer=0;				
-				memcpy(&tag_id_recv,&rx_buffer[TAG_ID_IDX],2);
+			case NEAR_POLL:	
+                frame_seq_nb2 = rx_buffer[SEQUENCE_IDX];
+			testt[ti++]=frame_seq_nb2;
+			if(ti>100)
+				ti=0;
+                battary = rx_buffer[BATTARY_IDX];
+                button = rx_buffer[BUTTON_IDX];
+                rec_nearbase_num=rx_buffer[NEARBASENUM_INDEX];                
+								memcpy(&tag_id_recv,&rx_buffer[TAG_ID_IDX],2);
+                memcpy(&rec_ancidlist,&rx_buffer[NEARBASEID_INDEX],2*rec_nearbase_num);
+                memcpy(&rec_ancdistlist,&rx_buffer[NEARBASEID_INDEX+2*rec_nearbase_num],2*rec_nearbase_num);
+                memcpy(&rec_antdelay,&rx_buffer[NEARBASEID_INDEX+nearbase_num*4],2);
+            #ifdef USART_ALL_OUTPUT
+                    usart_send[2] = 0x0c;//正常模式 
+					usart_send[3] = 8+rec_nearbase_num*4;//数据段长度
+					usart_send[4] = frame_seq_nb2;//数据段长度
+            		usart_send[5] = battary;
+					usart_send[6] = button;
+                    usart_send[7] = rec_nearbase_num;
+					memcpy(&usart_send[8],&tag_id_recv,2);
+					memcpy(&usart_send[10],&rec_ancidlist,2*rec_nearbase_num);				
+					memcpy(&usart_send[10+rec_nearbase_num*2],&rec_ancdistlist,2*rec_nearbase_num);
+					checksum = Checksum_u16(&usart_send[2],8+4*rec_nearbase_num);
+					memcpy(&usart_send[10+4*rec_nearbase_num],&checksum,2);
+					UART_PushFrame(usart_send,12+rec_nearbase_num*4);
+            #endif
+			if(tag_id_recv>=g_com_map[WHITELIST1_START]&&tag_id_recv<=g_com_map[WHITELIST1_END])
+			{break;}
 				taglist_pos=CmpTagInList(tag_id_recv);
 				if(taglist_pos==taglist_num)
 				{
 					taglist_pos=taglist_num;
-					tagid_list[taglist_num++]=tag_id_recv;
-					
+					tagid_list[taglist_num++]=tag_id_recv;					
 					new_tagid=1;
 				}else{
 					new_tagid=0;
 				}
 				tagofflinetime[taglist_pos]=0;
-		    temp_tagpos=round((float)(sync_timer%g_com_map[COM_INTERVAL])/slottime);
+                temp_tagpos=round((float)(sync_timer%g_com_map[COM_INTERVAL])/slottime);
 				tagpos_rec[(u8)temp_tagpos]=1;
-				rec_nearbase_num=rx_buffer[NEARBASENUM_INDEX];
+				
 			
 				if(rec_nearbase_num>ancidlist_num)
 					{
@@ -1094,8 +1249,13 @@
 				
 				break;		
 		}	
-	}else{
+	}
+}else{
 		dwt_write32bitreg(SYS_STATUS_ID, SYS_STATUS_ALL_RX_ERR);
 	}
+UART_CheckSend();
+	dwt_setinterrupt(  DWT_INT_RFCG | (DWT_INT_ARFE | DWT_INT_RFSL | DWT_INT_SFDT | DWT_INT_RPHE | DWT_INT_RFCE | DWT_INT_RFTO | DWT_INT_RXPTO), 1);
+		dwt_setrxtimeout(0);//设定接收超时时间,0位没有超时时间
+	dwt_rxenable(0);//打开接收
 }
 

--
Gitblit v1.9.3