From b2759837b7247ffced986c93bad07f78d43377a4 Mon Sep 17 00:00:00 2001
From: yincheng.zhong <634916154@qq.com>
Date: 星期四, 03 八月 2023 15:16:56 +0800
Subject: [PATCH] 修改成功

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

diff --git a/Src/application/dw_app.c b/Src/application/dw_app.c
index acfa1ce..c610e65 100644
--- a/Src/application/dw_app.c
+++ b/Src/application/dw_app.c
@@ -80,8 +80,13 @@
 	NEARPOLL,
     SINGLEPOLL,
 }tag_state=STARTPOLL;
+//#define	_UWB_4G
 static dwt_config_t config = {
+#ifdef	_UWB_4G
 	2,               /* Channel number. */
+#else
+	5,
+#endif
 	DWT_PRF_64M,     /* Pulse repetition frequency. */
 	DWT_PLEN_128,    /* Preamble length. */
 	DWT_PAC8,        /* Preamble acquisition chunk size. Used in RX only. */
@@ -107,7 +112,6 @@
 static uint64_t poll_rx_ts;
 static uint64_t resp_tx_ts;
 static uint64_t final_rx_ts;
-static double tof;
 int32_t anchor_dist_last_frm[TAG_NUM_IN_SYS],his_dist[TAG_NUM_IN_SYS];	;	
 uint32_t tag_id = 0;
 uint32_t tag_id_recv = 0;
@@ -714,14 +718,14 @@
 	u32 start_poll,frame_len;
     u8 nearmsg_i=0;
 	NextSlotDelayMs(0);
-    for(nearmsg_i=0;nearmsg_i<20;nearmsg_i++)
+    for(nearmsg_i=0;nearmsg_i<MAX_NEARBASE_NUM;nearmsg_i++)
     {
         nearbase_distlist[nearmsg_i] = 0x1ffff;
     }
-//mainbase_id = 0x9818;
+//mainbase_id = 0x1;
 	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;
+	tx_near_msg[MESSAGE_TYPE_IDX] = POS_MSG;
 	
     
 	dwt_setrxaftertxdelay(POLL_TX_TO_RESP_RX_DLY_UUS);			//设置发送后开启接收,并设定延迟时间
@@ -752,7 +756,7 @@
 		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数据
+		if (rx_buffer[MESSAGE_TYPE_IDX] == POS_MSG&&!memcmp(&rx_buffer[TAG_ID_IDX],&dev_id,2)) //判断接收到的数据是否是response数据
 		{
 			nearbase_num=rx_buffer[NEARBASENUM_INDEX];
 			memcpy(&rec_tagpos_binary,&rx_buffer[NEARMSG_EMPTYSLOTPOS_INDEX],4);
@@ -795,7 +799,62 @@
 					USART_puts(usart_send,27+8*nearbase_num);
 					//HexToAsciiSendUDP(usart_send,27+8*nearbase_num);
 }
+#define FREQ_OFFSET_MULTIPLIER          (998.4e6/2.0/1024.0/131072.0)
+#define FREQ_OFFSET_MULTIPLIER_110KB    (998.4e6/2.0/8192.0/131072.0)
+
+// Multiplication factors to convert frequency offset in Hertz to PPM crystal offset
+// NB: also changes sign so a positive value means the local RX clock is running slower than the remote TX device.
+
+#define HERTZ_TO_PPM_MULTIPLIER_CHAN_1     (-1.0e6/3494.4e6)
+#define HERTZ_TO_PPM_MULTIPLIER_CHAN_2     (-1.0e6/3993.6e6)
+#define HERTZ_TO_PPM_MULTIPLIER_CHAN_3     (-1.0e6/4492.8e6)
+#define HERTZ_TO_PPM_MULTIPLIER_CHAN_5     (-1.0e6/6489.6e6)
+int32_t test2;
 uint8_t pack_length = 0,pack_index = 0,pack_msgtype = 0;
+uint8_t motor_flag;
+uint32_t testtimer[10],testtimer2,anc_pollrx[11],anc_resptx[11],tag_resprx[11];
+int32_t anc_clockoffset[11];
+int16_t anc_distoffset[11];
+extern uint8_t Pah_HRD_flag_fangchai;
+uint8_t get_newdist,notenoughdist_count;
+void SetANCTimestap(uint8_t i,uint8_t* pollrx,uint8_t* resptx,uint32_t resprx,uint8_t* distoffset)
+{
+    memcpy(&anc_pollrx[i],pollrx,4);
+    memcpy(&anc_resptx[i],resptx,4);
+    memcpy(&tag_resprx[i],&resprx,4);
+    memcpy(&anc_distoffset[i],distoffset,2);
+    anc_clockoffset[i] = test2;
+}
+float clockOffsetRatio;
+double rtd_init, rtd_resp;
+double tof,distance;
+extern int32_t dwt_readcarrierintegrator(void) ;
+void CalculateDists(void)
+{
+    for(int i=0;i<11;i++)
+    {
+        rec_anc_signalpower[i] = exsistbase_list[i];
+      if(exsistbase_list[i]==KEEP_TIMES)
+      {
+
+          exsistbase_list[i]--;
+#ifdef _UWB_4G
+          clockOffsetRatio = anc_clockoffset[i] * (FREQ_OFFSET_MULTIPLIER * HERTZ_TO_PPM_MULTIPLIER_CHAN_2 / 1.0e6) ;
+#else
+					clockOffsetRatio = anc_clockoffset[i] * (FREQ_OFFSET_MULTIPLIER * HERTZ_TO_PPM_MULTIPLIER_CHAN_5 / 1.0e6) ;
+#endif
+          rtd_init = tag_resprx[i] - poll_tx_ts;
+          rtd_resp = anc_resptx[i] - anc_pollrx[i];
+          tof = ((rtd_init - rtd_resp * (1 - clockOffsetRatio)) / 2.0) * DWT_TIME_UNITS;
+          distance = tof * SPEED_OF_LIGHT;
+          if(distance>-10&&distance<1000)
+            nearbase_distlist[i] = distance*100+anc_distoffset[i];
+      }else{
+						nearbase_distlist[i] = 0x1ffff;
+      }
+    
+    }
+}
 void NearPoll(void)
 {
 	
@@ -820,22 +879,28 @@
 
 	recbase_num=0;
 //	motor_state=0;
+    if(motor_state!=0&&motor_state!=3)
+    {
+        motor_flag = 1;
+    }else{
+        motor_flag = 0;
+    }
 	
 	tx_near_msg[BATTARY_IDX] = bat_percent;
-	tx_near_msg[BUTTON_IDX] = userkey_state|stationary_flag<<1|gotosleep_flag<<2;
+	tx_near_msg[BUTTON_IDX] = userkey_state|stationary_flag<<1|gotosleep_flag<<2|motor_flag<<5;
 	tx_near_msg[SEQUENCE_IDX] = frame_seq_nb;
-  tx_near_msg[SEQUENCEH_IDX] = (frame_seq_nb++)>>8;
+    tx_near_msg[SEQUENCEH_IDX] = (frame_seq_nb++)>>8;
 	tx_near_msg[NEARBASENUM_INDEX] = nearbase_num;
 	memcpy(&tx_near_msg[NEARBASEID_INDEX],&nearbaseid_list,nearbase_num*2);
-  memcpy(&tx_near_msg[NEARBASEID_INDEX+nearbase_num*2],&nearbase_distlist,nearbase_num*4+4);
-  memcpy(&tx_near_msg[NEARBASEID_INDEX+nearbase_num*6+4],&rec_anc_signalpower,nearbase_num*2+2);
+    memcpy(&tx_near_msg[NEARBASEID_INDEX+nearbase_num*2],&nearbase_distlist,nearbase_num*4+4);
+    memcpy(&tx_near_msg[NEARBASEID_INDEX+nearbase_num*6+4],&rec_anc_signalpower,nearbase_num*2+2);
 
     
     if(intheight!=0)
     intheight+=g_com_map[HEIGHTOFFEST_INDEX];
     
     memcpy(&tx_near_msg[NEARBASEID_INDEX+nearbase_num*8+6],&intheight,2);
-	tx_near_msg[MESSAGE_TYPE_IDX] = NEAR_POLL;	
+	tx_near_msg[MESSAGE_TYPE_IDX] = POS_POLL;	
 	
 	tx_near_msg[NEARP_TAGFREQ_INDEX] = tag_frequency;	
 	tx_near_msg[NEARP_TAGSLOTPOS_INDEX] = tagslotpos;	
@@ -892,10 +957,11 @@
 							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);   //读取接收数据
+                            test2 = dwt_readcarrierintegrator();
 							dwt_setrxtimeout(0);//设定接收超时时间,0位没有超时时间
 							dwt_rxenable(0);//打开接收
 							//HAL_GPIO_WritePin(LED1_G_GPIO_Port, LED1_G_Pin, GPIO_PIN_SET);
-							if (rx_buffer[MESSAGE_TYPE_IDX] == NEAR_RESPONSE&&!memcmp(&rx_buffer[TAG_ID_IDX],&dev_id,2)) //判断接收到的数据是否是response数据
+							if (rx_buffer[MESSAGE_TYPE_IDX] == POS_RESPONSE&&!memcmp(&rx_buffer[TAG_ID_IDX],&dev_id,2)) //判断接收到的数据是否是response数据
 							{	u16 rec_nearbaseid,rec_nearbasepos;
 								poll_tx_ts = get_tx_timestamp_u64();										//获得POLL发送时间T1
 								resp_rx_ts = get_rx_timestamp_u64();										//获得RESPONSE接收时间T4	
@@ -903,32 +969,36 @@
 								memcpy(&rec_nearbaseid,&rx_buffer[ANCHOR_ID_IDX],2);
 								if(rec_nearbaseid==mainbase_id)
 								{
+                                     exsistbase_list[0]=KEEP_TIMES;
+                                   SetANCTimestap(0,&rx_buffer[RESP_MSG_POLL_RX_TS_IDX],&rx_buffer[RESP_MSG_RESP_TX_TS_IDX],resp_rx_ts,&rx_buffer[RESP_MSG_ANC_DISTOFFSET]);
+
 									//////////////////////////////////时间同步
 									memcpy(&sync_timer,&rx_buffer[ANCTIMEMS],2);
 									memcpy(&tmp_time,&rx_buffer[ANCTIMEUS],2);
 									current_count=HAL_LPTIM_ReadCounter(&hlptim1);
 										dwt_forcetrxoff();
-									final_tx_time = (resp_rx_ts + ((RESP_RX_TO_FINAL_TX_DLY_UUS) * UUS_TO_DWT_TIME)) >> 8;
-									final_tx_ts = (((uint64_t)(final_tx_time & 0xFFFFFFFE)) << 8) + TX_ANT_DLY;//final包实际发送时间是计算时间加上发送天线delay
-									final_msg_set_ts(&tx_near_msg[FINAL_MSG_POLL_TX_TS_IDX], poll_tx_ts);//将T1,T4,T5写入发送数据
-									final_msg_set_ts(&tx_near_msg[FINAL_MSG_RESP_RX_NEARBASE_IDX+nearbase_num*4], 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;
+//									final_tx_time = (resp_rx_ts + ((RESP_RX_TO_FINAL_TX_DLY_UUS) * UUS_TO_DWT_TIME)) >> 8;
+//									final_tx_ts = (((uint64_t)(final_tx_time & 0xFFFFFFFE)) << 8) + TX_ANT_DLY;//final包实际发送时间是计算时间加上发送天线delay
+//									final_msg_set_ts(&tx_near_msg[FINAL_MSG_POLL_TX_TS_IDX], poll_tx_ts);//将T1,T4,T5写入发送数据
+//									final_msg_set_ts(&tx_near_msg[FINAL_MSG_RESP_RX_NEARBASE_IDX+nearbase_num*4], 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]=POS_FINAL;
 									rec_remotepara_state=rx_buffer[MOTORSTATE_INDEX]>>4;
-								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);
-									}
-									dwt_writetxdata(28+nearbase_num*4, tx_near_msg, 0);//将发送数据写入DW1000
-									dwt_writetxfctrl(28+nearbase_num*4, 0);//设定发送数据长度
-									dwt_setdelayedtrxtime(final_tx_time);//设置final包发送时间T5
-									result=dwt_starttx(DWT_START_TX_DELAYED);//设定为延迟发送	
+                                    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);
+                                        }
+//									dwt_writetxdata(28+nearbase_num*4, tx_near_msg, 0);//将发送数据写入DW1000
+//									dwt_writetxfctrl(28+nearbase_num*4, 0);//设定发送数据长度
+//									dwt_setdelayedtrxtime(final_tx_time);//设置final包发送时间T5
+//									result=dwt_starttx(DWT_START_TX_DELAYED);//设定为延迟发送	
 									userkey_state = !GET_USERKEY;
 
