From 53267df53898af998cbd17676c05588a9a19c9c8 Mon Sep 17 00:00:00 2001 From: zhyinch <zhyinch@gmail.com> Date: 星期三, 15 四月 2020 08:38:02 +0800 Subject: [PATCH] V1.10 增加标签和基站不同固件模式 --- 源码/核心板/Src/application/dw_app.h | 15 +++++++++------ 1 files changed, 9 insertions(+), 6 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 c2f91da..18027c6 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" @@ -18,12 +18,15 @@ #include <stdio.h> #include "beep.h" #include <math.h> + +#define USART_INTEGRATE_OUTPUT //#define WORK_MODE_TAG -#define WORK_MODE_ANCHOR //#define NEWBOARD //#define TAG_OUTPUT #define HEX_OUTPUT + +#define MAX_NEARBASE_NUM 10 #define REPOET_ANC_NUM 1 #define REPOET_ANC_NUM_MIN 1 @@ -48,9 +51,9 @@ #define POLL_TX_TO_RESP_RX_DLY_UUS 150 /* This is the delay from Frame RX timestamp to TX reply timestamp used for calculating/setting the DW1000's delayed TX function. This includes the * frame length of approximately 2.66 ms with above configuration. */ -#define RESP_RX_TO_FINAL_TX_DLY_UUS 400 +#define RESP_RX_TO_FINAL_TX_DLY_UUS 410 /* Receive response timeout. See NOTE 5 below. */ -#define RESP_RX_TIMEOUT_UUS 600 +#define RESP_RX_TIMEOUT_UUS 2000 #define DELAY_BETWEEN_TWO_FRAME_UUS 240 @@ -82,7 +85,7 @@ #define DIST_IDX 10 #define ANCTIMEMS 14 #define ANCTIMEUS 16 -#define TAGSLOTPOS 8 +#define TAGSLOTPOS 7 //Final #define FINAL_MSG_POLL_TX_TS_IDX 10 #define FINAL_MSG_RESP_RX_TS_IDX 14 @@ -99,7 +102,7 @@ #define BUTTON_IDX 2 #define SEQUENCE_IDX 3 -#define THRESHOLD_CHANGE_MAINBASE_DIST 50 +#define THRESHOLD_CHANGE_MAINBASE_DIST 5 extern u8 neartimout_timer; extern u16 slottime,tyncpoll_time,max_slotpos; extern u16 poll_timer,tag_timer; @@ -112,7 +115,7 @@ extern uint32_t g_UWB_com_interval; extern float dis_after_filter; extern LPFilter_Frac* p_Dis_Filter; //测距用的低通滤波器 -extern u8 usart_send[25]; +extern u8 usart_send[100]; void IdleTask(void); uint16_t Checksum_u16(uint8_t* pdata, uint32_t len); -- Gitblit v1.9.3