From 9a4a74b85489fafa113ea76c31fbbf26feee31b6 Mon Sep 17 00:00:00 2001 From: zhyinch <zhyinch@gmail.com> Date: 星期二, 24 十二月 2019 16:07:33 +0800 Subject: [PATCH] 1对4完成 --- 源码/核心板/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