Index: firmware/App/Modes/ModeGenDialysate.c
===================================================================
diff -u -rdc3647b737971d298748796d2455b3e021325d8a -rf6fb03f1e20395a61a5d5996f11f802ab8eacb2f
--- firmware/App/Modes/ModeGenDialysate.c	(.../ModeGenDialysate.c)	(revision dc3647b737971d298748796d2455b3e021325d8a)
+++ firmware/App/Modes/ModeGenDialysate.c	(.../ModeGenDialysate.c)	(revision f6fb03f1e20395a61a5d5996f11f802ab8eacb2f)
@@ -66,7 +66,7 @@
 static OVERRIDE_F32_T targetHydChamberFluidTemp;                                            ///< Target hydraulics chamber fluid temperature.
 static OVERRIDE_U32_T isDialDeliveryInProgress;                                             ///< To indicate dialysate started delivering to dialyzer for treatment (overrideable)
 static OVERRIDE_U32_T isDialysateGoodtoDeliver;                                             ///< Flag indicating whether ready to deliver dialysate or not.
-static OVERRIDE_U32_T pendingStopDDGenDialRequest;                                          ///< Flag indicating TD has requested DD stop the generate dialysate (Overridable).
+static BOOL pendingStopDDGenDialRequest;                                                    ///< Flag indicating TD has requested DD stop the generate dialysate.
 static U32 genDialysateDataPublicationTimerCounter;                                         ///< Used to schedule generate dialysate data publication to CAN bus.
 static OVERRIDE_U32_T genDialysateDataPublishInterval;                                      ///< Generate dialysate mode data publish interval.
 static BOOL isTreatmentParamUpdated;                                                        ///< To indicate change in treatment parameters
@@ -107,10 +107,7 @@
     isDialDeliveryInProgress.ovData             = FALSE;
     isDialDeliveryInProgress.ovInitData         = FALSE;
     isDialDeliveryInProgress.override           = OVERRIDE_RESET;
-    pendingStopDDGenDialRequest.data            = FALSE;
-    pendingStopDDGenDialRequest.ovData          = FALSE;
-    pendingStopDDGenDialRequest.ovInitData      = FALSE;
-    pendingStopDDGenDialRequest.override        = OVERRIDE_RESET;
+    pendingStopDDGenDialRequest                 = FALSE;
     genDialysateDataPublishInterval.data        = GEN_DIALYSATE_DATA_PUBLISH_INTERVAL;
     genDialysateDataPublishInterval.ovData      = GEN_DIALYSATE_DATA_PUBLISH_INTERVAL;
     genDialysateDataPublishInterval.ovInitData  = 0;
@@ -282,9 +279,9 @@
     checkDialysateTemperature();
 
     //TODO: Transition to post gen dialysate then standby.
-    if ( TRUE == getU32OverrideValue( &pendingStopDDGenDialRequest ) )
+    if ( TRUE == pendingStopDDGenDialRequest )
     {
-        pendingStopDDGenDialRequest.data = FALSE;
+        pendingStopDDGenDialRequest = FALSE;
         requestNewOperationMode( DD_MODE_STAN );
     }
     // Continuous water inlet pressure check
@@ -466,7 +463,7 @@
 
     if ( DD_MODE_GEND == getCurrentOperationMode() )
     {
-        pendingStopDDGenDialRequest.data = TRUE;
+        pendingStopDDGenDialRequest = TRUE;
         status = TRUE;
     }
 
@@ -771,23 +768,6 @@
 
 /*********************************************************************//**
  * @brief
- * The testDDStopGenDialysateOverride function sets the override value
- * to stop the gen dialysate operation mode.
- * @details Inputs: pendingStopDDGenDialRequest
- * @details Outputs: pendingStopDDGenDialRequest
- * @param message Override message from Dialin which includes the flag
- * to override the operation mode.
- * @return TRUE if override successful, FALSE if not
- *************************************************************************/
-BOOL testDDStopGenDialysateOverride( MESSAGE_T *message )
-{
-    BOOL result = u32Override( message, &pendingStopDDGenDialRequest, FALSE, TRUE );
-
-    return result;
-}
-
-/*********************************************************************//**
- * @brief
  * The testGenDExecStateOverride function sets the Gen dialysate execution state
  * machine to given state.
  * @details \b Inputs: tester logged in, execStateSet