Index: firmware/App/Services/Reservoirs.c
===================================================================
diff -u -rcb74a0074b698cfd92cacbaea5bcbfbc6506649b -rcd5be724d5a3ba7457e761191d82f278654d7f5c
--- firmware/App/Services/Reservoirs.c	(.../Reservoirs.c)	(revision cb74a0074b698cfd92cacbaea5bcbfbc6506649b)
+++ firmware/App/Services/Reservoirs.c	(.../Reservoirs.c)	(revision cd5be724d5a3ba7457e761191d82f278654d7f5c)
@@ -1,14 +1,14 @@
 /**************************************************************************
 *
-* Copyright (c) 2021-2023 Diality Inc. - All Rights Reserved.
+* Copyright (c) 2021-2024 Diality Inc. - All Rights Reserved.
 *
 * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN
 * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER.
 *
 * @file    Reservoirs.c
 *
 * @author  (last)      Sean Nash
-* @date    (last)      30-Sep-2023
+* @date    (last)      06-Oct-2023
 *
 * @author  (original)  Dara Navaei
 * @date    (original)  21-Nov-2021
@@ -26,6 +26,7 @@
 #include "NVDataMgmt.h"
 #include "OperationModes.h"
 #include "Reservoirs.h"
+#include "SystemCommMessages.h"
 #include "TaskGeneral.h"
 #include "Timers.h"
 
@@ -40,7 +41,7 @@
 #define RESERVOIR_USED_SETTLE_TIME_MS                     5000                                           ///< Allocated time to settle the depleted reservoir in milliseconds.
 #define RESERVOIR_CYCLE_EXTRA_MARGIN_TIME_MS              8000                                           ///< Reservoir extra time in during the cycle for error in milliseconds.
 
-#define MAX_RESERVOIR_VOLUME_ML                           1950.0F                                        ///< Maximum allowed fluid in a reservoir in milliliters.
+#define MAX_RESERVOIR_VOLUME_ML                           1900.0F                                        ///< Maximum allowed fluid in a reservoir in milliliters.
 #define MAX_RESERVOIR_DILUTION                            0.15F                                          ///< Maximum reservoir dilution limit.
 #define MAX_RESERVOIR_RECIRCULATION_400_MLP               1.1F                                           ///< Maximum reservoir recirculation limit <= 400mL/m.
 #define MAX_RESERVOIR_RECIRCULATION_450_MLP               1.15F                                          ///< Maximum reservoir recirculation limit <= 450mL/m.
@@ -87,7 +88,7 @@
 static U32 lastTimeReservoirInUF;                                                                        ///< Reservoir time in ultrafiltration from prior reservoir (in ms).
 static F32 volSpentUFML;                                                                                 ///< Ultrafiltration volume in milliliters.
 static DG_RESERVOIR_ID_T activeReservoir;                                                                ///< Active reservoir.
-static F32 recirculationLevelPct;                                                                        ///< Recirculation level in percent.
+static OVERRIDE_F32_T recirculationLevelPct = { 0.0, 0.0, 0.0, 0 };                                      ///< Recirculation level in percent.
 static U32 reservoirSwitchStartTimeMS;                                                                   ///< Reservoir switch start time in milliseconds.
 static S32 timeWaitToFillMS;                                                                             ///< Time to wait to fill in milliseconds.
 static F32 targetFillFlowLPM;                                                                            ///< Target fill flow in liters/minutes.
@@ -145,7 +146,7 @@
     lastTimeReservoirInUF       = 0;
     volSpentUFML                = 0.0F;
     activeReservoir             = getDGActiveReservoir();
-    recirculationLevelPct       = 0.0F;
+    recirculationLevelPct.data  = 0.0F;
     reservoirSwitchStartTimeMS  = 0;
     timeWaitToFillMS            = 0;
     targetFillFlowLPM           = 0.0F;
@@ -202,7 +203,7 @@
         volSpentML += ( flowRateMLPerMS * msSinceLastVolumeCalc );
         timeReservoirInUse++;
         // Check the recirculation level
-        recirculationLevelPct = volSpentML / (F32)prevTargetFillVolumeML[ getDGActiveReservoir() ];
+        recirculationLevelPct.data = volSpentML / (F32)prevTargetFillVolumeML[ getDGActiveReservoir() ];
     }
 
     // Update the reservoir start time
@@ -452,7 +453,7 @@
         data.activeReservoirUFVolML    = volSpentUFML;
         data.activeReservoirVolSpentML = volSpentML;
         data.dilLevelPct               = dilutionLevelPct * 100;
-        data.recircLevelPct            = recirculationLevelPct * 100;
+        data.recircLevelPct            = getF32OverrideValue( &recirculationLevelPct ) * 100;
         data.timeDepletionMS           = timeDepleteMS;
         data.timeWaitFillMS            = timeWaitToFillMS;
         data.tempRemoveTargetFillFlow  = targetFillFlowLPM;
@@ -595,13 +596,13 @@
 
     // If the recirculation level has exceeded the max allowed, raise the alarm to stop using the active reservoir as it has been
     // diluted to much
-    if ( recirculationLevelPct >= getReservoirRecirculationMaxPercent() )
+    if ( getF32OverrideValue( &recirculationLevelPct ) >= getReservoirRecirculationMaxPercent() )
     {
 #ifndef _RELEASE_
         if ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_RESERVOIRS_ALARMS ) != SW_CONFIG_ENABLE_VALUE )
 #endif
         {
-            SET_ALARM_WITH_1_F32_DATA( ALARM_ID_HD_ACTIVE_RESERVOIR_RECIRCULATION_OUT_OF_RANGE, recirculationLevelPct )
+            SET_ALARM_WITH_1_F32_DATA( ALARM_ID_HD_ACTIVE_RESERVOIR_RECIRCULATION_OUT_OF_RANGE, getF32OverrideValue( &recirculationLevelPct ) )
         }
     }
 
@@ -740,4 +741,55 @@
     return targetFillVolumeML;
 }
 
+
+/*************************************************************************
+ *                       TEST SUPPORT FUNCTIONS
+ *************************************************************************/
+
+
+/*********************************************************************//**
+ * @brief
+ * The testSetRecirculationLevelPctOverride function overrides the recirculation
+ * percentage.
+ * @details Inputs: none
+ * @details Outputs: recirculationLevelPct
+ * @param value override percentage value with this
+ * @return TRUE if override successful, FALSE if not
+ *************************************************************************/
+BOOL testSetRecirculationLevelPctOverride( F32 value )
+{
+    BOOL result = FALSE;
+
+    if ( TRUE == isTestingActivated() )
+    {
+        result = TRUE;
+        recirculationLevelPct.ovData = value;
+        recirculationLevelPct.override = OVERRIDE_KEY;
+    }
+
+    return result;
+}
+
+/*********************************************************************//**
+ * @brief
+ * The testResetRecirculationLevelPctOverride function resets the override of the
+ * recirculation percentage.
+ * @details Inputs: none
+ * @details Outputs: recirculationLevelPct
+ * @return TRUE if reset successful, FALSE if not
+ *************************************************************************/
+BOOL testResetRecirculationLevelPctOverride( void )
+{
+    BOOL result = FALSE;
+
+    if ( TRUE == isTestingActivated() )
+    {
+        result = TRUE;
+        recirculationLevelPct.override = OVERRIDE_RESET;
+        recirculationLevelPct.ovData = recirculationLevelPct.ovInitData;
+    }
+
+    return result;
+}
+
 /**@}*/