From 458f6d4d74b74367125e16c2cb593252769fa7d6 Mon Sep 17 00:00:00 2001
From: zhyinch <zhyinch@gmail.com>
Date: 星期三, 25 八月 2021 22:49:29 +0800
Subject: [PATCH] V1.53 修改继电器控制BUG
---
源码/核心板/Src/application/beep_logic_app.c | 220 ++++++++++++++++++++++++++++++++++++++-----------------
1 files changed, 152 insertions(+), 68 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 4454f51..c7df14f 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"
@@ -12,77 +12,161 @@
#define ONTIME3 5 // 500ms
#define OFFTIME3 5 // 500ms
-u8 distoffset1=0,distoffset2=0;
-void main_logic(void) //主逻辑在这里执行
+
+uint16_t min_dist1,min_dist2;
+extern u16 JDQ_time;
+void Relay1Task(u16 min_dist)
{
- static uint8_t beep_state,timer_state,beep_timer,beep_ontime,beep_offtime;
- uint16_t i, min_dist;
+ static u8 distoffset1=0,distoffset2=0;
+ static uint8_t beep_state,timer_state,beep_timer,beep_ontime,beep_offtime;
+ if (min_dist <= g_com_map[ALARM_DISTANCE2]+distoffset1)
+ {
+ beep_ontime = 1;
+ beep_offtime = 0;
+ beep_state=2;
+ distoffset1=0;
+ distoffset2=0;
+ }
+ else if (min_dist <= g_com_map[ALARM_DISTANCE3]+distoffset2)
+ {
+ beep_ontime = JDQ_time;
+ beep_offtime = JDQ_time;
+ beep_state=1;
+ distoffset1=0;
+ distoffset2=0;
+ }
+ else{
+ beep_state=0;
+ distoffset1=0;
+ distoffset2=0;
+ }
+
+ if(beep_state!=0)
+ {
+ if(timer_state==1)
+ {
+ if(beep_timer++ < beep_ontime)
+ {
+ RELAY1_ON;
+
+ }else{
+ timer_state=0;
+ beep_timer=0;
+ }
+ }else{
+ if(beep_timer++ < beep_offtime)
+ {
+ RELAY1_OFF;
+
+ }else{
+ timer_state=1;
+ beep_timer=0;
+ }
+
+ }
+ }else {
+ RELAY1_OFF;
+ // RELAY2_OFF;
+ }
+}
+void Relay2Task(u16 min_dist)
+{
+ static u8 distoffset12=0,distoffset22=0;
+ static uint8_t beep_state2,timer_state2,beep_timer2,beep_ontime2,beep_offtime2;
+ if (min_dist <= g_com_map[RELAY2_DISTANCE2]+distoffset12)
+ {
+ beep_ontime2 = 1;
+ beep_offtime2 = 0;
+ beep_state2=2;
+ distoffset12=0;
+ distoffset22=0;
+ }
+ else if (min_dist <= g_com_map[RELAY2_DISTANCE3]+distoffset22)
+ {
+ beep_ontime2 = JDQ_time;
+ beep_offtime2 = JDQ_time;
+ beep_state2=1;
+ distoffset12=0;
+ distoffset22=0;
+ }
+ else{
+ beep_state2=0;
+ distoffset12=0;
+ distoffset22=0;
+ }
+
+ if(beep_state2!=0)
+ {
+ if(timer_state2==1)
+ {
+ if(beep_timer2++ < beep_ontime2)
+ {
+ RELAY2_ON;
+
+ }else{
+ timer_state2=0;
+ beep_timer2=0;
+ }
+ }else{
+ if(beep_timer2++ < beep_offtime2)
+ {
+ RELAY2_OFF;
+
+ }else{
+ timer_state2=1;
+ beep_timer2=0;
+ }
+
+ }
+ }else {
+ // RELAY1_OFF;
+ RELAY2_OFF;
+ }
+}
+void main_logic(void) //主逻辑在这里执行
+{
+ uint16_t i;
//除UWB之外的其他代码...
static uint16_t beep_judge_cnt = 0;
- if(beep_judge_cnt++ >= 100)
- {
- beep_judge_cnt = 0;
- min_dist=0xffff;
- for(i = 0; i < 255;i++)
- {
- 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_DISTANCE2]+distoffset1)
- {
- beep_ontime = ONTIME2;
- beep_offtime = OFFTIME2;
- beep_state=2;
- distoffset1=20;
- distoffset2=0;
- }
- else if (min_dist <= g_com_map[ALARM_DISTANCE3]+distoffset2)
- {
- beep_ontime = ONTIME3;
- beep_offtime = OFFTIME3;
- beep_state=1;
- distoffset1=0;
- distoffset2=20;
- }
- else{
- beep_state=0;
- distoffset1=0;
- distoffset2=0;
- }
-
- if(beep_state!=0)
- {
- if(timer_state==1)
- {
- 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;
- }
- }
+ if(g_com_map[ALARM_DISTANCE1]!=0||g_com_map[ALARM_DISTANCE2]!=0||g_com_map[ALARM_DISTANCE3]!=0||g_com_map[RELAY2_DISTANCE1]!=0||g_com_map[RELAY2_DISTANCE2]!=0||g_com_map[RELAY2_DISTANCE3]!=0)
+ {
+ if(beep_judge_cnt++ >= 100)
+ {
+ beep_judge_cnt = 0;
+ min_dist1=0xffff;
+ min_dist2=0xffff;
+ for(i = 0; i < 255;i++)
+ {
+ if(g_Tagdist[i] < min_dist1&&g_Tagdist[i]>g_com_map[ALARM_DISTANCE1])
+ {
+ min_dist1=g_Tagdist[i];
+ }
+ if(g_Tagdist[i] < min_dist2&&g_Tagdist[i]>g_com_map[RELAY2_DISTANCE1])
+ {
+ min_dist2=g_Tagdist[i];
+ }
+
+ }
+ Relay1Task(min_dist1);
+ Relay2Task(min_dist2);
+
+ }
+ }else{
+ if(g_com_map[RELAY1ON_INDEX]==1)
+ {
+ RELAY1_ON;
+ }else if(g_com_map[RELAY1ON_INDEX]==0)
+ {
+ RELAY1_OFF;
+ }
+ if(g_com_map[RELAY2ON_INDEX]==1)
+ {
+ RELAY2_ON;
+ }else if(g_com_map[RELAY2ON_INDEX]==0)
+ {
+ RELAY2_OFF;
+ }
+ }
}
--
Gitblit v1.9.3