继续测试修改

jinlicong

2024-05-30 a1810b89e66f184c62a0588ae7d57c91d0c376e8

 Function/VALVE/valve_control.h

@@ -2,27 +2,30 @@
#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_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_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 
#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_MISSING = 99U
} VALVE_STATUS; // ·§ÃÅ״̬ÀàÐÍ



typedef enum
{
@@ -61,21 +66,35 @@
   VL_LOCK
} VALVE_LOCK_STATE_T; // ·§ÃÅ״̬ÀàÐÍ


typedef enum
{
   VC_NONE   = 0U,
  VC_OPEN ,
   VC_CLOSE,
   VC_UNLOCK,             //½âËø
   VC_LOCK             //Ëø¶¨
	
} VALVE_CTRL_TYPE_T; // ·§ÃÅÃüÁîÀàÐÍ


typedef struct{
   
   VALVE_STATUS   valve_status;
//   VALVE_STATUS   valve_status;
   VALVE_CTRL_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 Valve_CTRL_GPIO_Init(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_CTRL_TYPE_T valve_ctrl_order_l) ;

#endif