Index: firmware/App/Services/Reservoirs.h
===================================================================
diff -u -r6145c5d1a645646587fb077df3c61eef2354f744 -r484b185f0cf4b2ea0ba9de331573952b1b5124b4
--- firmware/App/Services/Reservoirs.h	(.../Reservoirs.h)	(revision 6145c5d1a645646587fb077df3c61eef2354f744)
+++ firmware/App/Services/Reservoirs.h	(.../Reservoirs.h)	(revision 484b185f0cf4b2ea0ba9de331573952b1b5124b4)
@@ -17,9 +17,10 @@
 
 #ifndef __RESERVOIRS_H__
 #define __RESERVOIRS_H__
+
+#include "DGCommon.h"
+#include "DGDefs.h"
 
-#include "DGCommon.h"
-
 /**
  *  @defgroup Reservoirs Reservoirs
  *  @brief Reservoirs service module. Maintains reservoir set points and handles reservoir related commands from the HD.
@@ -29,23 +30,7 @@
  */
 
 // ********** public definitions **********
-
-/// Enumeration of reservoirs.
-typedef enum Reservoirs
-{
-    RESERVOIR_1 = 0,        ///< Reservoir number 1
-    RESERVOIR_2,            ///< Reservoir number 2
-    NUM_OF_RESERVOIRS       ///< Number of reservoirs
-} RESERVOIR_ID_T;
 
-/// Enumeration of valve settings.
-typedef enum Valve_Setting
-{
-    VALVE_SETTING_R1_TO_R2 = 0,         ///< Valve setting for displacement from reservoir 1 to reservoir 2
-    VALVE_SETTING_R2_TO_R1,             ///< Valve setting for displacement from reservoir 2 to reservoir 1
-    NUM_OF_VALVE_SETTTINGS              ///< Number of valve settings
-} VALVE_SETTING_ID_T;
-
 #pragma pack(push,1)
 
 /// Drain command data structure.
@@ -70,20 +55,22 @@
 void initReservoirs( void );
 void execReservoirs( void );
 
-void setActiveReservoirCmd( RESERVOIR_ID_T resID );                 // handle switch reservoirs command from HD
-void changeValveSettingCmd( VALVE_SETTING_ID_T valveSettingID );    // handle valve setting change command from HD
+void setActiveReservoirCmd( DG_RESERVOIR_ID_T resID );              // handle switch reservoirs command from HD
+void changeValveSettingCmd( DG_VALVE_SETTING_ID_T valveSettingID ); // handle valve setting change command from HD
 void startFillCmd( U32 fillToVolMl );                               // handle fill command from HD
 void stopFillCmd( void );                                           // handle stop fill command from HD
 void startDrainCmd( DRAIN_CMD_T drainCmd );                         // handle drain command from HD
 void stopDrainCmd( void );                                          // handle stop drain command from HD
 
-RESERVOIR_ID_T getInactiveReservoir( void );
-BOOL hasTargetFillVolumeBeenReached( RESERVOIR_ID_T reservoirId );
-BOOL hasTargetDrainVolumeBeenReached( RESERVOIR_ID_T reservoirId , U32 timeout );
+DG_RESERVOIR_ID_T getInactiveReservoir( void );
+F32 getReservoirWeight( DG_RESERVOIR_ID_T reservoirId );
+
+BOOL hasTargetFillVolumeBeenReached( DG_RESERVOIR_ID_T reservoirId );
+BOOL hasTargetDrainVolumeBeenReached( DG_RESERVOIR_ID_T reservoirId , U32 timeout );
 
-void resetReservoirLoadCellsOffset( RESERVOIR_ID_T reservoirId );
+void resetReservoirLoadCellsOffset( DG_RESERVOIR_ID_T reservoirId );
 
-BOOL testSetDGActiveReservoirOverride( RESERVOIR_ID_T value );
+BOOL testSetDGActiveReservoirOverride( DG_RESERVOIR_ID_T value );
 BOOL testResetDGActiveReservoirOverride( void );
 BOOL testSetReservoirFillVolumeMlOverride( U32 value );
 BOOL testResetReservoirFillVolumeMlOverride( void );