Index: firmware/App/Modes/ModeStandby.c =================================================================== diff -u -rf6fb03f1e20395a61a5d5996f11f802ab8eacb2f -r67731d57db9a620418b3b848d8f75ff204902c36 --- firmware/App/Modes/ModeStandby.c (.../ModeStandby.c) (revision f6fb03f1e20395a61a5d5996f11f802ab8eacb2f) +++ firmware/App/Modes/ModeStandby.c (.../ModeStandby.c) (revision 67731d57db9a620418b3b848d8f75ff204902c36) @@ -116,11 +116,6 @@ *************************************************************************/ U32 execStandbyMode( void ) { - if ( TRUE == areInletWaterConditionsAlarmsActive() ) - { - standbyState = DD_STANDBY_MODE_STATE_PAUSE; - } - // execute current Standby state switch ( standbyState ) { @@ -143,31 +138,6 @@ /*********************************************************************//** * @brief - * The areInletWaterConditionsAlarmsActive function checks whether the inlet - * water pressure conditions are out of range and any of their alarms are active. - * @details \b Inputs: Input and Output pressure of water inlet pressur regulator. - * @details \b Outputs: None - * @return TRUE if any of the alarms are active, otherwise, FALSE - *************************************************************************/ -BOOL areInletWaterConditionsAlarmsActive( void ) -{ - BOOL status = FALSE; - - //TODO: testing - Comment water pressure check - // Check Inlet Water Pressure - both Water inlet pressure Input, pressure Output after pressure regulator. - // checkInletWaterPressure(); - - // Check any active alarms - status |= isAlarmActive( ALARM_ID_DD_INLET_WATER_PRESSURE_OUT_LOW_RANGE ); - status |= isAlarmActive( ALARM_ID_DD_INLET_WATER_PRESSURE_OUT_HIGH_RANGE ); - status |= isAlarmActive( ALARM_ID_DD_INLET_WATER_PRESSURE_IN_HIGH_RANGE ); - status |= isAlarmActive( ALARM_ID_DD_INLET_WATER_PRESSURE_IN_LOW_RANGE ); - - return status; -} - -/*********************************************************************//** - * @brief * The handleStandbyIdleState function executes the idle state of the * standby mode state machine. * @details \b Inputs: pendingSampleWaterRequest, pendingStartDDPreGenRequest, @@ -235,11 +205,6 @@ { DD_STANDBY_MODE_STATE_T state = DD_STANDBY_MODE_STATE_PAUSE; - if ( FALSE == areInletWaterConditionsAlarmsActive() ) - { - state = DD_STANDBY_MODE_STATE_IDLE; - } - return state; }