From 16ed36e9ca17412fc2886b71fbdefd4fffe8cbe1 Mon Sep 17 00:00:00 2001 From: zhyinch <zhyinch@gmail.com> Date: 星期一, 23 十二月 2019 19:07:07 +0800 Subject: [PATCH] v1.16 修改数据频率bug --- 源码/核心板/Src/application/dw_app.h | 18 ++++++++++++------ 1 files changed, 12 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 ef6e1fd..174550c 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" @@ -2,9 +2,12 @@ #ifndef __DW_APP_H__ #define __DW_APP_H__ +#include <string.h> #include "stm32f10x.h" #include "filters.h" #include "ADC.h" +#include "TrackingDiff.h" + //#define WORK_MODE_TAG #define WORK_MODE_ANCHOR @@ -12,14 +15,15 @@ //#define TAG_OUTPUT #define HEX_OUTPUT -#define REPOET_ANC_NUM 6 -#define REPOET_ANC_NUM_MIN 4 -#define TOTAL_TAG_NUM 200 +#define REPOET_ANC_NUM 1 +#define REPOET_ANC_NUM_MIN 1 #define TAG_ID_START 0// 0x00980000 - +#define GROUP_TAG_NUM 2 #define TAG_NUM_IN_SYS 256 #define DFT_RAND_DLY_TIM_MS 1 - +extern TrackingDiffClass *pUWBDistanceTrackingDiff; +extern u16 poll_timer,tag_timer; +extern int8_t tag_delaytime; extern u32 dev_id; extern u8 anchor_type; extern volatile uint32_t time32_incr; @@ -30,11 +34,13 @@ extern LPFilter_Frac* p_Dis_Filter; //测距用的低通滤波器 extern u8 usart_send[25]; +void IdleTask(void); +uint16_t Checksum_u16(uint8_t* pdata, uint32_t len); void Dw1000_Init(void); void Tag_App(void); void Anchor_App(void); void tag_sleep_configuraion(void); -extern uint16_t g_Tagdist[TOTAL_TAG_NUM]; +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