From b3a961fbe28a5be0ae75203fe9a01a98ae7c2e4c Mon Sep 17 00:00:00 2001
From: zhyinch <zhyinch@gmail.com>
Date: 星期一, 11 十一月 2019 19:42:37 +0800
Subject: [PATCH] 周一发到华星，继电器有bug

---
 源码/核心板/Src/application/dw_app.h |   25 ++++++++++++++++---------
 1 files changed, 16 insertions(+), 9 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 2c9c332..e3388ff 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,35 +2,42 @@
 #ifndef __DW_APP_H__
 #define __DW_APP_H__
 
+#include <string.h>
 #include "stm32f10x.h"
 #include "filters.h"
-
-//#define NEWBOARD
-
+#include "ADC.h"
 //#define WORK_MODE_TAG
 #define WORK_MODE_ANCHOR
 
-
+//#define NEWBOARD
+//#define TAG_OUTPUT
 #define HEX_OUTPUT
-#define REPOET_ANC_NUM 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 u16 poll_timer,tag_timer;
+extern int8_t tag_delaytime;
+extern u32 dev_id;
+extern u8 anchor_type;
 extern volatile uint32_t time32_incr;
 extern u16 tag_recv_timer;
 extern double dist_cm;
 extern uint32_t g_UWB_com_interval;
 extern float dis_after_filter;
 extern LPFilter_Frac* p_Dis_Filter;		//测距用的低通滤波器
-extern u8 usart_send[16];
+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[256];
+extern uint16_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