From e61d1595ebb1fa76b499cddec2df4bd66ec92b97 Mon Sep 17 00:00:00 2001
From: jinlicong <493886250@qq.com>
Date: Mon, 20 May 2024 20:02:47 +0800
Subject: [PATCH] 继续完善

---
 Soft/system_run_fun.c |   81 ++++++++++++++++++++++++++++++----------
 1 files changed, 60 insertions(+), 21 deletions(-)

diff --git a/Soft/system_run_fun.c b/Soft/system_run_fun.c
index 0db5bde..d8c997b 100644
--- a/Soft/system_run_fun.c
+++ b/Soft/system_run_fun.c
@@ -2,12 +2,16 @@
 #include "system_eep_mem_manage.h"
 #include "system_mem_para.h"
 #include "eeprom.h"
-#include "mbcrc.h"
+#include "mbcrc1.h"
 #include "gpio.h"
 #include "extern_rtc.h"
 #include "key.h"
 #include "lcd_io_api.h"
 #include "wireless_remote_comm.h"
+#include "power_manage.h"
+#include "pulse_and_alarm_line.h"
+#include "valve_control.h"
+
 
 RS485_START_REASON	start_rs485_g = RS485_START_REASON_NONE;
 WRC_START_MEANS	start_wrc_g = WRC_MEANS_NONE;
@@ -15,23 +19,7 @@
 
 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;
+	E2P_Ctrl_Gpio_Init();
 	
 	RTC_GPIO_Init();
 	
@@ -39,6 +27,13 @@
 	
 	Lcd_GPIO_Init();
 	
+	Power_IO_Init();//��Դ���
+	
+	Valve_CTRL_GPIO_Init();
+	
+	Pulse_And_Alarm_Line_IO_Init();
+	
+	RS485_read_data_GPIO_Init();
 }
 
 //����������������
@@ -58,7 +53,7 @@
 	//I0������
 	allGpioInit();
 	
-	//��λ���������ֱ�Ҫ���蹦�ܳ�ʼ������Ҫ�õ��ſ��������蹦������ѭ������֮ǰ���ü���
+	//��λ���������ֱ�Ҫ���蹦�ܳ�ʼ������Ҫ�õ��ſ��������蹦�ܿɲ�����������
 //	allPeripheralDriver();
 		SPI3_Init();					//EEP-SPI��ʼ��
 }
@@ -76,8 +71,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);
@@ -95,6 +100,7 @@
 	SYSTEM_EEP_IDENTIFICATION_T		sys_eep_id_B_l={0};
 	uint8_t 	eep_none_flag = 1; //0����գ���0����ǿ�
 	
+	EEPROM_CTRL_ENABLE;
 	//��ȡ������ʼ�����ñ�ʶ 
 	//�����ʶ�޷�ʶ�������洢��Ҫȫ��д��Ĭ��ֵ
 	//�����ʶʶ��ɹ��������в���������ֱ�ӴӴ洢�����ȡ
@@ -130,6 +136,8 @@
 	//���������ʶ�޷�ʶ�����С�ڲ���ʱ�䣬����Ҫ�򲹶�����
 	allParaPatchPro();
 	
+	EEPROM_CTRL_DISABLE;
+	
 }
 
 
@@ -150,6 +158,17 @@
 	
 	//�������г�ʼ��
 	ValveRunParaInit(equipment_basic_inf_g.valve_type);
+	
+	//��Դ״̬���
+	PowerManagrInit();
+	
+	//���״̬���
+	
+	//��塢����״̬���
+	
+	//�����ߡ������߳�ʼ
+	PulseAndAlarmLineInit();
+	
 	
 	
 }
@@ -190,6 +209,7 @@
 	/*���ؿ��ƣ�����ͨ����������ָ��쳣�ȿ��ƣ���Ҫ����ʱֱ�ӵ���ValveCtrlOrder�������ɣ����ڴ˴�����*/
 	
 	
+	
 	/*Զ��ͨѶ�������ƣ���������������ڡ��쳣������*/
 	if((wrc_para_sizhu_g.time_start_type&WRC_TIME_START_INTERVAL)==WRC_TIME_START_INTERVAL){
 		for(uint16_t count_i=0;count_i<wrc_para_sizhu_g.timing_send_num;count_i++){
@@ -213,8 +233,12 @@
 	
 	
 	if(start_wrc_g  != WRC_MEANS_NONE){
+		
 		start_wrc_g = WRC_MEANS_NONE;
-		sys_fun_run_ctrl_p->wrc_ctrl_flag.start_flag = SET;
+		if(sys_fun_run_ctrl_p->wrc_ctrl_flag.start_flag == RESET){
+			pwr_vol_g.alka_flag = AMS_WRC_BEFORE;
+			sys_fun_run_ctrl_p->wrc_ctrl_flag.start_flag = SET;
+		}
 	}
 	
 }
@@ -239,3 +263,18 @@
 	
 	
 }
+
+
+
+//״̬�ִ���
+void SysStatusWordPro(void)
+{
+	
+	
+	
+	
+	
+}
+
+
+

--
Gitblit v1.9.3