From 170e557c0d38e66e6100d32a2a465ee1cd6f5275 Mon Sep 17 00:00:00 2001
From: zhyinch <zhyinch@gmail.com>
Date: 星期三, 07 十月 2020 18:17:34 +0800
Subject: [PATCH] 配临近初步测试完成

---
 源码/核心板/Src/application/dw_app.c |  784 ++++++++++++++++++++++++++++++++++++++++---------------
 1 files changed, 562 insertions(+), 222 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 4c15ddf..cb75c4a 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"
@@ -5,7 +5,7 @@
 	DISCPOLL,
 	GETNEARMSG,
 	NEARPOLL,
-}tag_state;
+}tag_state=GETNEARMSG;
 static dwt_config_t config = {
 	2,               /* Channel number. */
 	DWT_PRF_64M,     /* Pulse repetition frequency. */
@@ -26,7 +26,9 @@
 static uint8_t tx_nearresp_msg[80] = {0};
 static uint8_t tx_nearfinal_msg[80] = {0};
 
-static uint32_t frame_seq_nb = 0;	
+static uint8_t tx_near_msg[80] = {0};
+
+ uint32_t frame_seq_nb = 0, frame_seq_nb2 = 0;	
 static uint32_t status_reg = 0;
 static uint8_t rx_buffer[100];
 static uint64_t poll_tx_ts;
@@ -118,7 +120,9 @@
      * For initialisation, DW1000 clocks must be temporarily set to crystal speed. After initialisation SPI rate can be increased for optimum
      * performance. */
     Reset_DW1000();//重启DW1000 /* Target specific drive of RSTn line into DW1000 low for a period. */
+	status_reg = dwt_read32bitreg(SYS_STATUS_ID);
     dwt_initialise(DWT_LOADUCODE);//初始化DW1000
+	status_reg = dwt_read32bitreg(SYS_STATUS_ID);
 	Spi_ChangePrescaler(SPIx_PRESCALER_FAST);	//设置为快速模式
 
     /* Configure DW1000. See NOTE 6 below. */
@@ -169,6 +173,7 @@
 	dwt_configuresleep(0x940, 0x7);
 	dwt_entersleep();
 }
+
 extern uint8_t g_start_send_flag;
 u8 g_start_sync_flag;
 void SyncPoll(u8 sync_seq,uint32_t sync_baseid)
@@ -202,57 +207,270 @@
 
 u16 anclist_num=0,anclist_pos; //list 总数量和当前位置
 u16 ancid_list[TAG_NUM_IN_SYS];
-u8 nearbase_num=0;
+u8 nearbase_num=0,last_nearbase_num,next_nearbase_num;
 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];
+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;
+u32 rec_tagpos_binary;
+extern uint32_t tagpos_binary;
+void SetNextPollTime(u16 time)
+{
+	current_slotnum++;
+	if(current_slotnum==total_slotnum)
+		current_slotnum-=total_slotnum;
+	//time=5;
+	target_time=((current_slotnum*g_com_map[COM_INTERVAL])+time);
 
+	last_time=target_time;
+	if(target_time>=990&&target_time<992)
+	{
+		current_slotnum++;
+	target_time+=g_com_map[COM_INTERVAL];
+	tagslotpos=GetRandomSlotPos(rec_tagpos_binary|tagpos_binary);
+	tyncpoll_time = (tagslotpos--%max_slotpos)*slottime;	
+	}	
+	if(target_time>=1000)
+	{target_time-=1000;}
+	if(target_time<0)
+	{target_time+=1000;}
+
+}
 u8 FindNearBasePos(u16 baseid)
 {
 	u8 i;
-	for(i=0;i<=nearbase_num;i++)
+	for(i=0;i<last_nearbase_num;i++)
 	{
 		if(baseid==nearbaseid_list[i])
 			return i;
 	}
-	return i+1;
+	return i;
 }
 u8 recbase_num=0;
 #define CHANGE_BASE_THRESHOLD  5
