继续脉冲和报警线处理

jinlicong

2024-05-15 d14dd3a2106de793fbe08dc5a12cf80defd3258a

 Soft/system_run_fun.c

@@ -11,6 +11,7 @@
#include "power_manage.h"
#include "pulse_and_alarm_line.h"


RS485_START_REASON   start_rs485_g = RS485_START_REASON_NONE;
WRC_START_MEANS   start_wrc_g = WRC_MEANS_NONE;

@@ -67,6 +68,16 @@
   
   GPIO_EXTI_Init( LITH_PWR_LOSE_PORT, LITH_PWR_LOSE_PIN, EXTI_FALLING, ENABLE);
   GPIO_EXTI_Init( ALKA_PWR_LOSE_PORT, ALKA_PWR_LOSE_PIN, EXTI_FALLING, ENABLE);
	
   /*Âö³åÏßÖжÏÅäÖÃÑ¡Ôñ,û¿ªÆô¸´ÓÃÇÒ¿ªÆôÁËÂö³å*/
   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))){
      if((flow_meter_para_g.flow_meter_code !=ASMODBUS)&&(flow_meter_para_g.flow_meter_code !=AS100MODBUS)&&(flow_meter_para_g.flow_meter_code !=SIARGO_MODBUS)){
         GPIO_EXTI_Init( LF_PULSE_INT_PORT, LF_PULSE_INT_PIN, EXTI_FALLING, ENABLE);
      }else{
         GPIO_EXTI_Init( LF_PULSE_INT_PORT, LF_PULSE_INT_PIN, EXTI_RISING, ENABLE);
      }
   }
   
   /*NVICÖжÏÅäÖÃ*/
   NVIC_DisableIRQ(GPIO_IRQn);
@@ -148,7 +159,7 @@
   //²ð°å¡¢¿ª¸Ç״̬¼ì²â
   
   //Âö³åÏß¡¢±¨¾¯Ïß³õʼ
	
   PulseAndAlarmLineInit();