From 40a60c4d3d0d3859d93f239beadc3de7128ece4b Mon Sep 17 00:00:00 2001 From: zhyinch <zhyinch@gmail.com> Date: 星期四, 07 七月 2022 15:49:06 +0800 Subject: [PATCH] Revert "V1.64 增加碰撞随机跳时间片" --- 源码/核心板/Src/application/dw_app.h | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 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 0bc8089..d6dc397 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_INTEGRATE_OUTPUT +#define USART_SINGLE_OUTPUT +//#define USART_INTEGRATE_OUTPUT +//#define USART_ALL_OUTPUT //#define NEWBOARD @@ -89,6 +92,9 @@ #define MAINBASE_INDEX 18 #define MOTORSTATE_INDEX 19 #define REMOTEPARA_INDEX 20 +#define EXTRA_TAGID_INDEX 20 +#define EXTRA_TAGDIST_INDEX 22 + #define TAGSLOTPOS 7 //Final @@ -131,7 +137,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