From 2ad2b82d448645cc81409aa4765288da95931cb8 Mon Sep 17 00:00:00 2001
From: guanjiao <sqrgj@163.com>
Date: 星期六, 15 九月 2018 17:20:16 +0800
Subject: [PATCH] 1. 增加了“收不到信息1s后，停止报警”的功能 2. 将判断喇叭是否响的功能，在systick中断中实现

---
 源码/核心板/Src/application/dw_app.c |    9 +++++++++
 1 files changed, 9 insertions(+), 0 deletions(-)

diff --git "a/\346\272\220\347\240\201/\346\240\270\345\277\203\346\235\277/Src/application/dw_app.c" "b/\346\272\220\347\240\201/\346\240\270\345\277\203\346\235\277/Src/application/dw_app.c"
index bd1960c..64a0756 100644
--- "a/\346\272\220\347\240\201/\346\240\270\345\277\203\346\235\277/Src/application/dw_app.c"
+++ "b/\346\272\220\347\240\201/\346\240\270\345\277\203\346\235\277/Src/application/dw_app.c"
@@ -28,6 +28,8 @@
 #include "led.h"
 #include "serial_at_cmd_app.h"
 #include "Usart.h"
+#include "global_param.h"
+#include "filters.h"
 
 
 /*------------------------------------ Marcos ------------------------------------------*/
@@ -129,6 +131,10 @@
 uint8_t random_delay_tim = 0;
 
 double distance, dist_no_bias, dist_cm;
+
+uint32_t g_UWB_com_interval = 0; 
+float dis_after_filter;				//当前距离值
+LPFilter_Frac* p_Dis_Filter;		//测距用的低通滤波器
 
 /*------------------------------------ Functions ------------------------------------------*/
 
@@ -435,7 +441,10 @@
 					dist_cm = dist_no_bias * 100; //dis 为单位为cm的距离
 //					dist[TAG_ID] = LP(dis, TAG_ID); //LP 为低通滤波器，让数据更稳定
 					
+					/*--------------------------以下为非测距逻辑------------------------*/
 					LED0_BLINK; //每成功一次通讯则闪烁一次
+					g_UWB_com_interval = 0;
+					dis_after_filter = LP_Frac_Update(p_Dis_Filter, dist_cm);
 
 				}
 			}

--
Gitblit v1.9.3