From 2cb63340687ae2ada98c545227ffb247f48f3a9a Mon Sep 17 00:00:00 2001
From: yincheng.zhong <634916154@qq.com>
Date: 星期四, 11 五月 2023 11:05:41 +0800
Subject: [PATCH] V1.9
---
源码/核心板/Src/application/beep_logic_app.c | 28 ++++++++++++----------------
1 files changed, 12 insertions(+), 16 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 f6ce661..d618754 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"
@@ -157,7 +157,7 @@
}
}
#define RELAY2IDHEAD 9
-extern int16_t tag_angle[TAG_NUM_IN_SYS],alarm_angle;
+extern int16_t tag_angle[TAG_NUM_IN_SYS],tag_dist[TAG_NUM_IN_SYS],alarm_angle;
extern u16 tagid_list[TAG_NUM_IN_SYS];
void main_logic(void) //主逻辑在这里执行
{
@@ -173,24 +173,20 @@
min_dist2=0x1ffff;
for(i = 0; i < TAG_NUM_IN_SYS;i++)
{
- if((tagid_list[i]>>12)!=RELAY2IDHEAD)
+
+ if(g_Tagdist[i] < min_dist1&&g_Tagdist[i]>g_com_map[ALARM_DISTANCE1])
{
- if(g_Tagdist[i] < min_dist1&&g_Tagdist[i]>g_com_map[ALARM_DISTANCE1])
- {
- if(tag_angle[i]>alarm_angle)
- min_dist1=g_Tagdist[i];
- }
-
- }else{
- if(g_Tagdist[i] < min_dist2&&g_Tagdist[i]>g_com_map[RELAY2_DISTANCE1])
- {
- if(tag_angle[i]>alarm_angle)
- min_dist2=g_Tagdist[i];
- }
- }
+ min_dist1=g_Tagdist[i];
+ }
+ if(tag_dist[i] < min_dist2&&tag_dist[i]>g_com_map[RELAY2_DISTANCE1])
+ {
+ if(tag_angle[i]>alarm_angle)
+ min_dist2=tag_dist[i];
+ }
+
}
Relay1Task();
- // Relay2Task(min_dist2);
+ Relay2Task(min_dist2);
}
}else{
--
Gitblit v1.9.3