From 2ee2901d9c4b393be084a4ef2f501462704ad940 Mon Sep 17 00:00:00 2001
From: zhyinch <zhyinch@gmail.com>
Date: 星期一, 13 九月 2021 16:02:55 +0800
Subject: [PATCH] V1.44测试完成

---
 源码/核心板/Src/application/dw_app.c |    8 ++++----
 1 files changed, 4 insertions(+), 4 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 280a7e8..c7c80b7 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"
@@ -31,7 +31,7 @@
 #include "modbus.h"
 //#define DEBUG_OUTPUT
 #define TDFILTER
-#define CONSTANT_FILTER
+//#define CONSTANT_FILTER
 /*------------------------------------ Marcos ------------------------------------------*/
 /* Inter-ranging delay period, in milliseconds. */
 #define RNG_DELAY_MS 100
@@ -479,8 +479,8 @@
 			TIM3->CNT=tmp_time;
 		}
 			memcpy(&hex_dist2, &rx_buffer[DIST_IDX], 4);        
-            memcpy(&tag_distarray[i*4], &rx_buffer[DIST_IDX], 4);
-            memcpy(&tag_IDarray[i*2],&rx_buffer[ANCHOR_ID_IDX],2);
+            memcpy(&tag_distarray[i], &rx_buffer[DIST_IDX], 4);
+            memcpy(&tag_IDarray[i],&rx_buffer[ANCHOR_ID_IDX],2);
             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);
@@ -777,7 +777,7 @@
                                 memcpy(&usart_send[5],&tag_id_recv,2);
                                 memcpy(&usart_send[7],&ancrec_IDarray[i],2);
                                 
-                                memcpy(&usart_send[9],&anchor_dist_last_frm[tag_id_recv-TAG_ID_START],4);
+                                memcpy(&usart_send[9],&ancrec_distarray[i],4);
                                 usart_send[13] = battary;
                                 usart_send[14] = button;
                                 usart_send[15] = firstpath_power;

--
Gitblit v1.9.3