From a6d3ecc9ed8f7860a44f7ea0382acc3469ea3bd6 Mon Sep 17 00:00:00 2001
From: zhyinch <zhyinch@gmail.com>
Date: 星期三, 17 三月 2021 22:41:54 +0800
Subject: [PATCH] v1.43 增加信号强度输出

---
 源码/核心板/Src/application/dw_app.c |   34 +++++++++++++++++++++++++++++++---
 1 files changed, 31 insertions(+), 3 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 b446135..01463b2 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"
@@ -15,6 +15,7 @@
  */
 
 #include <string.h>
+#include <math.h>
 #include "dw_app.h"
 #include "deca_device_api.h"
 #include "deca_regs.h"
@@ -81,6 +82,7 @@
 #define ANCTIMEMS             14
 #define ANCTIMEUS             16
 #define ANCSEND_INTERVAL      18
+#define SIGNALPOWER           20
 
 #define POLL     					0x01
 #define RESPONSE 					0x02
@@ -109,7 +111,7 @@
 static uint8_t tx_final_msg[24] = {0};
 	
 //static uint8_t rx_poll_msg[] = {0x00, 0x88, 0, 0xCA, 0xDE, 'W', 'A', 'V', 'E', 0x21, 0, 0};
-static uint8_t tx_resp_msg[22] = {0};
+static uint8_t tx_resp_msg[23] = {0};
 //static uint8_t rx_final_msg[] = {0x41, 0x88, 0, 0xCA, 0xDE, 'W', 'A', 'V', 'E', 0x23, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
 	
 /* Frame sequence number, incremented after each transmission. */
@@ -320,6 +322,26 @@
 	dwt_writetxfctrl(sizeof(tx_sync_msg), 0);//设置超宽带发送数据长度
 	dwt_starttx(DWT_START_TX_IMMEDIATE);
 }
+ double firstpath_power, 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;
+  }
 uint16_t g_Resttimer;
 uint8_t result;
 u8 tag_succ_times=0;
@@ -414,6 +436,7 @@
 			TIM3->CNT=tmp_time;
 		}
 			memcpy(&hex_dist2, &rx_buffer[DIST_IDX], 4);
+            rec_firstpath_power = rx_buffer[SIGNALPOWER];
 			memcpy(&tx_final_msg[ANCHOR_ID_IDX], &rx_buffer[ANCHOR_ID_IDX], 4);
 			memcpy(&rec_com_interval,&rx_buffer[ANCSEND_INTERVAL],  2);
 			if(rec_com_interval>4&&rec_com_interval!=g_com_map[COM_INTERVAL])
@@ -468,6 +491,7 @@
 					memcpy(&usart_send[9],&hex_dist2,4);
 					usart_send[13] = bat_percent;
 					usart_send[14] = button;
+                    usart_send[15] = rec_firstpath_power;
 					checksum = Checksum_u16(&usart_send[2],17);
 					memcpy(&usart_send[19],&checksum,2);
 					UART_PushFrame(usart_send,21);
@@ -513,6 +537,7 @@
 	/* Execute a delay between ranging exchanges. */
 	
 }
+
 int8_t correction_time;
 extern uint8_t sync_seq;
 #define TDFILTER
@@ -585,7 +610,8 @@
 			/* Write and send the response message. See NOTE 9 below.*/
 			if(tag_id_recv-TAG_ID_START<=TAG_NUM_IN_SYS)
 			memcpy(&tx_resp_msg[DIST_IDX], &g_Tagdist[tag_id_recv], 4);
-		
+            tx_resp_msg[SIGNALPOWER] = firstpath_power;
+            
 			dwt_writetxdata(sizeof(tx_resp_msg), tx_resp_msg, 0);//写入发送数据
 			dwt_writetxfctrl(sizeof(tx_resp_msg), 0);//设定发送长度
 			result = dwt_starttx(DWT_START_TX_DELAYED | DWT_RESPONSE_EXPECTED);//延迟发送,等待接收
@@ -655,7 +681,8 @@
 
 					dist_cm = dist_no_bias * 1000; //dis 为单位为cm的距离
 //					dist[TAG_ID] = LP(dis, TAG_ID); //LP 为低通滤波器,让数据更稳定
-					
+					dwt_readdiagnostics(&d1);
+					LOS(&d1);
 					/*--------------------------以下为非测距逻辑------------------------*/
              #ifdef DEBUG_OUTPUT
             printf("收到FINAL包,标签ID: %d .\r\n",tag_id_recv);
@@ -694,6 +721,7 @@
 						memcpy(&usart_send[9],&anchor_dist_last_frm[tag_id_recv-TAG_ID_START],4);
 						usart_send[13] = battary;
 						usart_send[14] = button;
+                        usart_send[15] = firstpath_power;
 						checksum = Checksum_u16(&usart_send[2],17);
 						memcpy(&usart_send[19],&checksum,2);
 						UART_PushFrame(usart_send,21);

--
Gitblit v1.9.3