Index: firmware/App/Services/Reservoirs.c
===================================================================
diff -u -r6f1f269cd7d91f41c51797d17a85a7ea249e21f3 -rc0160362dc799802ec589d5b6cf4c2bd1face77e
--- firmware/App/Services/Reservoirs.c	(.../Reservoirs.c)	(revision 6f1f269cd7d91f41c51797d17a85a7ea249e21f3)
+++ firmware/App/Services/Reservoirs.c	(.../Reservoirs.c)	(revision c0160362dc799802ec589d5b6cf4c2bd1face77e)
@@ -19,7 +19,6 @@
 
 #include "LoadCell.h"
 #include "ModeRecirculate.h"
-#include "NVDataMgmt.h"
 #include "OperationModes.h"
 #include "Reservoirs.h"
 #include "SystemCommMessages.h"
@@ -37,7 +36,6 @@
 #define MIN_RESERVOIR_VOLUME_ML         0                                               ///< Minimum reservoir volume in mL.
 #define MAX_RESERVOIR_VOLUME_ML         2000                                            ///< Maximum reservoir volume in mL.
 #define DEFAULT_FILL_VOLUME_ML          1700                                            ///< Default fill volume for treatment in mL.
-#define DISINFECT_FILL_VOLUME_ML        2400                                            ///< Fill volume for disinfection in mL.
 #define MAX_FILL_VOLUME_ML              MAX_RESERVOIR_VOLUME_ML                         ///< Maximum fill volume in mL.
 #define DEFAULT_DRAIN_VOLUME_ML         0                                               ///< Default drain volume in mL.
 #define MAX_DRAIN_VOLUME_ML             MAX_RESERVOIR_VOLUME_ML                         ///< Maximum drain volume in mL.
@@ -64,7 +62,7 @@
 static F32 reservoirLowestWeight[ NUM_OF_DG_RESERVOIRS ] = { MAX_RESERVOIR_WEIGHT, MAX_RESERVOIR_WEIGHT };
 static U32 reservoirWeightUnchangeStartTime[ NUM_OF_DG_RESERVOIRS ] = { 0, 0 };         ///< The reservoirs' weight start time when weight stop decreasing.
 static BOOL tareLoadCellRequest;                                                        ///< Flag indicates if load cell tare has been requested by HD.
-static DG_RESERVOIR_VOLUME_RECORD_T reservoirsNVRecord;                                 ///< DG reservoirs non-volatile record.
+static DG_RESERVOIR_VOLUME_RECORD_T reservoirsCalRecord;                                ///< DG reservoirs non-volatile record.
 
 // ********** private function prototypes **********
 
@@ -113,6 +111,31 @@
         broadcastReservoirData( actRes, filVol, drnVol );
         reservoirDataPublicationTimerCounter = 0;
     }
+}
+
+/*********************************************************************//**
+ * @brief
+ * The execDrainPumpSelfTest function executes the drain pump's self-test.
+ * @details Inputs: none
+ * @details Outputs: none
+ * @return PressuresSelfTestResult (SELF_TEST_STATUS_T)
+ *************************************************************************/
+SELF_TEST_STATUS_T execReservoirsSelfTest( void )
+{
+    SELF_TEST_STATUS_T result = SELF_TEST_STATUS_IN_PROGRESS;
+
+    BOOL calStatus = processCalibrationData();
+
+    if ( TRUE == calStatus )
+    {
+        result = SELF_TEST_STATUS_PASSED;
+    }
+    else
+    {
+        result = SELF_TEST_STATUS_FAILED;
+    }
+
+    return result;
 }
 
 /*********************************************************************//**
@@ -238,8 +261,7 @@
     cmdResponse.rejectCode = DG_CMD_REQUEST_REJECT_REASON_NONE;
 
     // fill command only valid in re-circulate mode
-    if ( ( DG_MODE_CIRC == getCurrentOperationMode() ) &&
-         ( DG_RECIRCULATE_MODE_STATE_RECIRC_WATER == getCurrentRecirculateState() ) )
+    if ( ( DG_MODE_CIRC == getCurrentOperationMode() ) && ( DG_RECIRCULATE_MODE_STATE_RECIRC_WATER == getCurrentRecirculateState() ) )
     {
         // validate parameters
         if ( fillToVolMl < MAX_FILL_VOLUME_ML )
@@ -422,6 +444,19 @@
 
 /*********************************************************************//**
  * @brief
+ * The getReservoirsCalRecord function returns the reservoirs' calibration
+ * record.
+ * @details Inputs: reservoirsCalRecord
+ * @details Outputs: none
+ * @return reservoirs' calibration record
+ *************************************************************************/
+DG_RESERVOIR_VOLUME_RECORD_T getReservoirsCalRecord( void )
+{
+    return reservoirsCalRecord;
+}
+
+/*********************************************************************//**
+ * @brief
  * The hasTargetFillVolumeReached function checks if the target fill volume
  * for specific reservoir has been reached.
  * @details Inputs: fillVolumeTargetMl
@@ -578,7 +613,7 @@
  * sure it is valid by checking the calibration date. The calibration date
  * should not be 0.
  * @details Inputs: none
- * @details Outputs: reservoirsNVRecord
+ * @details Outputs: reservoirsCalRecord
  * @return TRUE if the calibration record is valid, otherwise FALSE
  *************************************************************************/
 static BOOL processCalibrationData( void )
@@ -593,22 +628,18 @@
     {
         // Check if the calibration data that was received from NVDataMgmt is legitimate
         // The calibration date item should not be zero. If the calibration date is 0,
-        // then the flow sensors data is not stored in the NV memory or it was corrupted.
+        // then the data is not stored in the NV memory or it was corrupted.
         if ( 0 == calData.reservoir[ reservoir ].calibrationTime )
         {
-#ifndef DISABLE_CAL_CHECK
-            SET_ALARM_WITH_1_U32_DATA( ALARM_ID_DG_RESERVOIRS_INVALID_NV_RECORD, (U32)reservoir );
-#endif
+            SET_ALARM_WITH_1_U32_DATA( ALARM_ID_DG_RESERVOIRS_INVALID_CAL_RECORD, (U32)reservoir );
             status = FALSE;
         }
-        else
-        {
-            // The calibration data was valid, update the local copy
-            reservoirsNVRecord.reservoir[ reservoir ].maxResidualFluid    = calData.reservoir[ reservoir ].maxResidualFluid;
-            reservoirsNVRecord.reservoir[ reservoir ].normalFillVolume    = calData.reservoir[ reservoir ].normalFillVolume;
-            reservoirsNVRecord.reservoir[ reservoir ].rsrvrUnfilledWeight = calData.reservoir[ reservoir ].rsrvrUnfilledWeight;
-            reservoirsNVRecord.reservoir[ reservoir ].rsrvrVolume         = calData.reservoir[ reservoir ].rsrvrVolume;
-        }
+
+        // The calibration data was valid, update the local copy
+        reservoirsCalRecord.reservoir[ reservoir ].maxResidualFluid    = calData.reservoir[ reservoir ].maxResidualFluid;
+        reservoirsCalRecord.reservoir[ reservoir ].normalFillVolume    = calData.reservoir[ reservoir ].normalFillVolume;
+        reservoirsCalRecord.reservoir[ reservoir ].rsrvrUnfilledWeight = calData.reservoir[ reservoir ].rsrvrUnfilledWeight;
+        reservoirsCalRecord.reservoir[ reservoir ].rsrvrVolume         = calData.reservoir[ reservoir ].rsrvrVolume;
     }
 
     return status;