Index: firmware/App/Modes/ModeStandby.c
===================================================================
diff -u -r6408d79e3a9a543e90b2fa7ab823be348befd391 -r67731d57db9a620418b3b848d8f75ff204902c36
--- firmware/App/Modes/ModeStandby.c	(.../ModeStandby.c)	(revision 6408d79e3a9a543e90b2fa7ab823be348befd391)
+++ firmware/App/Modes/ModeStandby.c	(.../ModeStandby.c)	(revision 67731d57db9a620418b3b848d8f75ff204902c36)
@@ -43,7 +43,7 @@
 
 static DD_STANDBY_MODE_STATE_T standbyState;                                              ///< Currently active standby state.
 
-static OVERRIDE_U32_T pendingStartDDPreGenRequest;                                        ///< Flag indicating TD has requested DD start the pre generation dialysate request(Overridable).
+static BOOL pendingStartDDPreGenRequest;                                                  ///< Flag indicating TD has requested DD start the pre generation dialysate request.
 static BOOL pendingBalanceChamberSwOnlyRequest;                                           ///< Flag indicating balancing chamber switch only request.
 //static BOOL pendingStartDDFlushRequest;                                                 ///< Flag indicating TD has requested DD start flush.
 //static BOOL pendingStartDDHeatDisinfectRequest;                                         ///< Flag indicating TD has requested DD start heat disinfect.
@@ -65,10 +65,7 @@
 void initStandbyMode( void )
 {
     standbyState                                 = DD_STANDBY_MODE_STATE_IDLE;
-    pendingStartDDPreGenRequest.data             = FALSE;
-    pendingStartDDPreGenRequest.ovData           = FALSE;
-    pendingStartDDPreGenRequest.ovInitData       = FALSE;
-    pendingStartDDPreGenRequest.override         = OVERRIDE_RESET;
+    pendingStartDDPreGenRequest                  = FALSE;
     pendingBalanceChamberSwOnlyRequest           = FALSE;
 //    pendingStartDDFlushRequest                   = FALSE;
 //    pendingStartDDHeatDisinfectRequest           = FALSE;
@@ -119,11 +116,6 @@
  *************************************************************************/
 U32 execStandbyMode( void )
 {
-    if ( TRUE == areInletWaterConditionsAlarmsActive() )
-    {
-        standbyState = DD_STANDBY_MODE_STATE_PAUSE;
-    }
-
     // execute current Standby state
     switch ( standbyState )
     {
@@ -146,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,
@@ -192,9 +159,9 @@
 //    {
             // define the alarm
 //    }
-    if ( TRUE == getU32OverrideValue( &pendingStartDDPreGenRequest ) )
+    if ( TRUE == pendingStartDDPreGenRequest )
     {
-        pendingStartDDPreGenRequest.data = FALSE;
+        pendingStartDDPreGenRequest = FALSE;
         requestNewOperationMode( DD_MODE_PREG );
     }
     //Test request to handle only balancing chamber switching
@@ -238,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;
 }
 
@@ -261,7 +223,7 @@
     if ( DD_STANDBY_MODE_STATE_IDLE == standbyState )
     {
         result                           = TRUE;
-        pendingStartDDPreGenRequest.data = TRUE;
+        pendingStartDDPreGenRequest      = TRUE;
     }
 
     return result;
@@ -502,21 +464,4 @@
  *************************************************************************/
 
 
-/*********************************************************************//**
- * @brief
- * The testDDStartPreGenDialysateOverride function sets the override value
- * to start the pre-gen dialysate operation mode.
- * @details Inputs: pendingStartDDPreGenRequest
- * @details Outputs: pendingStartDDPreGenRequest
- * @param message Override message from Dialin which includes the flag
- * to override the operation mode.
- * @return TRUE if override successful, FALSE if not
- *************************************************************************/
-BOOL testDDStartPreGenDialysateOverride( MESSAGE_T *message )
-{
-    BOOL result = u32Override( message, &pendingStartDDPreGenRequest, FALSE, TRUE );
-
-    return result;
-}
-
 /**@}*/