增加阀控事件记录及修改阀控命令

jinlicong

2024-06-07 fa6053f85287163f6e2d5dba690bec05cbc95f4a

 HARDWARE/EXTI/exti.c

@@ -48,6 +48,13 @@
         }
      }

      // ÅжÏÉÏλ»ú³¬Ê±Ê±¼ä
      if (sys_delay_sec_para_g.UC_active_time.delay_time)
      {
         if (!(--sys_delay_sec_para_g.UC_active_time.delay_time))
            sys_delay_sec_para_g.UC_active_time.delay_flag = SET;
      }
		
      // ÅжÏGPRS³¬Ê±Ê±¼ä
      if (sys_delay_sec_para_g.wrc_timeout_para.delay_time)
      {
@@ -74,12 +81,12 @@
         {
            //¿ª·§
            if(__SYS_STATUS_BYTES_GET(account_state) == RESET ||__SYS_STATUS_BYTES_GET(valve_lock) == RESET )
               ValveCtrlOrder(VC_OPEN);
               ValveCtrlOrder(VC_OPEN,VALVE_CTRL_SOURCE_KEY);
         }else if((KEY2_IO_READ==Bit_RESET)&&(__SYS_DELAY_SEC_TIME_GET_(sys_active_time) >0))
         {
            //¹Ø·§
            if(__SYS_STATUS_BYTES_GET(account_state) == RESET)
               ValveCtrlOrder(VC_CLOSE);
               ValveCtrlOrder(VC_CLOSE,VALVE_CTRL_SOURCE_KEY);
         }else
         {
            //µ¥»÷µçÔ´
@@ -178,14 +185,14 @@
//      __SYS_STATUS_ALARM_BYTES_SET(lith_remove);
      pwr_vol_g.lith_lose_check_flag = SET;
   }
   if(GPIO_EXTI_EXTIISR_ChkEx(ALKA_PWR_LOSE_PORT, ALKA_PWR_LOSE_PIN)  == SET)
   {
      GPIO_EXTI_EXTIISR_ClrEx(ALKA_PWR_LOSE_PORT, ALKA_PWR_LOSE_PIN);
//   if(GPIO_EXTI_EXTIISR_ChkEx(ALKA_PWR_LOSE_PORT, ALKA_PWR_LOSE_PIN)  == SET)
//   {
//      GPIO_EXTI_EXTIISR_ClrEx(ALKA_PWR_LOSE_PORT, ALKA_PWR_LOSE_PIN);

//      __SYS_STATUS_ALARM_BYTES_SET(alka_remove);
		
      pwr_vol_g.alka_lose_check_flag = SET;
   }
////      __SYS_STATUS_ALARM_BYTES_SET(alka_remove);
//		
//      pwr_vol_g.alka_lose_check_flag = SET;
//   }
   
   
   if(GPIO_EXTI_EXTIISR_ChkEx(LF_PULSE_INT_PORT, LF_PULSE_INT_PIN)  == SET) //¼Æ·ÑµÍƵÂö³å