From f437f7cbf70f6736081754522c655996c02558d8 Mon Sep 17 00:00:00 2001
From: yincheng.zhong <634916154@qq.com>
Date: 星期一, 02 十二月 2024 10:34:10 +0800
Subject: [PATCH] V2.6 增加标签 蜂鸣报警功能
---
Src/application/dw_ds_anc.c | 34 +++++++++++++++-------------------
1 files changed, 15 insertions(+), 19 deletions(-)
diff --git a/Src/application/dw_ds_anc.c b/Src/application/dw_ds_anc.c
index ab31825..6449bb4 100644
--- a/Src/application/dw_ds_anc.c
+++ b/Src/application/dw_ds_anc.c
@@ -169,25 +169,21 @@
memcpy(&send_buffer[DIST_IDX], &tagdist_list[taglist_pos], 4);
}
motorstate =0;
-// if(tagdist_list[taglist_pos]<g_com_map[ALARM_DISTANCE1]||tagdist_list[taglist_pos]<0)
-// {
-// motorstate =0;
-// }
-// else if(tagdist_list[taglist_pos]<g_com_map[ALARM_DISTANCE2])
-// {
-// if(flag_tag_distsmooth[taglist_pos])
-// {motorstate =2;
-// }else{
-// motorstate =0;
-// }
-// }else if(tagdist_list[taglist_pos]<g_com_map[ALARM_DISTANCE3])
-// {
-// if(flag_tag_distsmooth[taglist_pos])
-// {motorstate =1;
-// }else{
-// motorstate =0;
-// }
-// }
+ if(tagdist_list[taglist_pos]<g_com_map[ALARM_DISTANCE2])
+ {
+ if(flag_tag_distsmooth[taglist_pos])
+ {motorstate =2;
+ }else{
+ motorstate =0;
+ }
+ }else if(tagdist_list[taglist_pos]<g_com_map[ALARM_DISTANCE3])
+ {
+ if(flag_tag_distsmooth[taglist_pos])
+ {motorstate =1;
+ }else{
+ motorstate =0;
+ }
+ }
send_buffer[GROUP_ID_IDX] = group_id;
//send_buffer[MAINBASE_INDEX]=flag_syncbase;
send_buffer[MESSAGE_TYPE_IDX]=NEAR_RESPONSE;
--
Gitblit v1.9.3