-void NearAncSelect(void)
-{static u16 last_mainbase_id,change_base_count;
-	int32_t nearbase_mindist=99999, nearbase_minpos;
-	u8 i;
-	for(i=0;i<recbase_num-1;i++)
+//void NearAncSelect(void)
+//{static u16 last_mainbase_id,change_base_count;
+//	int32_t nearbase_mindist=99999, nearbase_minpos;
+//	u8 i;
+//	for(i=0;i<recbase_num-1;i++)
+//	{
+//		if(nearbase_mindist>nearbase_distlist[i])
+//		{
+//			nearbase_mindist=nearbase_distlist[i];
+//			nearbase_minpos=i;
+//		}
+//	}
+//	if(nearbase_mindist<mainbase_dist-THRESHOLD_CHANGE_MAINBASE_DIST)
+//	{
+//		if(last_mainbase_id==nearbaseid_list[nearbase_minpos])
+//		{
+//			change_base_count++;
+//			if(change_base_count>CHANGE_BASE_THRESHOLD)
+//			{
+//				mainbase_id=last_mainbase_id;
+//				tag_state=GETNEARMSG;
+//			}
+//		}else{
+//			change_base_count=0;
+//		}
+//		last_mainbase_id=nearbaseid_list[nearbase_minpos];		
+//	}else{
+//		change_base_count=0;
+//	}
+//}
+uint8_t GetRandomValue(void)
+{
+	uint8_t random_value=0,temp_adc,i;
+	for(i=0;i<8;i++)
 	{
-		if(nearbase_mindist>nearbase_distlist[i])
+		temp_adc=Get_ADC_Value();
+		random_value=random_value|((temp_adc&0x01)<<i);
+	}
+	return random_value;
+}
+u8 GetRandomSlotPos(uint32_t emptyslot)
+{
+	u8 i,temp_value;
+	temp_value = GetRandomValue();
+	for(i=temp_value%max_slotpos;i<max_slotpos;i++)
+	{
+		if(((emptyslot>>i)&0x1)==0)
 		{
-			nearbase_mindist=nearbase_distlist[i];
-			nearbase_minpos=i;
+			return i;
 		}
 	}
-	if(nearbase_mindist<mainbase_dist-THRESHOLD_CHANGE_MAINBASE_DIST)
+	
+		for(i=1;i<max_slotpos;i++)
 	{
-		if(last_mainbase_id==nearbaseid_list[nearbase_minpos])
+		if(((emptyslot>>i)&0x1)==0)
 		{
-			change_base_count++;
-			if(change_base_count>CHANGE_BASE_THRESHOLD)
-			{
-				mainbase_id=last_mainbase_id;
-				tag_state=GETNEARMSG;
-			}
-		}else{
-			change_base_count=0;
+			return i;
 		}
-		last_mainbase_id=nearbaseid_list[nearbase_minpos];		
-	}else{
-		change_base_count=0;
+	}
+return max_slotpos-1;
+}
+u8 test=0;
+u8 anclost_times=0;
+u8 exsistbase_list[MAX_NEARBASE_NUM],report_num,get_newbase=0;
+u16 temp_sync_timer1,temp_sync_timer2;
+
+void Poll(void)
+{
+	uint32_t frame_len;
+	uint32_t final_tx_time;
+	u32 start_poll;
+	int32_t mindist=999999,minid=-1,temp_dist;
+	u8 i,getsync_flag=0;
+    dwt_setrxaftertxdelay(POLL_TX_TO_RESP_RX_DLY_UUS);			//设置发送后开启接收,并设定延迟时间
+    dwt_setrxtimeout(RESP_RX_TIMEOUT_UUS);		
+	tag_succ_times = 0;
+	GPIO_WriteBit(GPIOA, GPIO_Pin_9, Bit_RESET);
+	for(i=0;i<g_com_map[MAX_REPORT_ANC_NUM];i++)
+	{
+	/* Write frame data to DW1000 and prepare transmission. See NOTE 7 below. */
+	tx_poll_msg[ANC_TYPE_IDX] = i;	
+	dwt_writetxdata(sizeof(tx_poll_msg), tx_poll_msg, 0);//将Poll包数据传给DW1000,将在开启发送时传出去
+	dwt_writetxfctrl(sizeof(tx_poll_msg), 0);//设置超宽带发送数据长度
+	dwt_starttx(DWT_START_TX_IMMEDIATE | DWT_RESPONSE_EXPECTED);//开启发送,发送完成后等待一段时间开启接收,等待时间在dwt_setrxaftertxdelay中设置
+	start_poll = time32_incr;
+	/* We assume that the transmission is achieved correctly, poll for reception of a frame or error/timeout. See NOTE 8 below. */
+	while (!((status_reg = dwt_read32bitreg(SYS_STATUS_ID)) & (SYS_STATUS_RXFCG | SYS_STATUS_ALL_RX_ERR)))//不断查询芯片状态直到成功接收或者发生错误
+	{ if(time32_incr - start_poll>20)
+		NVIC_SystemReset();
+	};
+	if(status_reg==0xffffffff)
+	{
+		NVIC_SystemReset();
+	}
+	if (status_reg & SYS_STATUS_RXFCG)//如果成功接收
+	{
+		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);   //读取接收数据
+		if (rx_buffer[MESSAGE_TYPE_IDX] == RESPONSE&&!memcmp(&rx_buffer[TAG_ID_IDX],&dev_id,2)) //判断接收到的数据是否是response数据
+		{
+			poll_tx_ts = get_tx_timestamp_u64();										//获得POLL发送时间T1
+			resp_rx_ts = get_rx_timestamp_u64();										//获得RESPONSE接收时间T4			
+			if(getsync_flag==0)
+			{
+				getsync_flag=1;
+			memcpy(&sync_timer,&rx_buffer[ANCTIMEMS],2);
+			memcpy(&tmp_time,&rx_buffer[ANCTIMEUS],2);
+			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;
+			if(tagslotpos>max_slotpos)
+				tagslotpos=tagslotpos%(max_slotpos+1);
+				tyncpoll_time=(tagslotpos-1)*slottime;
+		}
+			
+			memcpy(&temp_dist, &rx_buffer[DIST_IDX], 4);
+			memcpy(&tx_final_msg[ANCHOR_ID_IDX], &rx_buffer[ANCHOR_ID_IDX], 4);
+			/* Compute final message transmission time. See NOTE 9 below. */
+			final_tx_time = (resp_rx_ts + (RESP_RX_TO_FINAL_TX_DLY_UUS * UUS_TO_DWT_TIME)) >> 8;//计算final包发送时间,T5=T4+Treply2
+			dwt_setdelayedtrxtime(final_tx_time);//设置final包发送时间T5
+			final_tx_ts = (((uint64_t)(final_tx_time & 0xFFFFFFFE)) << 8) + TX_ANT_DLY;//final包实际发送时间是计算时间加上发送天线delay
+			final_msg_set_ts(&tx_final_msg[FINAL_MSG_POLL_TX_TS_IDX], poll_tx_ts);//将T1,T4,T5写入发送数据
+			final_msg_set_ts(&tx_final_msg[FINAL_MSG_RESP_RX_TS_IDX], resp_rx_ts);
+			final_msg_set_ts(&tx_final_msg[FINAL_MSG_FINAL_TX_TS_IDX], final_tx_ts);
+			dwt_writetxdata(sizeof(tx_final_msg), tx_final_msg, 0);//将发送数据写入DW1000
+			dwt_writetxfctrl(sizeof(tx_final_msg), 0);//设定发送数据长度
+			result=dwt_starttx(DWT_START_TX_DELAYED);//设定为延迟发送			
+			tag_succ_times++;		
+				LED0_BLINK;
+			
+			if(temp_dist<mindist)
+			{
+				memcpy(&minid, &rx_buffer[ANCHOR_ID_IDX], 4);
+				tag_state=GETNEARMSG;
+				trygetnearmsg_times=5;
+				mindist=temp_dist;
+			}
+			if(result==0)
+			{while (!(dwt_read32bitreg(SYS_STATUS_ID) & SYS_STATUS_TXFRS))//不断查询芯片状态直到发送完成
+			{ };
+		}
+			/* Clear TXFRS event. */
+			dwt_write32bitreg(SYS_STATUS_ID, SYS_STATUS_TXFRS);//清除标志位
+			random_delay_tim = 0;
+		}
+		else
+		{
+			random_delay_tim = DFT_RAND_DLY_TIM_MS; //如果通讯失败,将间隔时间增加5ms,避开因为多标签同时发送引起的冲突。
+		}
+	}
+	else
+	{
+	dwt_write32bitreg(SYS_STATUS_ID, SYS_STATUS_ALL_RX_ERR);
+		random_delay_tim = DFT_RAND_DLY_TIM_MS;
 	}
 }
-u8 anclost_times=0;
-u8 exsistbase_list[MAX_NEARBASE_NUM],report_num;
-u16 temp_sync_timer1,temp_sync_timer2;
-void NearPoll(void)
+	if(getsync_flag==0)
+	{
+	tagslotpos--;
+			if(tagslotpos==0||tagslotpos>max_slotpos)
+		{		
+			tagslotpos=max_slotpos;	
+		}
+		tyncpoll_time=(tagslotpos-1)*slottime;
+	}
+	mainbase_id=minid;
+}
+u8 nearmsg_mainbase=0,rec_tagpos_emptylist[32];
+void GetNearMsg(void)
+{
+	u32 start_poll,frame_len;
+
+	memcpy(&tx_near_msg[ANCHOR_ID_IDX],&mainbase_id,2);
+	memcpy(&tx_near_msg[TAG_ID_IDX],&dev_id,2);
+	tx_near_msg[MESSAGE_TYPE_IDX] = NEAR_MSG;
+	
+	dwt_setrxaftertxdelay(POLL_TX_TO_RESP_RX_DLY_UUS);			//设置发送后开启接收,并设定延迟时间
+  dwt_setrxtimeout(RESP_RX_TIMEOUT_UUS);	
+	dwt_writetxdata(12, tx_near_msg, 0);//将Poll包数据传给DW1000,将在开启发送时传出去
+	dwt_writetxfctrl(12, 0);//设置超宽带发送数据长度
+	dwt_starttx(DWT_START_TX_IMMEDIATE| DWT_RESPONSE_EXPECTED);
+	start_poll = time32_incr;
+	/* We assume that the transmission is achieved correctly, poll for reception of a frame or error/timeout. See NOTE 8 below. */
+	while (!((status_reg = dwt_read32bitreg(SYS_STATUS_ID)) & (SYS_STATUS_RXFCG | SYS_STATUS_ALL_RX_ERR)))//不断查询芯片状态直到成功接收或者发生错误
+	{ if(time32_incr - start_poll>20)
+		NVIC_SystemReset();
+	};
+	if(status_reg==0xffffffff)
+	{
+		NVIC_SystemReset();
+	}
+	if (status_reg & SYS_STATUS_RXFCG)//如果成功接收
+	{
+		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);   //读取接收数据
+		if (rx_buffer[MESSAGE_TYPE_IDX] == NEAR_MSG&&!memcmp(&rx_buffer[TAG_ID_IDX],&dev_id,2)) //判断接收到的数据是否是response数据
+		{
+			next_nearbase_num=rx_buffer[NEARBASENUM_INDEX];
+			memcpy(&rec_tagpos_binary,&rx_buffer[NEARMSG_EMPTYSLOTPOS_INDEX],4);
+			tagslotpos=GetRandomSlotPos(rec_tagpos_binary);
+			//tagslotpos=rx_buffer[TAGSLOTPOS];
+			memcpy(nearbaseid_list,&rx_buffer[NEARBASEID_INDEX],next_nearbase_num*2);
+			//slottime=ceil((nearbase_num+2)*0.4)+2;
+			tyncpoll_time=tagslotpos*slottime;
+			tag_state=NEARPOLL;
+		}else{
+				tyncpoll_time = (tagslotpos--%max_slotpos)*slottime;
+		}
+	}else{
+			tyncpoll_time = (tagslotpos--%max_slotpos)*slottime;
+	}
+	
+}
+ void NearPoll(void)
 {
 	static u8 mainbase_lost_count=0,flag_finalsend,flag_rxon;
 	uint32_t temp1,temp2,dw_systime;
@@ -261,16 +479,17 @@
 	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);		
 	tag_succ_times = 0;
 	GPIO_WriteBit(GPIOA, GPIO_Pin_10, Bit_SET);
