From 451d480321fd775084c0faf5d1877ed83f21d59b Mon Sep 17 00:00:00 2001
From: zhyinch <zhyinch@gmail.com>
Date: 星期三, 22 九月 2021 18:00:33 +0800
Subject: [PATCH] V1.57
---
源码/核心板/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 c7df14f..89a10f2 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"
@@ -13,7 +13,7 @@
#define ONTIME3 5 // 500ms
#define OFFTIME3 5 // 500ms
-uint16_t min_dist1,min_dist2;
+int32_t min_dist1,min_dist2;
extern u16 JDQ_time;
void Relay1Task(u16 min_dist)
{
@@ -26,6 +26,8 @@
beep_state=2;
distoffset1=0;
distoffset2=0;
+ beep_timer = 0;
+ timer_state = 1;
}
else if (min_dist <= g_com_map[ALARM_DISTANCE3]+distoffset2)
{
@@ -39,6 +41,8 @@
beep_state=0;
distoffset1=0;
distoffset2=0;
+ beep_timer = 0;
+ timer_state = 1;
}
if(beep_state!=0)
@@ -80,6 +84,8 @@
beep_state2=2;
distoffset12=0;
distoffset22=0;
+ timer_state2=1;
+ beep_timer2=0;
}
else if (min_dist <= g_com_map[RELAY2_DISTANCE3]+distoffset22)
{
@@ -93,6 +99,8 @@
beep_state2=0;
distoffset12=0;
distoffset22=0;
+ timer_state2=1;
+ beep_timer2=0;
}
if(beep_state2!=0)
@@ -133,8 +141,8 @@
if(beep_judge_cnt++ >= 100)
{
beep_judge_cnt = 0;
- min_dist1=0xffff;
- min_dist2=0xffff;
+ min_dist1=0x1ffff;
+ min_dist2=0x1ffff;
for(i = 0; i < 255;i++)
{
if(g_Tagdist[i] < min_dist1&&g_Tagdist[i]>g_com_map[ALARM_DISTANCE1])
--
Gitblit v1.9.3