From 7ff7ce16ea9febfd11db4ff61e13d112d4b2ba02 Mon Sep 17 00:00:00 2001
From: yincheng.zhong <634916154@qq.com>
Date: 星期六, 06 五月 2023 15:16:41 +0800
Subject: [PATCH] V1.72 测试完成
---
源码/核心板/Src/application/beep_logic_app.c | 38 +++++++++++++++++++++++---------------
1 files changed, 23 insertions(+), 15 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..21445a2 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,19 +26,23 @@
beep_state=2;
distoffset1=0;
distoffset2=0;
+ beep_timer = 0;
+ timer_state = 1;
}
else if (min_dist <= g_com_map[ALARM_DISTANCE3]+distoffset2)
{
- beep_ontime = JDQ_time;
- beep_offtime = JDQ_time;
- beep_state=1;
+ beep_state=0;
distoffset1=0;
distoffset2=0;
+ beep_timer = 0;
+ timer_state = 1;
}
else{
beep_state=0;
distoffset1=0;
distoffset2=0;
+ beep_timer = 0;
+ timer_state = 1;
}
if(beep_state!=0)
@@ -73,26 +77,30 @@
{
static u8 distoffset12=0,distoffset22=0;
static uint8_t beep_state2,timer_state2,beep_timer2,beep_ontime2,beep_offtime2;
- if (min_dist <= g_com_map[RELAY2_DISTANCE2]+distoffset12)
+ if (min_dist <= g_com_map[ALARM_DISTANCE2]+distoffset12)
+ {
+ beep_state2=0;
+ distoffset12=0;
+ distoffset22=0;
+ timer_state2=1;
+ beep_timer2=0;
+ }
+ else if (min_dist <= g_com_map[ALARM_DISTANCE3]+distoffset22)
{
beep_ontime2 = 1;
beep_offtime2 = 0;
beep_state2=2;
distoffset12=0;
distoffset22=0;
- }
- else if (min_dist <= g_com_map[RELAY2_DISTANCE3]+distoffset22)
- {
- beep_ontime2 = JDQ_time;
- beep_offtime2 = JDQ_time;
- beep_state2=1;
- distoffset12=0;
- distoffset22=0;
+ timer_state2=1;
+ beep_timer2=0;
}
else{
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