From 6cd32e662d56a34b3747f3aa6a601ebe2d77a0ed Mon Sep 17 00:00:00 2001 From: WXK <287788329@qq.com> Date: 星期二, 21 一月 2025 18:02:33 +0800 Subject: [PATCH] 2.62,加入兼容防撞跟下发蜂鸣 --- Src/application/dw_app.h | 20 +++++++++++++++++--- 1 files changed, 17 insertions(+), 3 deletions(-) diff --git a/Src/application/dw_app.h b/Src/application/dw_app.h index 478e069..1de81bd 100644 --- a/Src/application/dw_app.h +++ b/Src/application/dw_app.h @@ -19,7 +19,7 @@ #define HEX_OUTPUT #define TOTAL_SLOTNUM 200 #define SLOTTIME_MS 48 -#define SLOT_SCALE 0.24 +#define SLOT_SCALE 0.8 #define MAX_NEARBASE_NUM 12 #define KEEP_TIMES 3 @@ -29,7 +29,7 @@ #define GROUP_TAG_NUM 2 #define TAG_NUM_IN_SYS 25 #define DFT_RAND_DLY_TIM_MS 1 -#define THRESHOLD_CHANGE_MAINBASE_DIST 50 +#define THRESHOLD_CHANGE_MAINBASE_DIST 30 #define MIN_ANCHOR_NUM 2 #define SYNC_SEQ_IDX 5 #define REMOTEPARA_LEN 18 @@ -45,9 +45,19 @@ #define NEAR_RESPONSE 0x07 #define NEAR_FINAL 0x08 #define SPOLL 0x09 +#define DISCOVERPOLL 0x0A +#define DISCOVERRESPONSE 0x0B +#define DISCOVERFINAL 0x0C +#define DISCOVERPOLL2 0x1A + +#define POS_MSG 0x15 +#define POS_POLL 0x16 +#define POS_RESPONSE 0x17 +#define POS_FINAL 0x18 #define REG_POLL 0x10 // #define REG_RESPONSE 0x11 // +#define REG_POLL2 0x20 // //General #define GROUP_ID_IDX 0 #define ANCHOR_ID_IDX 1 @@ -69,6 +79,9 @@ #define REMOTEPARA_INDEX 22 #define MAXRANGE_DISTANCE 22 #define ANC_SIGNALPOWER 24 +#define RESP_MSG_POLL_RX_TS_IDX 26 +#define RESP_MSG_RESP_TX_TS_IDX 30 +#define RESP_MSG_ANC_DISTOFFSET 34 //Final #define TAGCONFIGSUCCESS_INDEX 7 @@ -94,6 +107,7 @@ #define REGP_IMUTHRES_INDEX 15 #define REGP_NOMOVESLEEPTIME_INDEX 17 #define REGP_HEIGHTOFFSET_INDEX 19 +#define REGP_BATTARY_INDEX 19 //REG RESPONSE #define REGR_TAGFREQ_INDEX 10 #define REGR_TAGSLOTPOS_INDEX 12 @@ -120,7 +134,7 @@ extern uint32_t g_UWB_com_interval; extern float dis_after_filter; -extern uint8_t usart_send[25]; +extern uint8_t usart_send[100]; void IdleTask(void); uint16_t Checksum_u16(uint8_t* pdata, uint32_t len); -- Gitblit v1.9.3