-	if(nearbase_num>=MAX_NEARBASE_NUM)
+	if(next_nearbase_num>=MAX_NEARBASE_NUM)
 	{
-		nearbase_num = MAX_NEARBASE_NUM-1;
+		next_nearbase_num = MAX_NEARBASE_NUM-1;
 	}
 	//nearbase_num=0;
+	last_nearbase_num=next_nearbase_num;
+	nearbase_num=next_nearbase_num;
 	recbase_num=0;
 	tx_nearpoll_msg[BATTARY_IDX] = Get_Battary();
 	tx_nearpoll_msg[BUTTON_IDX] = !READ_KEY0;
@@ -282,15 +501,12 @@
 	dwt_writetxdata(13+2*nearbase_num, tx_nearpoll_msg, 0);//将Poll包数据传给DW1000,将在开启发送时传出去
 	dwt_writetxfctrl(13+2*nearbase_num, 0);//设置超宽带发送数据长度
 	dwt_starttx(DWT_START_TX_IMMEDIATE | DWT_RESPONSE_EXPECTED);//开启发送,发送完成后等待一段时间开启接收,等待时间在dwt_setrxaftertxdelay中设置
-
-	for(i=0;i<MAX_NEARBASE_NUM;i++)
-	exsistbase_list[i]=0;
 	
 	flag_finalsend=0;
 	flag_rxon=1;
 	neartimout_timer=0;
-
-	timeout=ceil((float)nearbase_num/4)+2;
+	get_newbase=0;
+	timeout=ceil((float)nearbase_num*SLOT_SCALE)+3;
 	//timeout=5;
 	mainbase_dist=100000;
 	mainbase_lost_count++;
@@ -308,6 +524,9 @@
 								dwt_forcetrxoff();
 								dwt_setdelayedtrxtime(final_tx_time);
 								result=dwt_starttx(DWT_START_TX_DELAYED);//设定为延迟发送	
+																		#ifdef DEBUG_INF
+									USART_putc(0x33);
+									#endif
 								break;
 							}
 						}
@@ -332,11 +551,12 @@
 								resp_rx_ts = get_rx_timestamp_u64();										//获得RESPONSE接收时间T4	
 								recbase_num++;
 								memcpy(&rec_nearbaseid,&rx_buffer[ANCHOR_ID_IDX],2);
