Index: firmware/App/Modes/ModeStandby.c
===================================================================
diff -u -rf8bdb3ff260a42f46e178d08979758789db7c307 -reaeaf0d0c58e85a0a2718661c0964e8c0336f9fc
--- firmware/App/Modes/ModeStandby.c	(.../ModeStandby.c)	(revision f8bdb3ff260a42f46e178d08979758789db7c307)
+++ firmware/App/Modes/ModeStandby.c	(.../ModeStandby.c)	(revision eaeaf0d0c58e85a0a2718661c0964e8c0336f9fc)
@@ -30,7 +30,7 @@
 // ********** private data **********
 
 static RO_STANDBY_MODE_STATE_T standbyState;                                              ///< Currently active standby state.
-static OVERRIDE_U32_T pendingStartRORequest;                                              ///< Flag indicating DD has requested RO start the generate permeate (Overridable).
+static U32 pendingStartRORequest;                                              ///< Flag indicating DD has requested RO start the generate permeate (Overridable).
 
 // ********** private function prototypes **********
 
@@ -46,10 +46,7 @@
 void initStandbyMode( void )
 {
     standbyState = RO_STANDBY_MODE_STATE_IDLE;
-    pendingStartRORequest.data                   = FALSE;
-    pendingStartRORequest.ovData                 = FALSE;
-    pendingStartRORequest.ovInitData             = FALSE;
-    pendingStartRORequest.override               = OVERRIDE_RESET;
+    pendingStartRORequest                   = FALSE;
 }
 
 /*********************************************************************//**
@@ -107,9 +104,9 @@
 {
     RO_STANDBY_MODE_STATE_T state = RO_STANDBY_MODE_STATE_IDLE;
 
-    if ( TRUE == getU32OverrideValue( &pendingStartRORequest ) )
+    if ( TRUE == pendingStartRORequest )
     {
-        pendingStartRORequest.data = FALSE;
+        pendingStartRORequest = FALSE;
         requestNewOperationMode( RO_MODE_GENP );
     }
 
@@ -139,35 +136,19 @@
 {
     BOOL result = FALSE;
 
-    if ( RO_STANDBY_MODE_STATE_IDLE == standbyState )
+    if ( RO_MODE_STAN == getCurrentOperationMode() && RO_STANDBY_MODE_STATE_IDLE == standbyState )
     {
-        result                     = TRUE;
-        pendingStartRORequest.data = TRUE;
+        result                    = TRUE;
+        pendingStartRORequest     = TRUE;
     }
 
     return result;
 }
 
+
 /*************************************************************************
  *                       TEST SUPPORT FUNCTIONS
  *************************************************************************/
 
 
-/*********************************************************************//**
- * @brief
- * The testROstartGenPermeateOverride function sets the override value
- * to start the generate permeate operation mode.
- * @details Inputs: pendingStartRORequest
- * @details Outputs: pendingStartRORequest
- * @param message Override message from Dialin which includes the flag
- * to override the operation mode.
- * @return TRUE if override successful, FALSE if not
- *************************************************************************/
-BOOL testROstartGenPermeateOverride( MESSAGE_T *message )
-{
-    BOOL result = u32Override( message, &pendingStartRORequest, FALSE, TRUE );
-
-    return result;
-}
-
 /**@}*/