From 477554cd05c061057dc634ba703415305628b07a Mon Sep 17 00:00:00 2001
From: zhyinch <zhyinch@gmail.com>
Date: 星期五, 26 六月 2020 19:02:48 +0800
Subject: [PATCH] 修改slottime

---
 源码/核心板/Src/application/dw_app.c |  370 +++++++++++++++++++++++++++++++---------------------
 1 files changed, 222 insertions(+), 148 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 e5cbeb5..6b1ce81 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. */
@@ -25,6 +25,8 @@
 static uint8_t tx_nearpoll_msg[80] = {0};
 static uint8_t tx_nearresp_msg[80] = {0};
 static uint8_t tx_nearfinal_msg[80] = {0};
+
+static uint8_t tx_near_msg[80] = {0};
 
 static uint32_t frame_seq_nb = 0;	
 static uint32_t status_reg = 0;
@@ -206,7 +208,24 @@
 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;
+void SetNextPollTime(u16 time)
+{
+	if(current_slotnum>=total_slotnum)
+		current_slotnum-=total_slotnum;
+	//time=5;
+	target_time=((current_slotnum*g_com_map[COM_INTERVAL])+time);
+	if(target_time>=990&&target_time<1000)
+	{
+		current_slotnum++;
+	target_time+=g_com_map[COM_INTERVAL];
+	}	
+	if(target_time>=1000)
+	{target_time-=1000;}
+	if(target_time<0)
+	{target_time+=1000;}
 
+}
 u8 FindNearBasePos(u16 baseid)
 {
 	u8 i;
@@ -219,41 +238,74 @@
 }
 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;;
+u8 exsistbase_list[MAX_NEARBASE_NUM],report_num,get_newbase=0;
 u16 temp_sync_timer1,temp_sync_timer2;
-void NearPoll(void)
+u32 rec_tagpos_binary;
+extern uint32_t tagpos_binary;
+ void NearPoll(void)
 {
 	static u8 mainbase_lost_count=0,flag_finalsend,flag_rxon;
 	uint32_t temp1,temp2,dw_systime;
@@ -262,7 +314,6 @@
 	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;
@@ -290,7 +341,7 @@
 	flag_rxon=1;
 	neartimout_timer=0;
 	get_newbase=0;
-	timeout=ceil((float)nearbase_num/4)+2;
+	timeout=ceil((float)nearbase_num*0.4)+2;
 	//timeout=5;
 	mainbase_dist=100000;
 	mainbase_lost_count++;
@@ -345,11 +396,15 @@
 									temp_sync_timer2=sync_timer;
 									memcpy(&temp_sync_timer1,&rx_buffer[ANCTIMEMS],2);
 									memcpy(&tmp_time,&rx_buffer[ANCTIMEUS],2);
-									sync_timer=temp_sync_timer1;
 									exsistbase_list[0]=KEEP_TIMES;
+									
+									if(g_com_map[DEV_ROLE]!=0)
+									{
+									sync_timer=temp_sync_timer1;
 ////									memcpy(&tagslotpos,&rx_buffer[TAGSLOTPOS],2);		
 //									
-									tmp_time=tmp_time+650;
+									
+										tmp_time=tmp_time+650;
 									if(tmp_time>999)
 									{
 										tmp_time-=999;
@@ -358,13 +413,13 @@
 											{sync_timer=0;}
 									}
 									TIM3->CNT=tmp_time;
-									
+								}
 //									if(tagslotpos>max_slotpos)
 //										tagslotpos=tagslotpos%(max_slotpos+1);
 //										tyncpoll_time=(tagslotpos-1)*slottime;
 									////////////////////////////
 									rec_nearbasepos=0;
-									exsistbase_list[rec_nearbasepos]=10;
+									exsistbase_list[rec_nearbasepos]=KEEP_TIMES;
 									memcpy(&temp_dist,&rx_buffer[DIST_IDX],4);
 									nearbase_distlist[rec_nearbasepos]=temp_dist;
 									
@@ -381,23 +436,10 @@
 									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)
