From d14dd3a2106de793fbe08dc5a12cf80defd3258a Mon Sep 17 00:00:00 2001
From: jinlicong <493886250@qq.com>
Date: Wed, 15 May 2024 17:34:14 +0800
Subject: [PATCH] 继续脉冲和报警线处理
---
Soft/system_run_fun.c | 13 ++++++++++++-
1 files changed, 12 insertions(+), 1 deletions(-)
diff --git a/Soft/system_run_fun.c b/Soft/system_run_fun.c
index 55c4549..e7eda78 100644
--- a/Soft/system_run_fun.c
+++ b/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();
--
Gitblit v1.9.3