Index: firmware/App/Controllers/Valves.h =================================================================== diff -u -r975a29bff552a9e657364bd36b11c4d491cf7fae -r2d5157c59ced0866aaa32d9722d6f1ba28b0b18d --- firmware/App/Controllers/Valves.h (.../Valves.h) (revision 975a29bff552a9e657364bd36b11c4d491cf7fae) +++ firmware/App/Controllers/Valves.h (.../Valves.h) (revision 2d5157c59ced0866aaa32d9722d6f1ba28b0b18d) @@ -8,7 +8,8 @@ /** * @defgroup Valves Valves * @brief Valves module - * Driver that runs the valves in HD. + * Driver that runs the valves in HD. The driver can home the valves + * as well as setting a position. * * @addtogroup Valves * @{ @@ -50,8 +51,10 @@ S16 posA; ///< Calculated Position A S16 posB; ///< Calculated Position B U32 pwm; ///< Valve PWM in the bypass mode + U32 airTrapValve; ///< Air trap valve status } HD_VALVE_DATA_T; +#pragma pack(pop) /// HD valves PWM override payload typedef struct @@ -61,7 +64,6 @@ U32 pwm; ///< Valve PWM U32 direction; ///< Valve direction } OVERRIDE_VALVES_PWM_DIR_SET_PAYLOAD_T; -#pragma pack(pop) // ********** public function prototypes ********* @@ -71,14 +73,16 @@ void execValves( void ); -void homeValve( VALVE_T valve ); +BOOL homeValve( VALVE_T valve ); BOOL setValvePosition( VALVE_T valve, VALVE_POSITION_T position ); VALVE_POSITION_T getValvePosition( VALVE_T valve ); void setValveAirTrap( OPN_CLS_STATE_T state ); +OPN_CLS_STATE_T getValveAirTrapStatus( void ); + BOOL testSetValvesDataPublishInterval( U32 value ); BOOL testResetValvesDataPublishInterval( void );