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.h | 30 ++++++++++++++++++++++++------
1 files changed, 24 insertions(+), 6 deletions(-)
diff --git a/Function/VALVE/valve_control.h b/Function/VALVE/valve_control.h
index e108aaf..35efc21 100644
--- a/Function/VALVE/valve_control.h
+++ b/Function/VALVE/valve_control.h
@@ -2,7 +2,7 @@
#define _VALVE_CONTROL_H_
#include "define_all.h"
-
+#include "system_general_para.h"
/**********************IO����********************************/
#define Motor_A_PIN GPIO_Pin_10
@@ -23,6 +23,9 @@
#define Motor_CL_PORT GPIOE
#define Motor_CL_IO_READ GPIO_ReadInputDataBit(Motor_OP_PORT,Motor_OP_PIN)
+#define VALVE_FORCE_OPEN_PIN GPIO_Pin_12
+#define VALVE_FORCE_OPEN_PORT GPIOC
+#define VALVE_FORCE_OPEN_IO_READ GPIO_ReadInputDataBit(VALVE_FORCE_OPEN_PORT,VALVE_FORCE_OPEN_PIN)
/**********************���Ʋ����궨��********************************/
//���»�������ʱ��,���ʱ�䣬��������ʱ
@@ -47,13 +50,15 @@
typedef enum
{
VALVE_NONE = 0U,
- VALVE_OP,
- VALVE_CL,
+ VALVE_OPEN,
+ VALVE_CLOSE,
VALVE_OPENING,
VALVE_CLOSING,
VALVE_ERROR,
VALVE_MISSING = 99U
} VALVE_STATUS; // ����״̬����
+
+
typedef enum
{
@@ -61,21 +66,34 @@
VL_LOCK
} VALVE_LOCK_STATE_T; // ����״̬����
-
+typedef enum
+{
+ VC_NONE = 0U,
+ VC_OPEN ,
+ VC_CLOSE,
+ VC_UNLOCK, //����
+ VC_LOCK //����
+
+} VALVE_CTEL_TYPE_T; // ������������
typedef struct{
VALVE_STATUS valve_status;
+ VALVE_CTEL_TYPE_T valve_ctrl_order;
uint16_t open_time_cnt;
uint16_t close_time_cnt;
+ FlagStatus force_open_status;
}VALVE_CTRL_PARA_T;
+extern __IO VALVE_CTRL_PARA_T valve_ctrl_para_g;
-void valveCtrlPro(void);
-void ValveRunParaInit(void);
+void valveCtrlPro(FUN_START_CTRL_PARA_T * sys_fun_run_ctrl_p);
+void ValveRunParaInit(VALVE_TYPE valve_type_in);
+void ValveMotorStop(void);
+ErrorStatus ValveCtrlOrder(VALVE_CTEL_TYPE_T valve_ctrl_order_l) ;
#endif
--
Gitblit v1.9.3