From df3db0b978b1cab3555d6878a274b0f382bf707c Mon Sep 17 00:00:00 2001
From: zhyinch <zhyinch@gmail.com>
Date: 星期一, 01 十月 2018 15:42:49 +0800
Subject: [PATCH] 标签开机死机bug改好，基站增加软件超时复位
---
源码/核心板/Src/application/beep_logic_app.c | 14 +++++++++++---
1 files changed, 11 insertions(+), 3 deletions(-)
diff --git "a/\346\272\220\347\240\201/\346\240\270\345\277\203\346\235\277/Src/application/beep_logic_app.c" "b/\346\272\220\347\240\201/\346\240\270\345\277\203\346\235\277/Src/application/beep_logic_app.c"
index d93e96f..945a7e9 100644
--- "a/\346\272\220\347\240\201/\346\240\270\345\277\203\346\235\277/Src/application/beep_logic_app.c"
+++ "b/\346\272\220\347\240\201/\346\240\270\345\277\203\346\235\277/Src/application/beep_logic_app.c"
@@ -5,14 +5,22 @@
#include "dw_app.h"
void main_logic(void) //主逻辑在这里执行
-{
+{uint16_t i, min_dist;
//除UWB之外的其他代码...
static uint16_t beep_judge_cnt = 0;
if(beep_judge_cnt++ >= 200)
{
beep_judge_cnt = 0;
-
- if(dis_after_filter <= g_com_map[ALARM_DISTANCE])
+ min_dist=0xffff;
+ for(i = 0; i < 255;i++)
+ {
+ if(g_Tagdist[i] < min_dist)
+ {
+ min_dist=g_Tagdist[i];
+ }
+
+ }
+ if(min_dist <= g_com_map[ALARM_DISTANCE])
{
switch(g_com_map[ALARM_DEV])
{
--
Gitblit v1.9.3