Index: firmware/App/Services/Reservoirs.h
===================================================================
diff -u -r5d8530d242d8065178eab9e3e5d8e4561b790e01 -r3eb7c2e62c727be195cd937d49957db9d4ba83b4
--- firmware/App/Services/Reservoirs.h	(.../Reservoirs.h)	(revision 5d8530d242d8065178eab9e3e5d8e4561b790e01)
+++ firmware/App/Services/Reservoirs.h	(.../Reservoirs.h)	(revision 3eb7c2e62c727be195cd937d49957db9d4ba83b4)
@@ -33,6 +33,13 @@
 
 #pragma pack(push,1)
 
+/// Fill command data structure.
+typedef struct
+{
+    U32 fillToVolumeMl;     ///< Target volume to fill to (in mL)
+    U32 cmd;                ///< General command (start/stop)
+} FILL_CMD_T;
+
 /// Drain command data structure.
 typedef struct
 {
@@ -48,18 +55,26 @@
     U32 rejectCode;         ///< Reason code for rejecting the command
 } DG_CMD_RESPONSE_T;
 
-#pragma pack(pop)
+/// Reservoir data struct.
+typedef struct
+{
+    U32 activeReservoir;    ///< Active reservoir ID
+    U32 fillToVolumeMl;     ///< Volume target to fill to
+    U32 drainToVolumeMl;    ///< Volume target to drain to
+} RESERVOIR_DATA_T;
 
-// ********** public function prototypes **********
+#pragma pack(pop)
+
+// ********** public function prototypes **********
+
+void initReservoirs( void );
+void execReservoirs( void );
 
-void initReservoirs( void );
-void execReservoirs( void );
-
 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 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
 
 void tareReservoir( void );
@@ -71,16 +86,14 @@
 
 BOOL hasTargetFillVolumeBeenReached( DG_RESERVOIR_ID_T reservoirId );
 BOOL hasTargetDrainVolumeBeenReached( DG_RESERVOIR_ID_T reservoirId , U32 timeout );
-
-void resetReservoirLoadCellsOffset( DG_RESERVOIR_ID_T reservoirId );
-
-BOOL testSetDGActiveReservoirOverride( DG_RESERVOIR_ID_T value );
-BOOL testResetDGActiveReservoirOverride( void );
-BOOL testSetReservoirFillVolumeMlOverride( U32 value );
-BOOL testResetReservoirFillVolumeMlOverride( void );
-BOOL testSetReservoirDrainVolumeMlOverride( U32 value );
-BOOL testResetReservoirDrainVolumeMlOverride( void );
-
-/**@}*/
-
-#endif
+
+BOOL testSetDGActiveReservoirOverride( DG_RESERVOIR_ID_T value );
+BOOL testResetDGActiveReservoirOverride( void );
+BOOL testSetReservoirFillVolumeMlOverride( U32 value );
+BOOL testResetReservoirFillVolumeMlOverride( void );
+BOOL testSetReservoirDrainVolumeMlOverride( U32 value );
+BOOL testResetReservoirDrainVolumeMlOverride( void );
+
+/**@}*/
+
+#endif