加了几个远传接收数据处理

jinlicong

2024-05-23 e5ec6ffc2fa0c07785c9d797c3fd74fd3031059f

 HARDWARE/EXTI/exti.c

@@ -10,6 +10,9 @@
#include "system_mem_para.h"
#include "system_run_fun.h"
#include "power_manage.h"
#include "pulse_and_alarm_line.h"
#include "tim.h"
#include "wireless_remote_comm.h"

void NMI_Handler(void)
{
@@ -43,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))
            ;
      }

   }
   
@@ -61,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
         {
            //µ¥»÷µçÔ´
@@ -140,6 +151,20 @@
   }
   
   
   if(GPIO_EXTI_EXTIISR_ChkEx(LF_PULSE_INT_PORT, LF_PULSE_INT_PIN)  == SET) //¼Æ·ÑµÍƵÂö³å
   {
      GPIO_EXTI_EXTIISR_ClrEx(LF_PULSE_INT_PORT, LF_PULSE_INT_PIN);
      //Ä¿Ç°½ö¿ªÆô¼Æ·ÑÂö³å¹¦ÄÜÇÒûÓб»¸´ÓòÅÐèÒª´¦Àí
      if(((flow_meter_para_g.broken_line_multiplex & BROKEN_LINE_MUTIPLEX_PULSE)!=BROKEN_LINE_MUTIPLEX_PULSE)&&   \
      ((flow_meter_para_g.flow_meter_conn_type==FLOW_METER_CONN_PULSE)||(flow_meter_para_g.flow_meter_conn_type==FLOW_METER_CONN_RS485_AND_PULSE))){
         pulse_exti_flag = SET;
         BTx_CR1_CHEN_Setable(BT1,ENABLE);   //¿ªÆô¶¨Ê±Æ÷
			
      }

   }
	
	
//   if(GPIO_EXTI_EXTIISR_ChkEx(VALVE_FORCED_OPEN_PORT, VALVE_FORCED_OPEN_PIN)  == SET)
//   {
//      GPIO_EXTI_EXTIISR_ClrEx(VALVE_FORCED_OPEN_PORT, VALVE_FORCED_OPEN_PIN);