From 66b13717fce3890b464d0b43eb61b94ea7cdf56e Mon Sep 17 00:00:00 2001 From: zhyinch <zhyinch@gmail.com> Date: 星期二, 28 九月 2021 17:09:23 +0800 Subject: [PATCH] V2.30 --- 源码/核心板/Src/application/dw_app.h | 25 +++++++++++++++---------- 1 files changed, 15 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 60791e3..e5bc528 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,9 @@ //#define TAG_OUTPUT #define HEX_OUTPUT +#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 @@ -59,7 +60,7 @@ #define DELAY_BETWEEN_TWO_FRAME_UUS 250 -#define POLL_RX_TO_RESP_TX_DLY_UUS 470 +#define POLL_RX_TO_RESP_TX_DLY_UUS 670 /* 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. */ @@ -76,6 +77,8 @@ #define NEAR_POLL 0x06 #define NEAR_RESPONSE 0x07 #define NEAR_FINAL 0x08 +#define SPOLL 0x09 +#define DISCOVERPOLL 0x0a #define REG_POLL 0x10 #define REG_RESPONSE 0x11 @@ -87,13 +90,15 @@ //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 TAGSLOTPOS 7 //Final @@ -145,7 +150,7 @@ void Tag_App(void); void Anchor_App(void); void tag_sleep_configuraion(void); -extern uint16_t g_Tagdist[TAG_NUM_IN_SYS]; +extern int32_t g_Tagdist[TAG_NUM_IN_SYS]; extern uint8_t g_flag_Taggetdist[256]; extern void TagDistClear(void); void Dw1000_App_Init(void); -- Gitblit v1.9.3