From a44433dad85a3ce434cca78695a866748dd24d3b Mon Sep 17 00:00:00 2001
From: zhyinch <zhyinch@gmail.com>
Date: 星期一, 17 五月 2021 14:10:09 +0800
Subject: [PATCH] v1.49 数据<=0时输出10

---
 源码/核心板/Src/application/dw_app.c |  175 ++++++++++++++++++++++++++++++++++++++++++++--------------
 1 files changed, 132 insertions(+), 43 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 5c15035..774a2b6 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,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. */
@@ -13,7 +14,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. */
@@ -28,7 +29,7 @@
 
 static uint8_t tx_near_msg[80] = {0};
 
-static uint32_t frame_seq_nb = 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;
@@ -337,17 +338,24 @@
 	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);}
+   
+        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(13+4*nearbase_num, tx_nearpoll_msg, 0);//将Poll包数据传给DW1000,将在开启发送时传出去
+	dwt_writetxfctrl(13+4*nearbase_num, 0);//设置超宽带发送数据长度
 	dwt_starttx(DWT_START_TX_IMMEDIATE | DWT_RESPONSE_EXPECTED);//开启发送,发送完成后等待一段时间开启接收,等待时间在dwt_setrxaftertxdelay中设置
 	
 	flag_finalsend=0;
 	flag_rxon=1;
 	neartimout_timer=0;
 	get_newbase=0;
-	timeout=ceil((float)nearbase_num*0.4)+3;
+	timeout=ceil((float)nearbase_num*SLOT_SCALE)+3;
 	//timeout=5;
 	mainbase_dist=100000;
 	mainbase_lost_count++;
@@ -402,7 +410,7 @@
 									temp_sync_timer2=sync_timer;
 									memcpy(&temp_sync_timer1,&rx_buffer[ANCTIMEMS],2);
 									memcpy(&tmp_time,&rx_buffer[ANCTIMEUS],2);
-									exsistbase_list[0]=KEEP_TIMES;
+									
 									
 									if(g_com_map[DEV_ROLE]!=0)
 									{
@@ -426,10 +434,12 @@
 //										tyncpoll_time=(tagslotpos-1)*slottime;
 									////////////////////////////
 									rec_nearbasepos=0;
-									exsistbase_list[rec_nearbasepos]=KEEP_TIMES;
+									
 									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;
@@ -444,7 +454,34 @@
 									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)
+									{
+										g_Resttimer=0;
+                                        IWDG_Feed();
+										#ifdef USART_SINGLE_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
+
+									//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{
@@ -457,9 +494,11 @@
 										memcpy(&tx_nearfinal_msg[ANCHOR_ID_IDX],&rec_nearbaseid,2);
 									}
 									
-									exsistbase_list[rec_nearbasepos]=KEEP_TIMES;
 									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
@@ -469,12 +508,18 @@
 //									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;//数据段长度
+										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;
@@ -518,7 +563,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;
@@ -570,10 +615,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		
@@ -651,13 +693,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)
 	{
@@ -731,7 +779,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)))///不断查询芯片状态直到接收成功或者出现错误
@@ -781,7 +829,8 @@
 				dwt_write32bitreg(SYS_STATUS_ID, SYS_STATUS_ALL_RX_ERR);
 			}
 }
-u8 misdist_num[TAG_NUM_IN_SYS],seize_anchor;
+extern u16 dist_threshold;
+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;
@@ -799,7 +848,7 @@
 			
 			if(tagdist_list[taglist_pos]<g_com_map[ALARM_DISTANCE1])
 			{
-				motorstate =3;
+				motorstate =0;
 			}else if(tagdist_list[taglist_pos]<g_com_map[ALARM_DISTANCE2])
 			{
 				motorstate =2;
@@ -809,7 +858,7 @@
 			}else{
 				motorstate =0;
 			}
-			tx_nearresp_msg[MOTORSTATE_INDEX]=motorstate;
+			
 			if(new_tagid)
 			{
 				tagdist_list[taglist_pos]=0x1ffff;
@@ -819,14 +868,19 @@
 			}
 			tx_nearresp_msg[MAINBASE_INDEX]=flag_syncbase;
 			tx_nearresp_msg[MESSAGE_TYPE_IDX]=NEAR_RESPONSE;
-			
+			tx_nearresp_msg[MOTORSTATE_INDEX]=(remotesend_state<<4)|motorstate;
+			if(remotesend_state)
+			{
+			 	memcpy(&tx_nearresp_msg[REMOTEPARA_INDEX],remotetag_para,REMOTEPARA_LEN);
+				dwt_writetxdata(22+REMOTEPARA_LEN, tx_nearresp_msg, 0);//写入发送数据
+				dwt_writetxfctrl(22+REMOTEPARA_LEN, 0);//设定发送长度		
+			}else{
 			dwt_writetxdata(22, tx_nearresp_msg, 0);//写入发送数据
 			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_nb = 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)///不断查询芯片状态直到接收成功或者出现错误
@@ -868,28 +922,40 @@
 					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;
 					
 					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>-1000&&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])<dist_threshold||misdist_num[taglist_pos]>3)
 					{
+						int32_t filter_dist;
+                        g_Resttimer=0;
+                        IWDG_Feed();
+						#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;	
-				#ifndef USART_INTEGRATE_OUTPUT
+						g_Tagdist[taglist_pos]=filter_dist;	
+				#ifdef USART_SINGLE_OUTPUT
 					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[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;
@@ -915,7 +981,7 @@
 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_App(void)
 {
 	
@@ -931,6 +997,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);	
@@ -938,20 +1005,20 @@
 	{ 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];
+		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 SYNC:					
 				memcpy(&rec_syncid,&rx_buffer[ANCHOR_ID_IDX],4);
 				if(rec_syncid<current_syncid)
 				{
@@ -992,8 +1059,30 @@
 				}
 				break;
 		
-			case NEAR_POLL:			
+			case NEAR_POLL:	
+                frame_seq_nb2 = rx_buffer[SEQUENCE_IDX];
+                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);
+            #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)
 				{
@@ -1005,9 +1094,9 @@
 					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)
 					{

--
Gitblit v1.9.3