V1.72 测试完成

yincheng.zhong

2023-05-06 7ff7ce16ea9febfd11db4ff61e13d112d4b2ba02

 源码/核心板/Src/application/beep_logic_app.c

@@ -13,7 +13,7 @@
#define ONTIME3 5   // 500ms
#define OFFTIME3 5  // 500ms

uint16_t min_dist1,min_dist2;
int32_t min_dist1,min_dist2;
extern u16 JDQ_time;
void Relay1Task(u16 min_dist)
{
@@ -31,11 +31,11 @@
                }
         else if (min_dist <= g_com_map[ALARM_DISTANCE3]+distoffset2)
                {
                    beep_ontime = JDQ_time;
                    beep_offtime = JDQ_time;
                    beep_state=1;
                    beep_state=0;
                    distoffset1=0;
                    distoffset2=0;
                    beep_timer = 0;
                    timer_state = 1;
                }
                else{
                    beep_state=0;
@@ -77,7 +77,15 @@
{
    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)
         if (min_dist <= g_com_map[ALARM_DISTANCE2]+distoffset12)
                {
                    beep_state2=0;
                    distoffset12=0;
                    distoffset22=0;
                    timer_state2=1;
                    beep_timer2=0;
                }
         else if (min_dist <= g_com_map[ALARM_DISTANCE3]+distoffset22)
                {
                    beep_ontime2 = 1;
                    beep_offtime2 = 0;
@@ -86,14 +94,6 @@
                    distoffset22=0;
                    timer_state2=1;
                    beep_timer2=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;
@@ -141,8 +141,8 @@
            if(beep_judge_cnt++ >= 100)
            {   
                beep_judge_cnt = 0;
                min_dist1=0xffff;
                min_dist2=0xffff;
                min_dist1=0x1ffff;
                min_dist2=0x1ffff;
                for(i = 0; i < 255;i++)
                {
                    if(g_Tagdist[i] < min_dist1&&g_Tagdist[i]>g_com_map[ALARM_DISTANCE1])