Index: firmware/App/Modes/ModeFill.c
===================================================================
diff -u -rce659127f12060b21cb725240ff9ed919ab5f94d -receb190a5d66fdbee779478ac8bb50a846ed9241
--- firmware/App/Modes/ModeFill.c	(.../ModeFill.c)	(revision ce659127f12060b21cb725240ff9ed919ab5f94d)
+++ firmware/App/Modes/ModeFill.c	(.../ModeFill.c)	(revision eceb190a5d66fdbee779478ac8bb50a846ed9241)
@@ -7,8 +7,8 @@
 *
 * @file    ModeFill.c
 *
-* @author  (last)      Dara Navaei
-* @date    (last)      11-Nov-2022
+* @author  (last)      Michael Garthwaite
+* @date    (last)      21-Nov-2022
 *
 * @author  (original)  Leonardo Baloa
 * @date    (original)  19-Nov-2019
@@ -114,7 +114,6 @@
 static U32 flushBubblesStartTime;                                                                            ///< Starting time for flush bubbles.
 static U32 concentratePumpPrimeCount;                                                                        ///< Interval count for concentrate pump prime.
 
-static F32 integratedVolumeML;                                                                               ///< Total RO flow rate over period of time.
 static BOOL didFMPCheckStart;                                                                                ///< Flag indicates whether FMP flow vs. LC volume check has begun.
 static F32 acidConductivityTotal;                                                                            ///< Total of acid conductivity during fill.
 static F32 bicarbConductivityTotal;                                                                          ///< Total of bicarb conductivity during fill.
@@ -136,6 +135,7 @@
 static OVERRIDE_F32_T usedBicarbVolumeML = { 0.0, 0.0, 0.0, 0.0 };                                           ///< The integrated bicarb concentration volume has been used in mL.
 static OVERRIDE_U32_T fillModeDataPublishInterval = { FILL_MODE_DATA_PUB_INTERVAL,
                                                       FILL_MODE_DATA_PUB_INTERVAL, 0, 0 };                   ///< Interval (in ms) at which to publish fill mode data to CAN bus.
+static OVERRIDE_F32_T integratedVolumeML = { 0.0, 0.0, 0.0, 0.0 };                                           ///< Total RO flow rate over period of time.
 
 // ********** private function prototypes **********
 
@@ -170,7 +170,7 @@
     dialysateFillStartTime        = 0;
     dataPublishCounter            = DATA_PUBLISH_COUNTER_START_COUNT;
     reservoirBaseWeight           = 0.0F;
-    integratedVolumeML            = 0.0F;
+    integratedVolumeML.data       = 0.0F;
     didFMPCheckStart              = FALSE;
     concentrateTestStartTime      = 0;
     acidConductivityTotal         = 0.0F;
