From 526f2fbdaa4532c5bc0b6dffd7b9b84f784d7fef Mon Sep 17 00:00:00 2001 From: yincheng.zhong <634916154@qq.com> Date: 星期一, 29 一月 2024 15:49:44 +0800 Subject: [PATCH] 1.76 --- 源码/核心板/Src/application/dw_app.h | 11 +++++++---- 1 files changed, 7 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 8809815..70ce920 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,8 +18,11 @@ #include <stdio.h> #include "beep.h" #include <math.h> +#include "TrackingDiff.h" +#define USART_SINGLE_OUTPUT //#define USART_INTEGRATE_OUTPUT +//#define USART_ALL_OUTPUT //#define NEWBOARD @@ -36,7 +39,7 @@ #define DFT_RAND_DLY_TIM_MS 1 #define QUIT_SLOT_TIME 5 #define KEEP_TIMES 3 - +#define SLOT_SCALE 0.7 #define RNG_DELAY_MS 100 /* Default antenna delay values for 64 MHz PRF. See NOTE 1 below. */ @@ -105,9 +108,9 @@ #define NEARBASENUM_INDEX 10 #define NEARBASEID_INDEX 11 //NEAR POLL -#define BATTARY_IDX 1 -#define BUTTON_IDX 2 #define SEQUENCE_IDX 3 +#define BATTARY_IDX 4 +#define BUTTON_IDX 7 #define REMOTEPARA_LEN 18 #define THRESHOLD_CHANGE_MAINBASE_DIST 5 @@ -131,7 +134,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