From 5ac1d0febb8de5e91ce2463baea68ddac3f66091 Mon Sep 17 00:00:00 2001
From: jinlicong <493886250@qq.com>
Date: Thu, 16 May 2024 20:00:17 +0800
Subject: [PATCH] 完善脉冲计费和485采集处理
---
Function/VALVE/valve_control.c | 50 ++++++++++++++++++++++++++++++++++----------------
1 files changed, 34 insertions(+), 16 deletions(-)
diff --git a/Function/VALVE/valve_control.c b/Function/VALVE/valve_control.c
index b9fe480..28098fa 100644
--- a/Function/VALVE/valve_control.c
+++ b/Function/VALVE/valve_control.c
@@ -33,13 +33,25 @@
CloseIO(VALVE_FORCE_OPEN_PORT,VALVE_FORCE_OPEN_PIN);
}
+void Valve_CTRL_GPIO_Init(void)
+{
+ Motor_AB_GPIO_Init();
+ Motor_A_LOW;
+ Motor_B_LOW;
+ Motor_OP_CL_GPIO_Init_sleep_mode();
+
+}
+
+
+
+
void ValveMotorOpenRun(void)
{
Motor_AB_GPIO_Init();
Motor_OP_CL_GPIO_Init();
Motor_A_HIGH;
- Motor_B_HIGH;
+ Motor_B_LOW;
GPIO_EXTI_Init( Motor_OP_PORT, Motor_OP_PIN, EXTI_FALLING, ENABLE);
GPIO_EXTI_Init( Motor_CL_PORT, Motor_CL_PIN, EXTI_FALLING, ENABLE);
}
@@ -49,7 +61,7 @@
Motor_AB_GPIO_Init();
Motor_OP_CL_GPIO_Init();
Motor_A_LOW;
- Motor_B_LOW;
+ Motor_B_HIGH;
GPIO_EXTI_Init( Motor_OP_PORT, Motor_OP_PIN, EXTI_FALLING, ENABLE);
GPIO_EXTI_Init( Motor_CL_PORT, Motor_CL_PIN, EXTI_FALLING, ENABLE);
}
@@ -61,7 +73,7 @@
GPIO_EXTI_Init( Motor_OP_PORT, Motor_OP_PIN, EXTI_FALLING, DISABLE);
GPIO_EXTI_Init( Motor_CL_PORT, Motor_CL_PIN, EXTI_FALLING, DISABLE);
Motor_A_LOW;
- Motor_B_HIGH;
+ Motor_B_LOW;
}
@@ -116,20 +128,20 @@
uint16_t GetValveRunMaxTime(CALIBER_TYPE caliber_type_l)
{
switch (caliber_type_l){
- case DN25_TYPE: return VALVE_HADE_RUN_TIME_DN25 ;break;
- case DN32_TYPE: return VALVE_HADE_RUN_TIME_DN32 ;break;
- case DN40_TYPE: return VALVE_HADE_RUN_TIME_DN40 ;break;
- case DN50_TYPE: return VALVE_HADE_RUN_TIME_DN50 ;break;
- case DN80_TYPE: return VALVE_HADE_RUN_TIME_DN80 ;break;
- case DN100_TYPE: return VALVE_HADE_RUN_TIME_DN100 ;break;
- case DN150_TYPE: return VALVE_HADE_RUN_TIME_DN150 ;break;
- case DN200_TYPE: return VALVE_HADE_RUN_TIME_DN200 ;break;
- default: return VALVE_HADE_RUN_TIME_DN200 ;break;
+ case DN25_TYPE: return VALVE_HADE_RUN_TIME_DN25 ;
+ case DN32_TYPE: return VALVE_HADE_RUN_TIME_DN32 ;
+ case DN40_TYPE: return VALVE_HADE_RUN_TIME_DN40 ;
+ case DN50_TYPE: return VALVE_HADE_RUN_TIME_DN50 ;
+ case DN80_TYPE: return VALVE_HADE_RUN_TIME_DN80 ;
+ case DN100_TYPE: return VALVE_HADE_RUN_TIME_DN100 ;
+ case DN150_TYPE: return VALVE_HADE_RUN_TIME_DN150 ;
+ case DN200_TYPE: return VALVE_HADE_RUN_TIME_DN200 ;
+ default: return VALVE_HADE_RUN_TIME_DN200 ;
}
}
-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 +229,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 +306,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