-									memcpy(&temp_dist,&rx_buffer[DIST_IDX],4);
+									//memcpy(&temp_dist,&rx_buffer[DIST_IDX],4);
+                                    temp_dist = nearbase_distlist[0];
                                     if(temp_dist!=nearbase_distlist[0])
                                     {
                                         get_newdist++;
@@ -938,7 +1008,7 @@
                                     base_mindist = temp_dist;
 									if((rx_buffer[MOTORSTATE_INDEX]&0xf)!=3)
 										motor_state=rx_buffer[MOTORSTATE_INDEX]&0xf;
-                                    if(frame_len==28)
+                                    if(frame_len==38)
                                      {
                                          memcpy(&rec_maxrangelen,&rx_buffer[MAXRANGE_DISTANCE],2);
                                          memcpy(&rec_anc_signalpower[0],&rx_buffer[ANC_SIGNALPOWER],2);
@@ -946,7 +1016,7 @@
                                          {
                                              if(outrange_times++>OUTRANGE_RESTARTTIMES)
                                              {
-                                               // tag_state = STARTPOLL;
+                                                tag_state = STARTPOLL;
                                              }
                                          }else{
                                              outrange_times = 0;
@@ -957,7 +1027,7 @@
 									
 									mainbase_lost_count=0;
 									flag_finalsend=1;
-									memcpy(&mainbase_dist,&rx_buffer[DIST_IDX],4);
+//									memcpy(&mainbase_dist,&rx_buffer[DIST_IDX],4);
 		
 
 									flag_getresponse=1;								
@@ -972,17 +1042,20 @@
 									}
 									ancsync_time=((sync_timer)*1000+tmp_time);	
 									SetLPTimer(ancsync_time);
-									if(result==0)
-											{while (!(dwt_read32bitreg(SYS_STATUS_ID) & SYS_STATUS_TXFRS))//不断查询芯片状态直到发送完成
-											{ };}			
+//									if(result==0)
+//											{while (!(dwt_read32bitreg(SYS_STATUS_ID) & SYS_STATUS_TXFRS))//不断查询芯片状态直到发送完成
+//											{ };}			
 //HAL_GPIO_WritePin(LED1_G_GPIO_Port, LED1_G_Pin, GPIO_PIN_RESET);											
 										break;
 								}else{
 									
-									rec_nearbasepos=FindNearBasePos(rec_nearbaseid);									
-									exsistbase_list[rec_nearbasepos]=KEEP_TIMES;
-									memcpy(&temp_dist,&rx_buffer[DIST_IDX],4);
-                                    if(frame_len==28)
+									rec_nearbasepos=FindNearBasePos(rec_nearbaseid);	
+                                    SetANCTimestap(rec_nearbasepos+1,&rx_buffer[RESP_MSG_POLL_RX_TS_IDX],&rx_buffer[RESP_MSG_RESP_TX_TS_IDX],resp_rx_ts,&rx_buffer[RESP_MSG_ANC_DISTOFFSET]);
+									
+									exsistbase_list[rec_nearbasepos+1]=KEEP_TIMES;
+									//memcpy(&temp_dist,&rx_buffer[DIST_IDX],4);
+                                    temp_dist = nearbase_distlist[rec_nearbasepos+1];
+                                    if(frame_len==38)
                                     memcpy(&rec_anc_signalpower[rec_nearbasepos+1],&rx_buffer[ANC_SIGNALPOWER],2);
 									memcpy(&nearbase_switchdistlist[rec_nearbasepos],&rx_buffer[NR_NEARSWITCH_DISTANCE],2);
                                     if(temp_dist!=nearbase_distlist[rec_nearbasepos+1])
@@ -1001,7 +1074,7 @@
 									  {
                                             mainbase_id = rec_nearbaseid;
                                             tag_state = GETNEARMSG;
-																						trygetnearmsg_times = 0;
+											trygetnearmsg_times = 0;
                                         }
                                     #endif
 
@@ -1052,7 +1125,7 @@
 					NextSlotDelayMs(0);
 				}
 			}	
