From d352b1982dc9b4fb2135c64cd909bb9cecc62139 Mon Sep 17 00:00:00 2001
From: jinlicong <493886250@qq.com>
Date: Fri, 14 Jun 2024 15:58:03 +0800
Subject: [PATCH] 添加.gitignore
---
Function/VALVE/valve_control.h | 25 +++++++++++++++++++------
1 files changed, 19 insertions(+), 6 deletions(-)
diff --git a/Function/VALVE/valve_control.h b/Function/VALVE/valve_control.h
index 0183b7b..d6be2ca 100644
--- a/Function/VALVE/valve_control.h
+++ b/Function/VALVE/valve_control.h
@@ -12,8 +12,8 @@
#define Motor_B_PIN GPIO_Pin_9
#define Motor_B_PORT GPIOB
-#define Motor_B_HIGH GPIO_SetBits(Motor_A_PORT,Motor_A_PIN)
-#define Motor_B_LOW GPIO_ResetBits(Motor_A_PORT,Motor_A_PIN)
+#define Motor_B_HIGH GPIO_SetBits(Motor_B_PORT,Motor_B_PIN)
+#define Motor_B_LOW GPIO_ResetBits(Motor_B_PORT,Motor_B_PIN)
#define Motor_OP_PIN GPIO_Pin_6
#define Motor_OP_PORT GPIOB
@@ -69,18 +69,31 @@
typedef enum
{
VC_NONE = 0U,
- VC_OPEN ,
VC_CLOSE,
+ VC_CLOSE_AND_LOCK, //�ط�������
+ VC_OPEN ,
+ VC_LOCK, //����
VC_UNLOCK, //����
- VC_LOCK //����
-
+ VC_FORCE_OPEN
} VALVE_CTRL_TYPE_T; // ������������
+
+
+
+typedef enum
+{
+ VALVE_CTRL_SOURCE_WRC = 1U, //Զ������
+ VALVE_CTRL_SOURCE_AUTO, //�ն������Զ�����
+ VALVE_CTRL_SOURCE_KEY, //��������
+ VALVE_CTRL_SOURCE_UP_COMM, //�������
+ VALVE_CTRL_FORCE_OPEN
+} VALVE_CTRL_SOURCE_T; // ���ſ�����Դ
typedef struct{
// VALVE_STATUS valve_status;
VALVE_CTRL_TYPE_T valve_ctrl_order;
+ VALVE_CTRL_SOURCE_T valve_ctrl_source;
uint16_t open_time_cnt;
uint16_t close_time_cnt;
@@ -95,6 +108,6 @@
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_CTRL_TYPE_T valve_ctrl_order_l) ;
+ErrorStatus ValveCtrlOrder(VALVE_CTRL_TYPE_T valve_ctrl_order_l,VALVE_CTRL_SOURCE_T valve_ctrl_source) ;
#endif
--
Gitblit v1.9.3