From 2e895d0a7b81c6216457ddd23690c1249ceb993d Mon Sep 17 00:00:00 2001
From: zhyinch <zhyinch@gmail.com>
Date: 星期五, 24 七月 2020 10:09:38 +0800
Subject: [PATCH] V1.22 去掉标签串口输出

---
 源码/核心板/Src/application/dw_app.h |   13 ++++++++-----
 1 files changed, 8 insertions(+), 5 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..73d4193 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"
@@ -19,8 +19,8 @@
 #include "beep.h"
 #include <math.h>
 
-#define USART_INTEGRATE_OUTPUT
-//#define WORK_MODE_TAG
+//#define USART_INTEGRATE_OUTPUT
+
 
 //#define NEWBOARD
 //#define TAG_OUTPUT
@@ -87,6 +87,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 +105,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 +123,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