From 0a7ffb3c159918e1df3e0a2ab59c48e00cc48272 Mon Sep 17 00:00:00 2001 From: yincheng.zhong <634916154@qq.com> Date: 星期四, 02 三月 2023 15:57:30 +0800 Subject: [PATCH] V2.53 修改UWB通讯标志位,适配2.56之后的标签。 --- 源码/核心板/Src/application/dw_app.h | 32 ++++++++++++++++++++++---------- 1 files changed, 22 insertions(+), 10 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 96cebb2..8ffca5b 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" @@ -26,8 +26,10 @@ //#define TAG_OUTPUT #define HEX_OUTPUT +#define MAXUSERDATALEN 55 +#define ANCHORTYPE_NUM 5 #define MAX_NEARBASE_NUM 12 -#define MAX_RFPOWER 60 +#define MAX_RFPOWER 67 #define DEFAULT_RFPOWER 30 #define REPOET_ANC_NUM 1 #define REPOET_ANC_NUM_MIN 1 @@ -63,7 +65,7 @@ /* 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. */ #define RESP_TX_TO_FINAL_RX_DLY_UUS 0 /* Receive final timeout. See NOTE 5 below. */ -#define FINAL_RX_TIMEOUT_UUS 4300 +#define FINAL_RX_TIMEOUT_UUS 1000 #define SPEED_OF_LIGHT 299702547 @@ -77,6 +79,13 @@ #define NEAR_RESPONSE 0x07 #define NEAR_FINAL 0x08 #define SPOLL 0x09 +#define DISCOVERPOLL 0x0a +#define DISCOVERFINAL 0x0c + +#define POS_MSG 0x15 +#define POS_POLL 0x16 +#define POS_RESPONSE 0x17 +#define POS_FINAL 0x18 #define REG_POLL 0x10 #define REG_RESPONSE 0x11 @@ -88,14 +97,16 @@ //Poll #define ANC_TYPE_IDX 14 //respose -#define DIST_IDX 10 -#define ANCTIMEMS 14 -#define ANCTIMEUS 16 -#define MAINBASE_INDEX 18 -#define MOTORSTATE_INDEX 19 -#define NR_NEARSWITCH_DISTANCE 20 -#define REMOTEPARA_INDEX 22 - +#define DIST_IDX 10 +#define ANCTIMEMS 14 +#define ANCTIMEUS 16 +#define MAINBASE_INDEX 18 +#define MOTORSTATE_INDEX 19 +#define NR_NEARSWITCH_DISTANCE 20 +#define REMOTEPARA_INDEX 22 +#define MAXRANGE_DISTANCE 22 +#define ANC_SIGNALPOWER 24 +#define TAGPOS_INDEX 26 #define TAGSLOTPOS 7 //Final #define TAGCONFIGSUCCESS_INDEX 7 @@ -153,4 +164,5 @@ void TagListUpdate(void); void SyncPoll(u8 sync_seq); u8 GetRandomSlotPos(uint32_t emptyslot); +u16 CmpTagInList(u16 tagid); #endif -- Gitblit v1.9.3