From 6ea1a42391f86e72f53042a966dae970a3fd77cb Mon Sep 17 00:00:00 2001
From: jinlicong <493886250@qq.com>
Date: Fri, 17 May 2024 17:18:57 +0800
Subject: [PATCH] 阀门控制进一步完善
---
Soft/system_run_fun.c | 34 +++++++++++++++++++++++++++++++---
1 files changed, 31 insertions(+), 3 deletions(-)
diff --git a/Soft/system_run_fun.c b/Soft/system_run_fun.c
index 5257ca9..52a7a11 100644
--- a/Soft/system_run_fun.c
+++ b/Soft/system_run_fun.c
@@ -9,6 +9,9 @@
#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;
@@ -16,7 +19,8 @@
void allGpioInit(void)
{
-
+ E2P_Ctrl_Gpio_Init();
+
RTC_GPIO_Init();
Key_GPIO_Init();
@@ -25,6 +29,11 @@
Power_IO_Init();//��Դ���
+ Valve_CTRL_GPIO_Init();
+
+ Pulse_And_Alarm_Line_IO_Init();
+
+ RS485_read_data_GPIO_Init();
}
//����������������
@@ -65,6 +74,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);
NVIC_SetPriority(GPIO_IRQn,0);//�ж����ȼ�����
@@ -81,6 +100,7 @@
SYSTEM_EEP_IDENTIFICATION_T sys_eep_id_B_l={0};
uint8_t eep_none_flag = 1; //0����գ���0����ǿ�
+ EEPROM_CTRL_ENABLE;
//��ȡ������ʼ�����ñ�ʶ
//�����ʶ��ʶ�������洢��Ҫȫ��д��Ĭ��ֵ
//�����ʶʶ��ɹ��������в���������ֱ�ӴӴ洢�����ȡ
@@ -116,6 +136,8 @@
//���������ʶ��ʶ�����С�ڲ���ʱ�䣬����Ҫ������
allParaPatchPro();
+ EEPROM_CTRL_DISABLE;
+
}
@@ -144,7 +166,8 @@
//��塢����״̬���
- //������״̬���
+ //�����ߡ������߳�ʼ
+ PulseAndAlarmLineInit();
@@ -186,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++){
@@ -209,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;
+ }
}
}
--
Gitblit v1.9.3