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 |   99 +++++++++++++++++++++++++++++++++++++++----------
 1 files changed, 79 insertions(+), 20 deletions(-)

diff --git a/Soft/system_run_fun.c b/Soft/system_run_fun.c
index 27f92ef..e7eda78 100644
--- a/Soft/system_run_fun.c
+++ b/Soft/system_run_fun.c
@@ -8,6 +8,9 @@
 #include "key.h"
 #include "lcd_io_api.h"
 #include "wireless_remote_comm.h"
+#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;
@@ -15,29 +18,16 @@
 
 void allGpioInit(void)
 {
-//	CMU_PERCLK_SetableEx(PADCLK, ENABLE);  //PADʱ�ӣ�GPIO��ʹ�ܺ���
-//	
 
-//	InputtIO(UNCAP_DETECTION_PORT,UNCAP_DETECTION_PIN,IN_NORMAL);
-//	
-
-//	Lcd_GPIO_Init();
-//	Measure_IO_Init();
-//	KEY_IO_Init();
-//	Valve_IO_Init();
-//	ADC_LithIO_Init();
-//	ADC_AlkaIO_Init();
-//	Power_IO_Init();
-//	Gprs_IO_Init();
-//	E2p_IO_Init();
-//	
-//	SYS_BST_EN;
-	
 	RTC_GPIO_Init();
 	
 	Key_GPIO_Init();
 	
 	Lcd_GPIO_Init();
+	
+	Power_IO_Init();//��Դ���
+	
+	Pulse_And_Alarm_Line_IO_Init();
 	
 }
 
@@ -58,7 +48,7 @@
 	//I0������
 	allGpioInit();
 	
-	//��λ���������ֱ�Ҫ���蹦�ܳ�ʼ������Ҫ�õ��ſ��������蹦������ѭ������֮ǰ���ü���
+	//��λ���������ֱ�Ҫ���蹦�ܳ�ʼ������Ҫ�õ��ſ��������蹦�ܿɲ�����������
 //	allPeripheralDriver();
 		SPI3_Init();					//EEP-SPI��ʼ��
 }
@@ -76,8 +66,18 @@
 	GPIO_EXTI_Init( KEY3_PORT, KEY3_PIN, EXTI_FALLING, ENABLE);
 	GPIO_EXTI_Init( KEY4_PORT, KEY4_PIN, EXTI_FALLING, ENABLE);
 	
+	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);
@@ -151,6 +151,17 @@
 	//�������г�ʼ��
 	ValveRunParaInit(equipment_basic_inf_g.valve_type);
 	
+	//��Դ״̬���
+	PowerManagrInit();
+	
+	//���״̬���
+	
+	//��塢����״̬���
+	
+	//�����ߡ������߳�ʼ
+	PulseAndAlarmLineInit();
+	
+	
 	
 }
 	
@@ -160,7 +171,19 @@
 	uint8_t first_time[2] = {0,0};
 	uint16_t	IntervalTime;
 	
-	/*rs485�ɼ��������ƣ� ��������ʱ���쳣������*/
+	/*rs485�ɼ��������ƣ� ��������ʱ���쳣��������¼�洢�����*/
+	
+		/*Сʱ���졢��*/
+	if((sys_clockBCD_in.min == 0)&&(sys_clockBCD_in.sec == 0)) //Сʱ��¼�洢��
+		start_rs485_g = RS485_START_REASON_RECORD;
+	
+	if((sys_clockBCD_in.hour == 0)&&(sys_clockBCD_in.min == 0)&&(sys_clockBCD_in.sec == 0))//���¼�洢��
+		start_rs485_g = RS485_START_REASON_RECORD;
+	
+	if((sys_clockBCD_in.day == 1)&&(sys_clockBCD_in.hour == 0)&&(sys_clockBCD_in.min == 0)&&(sys_clockBCD_in.sec == 0))//�¼�¼�洢��
+		start_rs485_g = RS485_START_REASON_RECORD;
+	
+	
 	if(__SYS_STATUS_BYTES_GET(power_state) == SET)
 		IntervalTime = wrc_para_sizhu_g.ext_power_data_interval;
 	else
@@ -206,3 +229,39 @@
 	}
 	
 }
+
+
+//ϵͳ�������в�����״̬������RESET�����������
+FlagStatus SysKeepRunningStatusGet(FUN_START_CTRL_PARA_T sys_fun_run_ctrl_in)
+{
+	if(__SYS_STATUS_BYTES_GET(power_state) == SET) //�⹩��״̬�¿��Բ�����
+		return SET;
+	
+	if(sys_fun_run_ctrl_in.rs485_ctrl_flag.running_flag ==SET)
+		return SET;
+	
+//	if(sys_fun_run_ctrl_in.valve_ctrl_flag.running_flag ==SET) //�������������
+//		return SET;
+	
+	if(sys_fun_run_ctrl_in.wrc_ctrl_flag.running_flag ==SET)
+		return SET;
+	
+	return RESET;
+	
+	
+}
+
+
+
+//״̬�ִ���
+void SysStatusWordPro(void)
+{
+	
+	
+	
+	
+	
+}
+
+
+

--
Gitblit v1.9.3