Index: firmware/App/Controllers/Valves.h =================================================================== diff -u -r4d6c6df8f990037cb66fbd0efdc4cc5a0ec31558 -rd7c545dff2f13dd75ebab0af997c45047c844f7a --- firmware/App/Controllers/Valves.h (.../Valves.h) (revision 4d6c6df8f990037cb66fbd0efdc4cc5a0ec31558) +++ firmware/App/Controllers/Valves.h (.../Valves.h) (revision d7c545dff2f13dd75ebab0af997c45047c844f7a) @@ -1,17 +1,17 @@ /************************************************************************** * -* Copyright (c) 2024-2024 Diality Inc. - All Rights Reserved. +* Copyright (c) 2024-2026 Diality Inc. - All Rights Reserved. * * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER. * -* @file ValvesDD.h +* @file Valves.h * -* @author (last) Vinayakam Mani -* @date (last) 14-Aug-2024 +* @author (last) Jashwant Gantyada +* @date (last) 30-Mar-2026 * * @author (original) Vinayakam Mani -* @date (original) 14-Aug-2024 +* @date (original) 26-Aug-2024 * ***************************************************************************/ @@ -32,15 +32,19 @@ /// Enumeration of available valve state names per valve type (from SA and DD SRS documents). typedef enum ValveStateNames { - VALVE_STATE_OPEN = 0, ///< Open valve state, - VALVE_STATE_CLOSED, ///< Closed valve state, + VALVE_STATE_CLOSED = 0, ///< Closed valve state, + VALVE_STATE_OPEN, ///< Open valve state, NUM_OF_VALVE_STATES ///< number of valve states } VALVE_STATE_NAMES_T; -#define NUM_OF_DD_VALVES ( ( LAST_DD_VALVE - FIRST_DD_VALVE ) + 1 ) -#define NUM_OF_IOFP_VALVES ( ( LAST_FP_VALVE - FIRST_IO_VALVE ) + 1 ) -#define NUM_OF_IO_VALVES ( ( LAST_IO_VALVE - FIRST_IO_VALVE ) + 1 ) -#define NUM_OF_FP_VALVES ( ( LAST_FP_VALVE - FIRST_FP_VALVE ) + 1 ) +/// Enumerations for water recovery options +typedef enum recovery_States +{ + NO_RECOVERY = 0, ///< NO recovery + MEDIUM_RECOVERY, ///< Medium recovery + MAX_RECOVERY, ///< Maximum recovery + NUM_OF_RECOVERY_STATES ///< Number of recovery states +} RECOVERY_STATE_T; #pragma pack(push, 1) /// Valves publish structure @@ -57,12 +61,13 @@ { U08 valvesIOState; ///< Commanded IO valve states (bits). U08 valvesFPState; ///< Commanded FP valve states (bits). - U08 valvesSensedState[ NUM_OF_IOFP_VALVES ]; ///< Sensed FP valve states (enumerations). + U08 valvesSensedState[ LAST_FP_VALVE - FIRST_IO_VALVE + 1 ]; ///< Sensed FP valve states (enumerations). } FP_VALVES_DATA_T; /// Balancing chamber valve states override structure typedef struct { + BOOL reset; ///< Reset (bool) U32 valveStatesBits; ///< Bits indicating whether balancing chamber valve states should be open(1) or closed(0). } DD_BC_VALVE_OVERRIDE_PAYLOAD_T; #pragma pack(pop) @@ -76,6 +81,7 @@ BOOL setValveStateDelayed( DD_VALVES_T valve, VALVE_STATE_NAMES_T valveState, U32 delayMs ); VALVE_STATE_NAMES_T getValveStateName( DD_VALVES_T valveID ); void setHydValvesStatetoClosedState( void ); +void setRecoveryValvesConfig( void ); BOOL testValvesStatesPublishIntervalOverride( MESSAGE_T *message ); BOOL testValveStateOverride( MESSAGE_T *message );