Index: firmware/App/Services/Reservoirs.h
===================================================================
diff -u -rf267c42c91fd6e22db80e19039b8993582de51e9 -rf6413fefb94be1273323d4193bba3c522cf8ecb4
--- firmware/App/Services/Reservoirs.h	(.../Reservoirs.h)	(revision f267c42c91fd6e22db80e19039b8993582de51e9)
+++ firmware/App/Services/Reservoirs.h	(.../Reservoirs.h)	(revision f6413fefb94be1273323d4193bba3c522cf8ecb4)
@@ -1,4 +1,4 @@
-/**************************************************************************
+/**********************************************************************//**
  *
  *  Copyright (c) 2020 Diality Inc. - All Rights Reserved.
  *
@@ -19,6 +19,15 @@
 
 #include "DGCommon.h"
 
+/**
+ *  @defgroup Reservoirs Reservoirs
+ *  @brief Reservoirs service module.
+ *  Maintains reservoir set points and handles reservoir related commands from the HD
+ *
+ *  @addtogroup Reservoirs
+ *  @{
+ */
+
 // ********** public definitions **********
 
 /// Enumeration of reservoirs     TODO - move to a Reservoirs.h in Services?
@@ -34,6 +43,21 @@
 void initReservoirs( void );
 
 BOOL startFill( RESERVOIR_ID_T resID, U32 fillToVolMl, F32 targetPrimeTemp, F32 targetTrimTemp );   // handle fill command from HD
+BOOL stopFill( void );                                                                              // handle stop fill command from HD
 BOOL startDrain( RESERVOIR_ID_T resID, U32 drainToVolMl );                                          // handle drain command from HD
+BOOL stopDrain( void );                                                                             // handle stop drain command from HD
 
+DATA_GET_PROTOTYPE( RESERVOIR_ID_T, getActiveReservoir );
+DATA_GET_PROTOTYPE( U32, getReservoirFillVolumeTargetMl );
+DATA_GET_PROTOTYPE( U32, getReservoirDrainVolumeTargetMl );
+
+BOOL testSetDGActiveReservoirOverride( RESERVOIR_ID_T value );
+BOOL testResetDGActiveReservoirOverride( void );
+BOOL testSetReservoirFillVolumeMlOverride( U32 value );
+BOOL testResetReservoirFillVolumeMlOverride( void );
+BOOL testSetReservoirDrainVolumeMlOverride( U32 value );
+BOOL testResetReservoirDrainVolumeMlOverride( void );
+
+/**@}*/
+
 #endif