From 95e97a5cd0aa1bfd7c87e2bd66a9afbdd086e34e Mon Sep 17 00:00:00 2001
From: zhyinch <zhyinch@gmail.com>
Date: 星期六, 12 九月 2020 15:01:58 +0800
Subject: [PATCH] 增加基站远程修改标签配置功能，未充分测试

---
 源码/核心板/Src/application/dw_app.h |   19 ++++++++++++-------
 1 files changed, 12 insertions(+), 7 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 a78f29b..121b7f8 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"
@@ -20,7 +20,7 @@
 #include <math.h>
 
 #define USART_INTEGRATE_OUTPUT
-//#define WORK_MODE_TAG
+
 
 //#define NEWBOARD
 //#define TAG_OUTPUT
@@ -35,8 +35,8 @@
 #define TAG_NUM_IN_SYS				256
 #define DFT_RAND_DLY_TIM_MS			1
 #define QUIT_SLOT_TIME    5
-#define KEEP_TIMES 10
-
+#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. */
@@ -56,7 +56,7 @@
 /* Receive response timeout. See NOTE 5 below. */
 #define RESP_RX_TIMEOUT_UUS 2000
 
-#define DELAY_BETWEEN_TWO_FRAME_UUS 300
+#define DELAY_BETWEEN_TWO_FRAME_UUS 400
 
 #define POLL_RX_TO_RESP_TX_DLY_UUS 470
 /* This is the delay from the end of the frame transmission to the enable of the receiver, as programmed for the DW1000's wait for response feature. */
@@ -87,9 +87,12 @@
 #define ANCTIMEMS             14
 #define ANCTIMEUS             16
 #define MAINBASE_INDEX        18
+#define MOTORSTATE_INDEX      19
+#define REMOTEPARA_INDEX      20
 
 #define TAGSLOTPOS						7
 //Final
+#define TAGCONFIGSUCCESS_INDEX 7
 #define FINAL_MSG_POLL_TX_TS_IDX 10
 #define FINAL_MSG_RESP_RX_TS_IDX 14
 #define FINAL_MSG_FINAL_TX_TS_IDX 18
@@ -103,10 +106,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 +124,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);
@@ -134,4 +138,5 @@
 void Dw1000_App_Init(void);
 void TagListUpdate(void);
 void SyncPoll(u8 sync_seq,uint32_t sync_baseid);
+u8 GetRandomSlotPos(uint32_t emptyslot);
 #endif

--
Gitblit v1.9.3