From a05cacad5239ab3f35ffb58f443356b484e6cc1b Mon Sep 17 00:00:00 2001
From: jinlicong <493886250@qq.com>
Date: Tue, 21 May 2024 19:17:22 +0800
Subject: [PATCH] 继续完善远传

---
 Function/FLOW_METER_DATA_COLLECT/pulse_and_alarm_line.h |   26 ++++++++++++++++++++++----
 1 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/Function/FLOW_METER_DATA_COLLECT/pulse_and_alarm_line.h b/Function/FLOW_METER_DATA_COLLECT/pulse_and_alarm_line.h
index 3aa3ba9..e6e0f9e 100644
--- a/Function/FLOW_METER_DATA_COLLECT/pulse_and_alarm_line.h
+++ b/Function/FLOW_METER_DATA_COLLECT/pulse_and_alarm_line.h
@@ -1,6 +1,14 @@
 #ifndef _PULSE_AND_ALARM_LINE_H_
 #define _PULSE_AND_ALARM_LINE_H_
 
+
+#include "rs485_data_analysis_pro.h"
+
+
+//����������ʱ��  
+#define	PULSE_CHECK_DELAY_MS	10U
+
+
 //����
 #define	BROKEN_LINE_MUTIPLEX_NONE  0x00
 #define	BROKEN_LINE_MUTIPLEX_LOW_PWR  0x10
@@ -14,40 +22,50 @@
 #define LP_LOSE_CHECK_EN_PORT 	GPIOA
 #define LP_LOSE_CHECK_EN_PIN 		GPIO_Pin_0
 #define LP_LOSE_CHECK_ENABLE		GPIO_SetBits(LP_LOSE_CHECK_EN_PORT,LP_LOSE_CHECK_EN_PIN)
-#define LP_LOSE_CHECK_DISENABLE		GPIO_ResetBits(LP_LOSE_CHECK_EN_PORT,LP_LOSE_CHECK_EN_PIN)
+#define LP_LOSE_CHECK_DISABLE		GPIO_ResetBits(LP_LOSE_CHECK_EN_PORT,LP_LOSE_CHECK_EN_PIN)
 //������IO
 #define LF_PULSE_INT_PORT 	GPIOA
 #define LF_PULSE_INT_PIN 		GPIO_Pin_0
+#define LF_PULSE_INT_IO_READ	GPIO_ReadInputDataBit(LF_PULSE_INT_PORT, LF_PULSE_INT_PIN)
 
 
 //�͵籨���߼��ʹ��IO
 #define LV_LOSE_CHECK_EN_PORT 	GPIOA
 #define LV_LOSE_CHECK_EN_PIN 		GPIO_Pin_1
 #define LV_LOSE_CHECK_ENABLE		GPIO_SetBits(LV_LOSE_CHECK_EN_PORT,LV_LOSE_CHECK_EN_PIN)
-#define LV_LOSE_CHECK_DISENABLE		GPIO_ResetBits(LV_LOSE_CHECK_EN_PORT,LV_LOSE_CHECK_EN_PIN)
+#define LV_LOSE_CHECK_DISABLE		GPIO_ResetBits(LV_LOSE_CHECK_EN_PORT,LV_LOSE_CHECK_EN_PIN)
 //�͵籨���߼��IO
 #define LOW_PWR_INT_PORT 	GPIOB
 #define LOW_PWR_INT_PIN 		GPIO_Pin_2
+#define LOW_PWR_INT_IO_READ	GPIO_ReadInputDataBit(LOW_PWR_INT_PORT, LOW_PWR_INT_PIN)
 
 //Ƿѹ�����߼��ʹ��IO
 #define UV_LOSE_CHECK_EN_PORT 	GPIOA
 #define UV_LOSE_CHECK_EN_PIN 		GPIO_Pin_2
 #define UV_LOSE_CHECK_ENABLE		GPIO_SetBits(UV_LOSE_CHECK_EN_PORT,UV_LOSE_CHECK_EN_PIN)
-#define UV_LOSE_CHECK_DISENABLE		GPIO_ResetBits(UV_LOSE_CHECK_EN_PORT,UV_LOSE_CHECK_EN_PIN)
+#define UV_LOSE_CHECK_DISABLE		GPIO_ResetBits(UV_LOSE_CHECK_EN_PORT,UV_LOSE_CHECK_EN_PIN)
 //Ƿѹ�����߼��IO
 #define UNDER_PWR_INT_PORT 	GPIOB
 #define UNDER_PWR_INT_PIN 		GPIO_Pin_3
+#define UNDER_PWR_INT_IO_READ	GPIO_ReadInputDataBit(UNDER_PWR_INT_PORT, UNDER_PWR_INT_PIN)
 
 
 //�ط������߼��ʹ��IO
 #define CV_LOSE_CHECK_EN_PORT 	GPIOA
 #define CV_LOSE_CHECK_EN_PIN 		GPIO_Pin_3
 #define CV_LOSE_CHECK_ENABLE		GPIO_SetBits(CV_LOSE_CHECK_EN_PORT,CV_LOSE_CHECK_EN_PIN)
-#define CV_LOSE_CHECK_DISENABLE		GPIO_ResetBits(CV_LOSE_CHECK_EN_PORT,CV_LOSE_CHECK_EN_PIN)
+#define CV_LOSE_CHECK_DISABLE		GPIO_ResetBits(CV_LOSE_CHECK_EN_PORT,CV_LOSE_CHECK_EN_PIN)
 //�ط������߼��IO
 #define CV_ALM_A_PORT 	GPIOA
 #define CV_ALM_A_PIN 		GPIO_Pin_13
+#define CV_ALM_A_IO_READ	GPIO_ReadInputDataBit(CV_ALM_A_PORT, CV_ALM_A_PIN)
+
+extern __IO	int16_t pulse_count ; 
+extern __IO FlagStatus pulse_exti_flag ;
+
 
 void Pulse_And_Alarm_Line_IO_Init(void);
+void PulseAndAlarmLineInit(void);
+void PulseAndAlarmLineCheck(void);
 
 #endif

--
Gitblit v1.9.3