From 5b130136a057f2cec4df6b4f14165b503e8ac816 Mon Sep 17 00:00:00 2001 From: zhyinch <zhyinch@gmail.com> Date: 星期日, 31 五月 2020 18:19:17 +0800 Subject: [PATCH] 修改部分bug --- 源码/核心板/Src/application/dw_app.h | 13 +++++++++---- 1 files changed, 9 insertions(+), 4 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 98b8b04..78ae8b9 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,12 +20,13 @@ #include <math.h> #define USART_INTEGRATE_OUTPUT +//#define WORK_MODE_TAG //#define NEWBOARD //#define TAG_OUTPUT #define HEX_OUTPUT -#define MAX_NEARBASE_NUM 10 +#define MAX_NEARBASE_NUM 12 #define REPOET_ANC_NUM 1 #define REPOET_ANC_NUM_MIN 1 @@ -34,6 +35,7 @@ #define TAG_NUM_IN_SYS 256 #define DFT_RAND_DLY_TIM_MS 1 #define QUIT_SLOT_TIME 5 +#define KEEP_TIMES 10 #define RNG_DELAY_MS 100 @@ -56,7 +58,7 @@ #define DELAY_BETWEEN_TWO_FRAME_UUS 240 -#define POLL_RX_TO_RESP_TX_DLY_UUS 420 +#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. */ #define RESP_TX_TO_FINAL_RX_DLY_UUS 200 /* Receive final timeout. See NOTE 5 below. */ @@ -84,6 +86,8 @@ #define DIST_IDX 10 #define ANCTIMEMS 14 #define ANCTIMEUS 16 +#define MAINBASE_INDEX 18 + #define TAGSLOTPOS 7 //Final #define FINAL_MSG_POLL_TX_TS_IDX 10 @@ -92,6 +96,7 @@ #define FINAL_MSG_RESP_RX_NEARBASE_IDX 22 #define FINAL_MSG_TS_LEN 4 //SYNC +#define ANCHOR_ID_IDX 1 #define SYNC_SEQ_IDX 5 //NEAR MSG #define NEARBASENUM_INDEX 10 @@ -114,7 +119,7 @@ extern uint32_t g_UWB_com_interval; extern float dis_after_filter; extern LPFilter_Frac* p_Dis_Filter; //测距用的低通滤波器 -extern u8 usart_send[100]; +extern u8 usart_send[100],usart_send_anc[100],flag_syncbase; void IdleTask(void); uint16_t Checksum_u16(uint8_t* pdata, uint32_t len); @@ -127,5 +132,5 @@ extern void TagDistClear(void); void Dw1000_App_Init(void); void TagListUpdate(void); -void SyncPoll(u8 sync_seq); +void SyncPoll(u8 sync_seq,uint32_t sync_baseid); #endif -- Gitblit v1.9.3