增加IAP功能，准备测试上位机升级

jinlicong

2024-06-12 f03cf3ae7a36954e64fc014e6bb7afd20c5a5247

 Function/VALVE/valve_control.h

@@ -5,23 +5,23 @@
#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; // ·§ÃÅ״̬ÀàÐÍ


@@ -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             //Ëø¶¨
	
} VALVE_CTEL_TYPE_T; // ·§ÃÅÃüÁîÀàÐÍ
   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_CTEL_TYPE_T   valve_ctrl_order;
//   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_CTEL_TYPE_T valve_ctrl_order_l) ;
ErrorStatus ValveCtrlOrder(VALVE_CTRL_TYPE_T valve_ctrl_order_l,VALVE_CTRL_SOURCE_T valve_ctrl_source)  ;

#endif