Index: firmware/App/Controllers/Valves.c =================================================================== diff -u -r0c296cef29037819be204c45a23d4d38a52b2718 -r6f2991204047ccbceeb5461f7c35af6d8f5dfd0b --- firmware/App/Controllers/Valves.c (.../Valves.c) (revision 0c296cef29037819be204c45a23d4d38a52b2718) +++ firmware/App/Controllers/Valves.c (.../Valves.c) (revision 6f2991204047ccbceeb5461f7c35af6d8f5dfd0b) @@ -18,7 +18,8 @@ #include "FPGA.h" #include "MessageSupport.h" #include "SystemCommMessages.h" -#include "TaskPriority.h" +#include "TaskPriority.h" +#include "Timers.h" #include "Valves.h" /** @@ -28,57 +29,81 @@ // ********** private definitions ********** -#define DEENERGIZED 0 ///< 0 for de-energized valve. -#define ENERGIZED 1 ///< 1 for energized valve. -#define ALL_VALVES_DEENERGIZED 0x0000 ///< 0 in U16 bit field for all valves. +#define DEENERGIZED 0 ///< 0 for de-energized valve. +#define ENERGIZED 1 ///< 1 for energized valve. +#define ALL_VALVES_DEENERGIZED 0x0000 ///< 0 in U16 bit field for all valves. -#define MAX_VALVE_STATE_MISMATCH_COUNT 3 ///< Maximum number of times commanded valves state can fail to match read back valve states in a row. +#define MAX_VALVE_STATE_MISMATCH_COUNT 3 ///< Maximum number of times commanded valves state can fail to match read back valve states in a row. -#define VALVES_STATE_PUB_INTERVAL ( MS_PER_SECOND / TASK_PRIORITY_INTERVAL ) ///< Interval ( ms / task time) at which valves states are published on CAN bus. -#define DATA_PUBLISH_COUNTER_START_COUNT 50 ///< Data publish counter start count. +#define VALVES_STATE_PUB_INTERVAL ( MS_PER_SECOND / TASK_PRIORITY_INTERVAL ) ///< Interval ( ms / task time) at which valves states are published on CAN bus. +#define DATA_PUBLISH_COUNTER_START_COUNT 50 ///< Data publish counter start count. + +#define VPI_MIN_OPEN_TO_SKIP_DISINFECT_FLUSH_MS ( 2 * SEC_PER_MIN * MS_PER_SECOND ) ///< VPi minimum required time to be open to skip disinfects flush state in milliseconds. +#define VPI_MAX_OPEN_WINDOW_TO_SKIP_DISINFECT_FLUSH_MS ( 30 * SEC_PER_MIN * MS_PER_SECOND ) ///< VPi maximum allowed time window that VPi could have been open in milliseconds. + +/// VPi open/close time status for disinfects +typedef struct +{ + U32 vpiOpenStartTimeMS; ///< VPi open start time in milliseconds. + U32 vpiOpenDurationMS; ///< VPi duration that is has been open in milliseconds. + U32 vpiClosedStartTimeMS; ///< VPi closed start time in milliseconds. +} VPI_OPEN_CLOSE_TIME_T; // ********** private data ********** static U32 valvesStatesPublicationTimerCounter; ///< Timer counter used to schedule valve state publication to CAN bus. static U16 commandedValvesStates = ALL_VALVES_DEENERGIZED; ///< Initialize commanded valves states bit field. -static U32 valveStateMismatchCounter = 0; ///< Initialize valve state mismatch counter. +static U32 valveStateMismatchCounter; ///< Initialize valve state mismatch counter. static U32 pendingValveStateChanges[ NUM_OF_VALVES ]; ///< Delayed (pending) valve state changes. static U32 pendingValveStateChangeCountDowns[ NUM_OF_VALVES ]; ///< Delayed (pending) valve state change count down timers (in task intervals). -static OVERRIDE_U32_T valveStates[ NUM_OF_VALVES ]; ///< Currently commanded valves states. +static OVERRIDE_U32_T valveStates[ NUM_OF_VALVES ]; ///< Currently commanded valves states. +static OVERRIDE_U32_T valveSensedStates[ NUM_OF_VALVES ]; ///< Valve sensed states override. static OVERRIDE_U32_T valvesStatesPublishInterval = { VALVES_STATE_PUB_INTERVAL, VALVES_STATE_PUB_INTERVAL, 0, 0 }; ///< Interval (in ms/task interval) at which to publish valves state to CAN bus. +static VPI_OPEN_CLOSE_TIME_T vpiTime; ///< VPi open/close time structure. // ********** private function prototypes ********** static BOOL checkValveStateName( VALVES_T valve, VALVE_STATE_NAMES_T valveStateName ); -static U32 convertValveStateNameToValveState(VALVE_STATE_NAMES_T valveStateName); +static U32 convertValveStateNameToValveState( VALVE_STATE_NAMES_T valveStateName ); static U16 fromU32ArrayToU16( void ); static void publishValvesStates( void ); -static U32 getValveState( U32 valveID ); +static U32 getValveState( U32 valveID ); +static void checkVPiTimeStatus( void ); /*********************************************************************//** * @brief * The initValves function initializes the Valves module. * @details Inputs: none - * @details Outputs: Valves module initialized + * @details Outputs: valveStates, pendingValveStateChanges, valveSensedStates, + * pendingValveStateChangeCountDowns, valveStateMismatchCounter, + * commandedValvesStates * @return none *************************************************************************/ + void initValves( void ) { U32 i; // initialize commanded valve states for ( i = 0; i < NUM_OF_VALVES; i++ ) { - valveStates[ i ].data = DEENERGIZED; - valveStates[ i ].ovInitData = DEENERGIZED; - valveStates[ i ].ovData = DEENERGIZED; - valveStates[ i ].override = OVERRIDE_RESET; + valveStates[ i ].data = DEENERGIZED; + valveStates[ i ].ovInitData = DEENERGIZED; + valveStates[ i ].ovData = DEENERGIZED; + valveStates[ i ].override = OVERRIDE_RESET; + pendingValveStateChanges[ i ] = DEENERGIZED; + pendingValveStateChangeCountDowns[ i ] = 0; + valveSensedStates[ i ].data = DEENERGIZED; + valveSensedStates[ i ].ovInitData = DEENERGIZED; + valveSensedStates[ i ].ovData = DEENERGIZED; + valveSensedStates[ i ].override = OVERRIDE_RESET; + } - pendingValveStateChanges[ i ] = DEENERGIZED; - pendingValveStateChangeCountDowns[ i ] = 0; - } - commandedValvesStates = fromU32ArrayToU16(); + memset( &vpiTime, 0, sizeof( VPI_OPEN_CLOSE_TIME_T ) ); + + valveStateMismatchCounter = 0; + commandedValvesStates = fromU32ArrayToU16(); setFPGAValveStates( commandedValvesStates ); // initially set all valves to de-energized state via FPGA valvesStatesPublicationTimerCounter = DATA_PUBLISH_COUNTER_START_COUNT; // reset valves states publication timer @@ -126,8 +151,10 @@ // Set valves states (via FPGA) to currently commanded states commandedValvesStates = fromU32ArrayToU16(); - setFPGAValveStates( commandedValvesStates ); - + setFPGAValveStates( commandedValvesStates ); + + checkVPiTimeStatus(); + // Publish valve states on interval publishValvesStates(); } @@ -409,6 +436,11 @@ { U32 valveState = getU32OverrideValue( &valveStates[ valveID ] ); + if ( OVERRIDE_KEY == valveSensedStates[ valveID ].override ) + { + valveState = valveSensedStates[ valveID ].ovData; + } + // Convert the bit status of the valve to the valve name switch ( valveID ) { @@ -449,6 +481,26 @@ } return name; +} + +/*********************************************************************//** + * @brief + * The isFliterFlushRequired function checks whether filter flush is required in + * cleaning modes. + * @details Inputs: vpiTime + * @details Outputs: none + * @return TRUE if filter flush is required otherwise, FALSE + *************************************************************************/ +BOOL isFliterFlushRequired( void ) +{ + BOOL status = TRUE; + + if ( vpiTime.vpiOpenDurationMS >= VPI_MIN_OPEN_TO_SKIP_DISINFECT_FLUSH_MS ) + { + status = ( calcTimeSince( vpiTime.vpiClosedStartTimeMS ) <= VPI_MAX_OPEN_WINDOW_TO_SKIP_DISINFECT_FLUSH_MS ? FALSE : TRUE ); + } + + return status; } /*********************************************************************//** @@ -464,9 +516,15 @@ if ( ++valvesStatesPublicationTimerCounter >= getU32OverrideValue( &valvesStatesPublishInterval ) ) { DG_VALVES_DATA_T data; + U32 i; - data.valvesStatus = getFPGAValveStates(); + data.valvesStatus = getFPGAValveStates(); + for ( i = 0; i < NUM_OF_VALVES; i++ ) + { + data.valvesSensedState[ i ] = (U08)getValveStateName( (VALVES_T)i ); + } + broadcastData( MSG_ID_DG_VALVES_STATES, COMM_BUFFER_OUT_CAN_DG_BROADCAST, (U08*)&data, sizeof( DG_VALVES_DATA_T ) ); valvesStatesPublicationTimerCounter = 0; @@ -495,8 +553,31 @@ } return valveState; -} +} +/*********************************************************************//** + * @brief + * The checkVPiTimeStatus function checks the status of the VPi to see if + * it was open or closed. + * @details Inputs: vpiTime + * @details Outputs: vpiTime + * @return none + *************************************************************************/ +static void checkVPiTimeStatus( void ) +{ + if ( ( VALVE_STATE_OPEN == getValveStateName( VPI ) ) && ( 0 == vpiTime.vpiOpenStartTimeMS ) ) + { + vpiTime.vpiOpenStartTimeMS = getMSTimerCount(); + vpiTime.vpiClosedStartTimeMS = 0; + } + else if ( ( VALVE_STATE_CLOSED == getValveStateName( VPI ) ) && ( 0 == vpiTime.vpiClosedStartTimeMS ) ) + { + vpiTime.vpiOpenDurationMS = calcTimeSince( vpiTime.vpiOpenStartTimeMS ); + vpiTime.vpiOpenStartTimeMS = 0; + vpiTime.vpiClosedStartTimeMS = getMSTimerCount(); + } +} + /************************************************************************* * TEST SUPPORT FUNCTIONS @@ -600,6 +681,59 @@ } return result; +} + +/*********************************************************************//** + * @brief + * The testSetValveSensedStateOverride function overrides the value of the + * specified sensed state with a given value. + * @details Inputs: none + * @details Outputs: valveSensedStates + * @param valve ID of valve to override for + * @param value override value for the given valve ID + * @return TRUE if override successful, FALSE if not + *************************************************************************/ +BOOL testSetValveSensedStateOverride( U32 valve, U32 status ) +{ + BOOL result = FALSE; + + if ( valve < NUM_OF_VALVES ) + { + if ( TRUE == isTestingActivated() ) + { + valveSensedStates[ valve ].ovData = status; + valveSensedStates[ valve ].override = OVERRIDE_KEY; + result = TRUE; + } + } + + return result; +} + +/*********************************************************************//** + * @brief + * The testResetValveSensedStateOverride function resets the override of + * the specified valve's sensed state. + * @details Inputs: none + * @details Outputs: valveSensedStates + * @param valve ID of valve to reset override state for + * @return TRUE if override successful, FALSE if not + *************************************************************************/ +BOOL testResetValveSensedStateOverride( U32 valve ) +{ + BOOL result = FALSE; + + if ( valve < NUM_OF_VALVES ) + { + if ( TRUE == isTestingActivated() ) + { + valveSensedStates[ valve ].override = OVERRIDE_RESET; + valveSensedStates[ valve ].ovData = valveSensedStates[ valve ].ovInitData; + result = TRUE; + } + } + + return result; } /**@}*/