Index: firmware/App/Modes/ModePreGenDialysate.c
===================================================================
diff -u -r88f86f2dc5107670e32f53e04e256ad8249ba55f -rf6fb03f1e20395a61a5d5996f11f802ab8eacb2f
--- firmware/App/Modes/ModePreGenDialysate.c	(.../ModePreGenDialysate.c)	(revision 88f86f2dc5107670e32f53e04e256ad8249ba55f)
+++ firmware/App/Modes/ModePreGenDialysate.c	(.../ModePreGenDialysate.c)	(revision f6fb03f1e20395a61a5d5996f11f802ab8eacb2f)
@@ -47,8 +47,8 @@
 static DD_WET_SELF_TEST_STATE_T wetSelfTestState;                                                           ///< Currently active pre-gen Wet self test state.
 static U32 hydChamberPressureCheckStartTimeMS;                                                              ///< Current time when hydraulics chamber pressure check started in milliseconds.
 static U32 pressureCheckPersistanceStartTimeMS;                                                             ///< Current time for pressure check persistance time started in milliseconds.
-static OVERRIDE_U32_T pendingStartDDGenDialRequest;                                                         ///< Flag indicating TD has requested DD start the generation dialysate request(Overridable).
-static OVERRIDE_U32_T pendingStopDDPreGenDialRequest;                                                       ///< Flag indicating TD has requested DD stop the pre generation dialysate (Overridable).
+static BOOL pendingStartDDGenDialRequest;                                                                   ///< Flag indicating TD has requested DD start the generation dialysate request.
+static BOOL pendingStopDDPreGenDialRequest;                                                                 ///< Flag indicating TD has requested DD stop the pre generation dialysate.
 static U32 preGenDialysatePublishTimerCounter;                                                              ///< Pre-Gen Dialysate data broadcast timer counter used to schedule when to transmit data.
 static OVERRIDE_U32_T preGenDialysateModePublishInterval;                                                   ///< Interval (in task intervals) at which to publish pre-gen dialysate mode data to CAN bus.
 
@@ -79,14 +79,8 @@
     wetSelfTestState                                = DD_WET_SELF_TEST_START;
     hydChamberPressureCheckStartTimeMS              = 0;
     pressureCheckPersistanceStartTimeMS             = 0;
-    pendingStartDDGenDialRequest.data               = FALSE;
-    pendingStartDDGenDialRequest.ovData             = FALSE;
-    pendingStartDDGenDialRequest.ovInitData         = FALSE;
-    pendingStartDDGenDialRequest.override           = OVERRIDE_RESET;
-    pendingStopDDPreGenDialRequest.data             = FALSE;
-    pendingStopDDPreGenDialRequest.ovData           = FALSE;
-    pendingStopDDPreGenDialRequest.ovInitData       = FALSE;
-    pendingStopDDPreGenDialRequest.override         = OVERRIDE_RESET;
+    pendingStartDDGenDialRequest                    = FALSE;
+    pendingStopDDPreGenDialRequest                  = FALSE;
     preGenDialysateModePublishInterval.data         = PRE_GEN_DIALYSATE_DATA_PUB_INTERVAL;
     preGenDialysateModePublishInterval.ovData       = PRE_GEN_DIALYSATE_DATA_PUB_INTERVAL;
     preGenDialysateModePublishInterval.ovInitData   = 0;
@@ -127,15 +121,15 @@
     hydChamberWaterInletControl();
 
     //TODO: To be placed in correct states once states defined.
-    if ( TRUE == getU32OverrideValue( &pendingStartDDGenDialRequest ) )
+    if ( TRUE == pendingStartDDGenDialRequest )
     {
-        pendingStartDDGenDialRequest.data = FALSE;
+        pendingStartDDGenDialRequest = FALSE;
         requestNewOperationMode( DD_MODE_GEND );
     }
     //TODO: Transition to post gen dialysate if concentrate priming has been started
-    else if ( TRUE == getU32OverrideValue( &pendingStopDDPreGenDialRequest ) )
+    else if ( TRUE == pendingStopDDPreGenDialRequest )
     {
-        pendingStopDDPreGenDialRequest.data = FALSE;
+        pendingStopDDPreGenDialRequest = FALSE;
         requestNewOperationMode( DD_MODE_STAN );
     }
     else
@@ -194,7 +188,7 @@
     if ( DD_PRE_GEN_DIALYSATE_WAIT_FOR_GEND == preGenDialysateState )
     {
         result                              = TRUE;
-        pendingStartDDGenDialRequest.data   = TRUE;
+        pendingStartDDGenDialRequest        = TRUE;
     }
 
     return result;
@@ -214,7 +208,7 @@
 
     if ( DD_MODE_PREG == getCurrentOperationMode() )
     {
-        pendingStopDDPreGenDialRequest.data = TRUE;
+        pendingStopDDPreGenDialRequest = TRUE;
         status = TRUE;
     }
 
@@ -477,38 +471,4 @@
     return result;
 }
 
-/*********************************************************************//**
- * @brief
- * The testDDStartGenDialysateOverride function sets the override value
- * to start the gen dialysate operation mode.
- * @details Inputs: pendingStartDDGenDialRequest
- * @details Outputs: pendingStartDDGenDialRequest
- * @param message Override message from Dialin which includes the flag
- * to override the operation mode.
- * @return TRUE if override successful, FALSE if not
- *************************************************************************/
-BOOL testDDStartGenDialysateOverride( MESSAGE_T *message )
-{
-    BOOL result = u32Override( message, &pendingStartDDGenDialRequest, FALSE, TRUE );
-
-    return result;
-}
-
-/*********************************************************************//**
- * @brief
- * The testDDStopPreGenDialysateOverride function sets the override value
- * to stop the pre gen dialysate operation mode.
- * @details Inputs: pendingStopDDPreGenDialRequest
- * @details Outputs: pendingStopDDPreGenDialRequest
- * @param message Override message from Dialin which includes the flag
- * to override the operation mode.
- * @return TRUE if override successful, FALSE if not
- *************************************************************************/
-BOOL testDDStopPreGenDialysateOverride( MESSAGE_T *message )
-{
-    BOOL result = u32Override( message, &pendingStopDDPreGenDialRequest, FALSE, TRUE );
-
-    return result;
-}
-
 /**@}*/