@@ -323,6 +323,20 @@
 
 /*********************************************************************//**
  * @brief
+ * The getIntegratedVolumeML function returns the integrated volume in mL
+ * @details Inputs: integratedVolumeML
+ * @details Outputs: integrated volume
+ * @return integrated volume
+ *************************************************************************/
+F32 getIntegratedVolumeML( void )
+{
+
+    F32 integratedVolume = getF32OverrideValue(&integratedVolumeML);
+    return integratedVolume;
+}
+
+/*********************************************************************//**
+ * @brief
  * The resetFillStatusParameters function resets the fill status parameters.
  * @details Inputs: none
  * @details Outputs: fillStatus
@@ -763,7 +777,7 @@
             reservoirBaseWeight = getReservoirWeight( getInactiveReservoir() );
         }
 
-        integratedVolumeML += getMeasuredROFlowRateWithConcPumpsLPM() * ML_PER_LITER * FLOW_INTEGRATOR;
+        integratedVolumeML.data += getMeasuredROFlowRateWithConcPumpsLPM() * ML_PER_LITER * FLOW_INTEGRATOR;
     }
 
     usedAcidVolumeML.data   += getMeasuredPumpSpeed( CONCENTRATEPUMPS_CP1_ACID ) * FLOW_INTEGRATOR;
@@ -788,7 +802,7 @@
     if ( TRUE == hasTargetFillVolumeBeenReached( inactiveRsrvr ) )
     {
         F32 filledVolumeML                           = getReservoirWeight( inactiveRsrvr ) - reservoirBaseWeight;
-        F32 integratedVolumeToLoadCellReadingPercent = fabs( 1.0F - ( filledVolumeML / integratedVolumeML ) );
+        F32 integratedVolumeToLoadCellReadingPercent = fabs( 1.0F - ( filledVolumeML / getIntegratedVolumeML() ) );
         F32 avgAcidConductivity                      = acidConductivityTotal / conductivitySampleCount;
         F32 avgBicarbConductivity                    = bicarbConductivityTotal / conductivitySampleCount;
         F32 acidNormalConductivity                   = acid.acidConcentrate[ CAL_DATA_ACID_CONCENTRATE_1 ].acidConductivityUSPerCM;
@@ -800,7 +814,7 @@
         {
             if ( integratedVolumeToLoadCellReadingPercent > FLOW_INTEGRATED_VOLUME_CHECK_TOLERANCE )  // SRSDG 240
             {
-                SET_ALARM_WITH_2_F32_DATA( ALARM_ID_DG_FLOW_METER_CHECK_FAILURE, filledVolumeML, integratedVolumeML );
+                SET_ALARM_WITH_2_F32_DATA( ALARM_ID_DG_FLOW_METER_CHECK_FAILURE, filledVolumeML, getIntegratedVolumeML() );
             }
         }
 
@@ -979,8 +993,8 @@
  * @brief
  * The publishFillModeData function publishes fill mode data
  * at the set interval.
- * @details Inputs: fillModeDataPublicationTimerCounter
- * @details Outputs: fillModeDataPublicationTimerCounter
+ * @details Inputs: fillModeDataPublicationTimerCounter, fillModeDataPublishInterval
+ * @details Outputs: fillModeData
  * @return none
  *************************************************************************/
 static void publishFillModeData( void )
@@ -997,7 +1011,7 @@
         fillModeData.pctDiffInConductivity     = pctDiffInConductivity;
         fillModeData.usedAcidVolumeML          = getChemicalUsedVolumeML( ACID );
         fillModeData.usedBicarbVolumeML        = getChemicalUsedVolumeML( BICARB );
-        fillModeData.integratedVolumeML        = integratedVolumeML;
+        fillModeData.integratedVolumeML        = getIntegratedVolumeML();
 
         broadcastData( MSG_ID_DG_FILL_MODE_DATA, COMM_BUFFER_OUT_CAN_DG_BROADCAST, (U08*)&fillModeData, sizeof( DG_FILL_MODE_DATA_T ) );
 
@@ -1153,4 +1167,49 @@
     return result;
 }
 
+/*********************************************************************//**
+ * @brief
+ * The testSetIntegratedVolumeOverride function overrides the
+ * integrated volume.
+ * @details Inputs: value
+ * @details Outputs: integratedVolumeML
+ * @param: value integrated volume in mL
+ * @return TRUE if override successful, FALSE if not
+ *************************************************************************/
+BOOL testSetIntegratedVolumeOverride( U32 value )
+{
+    BOOL result = FALSE;
+
+    if ( TRUE == isTestingActivated() )
+    {
+        integratedVolumeML.ovData   = value;
+        integratedVolumeML.override = OVERRIDE_KEY;
+        result = TRUE;
+    }
+
+    return result;
+}
+
+/*********************************************************************//**
+ * @brief
+ * The testResetIntegratedVolumeOverride function resets the
+ * override of integrated volume.
+ * @details Inputs: none
+ * @details Outputs: integratedVolumeML
+ * @return TRUE if override reset successful, FALSE if not
+ *************************************************************************/
+BOOL testResetIntegratedVolumeOverride( void )
+{
+    BOOL result = FALSE;
+
+    if ( TRUE == isTestingActivated() )
+    {
+        integratedVolumeML.override = OVERRIDE_RESET;
+        integratedVolumeML.ovData   = integratedVolumeML.ovInitData;
+        result = TRUE;
+    }
+
+    return result;
+}
+
 /**@}*/