From 25c460c9da82215badc40a3ee917670263669f8e Mon Sep 17 00:00:00 2001
From: zhyinch <zhyinch@gmail.com>
Date: 星期四, 25 三月 2021 17:48:40 +0800
Subject: [PATCH] V1.43 去掉滤波 单基站输出

---
 源码/核心板/Src/application/dw_app.h |   21 +++++++++++++++------
 1 files changed, 15 insertions(+), 6 deletions(-)

diff --git "a/\346\272\220\347\240\201/\346\240\270\345\277\203\346\235\277/Src/application/dw_app.h" "b/\346\272\220\347\240\201/\346\240\270\345\277\203\346\235\277/Src/application/dw_app.h"
index b574b3d..3097882 100644
--- "a/\346\272\220\347\240\201/\346\240\270\345\277\203\346\235\277/Src/application/dw_app.h"
+++ "b/\346\272\220\347\240\201/\346\240\270\345\277\203\346\235\277/Src/application/dw_app.h"
@@ -18,9 +18,15 @@
 #include <stdio.h>
 #include "beep.h"
 #include <math.h>
+#include "TrackingDiff.h"
+<<<<<<< HEAD
+=======
+//#define USART_INTEGRATE_OUTPUT
+>>>>>>> parent of 47d2701 (V1.41  璐熸暟涓嶈緭鍑� 淇敼鍥炲485鏃犳樉绀築UG)
 
-#define USART_INTEGRATE_OUTPUT
-//#define WORK_MODE_TAG
+//#define USART_SINGLE_OUTPUT
+//#define USART_INTEGRATE_OUTPUT
+#define USART_ALL_OUTPUT
 
 //#define NEWBOARD
 //#define TAG_OUTPUT
@@ -36,7 +42,7 @@
 #define DFT_RAND_DLY_TIM_MS			1
 #define QUIT_SLOT_TIME    5
 #define KEEP_TIMES 3
-
+#define SLOT_SCALE 0.7
 #define RNG_DELAY_MS 100
 
 /* Default antenna delay values for 64 MHz PRF. See NOTE 1 below. */
@@ -87,6 +93,8 @@
 #define ANCTIMEMS             14
 #define ANCTIMEUS             16
 #define MAINBASE_INDEX        18
+#define MOTORSTATE_INDEX      19
+#define REMOTEPARA_INDEX      20
 
 #define TAGSLOTPOS						7
 //Final
@@ -103,10 +111,11 @@
 #define NEARBASENUM_INDEX    10
 #define NEARBASEID_INDEX		 11
 //NEAR POLL
-#define BATTARY_IDX						1
-#define BUTTON_IDX						2
 #define SEQUENCE_IDX					3
+#define BATTARY_IDX						4
+#define BUTTON_IDX						7
 
+#define REMOTEPARA_LEN 18
 #define THRESHOLD_CHANGE_MAINBASE_DIST   5
 extern u8 neartimout_timer;
 extern u16 slottime,tyncpoll_time,max_slotpos;
@@ -120,7 +129,7 @@
 extern uint32_t g_UWB_com_interval;
 extern float dis_after_filter;
 extern LPFilter_Frac* p_Dis_Filter;		//测距用的低通滤波器
-extern u8 usart_send[100],usart_send_anc[100],flag_syncbase;
+extern u8 usart_send[100],usart_send_anc[100],flag_syncbase,remotesend_state, remotetag_para[30];;
 
 void IdleTask(void);
 uint16_t Checksum_u16(uint8_t* pdata, uint32_t len);

--
Gitblit v1.9.3