From 6e05e12690b25544bc4d678a9b814a864afe0b8d Mon Sep 17 00:00:00 2001
From: zhyinch <zhyinch@gmail.com>
Date: 星期六, 23 五月 2020 18:52:17 +0800
Subject: [PATCH] V1.23 标签没数据2S之后，MODBUS输出0x1ffff

---
 源码/核心板/Src/application/dw_app.h |   21 ++++++++++++++-------
 1 files changed, 14 insertions(+), 7 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 908e171..bc6b392 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,24 +2,28 @@
 #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
 
 //#define NEWBOARD
-#define TAG_OUTPUT
+//#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,12 +34,15 @@
 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);
+void SyncPoll(u8 sync_seq);
 #endif

--
Gitblit v1.9.3