-								if(nearbase_num==0)
+								if(last_nearbase_num==0)
 								{
-								nearbaseid_list[0]=rec_nearbaseid;
-								nearbase_num=1;
-								memcpy(&tx_nearfinal_msg[ANCHOR_ID_IDX],&rec_nearbaseid,2);
+									get_newbase=1;
+									nearbaseid_list[0]=rec_nearbaseid;
+									nearbase_num=1;
+									memcpy(&tx_nearfinal_msg[ANCHOR_ID_IDX],&rec_nearbaseid,2);
 								}
 								if(rec_nearbaseid==nearbaseid_list[0])
 								{
@@ -344,29 +564,39 @@
 									temp_sync_timer2=sync_timer;
 									memcpy(&temp_sync_timer1,&rx_buffer[ANCTIMEMS],2);
 									memcpy(&tmp_time,&rx_buffer[ANCTIMEUS],2);
+									
+									
+									if(g_com_map[DEV_ROLE]!=0)
+									{
 									sync_timer=temp_sync_timer1;
-									exsistbase_list[0]=1;
 ////									memcpy(&tagslotpos,&rx_buffer[TAGSLOTPOS],2);		
 //									
-									tmp_time=tmp_time+450;
+									
+										tmp_time=tmp_time+650;
 									if(tmp_time>999)
 									{
 										tmp_time-=999;
 										sync_timer++;
-										if(sync_timer>=1010)
+										if(sync_timer>=1000)
 											{sync_timer=0;}
 									}
 									TIM3->CNT=tmp_time;
-									
+								}
+									current_slotnum=temp_sync_timer1/g_com_map[COM_INTERVAL];
 //									if(tagslotpos>max_slotpos)
 //										tagslotpos=tagslotpos%(max_slotpos+1);
 //										tyncpoll_time=(tagslotpos-1)*slottime;
 									////////////////////////////
+																	#ifdef DEBUG_INF
+									USART_putc(0x31);
+									#endif
 									rec_nearbasepos=0;
-									exsistbase_list[rec_nearbasepos]=1;
+									
 									memcpy(&temp_dist,&rx_buffer[DIST_IDX],4);
 									nearbase_distlist[rec_nearbasepos]=temp_dist;
-									
+								if(temp_dist!=0x1ffff)
+									exsistbase_list[rec_nearbasepos]=KEEP_TIMES;
+								
 									mainbase_lost_count=0;
 									flag_finalsend=1;
 									final_tx_time = (resp_rx_ts + ((RESP_RX_TO_FINAL_TX_DLY_UUS+DELAY_BETWEEN_TWO_FRAME_UUS*nearbase_num+500) * UUS_TO_DWT_TIME)) >> 8;
@@ -380,48 +610,22 @@
 									tx_nearfinal_msg[MESSAGE_TYPE_IDX]=NEAR_FINAL;
 									dwt_writetxdata(28+nearbase_num*4, tx_nearfinal_msg, 0);//将发送数据写入DW1000
 									dwt_writetxfctrl(28+nearbase_num*4, 0);//设定发送数据长度
-									if(temp_dist!=0x1ffff)
+									memcpy(&rec_tagpos_binary,&rx_buffer[NEARMSG_EMPTYSLOTPOS_INDEX],4);
+								if(temp_dist!=0x1ffff)
 									{
-									#ifndef USART_INTEGRATE_OUTPUT
-										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],&rec_nearbaseid,2);				
-										memcpy(&usart_send[9],&rx_buffer[DIST_IDX],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);
-									#endif
-									}
-									//result=dwt_starttx(DWT_START_TX_DELAYED);//设定为延迟发送			
-								}else{
-									rec_nearbasepos=FindNearBasePos(rec_nearbaseid);
-									if(rec_nearbasepos>nearbase_num)          //发现新的基站
-									{
-										nearbase_num++;
-										nearbaseid_list[nearbase_num] = rec_nearbaseid;
-										memcpy(&tx_nearfinal_msg[ANCHOR_ID_IDX],&rec_nearbaseid,2);
-									}
-									
-									exsistbase_list[rec_nearbasepos]=1;
-									memcpy(&temp_dist,&rx_buffer[DIST_IDX],4);
-									nearbase_distlist[rec_nearbasepos]=temp_dist;
-									
-									final_msg_set_ts(&tx_nearfinal_msg[FINAL_MSG_RESP_RX_NEARBASE_IDX+(rec_nearbasepos)*4], resp_rx_ts);								
-									dwt_writetxdata(28+nearbase_num*4, tx_nearfinal_msg, 0);//将发送数据写入DW1000
-									dwt_writetxfctrl(28+nearbase_num*4, 0);//设定发送数据长度
-									LED0_BLINK;
-									if(temp_dist!=0x1ffff)
-									{
+									#ifdef TAG_OUTPUT
 										#ifndef USART_INTEGRATE_OUTPUT
 										usart_send[2] = 1;//正常模式
 										usart_send[3] = 17;//数据段长度
 										usart_send[4] = frame_seq_nb;//数据段长度
+										if(g_com_map[DEV_ROLE])
+										{
 										memcpy(&usart_send[5],&dev_id,2);
-										memcpy(&usart_send[7],&rec_nearbaseid,2);				
+										memcpy(&usart_send[7],&rec_nearbaseid,2);		
+										}else{
+										memcpy(&usart_send[5],&rec_nearbaseid,2);
+										memcpy(&usart_send[7],&dev_id,2);	
+										}											
 										memcpy(&usart_send[9],&rx_buffer[DIST_IDX],4);
 										usart_send[13] = battary;
 										usart_send[14] = button;
@@ -429,7 +633,61 @@
 										memcpy(&usart_send[19],&checksum,2);
 										UART_PushFrame(usart_send,21);
 										#endif
+									#endif
 
+									//dwt_setdelayedtrxtime(final_tx_time);//设置final包发送时间T5
+								//	result=dwt_starttx(DWT_START_TX_DELAYED);//设定为延迟发送			
+									//dwt_writetxdata(4,&tx_near_msg[FINAL_MSG_RESP_RX_NEARBASE_IDX+(rec_nearbasepos+1)*4], FINAL_MSG_RESP_RX_NEARBASE_IDX+(rec_nearbasepos+1)*4);//将发送数据写入DW1000
+								}
+		
+									
+								}else{
+									rec_nearbasepos=FindNearBasePos(rec_nearbaseid);
+									if(rec_nearbasepos>=last_nearbase_num)          //发现新的基站
+									{
+										get_newbase=1;
+										nearbase_num++;
+										nearbaseid_list[rec_nearbasepos] = rec_nearbaseid;
+										memcpy(&tx_nearfinal_msg[ANCHOR_ID_IDX],&rec_nearbaseid,2);
+									}
+									#ifdef DEBUG_INF
+									USART_putc(0x32);
+									#endif
+									memcpy(&temp_dist,&rx_buffer[DIST_IDX],4);
+									nearbase_distlist[rec_nearbasepos]=temp_dist;
+									
+									if(temp_dist!=0x1ffff)
+									exsistbase_list[rec_nearbasepos]=KEEP_TIMES;
+									
+									final_msg_set_ts(&tx_nearfinal_msg[FINAL_MSG_RESP_RX_NEARBASE_IDX+(rec_nearbasepos)*4], resp_rx_ts);								
+									dwt_writetxdata(28+nearbase_num*4, tx_nearfinal_msg, 0);//将发送数据写入DW1000
+									dwt_writetxfctrl(28+nearbase_num*4, 0);//设定发送数据长度
+									LED0_BLINK;
+//									memcpy(&rec_tagpos_binary,&rx_buffer[NEARMSG_EMPTYSLOTPOS_INDEX],4);
+//									tagslotpos=GetRandomSlotPos(rec_tagpos_binary);
+									if(temp_dist!=0x1ffff)
+									{
+									#ifdef TAG_OUTPUT
+										#ifndef USART_INTEGRATE_OUTPUT
+										usart_send[2] = 1;//正常模式
+										usart_send[3] = 17;//数据段长度
+										usart_send[4] = frame_seq_nb;//数据段长度
+										if(g_com_map[DEV_ROLE])
+										{
+										memcpy(&usart_send[5],&dev_id,2);
+										memcpy(&usart_send[7],&rec_nearbaseid,2);		
+										}else{
+										memcpy(&usart_send[5],&rec_nearbaseid,2);
+										memcpy(&usart_send[7],&dev_id,2);	
+										}											
+										memcpy(&usart_send[9],&rx_buffer[DIST_IDX],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);
+										#endif
+								#endif
 									//dwt_setdelayedtrxtime(final_tx_time);//设置final包发送时间T5
 								//	result=dwt_starttx(DWT_START_TX_DELAYED);//设定为延迟发送			
 									//dwt_writetxdata(4,&tx_near_msg[FINAL_MSG_RESP_RX_NEARBASE_IDX+(rec_nearbasepos+1)*4], FINAL_MSG_RESP_RX_NEARBASE_IDX+(rec_nearbasepos+1)*4);//将发送数据写入DW1000
@@ -437,6 +695,9 @@
 							}									
 							}
 						}else{
+							 #ifdef DEBUG_INF
+								printf("response包失败:%x/n",status_reg);
+								#endif
 						dwt_write32bitreg(SYS_STATUS_ID,SYS_STATUS_RXFCG| SYS_STATUS_ALL_RX_ERR);
 						if(flag_rxon)
 							{dwt_rxenable(0);	
@@ -456,53 +717,72 @@
 			j=0;
 			if(exsistbase_list[0]==0)
 			{
-			 u8 temp_adc,random_value;
-				random_value=0;
-				for(i=0;i<8;i++)
-				{
-					temp_adc=Get_ADC_Value();
-					random_value=random_value|((temp_adc&0x01)<<i);
-				}
-				tyncpoll_time=(random_value%max_slotpos)*slottime;	
+//			 u8 temp_adc,random_value;
+//				random_value=0;
+//				for(i=0;i<8;i++)
+//				{
+//					temp_adc=Get_ADC_Value();
+//					random_value=random_value|((temp_adc&0x01)<<i);
+//				}
+				tagslotpos=GetRandomSlotPos(rec_tagpos_binary|tagpos_binary);
+				tyncpoll_time = (tagslotpos--%max_slotpos)*slottime;
+		tag_state=GETNEARMSG;		
 			}
-			for(i=0;i<MAX_NEARBASE_NUM;i++)
+		//	tyncpoll_time=0;
+			next_nearbase_num=0;
+			for(i=0;i<last_nearbase_num+get_newbase;i++)
 			{
-				if(exsistbase_list[i]==1)
-				{
+				if(exsistbase_list[i]>0)
+				{		
+					next_nearbase_num++;
+					true_exsistbase_list[j]=exsistbase_list[i];
 					true_nearbase_idlist[j]=nearbaseid_list[i];			
 					true_nearbase_distlist[j++]=nearbase_distlist[i];
+					exsistbase_list[i]--;
 				}
-			
 			}
-		
-			for(i=0;i<nearbase_num-1;i++)
+
+			if(recbase_num<3)
+			{next_nearbase_num=next_nearbase_num;}
+					last_nearbase_num = next_nearbase_num;
+			for(i=0;i<last_nearbase_num-1;i++)
 			{
-				for(j=0;j<nearbase_num-1;j++)
+				for(j=0;j<last_nearbase_num-1;j++)
 				{
 					if(true_nearbase_distlist[j]>true_nearbase_distlist[j+1])
 					{
-						u32 temp_dist,temp_id;
+						u32 temp_dist,temp_id,temp_exsis;
 						temp_dist=true_nearbase_distlist[j];
 						temp_id = true_nearbase_idlist[j];
+						temp_exsis=true_exsistbase_list[i];
 						true_nearbase_distlist[j]=true_nearbase_distlist[j+1];
 						true_nearbase_idlist[j]=true_nearbase_idlist[j+1];
+						true_exsistbase_list[j]=true_exsistbase_list[j+1];
+						
 						true_nearbase_distlist[j+1]=temp_dist;
 						true_nearbase_idlist[j+1]=temp_id;
+						true_exsistbase_list[j+1]=temp_exsis;
 					}			
 				}
 			}
+			
 			report_num=0;
-	for (i=0;i<nearbase_num;i++)
+	for (i=0;i<last_nearbase_num;i++)
 			{
 				nearbaseid_list[i]=true_nearbase_idlist[i];
 				nearbase_distlist[i]=true_nearbase_distlist[i];
-				if(nearbase_distlist[i]!=0x1ffff)
+				if(nearbase_distlist[i]!=0x1ffff&&true_exsistbase_list[i]==KEEP_TIMES)
 				{
 					memcpy(&usart_send[4+6*report_num],&nearbaseid_list[i],2);
 					memcpy(&usart_send[6+6*report_num],&nearbase_distlist[i],4);
 					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		
 				usart_send[2] = 4;//正常模式
@@ -511,6 +791,9 @@
 				memcpy(&usart_send[4+report_num*6],&checksum,2);
 				UART_PushFrame(usart_send,6+report_num*6);
 			#endif
+			#ifdef DEBUG_INF
+				printf("序号:%d,基站数量:%d/n",(frame_seq_nb-1)&0xff,nearbase_num);
+				#endif
 //			if(mainbase_lost_count>5)
 //			{
 //				//tag_state=DISCPOLL;
@@ -526,56 +809,32 @@
 //			}else{
 //				anclost_times=0;
 //			}
-
-	dwt_write32bitreg(SYS_STATUS_ID, SYS_STATUS_ALL_RX_ERR);
-
-
+dwt_forcetrxoff();
+	dwt_write32bitreg(SYS_STATUS_ID, SYS_STATUS_ALL_RX_ERR| SYS_STATUS_TXFRS |SYS_STATUS_RXFCG);
 }
-
-//void GetNearMsg(void)
-//{
-//	u32 start_poll,frame_len;
-//	memcpy(&tx_near_msg[ANCHOR_ID_IDX],&mainbase_id,2);
-//	memcpy(&tx_near_msg[TAG_ID_IDX],&dev_id,2);
-//	tx_near_msg[MESSAGE_TYPE_IDX] = NEAR_MSG;
-//	
-//	dwt_setrxaftertxdelay(POLL_TX_TO_RESP_RX_DLY_UUS);			//设置发送后开启接收,并设定延迟时间
-//  dwt_setrxtimeout(RESP_RX_TIMEOUT_UUS);	
-//	dwt_writetxdata(12, tx_near_msg, 0);//将Poll包数据传给DW1000,将在开启发送时传出去
-//	dwt_writetxfctrl(12, 0);//设置超宽带发送数据长度
-//	dwt_starttx(DWT_START_TX_IMMEDIATE| DWT_RESPONSE_EXPECTED);
-//	start_poll = time32_incr;
-//	/* We assume that the transmission is achieved correctly, poll for reception of a frame or error/timeout. See NOTE 8 below. */
-//	while (!((status_reg = dwt_read32bitreg(SYS_STATUS_ID)) & (SYS_STATUS_RXFCG | SYS_STATUS_ALL_RX_ERR)))//不断查询芯片状态直到成功接收或者发生错误
-//	{ if(time32_incr - start_poll>20)
-//		NVIC_SystemReset();
-//	};
-//	if(status_reg==0xffffffff)
-//	{
-//		NVIC_SystemReset();
-//	}
-//	if (status_reg & SYS_STATUS_RXFCG)//如果成功接收
-//	{
-//		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);   //读取接收数据
-//		if (rx_buffer[MESSAGE_TYPE_IDX] == NEAR_MSG&&!memcmp(&rx_buffer[TAG_ID_IDX],&dev_id,2)) //判断接收到的数据是否是response数据
-//		{
-//			nearbase_num=rx_buffer[NEARBASENUM_INDEX];
-//			tagslotpos=rx_buffer[TAGSLOTPOS];
-//			memcpy(nearbaseid_list,&rx_buffer[NEARBASEID_INDEX],nearbase_num*2);
-//			slottime=ceil((nearbase_num+2)*0.3)+1;
-//			tyncpoll_time=tagslotpos*slottime;
-//			tag_state=NEARPOLL;
-//		}
-//	}
-//}
 
 void Tag_App(void)//发送模式(TAG标签)
 {
 	//LED0_ON;
+	dwt_forcetrxoff();
 	g_Resttimer=0;
-	NearPoll();
+		GPIO_WriteBit(GPIOA, GPIO_Pin_10, Bit_SET);	
+	switch(tag_state)
+	{
+		case DISCPOLL:
+				Poll();
+			break;
+		case GETNEARMSG:
+			  GetNearMsg();
+			break;
+		case NEARPOLL:
+				NearPoll();
+			break;
+	}
+
+	SetNextPollTime(tyncpoll_time);
+	g_start_send_flag = 0;		
+	GPIO_WriteBit(GPIOA, GPIO_Pin_10, Bit_RESET);	
 }
 
 int8_t correction_time,new_tagid=0;
@@ -602,9 +861,9 @@
 	for(i=0;i<taglist_num;i++)
 	{
 		if(memcmp(&tagid,&tagid_list[i],2)==0)
-			return i+1;
+			break;
 	}
-	return 0;
+	return i;
 }
 uint32_t frame_len;
 uint32_t resp_tx_time;
@@ -632,7 +891,7 @@
 
 			battary = rx_buffer[BATTARY_IDX];
 			button = rx_buffer[BUTTON_IDX];
-			frame_seq_nb = rx_buffer[SEQUENCE_IDX];
+			frame_seq_nb2 = rx_buffer[SEQUENCE_IDX];
 			if(result==0)
 			{
 				while (!((status_reg = dwt_read32bitreg(SYS_STATUS_ID)) & (SYS_STATUS_RXFCG | SYS_STATUS_ALL_RX_ERR)))///不断查询芯片状态直到接收成功或者出现错误
@@ -682,9 +941,12 @@
 				dwt_write32bitreg(SYS_STATUS_ID, SYS_STATUS_ALL_RX_ERR);
 			}
 }
-u8 misdist_num,seize_anchor;
+extern uint16_t configremotetagID;
+extern u8 remotetag_paralen;
+u8 misdist_num[TAG_NUM_IN_SYS],seize_anchor,waittagconfig_reponse;
 u8 Anchor_RecNearPoll(u8 ancrec_nearbasepos) //0 mainbase  1 first near_base
 {
+	u8 motorstate;
 			tmp_time=TIM3->CNT;
 			memcpy(&tx_nearresp_msg[ANCTIMEMS],&sync_timer,2);
 			memcpy(&tx_nearresp_msg[ANCTIMEUS],&tmp_time,2);
@@ -696,7 +958,20 @@
 			dwt_setdelayedtrxtime(resp_tx_time);//设置Response发送时间T3
 			dwt_setrxaftertxdelay(RESP_TX_TO_FINAL_RX_DLY_UUS+(rec_nearbase_num+1-ancrec_nearbasepos)*DELAY_BETWEEN_TWO_FRAME_UUS);//设置发送完成后开启接收延迟时间
 			dwt_setrxtimeout(FINAL_RX_TIMEOUT_UUS);//接收超时时间
-
+			
+			if(tagdist_list[taglist_pos]<g_com_map[ALARM_DISTANCE1])
+			{
+				motorstate =0;
+			}else if(tagdist_list[taglist_pos]<g_com_map[ALARM_DISTANCE2])
+			{
+				motorstate =2;
+			}else if(tagdist_list[taglist_pos]<g_com_map[ALARM_DISTANCE3])
+			{
+				motorstate =1;
+			}else{
+				motorstate =0;
+			}
+			
 			if(new_tagid)
 			{
 				tagdist_list[taglist_pos]=0x1ffff;
@@ -704,15 +979,49 @@
 			}else{
 				memcpy(&tx_nearresp_msg[DIST_IDX], &tagdist_list[taglist_pos], 4);
 			}
-	
+			tx_nearresp_msg[MAINBASE_INDEX]=flag_syncbase;
 			tx_nearresp_msg[MESSAGE_TYPE_IDX]=NEAR_RESPONSE;
-			dwt_writetxdata(20, tx_nearresp_msg, 0);//写入发送数据
-			dwt_writetxfctrl(20, 0);//设定发送长度
+			tx_nearresp_msg[MOTORSTATE_INDEX]=(remotesend_state<<4)|motorstate;
+			waittagconfig_reponse=0;
+			if(pwtag.remain_time>0)
+				{uint8_t i;
+					for(i=0;i<pwtag.groupnum;i++)
+					{
+						if(pwtag.groupid[i][0]<=tag_id_recv&&tag_id_recv<=pwtag.groupid[i][1])
+						{
+							remotesend_state=1;
+							tx_nearresp_msg[MOTORSTATE_INDEX]=(remotesend_state<<4)|motorstate;
+							remotetag_paralen = 2+3;
+							remotetag_para[0] = 2;
+							remotetag_para[1] = 6;
+							remotetag_para[2] = 2;
+							memcpy(&remotetag_para[3],&pwtag.group_interval[i],2);
+							memcpy(&tx_nearresp_msg[REMOTEPARA_INDEX],remotetag_para,remotetag_paralen);
+							dwt_writetxdata(22+remotetag_paralen, tx_nearresp_msg, 0);//写入发送数据
+							dwt_writetxfctrl(22+remotetag_paralen, 0);//设定发送长度		
+							remotesend_state=0;
+							break;
+						}				
+					}
+					
+				}else{
+						dwt_writetxdata(22, tx_nearresp_msg, 0);//写入发送数据
+						dwt_writetxfctrl(22, 0);//设定发送长度
+				}
+					
+//			 if(remotesend_state&&tag_id_recv==configremotetagID)
+//			{
+//			 	memcpy(&tx_nearresp_msg[REMOTEPARA_INDEX],remotetag_para,remotetag_paralen);
+//				dwt_writetxdata(22+remotetag_paralen, tx_nearresp_msg, 0);//写入发送数据
+//				dwt_writetxfctrl(22+remotetag_paralen, 0);//设定发送长度		
+//				waittagconfig_reponse=1;
+//			}else{
+
 			result = dwt_starttx(DWT_START_TX_DELAYED | DWT_RESPONSE_EXPECTED);//延迟发送,等待接收
 
 			battary = rx_buffer[BATTARY_IDX];
 			button = rx_buffer[BUTTON_IDX];
-			frame_seq_nb = rx_buffer[SEQUENCE_IDX];
+			frame_seq_nb2 = rx_buffer[SEQUENCE_IDX];
 			if(result==0)
 			{
 				while (!((status_reg = dwt_read32bitreg(SYS_STATUS_ID)) & (SYS_STATUS_RXFCG | SYS_STATUS_ALL_RX_ERR))&&!g_start_sync_flag)///不断查询芯片状态直到接收成功或者出现错误
@@ -761,17 +1070,19 @@
 					LED0_BLINK; //每成功一次通讯则闪烁一次
 					dis_after_filter=dist_cm;
 					hex_dist = dist_cm+(int16_t)g_com_map[DIST_OFFSET];
-					if(hex_dist>-1000&&hex_dist<100000)
+					g_flag_Taggetdist[taglist_pos]=0;
+					if(hex_dist>-1000&&hex_dist<200000)
 					{
-					if(abs(hex_dist-his_dist[taglist_pos])<1500||misdist_num>3)
+					if(abs(hex_dist-his_dist[taglist_pos])<1500||misdist_num[taglist_pos]>3)
 					{
-						misdist_num=0;
+						misdist_num[taglist_pos]=0;
 					tagdist_list[taglist_pos] = hex_dist;	
 					his_dist[taglist_pos]=hex_dist;	
+						g_Tagdist[taglist_pos]=hex_dist;	
 				#ifndef USART_INTEGRATE_OUTPUT
-					usart_send[2] = 1;//正常模式
+					usart_send[2] = 1;//正常模式 
 					usart_send[3] = 17;//数据段长度
-					usart_send[4] = frame_seq_nb;//数据段长度
+					usart_send[4] = frame_seq_nb2;//数据段长度
 					memcpy(&usart_send[5],&tag_id_recv,2);
 					memcpy(&usart_send[7],&dev_id,2);				
 					memcpy(&usart_send[9],&tagdist_list[taglist_pos],4);
@@ -785,21 +1096,38 @@
 					memcpy(&usart_send_anc[6+6*anc_report_num],&tagdist_list[taglist_pos],4);
 					anc_report_num++;
 				#endif
+				 #ifdef DEBUG_INF
+				 printf("序号:%d\r\n",frame_seq_nb2);
+				 #endif
 					}else{
 					//	printf("%d",hex_dist);
-						misdist_num++;
+						misdist_num[taglist_pos]++;
 					}
 				}
+					if(rx_buffer[TAGCONFIGSUCCESS_INDEX]==1&&waittagconfig_reponse)
+					{
+						waittagconfig_reponse = 0;
+						remotesend_state = 0;
+						usart_send[2] = 7;//正常模式 
+						usart_send[3] = 5;//数据段长度
+						memcpy(&usart_send[4],&tag_id_recv,2);
+						usart_send[6] = 1;//数据段长度
+						checksum = Checksum_u16(&usart_send[2],5);
+						memcpy(&usart_send[7],&checksum,2);
+						UART_PushFrame(usart_send,9);
+					}
 			}
-		
 			}else{
-					//printf("%x/n",status_reg);
+				 #ifdef DEBUG_INF
+					printf("final包失败:%x/n",status_reg);
+				#endif
 				dwt_write32bitreg(SYS_STATUS_ID, SYS_STATUS_ALL_RX_ERR);
 			}
-	
 }
 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];
 void Anchor_App(void)
 {
 	
@@ -807,45 +1135,35 @@
 	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_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();
-		g_Resttimer=0;
 	};
