From 7c12dad5dc25593b4e23ad0bc092be8cb9542167 Mon Sep 17 00:00:00 2001
From: yincheng.zhong <634916154@qq.com>
Date: 星期二, 01 十一月 2022 17:49:13 +0800
Subject: [PATCH] V1.37

---
 Src/application/dw_app.c |  121 +++++++++++++++++++---------------------
 1 files changed, 58 insertions(+), 63 deletions(-)

diff --git a/Src/application/dw_app.c b/Src/application/dw_app.c
index 05052a3..d76461a 100644
--- a/Src/application/dw_app.c
+++ b/Src/application/dw_app.c
@@ -30,6 +30,7 @@
 #include "beep.h"
 #include "modbus.h"
 
+#define USART_INTEGRATE_OUTPUT
 /*------------------------------------ Marcos ------------------------------------------*/
 /* Inter-ranging delay period, in milliseconds. */
 #define RNG_DELAY_MS 100
@@ -47,7 +48,7 @@
 #define POLL_TX_TO_RESP_RX_DLY_UUS 150
 /* This is the delay from Frame RX timestamp to TX reply timestamp used for calculating/setting the DW1000's delayed TX function. This includes the
  * frame length of approximately 2.66 ms with above configuration. */
-#define RESP_RX_TO_FINAL_TX_DLY_UUS 410
+#define RESP_RX_TO_FINAL_TX_DLY_UUS 2410
 
 /* Receive response timeout. See NOTE 5 below. */
 #define RESP_RX_TIMEOUT_UUS 600
@@ -83,7 +84,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. */
@@ -294,7 +295,29 @@
 u8 nearbase_num=0,last_nearbase_num,next_nearbase_num,last_slotnum, para_update,para_len,stationary_flag=0;
 u32 rec_tagpos_binary;
 int16_t offset=2700;
+extern int16_t g_commap_antdelay;
 u8 motor_state,rec_remotepara_state,rec_remotepara[80];