-
+CalculateDists();
 			if(para_update)
 			{
 			
@@ -1065,7 +1138,17 @@
 					{
                         if(motor_keeptime==0)
                             motor_keeptime = rec_remotepara[3];
-					}else{
+					}else if( pack_index == 2*COM_INTERVAL)
+                    {
+                        if(memcmp(&g_com_map[COM_INTERVAL],&rec_remotepara[3],2)!=0)
+                        {
+                            memcpy((uint8_t*)&g_com_map + pack_index, &rec_remotepara[3], pack_length);
+                            save_com_map_to_flash();
+                            tag_frequency = 1000/g_com_map[COM_INTERVAL];
+                            bigslot_num = TOTAL_SLOTNUM/tag_frequency;
+                        }
+                    }
+                    else{
                         if(pack_index<200)
                         {
                             memcpy((uint8_t*)&g_com_map + pack_index, &rec_remotepara[3], pack_length);
@@ -1078,16 +1161,16 @@
 					}
 				}
 			}
-            if(get_newdist>2)
-            {
-                notenoughdist_count = 0;
-            }else{
-                if(notenoughdist_count++>3)
-                {
-                    notenoughdist_count = 0;
-             //       tag_state = DISCPOLL;
-                }
-            }
+//            if(get_newdist>=2)
+//            {
+//                notenoughdist_count = 0;
+//            }else{
+//                if(notenoughdist_count++>10)
+//                {
+//                    notenoughdist_count = 0;
+//                    tag_state = DISCPOLL;
+//                }
+//            }
 			for(i=0;i<nearbase_num;i++)
 			{
                 if(nearbaseid_list[i]!=nearbaseid_list2[i])
@@ -1128,7 +1211,8 @@
 		memcpy(&tx_near_msg[REGP_VERSION_INDEX],&g_com_map[VERSION],2);	
 		memcpy(&tx_near_msg[REGP_IMUTHRES_INDEX],&g_com_map[IMU_THRES],2);
 		memcpy(&tx_near_msg[REGP_NOMOVESLEEPTIME_INDEX],&g_com_map[NOMOVESLEEP_TIME],2);
-    memcpy(&tx_near_msg[REGP_HEIGHTOFFSET_INDEX],&g_com_map[HEIGHTOFFEST_INDEX],2);
+        send_buffer[REGP_BATTARY_INDEX] = bat_percent;
+//    memcpy(&tx_near_msg[REGP_HEIGHTOFFSET_INDEX],&g_com_map[HEIGHTOFFEST_INDEX],2);
 		dwt_writetxdata(23, tx_near_msg, 0);//将Poll包数据传给DW1000,将在开启发送时传出去
 		dwt_writetxfctrl(23, 0);//设置超宽带发送数据长度
 		dwt_starttx(DWT_START_TX_IMMEDIATE | DWT_RESPONSE_EXPECTED);//开启发送,发送完成后等待一段时间开启接收,等待时间在dwt_setrxaftertxdelay中设置
@@ -1149,10 +1233,10 @@
 							if (rx_buffer[MESSAGE_TYPE_IDX] == REG_RESPONSE&&!memcmp(&rx_buffer[TAG_ID_IDX],&dev_id,2)) //判断接收到的数据是否是response数据
 							{	u16 rec_nearbaseid,rec_nearbasepos;
 								
-								memcpy(&rec_nearbaseid,&rx_buffer[ANCHOR_ID_IDX],2);
-								tag_frequency = rx_buffer[REGR_TAGFREQ_INDEX];
-								bigslot_num = TOTAL_SLOTNUM/tag_frequency;
-								tagslotpos = rx_buffer[REGR_TAGSLOTPOS_INDEX];
+                                    memcpy(&rec_nearbaseid,&rx_buffer[ANCHOR_ID_IDX],2);
+                                    tag_frequency = rx_buffer[REGR_TAGFREQ_INDEX];
+                                    bigslot_num = TOTAL_SLOTNUM/tag_frequency;
+                                    tagslotpos = rx_buffer[REGR_TAGSLOTPOS_INDEX];
 									//////////////////////////////////时间同步
 									memcpy(&sync_timer,&rx_buffer[ANCTIMEMS],2);
 									memcpy(&tmp_time,&rx_buffer[ANCTIMEUS],2);
@@ -1183,7 +1267,7 @@
 									memcpy(nearbaseid_list,&rx_buffer[NEARBASEID_INDEX],nearbase_num*2);
 									memcpy(nearbaseid_list2,&rx_buffer[NEARBASEID_INDEX],nearbase_num*2);
 									if(tagslotpos!=255)
-									tag_state = DISCPOLL;
+                   tag_state = DISCPOLL;
 								}
 							}
 }
@@ -1210,6 +1294,7 @@
         }
     }
     error_times = 0;
+		tag_state = DISCPOLL;
 	switch(tag_state)
 	{
 		case REGPOLL:

--
Gitblit v1.9.3