继续完善远传

jinlicong

2024-05-22 66ea95dcb8fd91d29465c2f11ced4dd6153a2504

 HARDWARE/EXTI/exti.c

@@ -12,6 +12,7 @@
#include "power_manage.h"
#include "pulse_and_alarm_line.h"
#include "tim.h"
#include "wireless_remote_comm.h"

void NMI_Handler(void)
{
@@ -45,12 +46,18 @@
      }

      // ÅжÏGPRS³¬Ê±Ê±¼ä
      if (sys_delay_sec_para_g.gprs_timeout_para.delay_time)
      if (sys_delay_sec_para_g.wrc_timeout_para.delay_time)
      {
         if (!(--sys_delay_sec_para_g.gprs_timeout_para.delay_time))
            sys_delay_sec_para_g.gprs_timeout_para.delay_flag = SET;
         if (!(--sys_delay_sec_para_g.wrc_timeout_para.delay_time))
            sys_delay_sec_para_g.wrc_timeout_para.delay_flag = SET;
      }
      
      //wrcÖر¨Ê±¼äµ¹¼Æʱ
      if (wrc_ctrl_para_g.wrc_restart_time_sec_cnt)
      {
         if (!(--wrc_ctrl_para_g.wrc_restart_time_sec_cnt))
            ;
      }

   }
   
@@ -63,11 +70,13 @@
         if(KEY3_IO_READ==Bit_RESET)
         {
            //¿ª·§
				
            if(__SYS_STATUS_BYTES_GET(account_state) == RESET ||__SYS_STATUS_BYTES_GET(valve_lock) == RESET )
               ValveCtrlOrder(VC_OPEN);
         }else if(KEY2_IO_READ==Bit_RESET)
         {
            //¹Ø·§
				
            if(__SYS_STATUS_BYTES_GET(account_state) == RESET)
               ValveCtrlOrder(VC_OPEN);
         }else
         {
            //µ¥»÷µçÔ´