Index: firmware/App/Modes/ModeStandby.c =================================================================== diff -u -r286fbceae8be1276780690fe4b3010c8b2270239 -r12c4f28723f9af89ae693df771039da1bc7ffc80 --- firmware/App/Modes/ModeStandby.c (.../ModeStandby.c) (revision 286fbceae8be1276780690fe4b3010c8b2270239) +++ firmware/App/Modes/ModeStandby.c (.../ModeStandby.c) (revision 12c4f28723f9af89ae693df771039da1bc7ffc80) @@ -16,6 +16,7 @@ ***************************************************************************/ #include "ModeStandby.h" +#include "ModeWaterPreGen.h" #include "OperationModes.h" #include "PersistentAlarm.h" #include "SystemCommRO.h" @@ -30,7 +31,6 @@ // ********** private data ********** static RO_STANDBY_MODE_STATE_T standbyState; ///< Currently active standby state. -static U32 pendingStartPreGenRequest; ///< Flag indicating DD has requested RO start the generate permeate. // ********** private function prototypes ********** @@ -46,7 +46,6 @@ void initStandbyMode( void ) { standbyState = RO_STANDBY_MODE_STATE_IDLE; - pendingStartPreGenRequest = FALSE; } /*********************************************************************//** @@ -103,9 +102,8 @@ { RO_STANDBY_MODE_STATE_T state = RO_STANDBY_MODE_STATE_IDLE; - if ( TRUE == pendingStartPreGenRequest ) + if ( TRUE == getPreGenRequest() ) { - pendingStartPreGenRequest = FALSE; requestNewOperationMode( RO_MODE_PGEN ); } @@ -124,27 +122,7 @@ return standbyState; } -/*********************************************************************//** - * @brief - * The requestPreGenStart function handles an DD request to start (go to gen permeate mode). - * @details \b Inputs: standbyState - * @details \b Outputs: pendingStartRORequest - * @return TRUE if request accepted, FALSE if not. - *************************************************************************/ -BOOL requestPreGenStart( void ) -{ - BOOL result = FALSE; - if ( ( RO_MODE_STAN == getCurrentOperationMode() ) && ( RO_STANDBY_MODE_STATE_IDLE == standbyState ) ) - { - result = TRUE; - pendingStartPreGenRequest = TRUE; - } - - return result; -} - - /************************************************************************* * TEST SUPPORT FUNCTIONS *************************************************************************/