-
+//GPIO_WriteBit(GPIOA, GPIO_Pin_10, Bit_RESET);	
 	if (status_reg & SYS_STATUS_RXFCG)//成功接收
 	{ 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);//读取接收数据
-		//将收到的tag_id分别写入各次通讯的包中,为多标签通讯服务,防止一次通讯中接收到不同ID标签的数据
-		//tag_id_recv = rx_buffer[TAG_ID_IDX];
-		memcpy(&tag_id_recv,&rx_buffer[TAG_ID_IDX],2);
 		memcpy(&anc_id_recv,&rx_buffer[ANCHOR_ID_IDX],2);
-		taglist_pos=CmpTagInList(tag_id_recv);
-		if(taglist_pos==0)
-		{
-			synclost_timer=0;
-			tagid_list[taglist_num++]=tag_id_recv;
-			taglist_pos=taglist_num;
-			new_tagid=1;
-		}else{
-			new_tagid=0;
-		}
-		tagofflinetime[taglist_pos-1]=0;
+		//将收到的tag_id分别写入各次通讯的包中,为多标签通讯服务,防止一次通讯中接收到不同ID标签的数据
+		memcpy(&tag_id_recv,&rx_buffer[TAG_ID_IDX],2);
 		switch(rx_buffer[MESSAGE_TYPE_IDX])
 		{
-//			case POLL:
-//				if (anchor_type == rx_buffer[ANC_TYPE_IDX])
-//				Anchor_RecPoll();
-//				break;
-			case SYNC:
-				
+			case POLL:
+				if (anchor_type == rx_buffer[ANC_TYPE_IDX])
+				Anchor_RecPoll();
+				break;
+			case SYNC:			
 				memcpy(&rec_syncid,&rx_buffer[ANCHOR_ID_IDX],4);
 				if(rec_syncid<current_syncid)
 				{
@@ -855,40 +1173,61 @@
 					TIM3->CNT = sync_seq*325%1000+15;
 					sync_timer = sync_seq*325/1000;
 					synclost_timer=0;
-					SyncPoll(sync_seq,rec_syncid);			
+					//SyncPoll(sync_seq,rec_syncid);			
 					}else if(rec_syncid==current_syncid)
 				{
 					if(rx_buffer[SYNC_SEQ_IDX]<sync_seq)		
 						{
 							flag_syncbase=0;
 							sync_seq=rx_buffer[SYNC_SEQ_IDX]+1;
-							TIM3->CNT = sync_seq*325%1000+15;
-							sync_timer = sync_seq*325/1000;
+							TIM3->CNT = sync_seq*325%1000+5;
+							sync_timer = sync_seq*325/1000+995;
 							synclost_timer=0;
-							SyncPoll(sync_seq,rec_syncid);
+							//SyncPoll(sync_seq,rec_syncid);
 						}
 				
 				}
 				break;
-//			case NEAR_MSG:
-//				if(anc_id_recv==dev_id)
-//				{
-//					rx_buffer[TAGSLOTPOS]=taglist_pos;
-//					tx_near_msg[MESSAGE_TYPE_IDX] = NEAR_MSG;
-//					memcpy(&tx_near_msg[TAG_ID_IDX],&tag_id_recv,2);
-//					tx_near_msg[NEARBASENUM_INDEX]=g_com_map[NEARBASE_NUM];
-//					memcpy(&tx_near_msg[NEARBASEID_INDEX],&g_com_map[NEARBASE_ID1],g_com_map[NEARBASE_NUM]*2);
-//					send_len=11+g_com_map[NEARBASE_NUM]*2+2;
-//					dwt_writetxdata(send_len, tx_near_msg, 0);//将Poll包数据传给DW1000,将在开启发送时传出去
-//					dwt_writetxfctrl(send_len, 0);//设置超宽带发送数据长度
-//					dwt_starttx(DWT_START_TX_IMMEDIATE);
-//				}
-//				break;
-//		
-			case NEAR_POLL:
-				
+			case NEAR_MSG:
+				if(anc_id_recv==dev_id)
+				{
+					rx_buffer[TAGSLOTPOS]=taglist_pos;
+					tx_near_msg[MESSAGE_TYPE_IDX] = NEAR_MSG;
+					memcpy(&tx_near_msg[TAG_ID_IDX],&tag_id_recv,2);
+					memcpy(&tx_near_msg[NEARMSG_EMPTYSLOTPOS_INDEX],&tagpos_binary,4);
+					ancidlist_num=g_com_map[NEARBASE_NUM];
+					tx_near_msg[NEARBASENUM_INDEX]=g_com_map[NEARBASE_NUM];
+					memcpy(&tx_near_msg[NEARBASEID_INDEX],&g_com_map[NEARBASE_ID1],g_com_map[NEARBASE_NUM]*2);
+					send_len=11+ancidlist_num*2+2;
+					dwt_writetxdata(send_len, tx_near_msg, 0);//将Poll包数据传给DW1000,将在开启发送时传出去
+					dwt_writetxfctrl(send_len, 0);//设置超宽带发送数据长度
+					dwt_starttx(DWT_START_TX_IMMEDIATE);
+				}
+				break;
+		
+			case NEAR_POLL:			
+				memcpy(&tag_id_recv,&rx_buffer[TAG_ID_IDX],2);
+				taglist_pos=CmpTagInList(tag_id_recv);
+				if(taglist_pos==taglist_num)
+				{
+					taglist_pos=taglist_num;
+					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);
+				tagpos_rec[(u8)temp_tagpos]=1;
 				rec_nearbase_num=rx_buffer[NEARBASENUM_INDEX];
 			
+				if(rec_nearbase_num>ancidlist_num)
+					{
+						ancidlist_num=rec_nearbase_num;
+						memcpy(ancidlist_rec,&rx_buffer[NEARBASEID_INDEX],rec_nearbase_num*2);
+					}
+					
 				for(i=0;i<rec_nearbase_num;i++)
 				{
 					 memcpy(&tempid,&rx_buffer[NEARBASEID_INDEX+i*2],2);
@@ -899,19 +1238,20 @@
 						break;
 					}						
 				}
-					if(i==rec_nearbase_num)
-					{
-						seize_anchor=1;   //抢占anchor
-						Anchor_RecNearPoll(i);	
-					}
+				//抢占模式
+//					if(i==rec_nearbase_num)
+//					{
+//						seize_anchor=1;   //抢占anchor
+//						Anchor_RecNearPoll(i);	
+//					}
+
 				
-				break;
-		
-		}
-		
-	}
-	else
-	{
+				break;		
+		}	
+	}else{
+		 #ifdef DEBUG_INF
+		printf("poll包失败:%x/n",status_reg);
+		#endif
 		dwt_write32bitreg(SYS_STATUS_ID, SYS_STATUS_ALL_RX_ERR);
 	}
 }

--
Gitblit v1.9.3