From d97b9d1feb9f59b7b5508fe2d0fb2c94767204a2 Mon Sep 17 00:00:00 2001
From: zhyinch <zhyinch@gmail.com>
Date: 星期一, 21 九月 2020 12:23:25 +0800
Subject: [PATCH] 增加批量修改标签参数功能
---
源码/核心板/Src/application/beep_logic_app.c | 103 ++++++++++++++++++++++++++++++---------------------
1 files changed, 60 insertions(+), 43 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 945a7e9..1fd5085 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"
@@ -4,67 +4,84 @@
#include "global_param.h"
#include "dw_app.h"
+#define ONTIME1 1 // 100ms
+#define OFFTIME1 0 // 100ms
+
+#define ONTIME2 1 // 100ms
+#define OFFTIME2 0 // 100ms
+
+#define ONTIME3 5 // 500ms
+#define OFFTIME3 5 // 500ms
+u8 distoffset1=0,distoffset2=0;
+uint16_t min_dist;
void main_logic(void) //主逻辑在这里执行
-{uint16_t i, min_dist;
+{
+ static uint8_t beep_state,timer_state,beep_timer,beep_ontime,beep_offtime;
+ uint16_t i;
//除UWB之外的其他代码...
static uint16_t beep_judge_cnt = 0;
- if(beep_judge_cnt++ >= 200)
+ if(beep_judge_cnt++ >= 100)
{
beep_judge_cnt = 0;
min_dist=0xffff;
for(i = 0; i < 255;i++)
{
- if(g_Tagdist[i] < min_dist)
+ if(g_Tagdist[i] < min_dist&&g_Tagdist[i]>g_com_map[ALARM_DISTANCE1])
{
min_dist=g_Tagdist[i];
}
}
- if(min_dist <= g_com_map[ALARM_DISTANCE])
+
+ if (min_dist <= g_com_map[ALARM_DISTANCE2]+distoffset1)
{
- switch(g_com_map[ALARM_DEV])
- {
- case 0:
- BEEP2_ON;
- BEEP_OFF;
- OUT2_OFF;
- break;
- case 1:
- BEEP_ON;
- BEEP2_OFF;
- OUT2_OFF;
- break;
- case 2:
- OUT2_ON;
- BEEP_OFF;
- BEEP2_OFF;
- break;
- default:
- BEEP2_ON;
- BEEP_ON;
- OUT2_ON;
- break;
- }
+ beep_ontime = ONTIME2;
+ beep_offtime = OFFTIME2;
+ beep_state=2;
+ distoffset1=0;
+ distoffset2=0;
}
- else
+ else if (min_dist <= g_com_map[ALARM_DISTANCE3]+distoffset2)
{
- switch(g_com_map[ALARM_DEV])
+ beep_ontime = ONTIME3;
+ beep_offtime = OFFTIME3;
+ beep_state=1;
+ distoffset1=0;
+ distoffset2=0;
+ }
+ else{
+ beep_state=0;
+ distoffset1=0;
+ distoffset2=0;
+ }
+
+ if(beep_state!=0)
+ {
+ if(timer_state==1)
{
- case 0:
- BEEP2_OFF;
- break;
- case 1:
- BEEP_OFF;
- break;
- case 2:
- OUT2_OFF;
- break;
- default:
- BEEP2_OFF;
- BEEP_OFF;
- OUT2_OFF;
- break;
+ if(beep_timer++ < beep_ontime)
+ {
+ RELAY1_ON;
+ RELAY2_ON;
+ }else{
+ timer_state=0;
+ beep_timer=0;
+ }
+ }else{
+ if(beep_timer++ < beep_offtime)
+ {
+ RELAY1_OFF;
+ RELAY2_OFF;
+ }else{
+ timer_state=1;
+ beep_timer=0;
+ }
+
}
+
+ } else {
+ RELAY1_OFF;
+ RELAY2_OFF;
}
}
}
--
Gitblit v1.9.3