From aaf7e4ef5c1aa0535940531f20e4846cbcd39b69 Mon Sep 17 00:00:00 2001
From: zhyinch <zhyinch@gmail.com>
Date: 星期一, 04 十一月 2019 19:48:15 +0800
Subject: [PATCH] Merge branch '基站测距' into ALPHAV1
---
源码/核心板/Src/application/beep_logic_app.c | 26 +++++++++++++++-----------
1 files changed, 15 insertions(+), 11 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 e2cfbea..74c8075 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"
@@ -12,6 +12,7 @@
#define ONTIME3 1 // 500ms
#define OFFTIME3 5 // 500ms
+
void main_logic(void) //主逻辑在这里执行
{
static uint8_t beep_state,timer_state,beep_timer,beep_ontime,beep_offtime;
@@ -36,17 +37,20 @@
beep_ontime = ONTIME1;
beep_offtime = OFFTIME1;
beep_state=1;
- }else if (min_dist <= g_com_map[ALARM_DISTANCE2])
- {
- beep_ontime = ONTIME2;
- beep_offtime = OFFTIME2;
- beep_state=1;
- }else if (min_dist <= g_com_map[ALARM_DISTANCE3])
- {
- beep_ontime = ONTIME3;
- beep_offtime = OFFTIME3;
- beep_state=1;
- }else{
+
+ }
+// else if (min_dist <= g_com_map[ALARM_DISTANCE2])
+// {
+// beep_ontime = ONTIME2;
+// beep_offtime = OFFTIME2;
+// beep_state=1;
+// }else if (min_dist <= g_com_map[ALARM_DISTANCE3])
+// {
+// beep_ontime = ONTIME3;
+// beep_offtime = OFFTIME3;
+// beep_state=1;
+// }
+ else{
beep_state=0;
}
--
Gitblit v1.9.3