+ double firstpath_power,firstpath_power2, 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;
+  }
+
 void NearPoll(void)
 {
 	
@@ -316,16 +339,17 @@
 	nearbase_num=next_nearbase_num;
 	recbase_num=0;
 //	motor_state=0;
-	
+	tx_near_msg[GROUP_ID_IDX] = group_id;
 	tx_near_msg[BATTARY_IDX] = bat_percent;
 	tx_near_msg[BUTTON_IDX] = !GET_USERKEY|stationary_flag<<1;
 	tx_near_msg[SEQUENCE_IDX] = frame_seq_nb++;
 	tx_near_msg[NEARBASENUM_INDEX] = nearbase_num;
 	memcpy(&tx_near_msg[NEARBASEID_INDEX],&nearbaseid_list,nearbase_num*2);
 	tx_near_msg[MESSAGE_TYPE_IDX] = NEAR_POLL;	
+    memcpy(&tx_near_msg[NEARBASEID_INDEX+nearbase_num*4],&g_commap_antdelay,2);
 	memcpy(&tx_near_msg[ANCHOR_ID_IDX],&mainbase_id,2);	
-	dwt_writetxdata(13+2*nearbase_num, tx_near_msg, 0);//将Poll包数据传给DW1000,将在开启发送时传出去
-	dwt_writetxfctrl(13+2*nearbase_num, 0);//设置超宽带发送数据长度
+	dwt_writetxdata(15+4*nearbase_num, tx_near_msg, 0);//将Poll包数据传给DW1000,将在开启发送时传出去
+	dwt_writetxfctrl(15+4*nearbase_num, 0);//设置超宽带发送数据长度
 	dwt_starttx(DWT_START_TX_IMMEDIATE | DWT_RESPONSE_EXPECTED);//开启发送,发送完成后等待一段时间开启接收,等待时间在dwt_setrxaftertxdelay中设置
 	
 	tx_near_msg[TAGCONFIGSUCCESS_INDEX] =0;
@@ -376,7 +400,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;
 								poll_tx_ts = get_tx_timestamp_u64();										//获得POLL发送时间T1
 								resp_rx_ts = get_rx_timestamp_u64();										//获得RESPONSE接收时间T4	
@@ -429,13 +453,15 @@
 									final_msg_set_ts(&tx_near_msg[FINAL_MSG_RESP_RX_NEARBASE_IDX], resp_rx_ts);
 									final_msg_set_ts(&tx_near_msg[FINAL_MSG_FINAL_TX_TS_IDX], final_tx_ts);
 									tx_near_msg[MESSAGE_TYPE_IDX]=NEAR_FINAL;
-
+                                    tx_near_msg[GROUP_ID_IDX] = group_id;
 									
 									dwt_writetxdata(28+nearbase_num*4, tx_near_msg, 0);//将发送数据写入DW1000
 									dwt_writetxfctrl(28+nearbase_num*4, 0);//设定发送数据长度
 									flag_getresponse=1;
 									memcpy(&rec_tagpos_binary,&rx_buffer[NEARMSG_EMPTYSLOTPOS_INDEX],4);
-									
+									dwt_readdiagnostics(&d1);
+                                    LOS(&d1);
+                                    tx_near_msg[TAGRXPOWER_IDX] = -(int)firstpath_power;
 								
 									//时间同步
 									ancsync_time=((sync_timer)*1000+tmp_time);	
@@ -446,36 +472,17 @@
 									lastsync_timer=sync_timer;
 									offsettimeus=ancsync_time-current_count*LPTIMER_LSB+offset;
 									SetNextPollTime(tyncpoll_time);
-									if(rec_remotepara_state&&rec_remotepara_state!=g_com_map[REMOTEPARA_STATE])
+									if(rec_remotepara_state==1)
 									{
-										g_com_map[REMOTEPARA_STATE]=rec_remotepara_state;
-										memcpy(rec_remotepara,&rx_buffer[REMOTEPARA_INDEX],REMOTEPARA_LEN);
+                             			memcpy(rec_remotepara,&rx_buffer[REMOTEPARA_INDEX],REMOTEPARA_LEN);
 										memcpy(&g_com_map[COM_INTERVAL],&rec_remotepara[0],8);
 										memcpy(&g_com_map[POWER],&rec_remotepara[8],10);
-										save_com_map_to_flash();
-										delay_ms(100);
-										NVIC_SystemReset();
-									
-									}
-									
-								//	count_offset=sync_count-current_count-143;
-								//	current_slottimes=(ancsync_time-10000)/(g_com_map[COM_INTERVAL]*1000);
-								//	nextpoll_delaytime=tyncpoll_time*1000+g_com_map[COM_INTERVAL]*1000-((ancsync_time)%(g_com_map[COM_INTERVAL]*1000))-4300;
-//									if(abs(ancsync_time-910000)<1000)
-//									{
-//									nextpoll_delaytime+=10000;
-//									}		
-//									if(nextpoll_delaytime<2000)
-//									{
-//										nextpoll_delaytime+=g_com_map[COM_INTERVAL]*1000;
-//									}
-//									lastpoll_count= current_count+(nextpoll_delaytime)/LPTIMER_LSB;
-//									if(lastpoll_count>LPTIMER_1S_COUNT)
-//										lastpoll_count-=LPTIMER_1S_COUNT;
-//									__HAL_LPTIM_COMPARE_SET(&hlptim1, lastpoll_count);
-			/////////////////////////////////////////
-//									dwt_setdelayedtrxtime(final_tx_time);
-//								result=dwt_starttx(DWT_START_TX_DELAYED);//设定为延迟发送	
+                                        if(g_com_map[COM_INTERVAL]>0&&g_com_map[COM_INTERVAL]<1000&&g_com_map[POWER]<67&&g_com_map[POWER]>0)
+										{save_com_map_to_flash();
+										delay_ms(100);										
+                                        }
+                                        NVIC_SystemReset();
+									} 
 								}else{
 									rec_nearbasepos=FindNearBasePos(rec_nearbaseid);
 									
@@ -494,13 +501,6 @@
 									if(motor_state<(rx_buffer[MOTORSTATE_INDEX]&0xf)&&(rx_buffer[MOTORSTATE_INDEX]&0xf)!=3)
 									{
 											motor_state=rx_buffer[MOTORSTATE_INDEX];
-									}
-								if(rec_remotepara_state&&!memcmp(&rx_buffer[TAG_ID_IDX],&dev_id,2))
-									{
-										para_update = 1;
-										tx_near_msg[TAGCONFIGSUCCESS_INDEX] = 1;
-										para_len = frame_len-22;
-										memcpy(rec_remotepara,&rx_buffer[REMOTEPARA_INDEX],para_len);
 									}
 									final_msg_set_ts(&tx_near_msg[FINAL_MSG_RESP_RX_NEARBASE_IDX+(rec_nearbasepos)*4], resp_rx_ts);								
 									dwt_writetxdata(28+nearbase_num*4, tx_near_msg, 0);//将发送数据写入DW1000
@@ -522,9 +522,9 @@
 			}
 			if(mainbase_lost_count>tag_frequency*BASELOST_STOPMOTOR_TIME)
 			{motor_state=0; }