-									{
-									#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);//设定为延迟发送			
+									memcpy(&rec_tagpos_binary,&rx_buffer[NEARMSG_EMPTYSLOTPOS_INDEX],4);
+									
+		
+									
 								}else{
 									rec_nearbasepos=FindNearBasePos(rec_nearbaseid);
 									if(rec_nearbasepos>=last_nearbase_num)          //发现新的基站
@@ -416,6 +458,8 @@
 									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)
 									{
 										#ifndef USART_INTEGRATE_OUTPUT
@@ -458,22 +502,22 @@
 			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;	
 			}
 		//	tyncpoll_time=0;
 			next_nearbase_num=0;
 			for(i=0;i<last_nearbase_num+get_newbase;i++)
 			{
 				if(exsistbase_list[i]>0)
-				{
-				
+				{		
 					next_nearbase_num++;
 					true_exsistbase_list[j]=exsistbase_list[i];
 					true_nearbase_idlist[j]=nearbaseid_list[i];			
@@ -524,13 +568,13 @@
 			}
 			
 		//	printf("%d,%d",temp_sync_timer2,temp_sync_timer1);
-			#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
+//			#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
 //			if(mainbase_lost_count>5)
 //			{
 //				//tag_state=DISCPOLL;
@@ -546,56 +590,80 @@
 //			}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;
-//		}
-//	}
-//}
+u8 nearmsg_mainbase=0,rec_tagpos_emptylist[32];
+void GetNearMsg(void)
+{
+	u32 start_poll,frame_len;
+	if(nearmsg_mainbase)
+	{nearmsg_mainbase=0;
+	}else{
+	nearmsg_mainbase=1;
+	}
+	memcpy(&tx_near_msg[ANCHOR_ID_IDX],&nearmsg_mainbase,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;
+	}
+	
+}
 
 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:
+			
+			break;
+		case GETNEARMSG:
+			  GetNearMsg();
+			break;
+		case NEARPOLL:
+				NearPoll();
+			break;
+	}
+	current_slotnum++;
+	SetNextPollTime(tyncpoll_time);
+	GPIO_WriteBit(GPIOA, GPIO_Pin_10, Bit_RESET);	
 }
 
 int8_t correction_time,new_tagid=0;
@@ -702,7 +770,7 @@
 				dwt_write32bitreg(SYS_STATUS_ID, SYS_STATUS_ALL_RX_ERR);
 			}
 }
-u8 misdist_num,seize_anchor;
+u8 misdist_num[TAG_NUM_IN_SYS],seize_anchor;
 u8 Anchor_RecNearPoll(u8 ancrec_nearbasepos) //0 mainbase  1 first near_base
 {
 			tmp_time=TIM3->CNT;
@@ -785,11 +853,12 @@
 					g_flag_Taggetdist[taglist_pos]=0;
 					if(hex_dist>-1000&&hex_dist<100000)
 					{
-					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[3] = 17;//数据段长度
@@ -809,19 +878,19 @@
 				#endif
 					}else{
 					//	printf("%d",hex_dist);
-						misdist_num++;
+						misdist_num[taglist_pos]++;
 					}
 				}
 			}
-		
 			}else{
 					//printf("%x/n",status_reg);
 				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)
 {
 	
@@ -829,32 +898,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);//读取接收数据
+		memcpy(&anc_id_recv,&rx_buffer[ANCHOR_ID_IDX],2);
 		//将收到的tag_id分别写入各次通讯的包中,为多标签通讯服务,防止一次通讯中接收到不同ID标签的数据
-		//tag_id_recv = rx_buffer[TAG_ID_IDX];
+		tag_id_recv = rx_buffer[TAG_ID_IDX];
 		switch(rx_buffer[MESSAGE_TYPE_IDX])
 		{
 //			case POLL:
 //				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)
 				{
@@ -879,25 +951,24 @@
 				
 				}
 				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==flag_syncbase)
+				{
+					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);
+					tx_near_msg[NEARBASENUM_INDEX]=ancidlist_num;
+					memcpy(&tx_near_msg[NEARBASEID_INDEX],&ancidlist_send,ancidlist_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);
-				memcpy(&anc_id_recv,&rx_buffer[ANCHOR_ID_IDX],2);
 				taglist_pos=CmpTagInList(tag_id_recv);
 				if(taglist_pos==taglist_num)
 				{
@@ -909,10 +980,16 @@
 					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);
@@ -928,14 +1005,11 @@
 						seize_anchor=1;   //抢占anchor
 						Anchor_RecNearPoll(i);	
 					}
+
 				
-				break;
-		
-		}
-		
-	}
-	else
-	{
+				break;		
+		}	
+	}else{
 		dwt_write32bitreg(SYS_STATUS_ID, SYS_STATUS_ALL_RX_ERR);
 	}
 }

--
Gitblit v1.9.3