V1.7

zhyinch

2019-11-13 8c44ac4d11d4e72eba7fc0506b1b78ec86c33dda

 Ô´Âë/ºËÐÄ°å/Src/application/beep_logic_app.c

@@ -12,7 +12,7 @@

#define ONTIME3 1   // 500ms
#define OFFTIME3 5  // 500ms
int16_t min_dist;
int32_t min_dist;
void main_logic(void)   //主逻辑在这里执行
{
   static uint8_t beep_state,timer_state,beep_timer,beep_ontime,beep_offtime;
@@ -22,7 +22,7 @@
   if(beep_judge_cnt++ >= 100)
   {   
      beep_judge_cnt = 0;
      min_dist=0x7fff;
      min_dist=0x7fffff;
      for(i = 0; i < 255;i++)
      {
         if(g_Tagdist[i] < min_dist)
@@ -67,86 +67,86 @@
         RELAY2_OFF;
      }
      
		
      if(beep_state==1)
      {
         if(timer_state==1)
         {
            if(beep_timer++ < beep_ontime)
            {
               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;
                     }				
            }else{
               timer_state=0;
               beep_timer=0;
            }
         }else{
             if(beep_timer++ < beep_offtime)
               {
                  switch(g_com_map[ALARM_DEV]) 
                     {
                        case 0:
                           BEEP2_OFF;
                           break;
                        case 1:
                           BEEP_OFF;
                           break;
                        case 2:
                           OUT2_OFF;
                           break;
                        default:
                           BEEP2_OFF;
                           BEEP_OFF;
                           OUT2_OFF;
                           break;
                     }
               }else{
                     timer_state=1;
                     beep_timer=0;
               }
				
         }
		
      }   else {
         switch(g_com_map[ALARM_DEV]) 
         {
            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_state==1)
//      {
//         if(timer_state==1)
//         {
//            if(beep_timer++ < beep_ontime)
//            {
//               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;
//                     }				
//            }else{
//               timer_state=0;
//               beep_timer=0;
//            }
//         }else{
//             if(beep_timer++ < beep_offtime)
//               {
//                  switch(g_com_map[ALARM_DEV]) 
//                     {
//                        case 0:
//                           BEEP2_OFF;
//                           break;
//                        case 1:
//                           BEEP_OFF;
//                           break;
//                        case 2:
//                           OUT2_OFF;
//                           break;
//                        default:
//                           BEEP2_OFF;
//                           BEEP_OFF;
//                           OUT2_OFF;
//                           break;
//                     }
//               }else{
//                     timer_state=1;
//                     beep_timer=0;
//               }
//				
//         }
//		
//      }   else {
//         switch(g_com_map[ALARM_DEV]) 
//         {
//            case 0:
//               BEEP2_OFF;
//               break;
//            case 1:
//               BEEP_OFF;
//               break;
//            case 2:
//               OUT2_OFF;
//               break;
//            default:
//               BEEP2_OFF;
//               BEEP_OFF;
//               OUT2_OFF;
//               break;
//         }
//      }
   }
}