-dwt_write32bitreg(SYS_STATUS_ID,SYS_STATUS_RXFCG| SYS_STATUS_ALL_RX_ERR);
+            dwt_write32bitreg(SYS_STATUS_ID,SYS_STATUS_RXFCG| SYS_STATUS_ALL_RX_ERR);
 			nearbase_num=recbase_num;
-		j=0;
+            j=0;
 			if(exsistbase_list[0]==0)
 			{
 //			 u8 temp_adc,random_value;
@@ -581,32 +581,26 @@
 			{
 				nearbaseid_list[i]=true_nearbase_idlist[i];
 				nearbase_distlist[i]=true_nearbase_distlist[i];
-				if(nearbase_distlist[i]!=0x1ffff&&true_exsistbase_list[i]==0xa)
+				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++;
 				}
 			}
+            #ifdef USART_INTEGRATE_OUTPUT	
+                usart_send[0] = 0x55;     
+                usart_send[1] = 0xAA;              
+				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);
+				USART_puts(usart_send,6+report_num*6);
+			#endif
+            
 			for(i=0;i<MAX_NEARBASE_NUM;i++)
 			{
 				nearbase_distlist[i]=0x1ffff;
-			}
-			if(para_update)
-			{
-			uint8_t pack_length = 0,pack_index = 0,pack_msgtype = 0;
-				pack_msgtype = rec_remotepara[0];
-				pack_index = rec_remotepara[1];
-				pack_length = rec_remotepara[2];
-				if(pack_msgtype==2)
-				{
-						memcpy((uint8_t*)&g_com_map + pack_index, &rec_remotepara[3], pack_length);
-					//返回一个error状态
-					//SendComMap(pack_datalen,pack_index);
-					save_com_map_to_flash();
-					delay_ms(100);
-					NVIC_SystemReset();
-				}
 			}
 	dwt_write32bitreg(SYS_STATUS_ID, SYS_STATUS_ALL_RX_ERR| SYS_STATUS_TXFRS |SYS_STATUS_RXFCG);
 HAL_GPIO_WritePin(LED0_GPIO, GPIO_PIN_9, GPIO_PIN_RESET);
@@ -623,6 +617,7 @@
 	}
 	memcpy(&tx_near_msg[ANCHOR_ID_IDX],&nearmsg_mainbase,2);
 	memcpy(&tx_near_msg[TAG_ID_IDX],&dev_id,2);
+    tx_near_msg[GROUP_ID_IDX] = group_id;
 	tx_near_msg[MESSAGE_TYPE_IDX] = NEAR_MSG;
 	
 	dwt_setrxaftertxdelay(POLL_TX_TO_RESP_RX_DLY_UUS);			//设置发送后开启接收,并设定延迟时间
@@ -659,10 +654,10 @@
 			tyncpoll_time = (tagslotpos--%max_slotpos)*slottime;
 	}
 }
-
+u32 id;
 void Tag_App(void)//发送模式(TAG标签)
 {
-	u32 id;
+	
 	//LED0_ON;
 	id =  dwt_readdevid() ;
 	    while (DWT_DEVICE_ID != id) 

--
Gitblit v1.9.3