Index: firmware/App/Services/Reservoirs.c
===================================================================
diff -u -re6f3a632890f96a5aa282922d11df148bdd06587 -rd3819286869611f9c02add72a0f8e321598fdf42
--- firmware/App/Services/Reservoirs.c	(.../Reservoirs.c)	(revision e6f3a632890f96a5aa282922d11df148bdd06587)
+++ firmware/App/Services/Reservoirs.c	(.../Reservoirs.c)	(revision d3819286869611f9c02add72a0f8e321598fdf42)
@@ -65,10 +65,6 @@
 
 // ********** private function prototypes **********
 
-static DG_RESERVOIR_ID_T getActiveReservoir( void );
-static U32 getReservoirFillVolumeTargetMl( void );
-
-static U32 getReservoirDrainVolumeTargetMl( void );
 static BOOL processCalibrationData( void );
 
 /*********************************************************************//**
@@ -104,9 +100,9 @@
     // publish active reservoir, fill/drain volume targets at 1 Hz.
     if ( ++reservoirDataPublicationTimerCounter >= RESERVOIR_DATA_PUB_INTERVAL )
     {
-        U32 actRes = getActiveReservoir();
-        U32 filVol = getReservoirFillVolumeTargetMl();
-        U32 drnVol = getReservoirDrainVolumeTargetMl();
+        U32 actRes = getU32OverrideValue( &activeReservoir );
+        U32 filVol = getU32OverrideValue( &fillVolumeTargetMl );
+        U32 drnVol = getU32OverrideValue( &drainVolumeTargetMl );
         broadcastReservoirData( actRes, filVol, drnVol );
         reservoirDataPublicationTimerCounter = 0;
     }
@@ -414,7 +410,7 @@
 {
     DG_RESERVOIR_ID_T inactiveReservoir = DG_RESERVOIR_1;
 
-    if ( DG_RESERVOIR_1 == getActiveReservoir() )
+    if ( DG_RESERVOIR_1 == getU32OverrideValue( &activeReservoir ) )
     {
         inactiveReservoir = DG_RESERVOIR_2;
     }
@@ -461,7 +457,7 @@
 BOOL hasTargetFillVolumeBeenReached( DG_RESERVOIR_ID_T reservoirId )
 {
     F32 const loadcellWeight = getLoadCellSmallFilteredWeight( associatedLoadCell[ reservoirId ] );
-    U32 const targetFillVolume = getReservoirFillVolumeTargetMl();
+    U32 const targetFillVolume = getU32OverrideValue( &fillVolumeTargetMl );
     BOOL const hasTargetReached = ( loadcellWeight >= targetFillVolume );
 
     return hasTargetReached;
@@ -482,7 +478,7 @@
     BOOL result = FALSE;
 
     F32 const loadcellWeight = getLoadCellSmallFilteredWeight( associatedLoadCell[ reservoirId ] );
-    U32 const targetDrainVolume = getReservoirDrainVolumeTargetMl();
+    U32 const targetDrainVolume = getU32OverrideValue( &drainVolumeTargetMl );
 
     if ( loadcellWeight < reservoirLowestWeight[ reservoirId ] )
     {
@@ -523,7 +519,7 @@
  *************************************************************************/
 void tareLoadCellsAtEmpty( DG_RESERVOIR_ID_T reservoirId )
 {
-    U32 const targetDrainVolume = getReservoirDrainVolumeTargetMl();
+    U32 const targetDrainVolume = getU32OverrideValue( &drainVolumeTargetMl );
 
     if ( TRUE == tareLoadCellRequest )
     {
@@ -552,63 +548,6 @@
 
 /*********************************************************************//**
  * @brief
- * The getActiveReservoir function gets the active reservoir.
- * @details Inputs: activeReservoir
- * @details Outputs: none
- * @return the currently active reservoir.
- *************************************************************************/
-static DG_RESERVOIR_ID_T getActiveReservoir( void )
-{
-    DG_RESERVOIR_ID_T result = (DG_RESERVOIR_ID_T)activeReservoir.data;
-
-    if ( OVERRIDE_KEY == activeReservoir.override )
-    {
-        result = (DG_RESERVOIR_ID_T)activeReservoir.ovData;
-    }
-
-    return result;
-}
-
-/*********************************************************************//**
- * @brief
- * The getReservoirFillVolumeTargetMl function gets the reservoir fill volume (in mL).
- * @details Inputs: fillVolumeTargetMl
- * @details Outputs: none
- * @return the current target reservoir fill volume (in mL).
- *************************************************************************/
-static U32 getReservoirFillVolumeTargetMl( void )
-{
-    U32 result = fillVolumeTargetMl.data;
-
-    if ( OVERRIDE_KEY == fillVolumeTargetMl.override )
-    {
-        result = fillVolumeTargetMl.ovData;
-    }
-
-    return result;
-}
-
-/*********************************************************************//**
- * @brief
- * The getReservoirDrainVolumeTargetMl function gets the reservoir drain volume (in mL).
- * @details Inputs: drainVolumeTargetMl
- * @details Outputs: none
- * @return the current target reservoir drain volume (in mL).
- *************************************************************************/
-static U32 getReservoirDrainVolumeTargetMl( void )
-{
-    U32 result = drainVolumeTargetMl.data;
-
-    if ( OVERRIDE_KEY == drainVolumeTargetMl.override )
-    {
-        result = drainVolumeTargetMl.ovData;
-    }
-
-    return result;
-}
-
-/*********************************************************************//**
- * @brief
  * The processCalibrationData function gets the calibration data and makes
  * sure it is valid by checking the calibration date. The calibration date
  * should not be 0.