继续测试优化

jinlicong

2024-06-11 e4424eb6b50d0300583c422dfb71d58e040f4b9e

 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