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] 继续脉冲和报警线处理
---
Function/VALVE/valve_control.c | 14 ++++++++++----
1 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/Function/VALVE/valve_control.c b/Function/VALVE/valve_control.c
index b9fe480..e750c7e 100644
--- a/Function/VALVE/valve_control.c
+++ b/Function/VALVE/valve_control.c
@@ -129,7 +129,7 @@
}
-void ValveCtrlHade(CALIBER_TYPE caliber_type_l)
+void ValveCtrlHade(CALIBER_TYPE caliber_type_l,FUN_START_CTRL_PARA_T * sys_fun_run_ctrl_p)
{
if(valve_ctrl_para_g.valve_ctrl_order == VC_OPEN){
if(Read_OP_CL_VALVE_Status(0) == VALVE_OPEN){
@@ -217,10 +217,16 @@
}
}
+
+ if((save_valve_para_g.valve_status==VALVE_OPENING)||(save_valve_para_g.valve_status==VALVE_CLOSING))
+ sys_fun_run_ctrl_p->valve_ctrl_flag.running_flag = SET;
+ else
+ sys_fun_run_ctrl_p->valve_ctrl_flag.running_flag = RESET;
+
}
-//���Ų�������
+//���Ų�������������������������У������ط�������Ҫֹͣ������ת�����йط�
ErrorStatus ValveCtrlOrder(VALVE_CTEL_TYPE_T valve_ctrl_order_l)
{
switch(valve_ctrl_order_l){
@@ -288,12 +294,12 @@
}
-void valveCtrlPro(void) //? ���Ҫ������������ú���ValveCtrlOrder��VC_OPEN��;��δ����������
+void valveCtrlPro(FUN_START_CTRL_PARA_T * sys_fun_run_ctrl_p) //? ���Ҫ������������ú���ValveCtrlOrder��VC_OPEN��;��δ����������
{
ValveForceOpenSignalCheck();//?ǿ���жϴ���
- ValveCtrlHade(equipment_basic_inf_g.caliber_type);//���·��Ų���������
+ ValveCtrlHade(equipment_basic_inf_g.caliber_type,sys_fun_run_ctrl_p);//���·��Ų���������
}
--
Gitblit v1.9.3