From 08b3909c40a192778719c6262bbee4745682948d Mon Sep 17 00:00:00 2001
From: jinlicong <493886250@qq.com>
Date: Fri, 31 May 2024 19:15:47 +0800
Subject: [PATCH] 测试和修改了一些功能bug
---
Function/VALVE/valve_control.h | 37 +++++++++++++++++++------------------
1 files changed, 19 insertions(+), 18 deletions(-)
diff --git a/Function/VALVE/valve_control.h b/Function/VALVE/valve_control.h
index a215d04..8706b2c 100644
--- a/Function/VALVE/valve_control.h
+++ b/Function/VALVE/valve_control.h
@@ -2,26 +2,26 @@
#define _VALVE_CONTROL_H_
#include "define_all.h"
-
+#include "system_general_para.h"
/**********************IO����********************************/
-#define Motor_A_PIN GPIO_Pin_10
-#define Motor_A_PORT GPIOE
+#define Motor_A_PIN GPIO_Pin_8
+#define Motor_A_PORT GPIOB
#define Motor_A_HIGH GPIO_SetBits(Motor_A_PORT,Motor_A_PIN)
#define Motor_A_LOW GPIO_ResetBits(Motor_A_PORT,Motor_A_PIN)
-#define Motor_B_PIN GPIO_Pin_10
-#define Motor_B_PORT GPIOE
-#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_PIN GPIO_Pin_9
+#define Motor_B_PORT GPIOB
+#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_9
-#define Motor_OP_PORT GPIOE
+#define Motor_OP_PIN GPIO_Pin_6
+#define Motor_OP_PORT GPIOB
#define Motor_OP_IO_READ GPIO_ReadInputDataBit(Motor_OP_PORT,Motor_OP_PIN)
-#define Motor_CL_PIN GPIO_Pin_9
-#define Motor_CL_PORT GPIOE
-#define Motor_CL_IO_READ GPIO_ReadInputDataBit(Motor_OP_PORT,Motor_OP_PIN)
+#define Motor_CL_PIN GPIO_Pin_7
+#define Motor_CL_PORT GPIOB
+#define Motor_CL_IO_READ GPIO_ReadInputDataBit(Motor_CL_PORT,Motor_CL_PIN)
#define VALVE_FORCE_OPEN_PIN GPIO_Pin_12
#define VALVE_FORCE_OPEN_PORT GPIOC
@@ -55,7 +55,7 @@
VALVE_OPENING,
VALVE_CLOSING,
VALVE_ERROR,
- VALVE_MISSING = 99U
+// VALVE_MISSING = 99U
} VALVE_STATUS; // ����״̬����
@@ -74,13 +74,13 @@
VC_UNLOCK, //����
VC_LOCK //����
-} VALVE_CTEL_TYPE_T; // ������������
+} VALVE_CTRL_TYPE_T; // ������������
typedef struct{
- VALVE_STATUS valve_status;
- VALVE_CTEL_TYPE_T valve_ctrl_order;
+// VALVE_STATUS valve_status;
+ VALVE_CTRL_TYPE_T valve_ctrl_order;
uint16_t open_time_cnt;
uint16_t close_time_cnt;
@@ -90,10 +90,11 @@
extern __IO VALVE_CTRL_PARA_T valve_ctrl_para_g;
+void Valve_CTRL_GPIO_Init(void);
-void valveCtrlPro(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) ;
+ErrorStatus ValveCtrlOrder(VALVE_CTRL_TYPE_T valve_ctrl_order_l) ;
#endif
--
Gitblit v1.9.3