From e129a69147731a8ff302413e009b792afee5fb2c Mon Sep 17 00:00:00 2001
From: zhyinch <zhyinch@gmail.com>
Date: 星期三, 04 十二月 2019 21:50:09 +0800
Subject: [PATCH] 配临近算法初步完成,未测试

---
 源码/核心板/Src/application/beep_logic_app.c |   13 +++++++------
 1 files changed, 7 insertions(+), 6 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 74c8075..a40b977 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"
@@ -39,12 +39,13 @@
 			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])
+		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;

--
Gitblit v1.9.3