阀门控制进一步完善

jinlicong

2024-05-17 6ea1a42391f86e72f53042a966dae970a3fd77cb

 HARDWARE/EXTI/exti.c

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

void NMI_Handler(void)
{
@@ -61,11 +63,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 +144,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);