Index: firmware/App/Services/Reservoirs.h
===================================================================
diff -u -r484b185f0cf4b2ea0ba9de331573952b1b5124b4 -r5d8530d242d8065178eab9e3e5d8e4561b790e01
--- firmware/App/Services/Reservoirs.h	(.../Reservoirs.h)	(revision 484b185f0cf4b2ea0ba9de331573952b1b5124b4)
+++ firmware/App/Services/Reservoirs.h	(.../Reservoirs.h)	(revision 5d8530d242d8065178eab9e3e5d8e4561b790e01)
@@ -14,23 +14,23 @@
 * @date (original) 18-Mar-2020
 *
 ***************************************************************************/
-
-#ifndef __RESERVOIRS_H__
-#define __RESERVOIRS_H__
 
+#ifndef __RESERVOIRS_H__
+#define __RESERVOIRS_H__
+
 #include "DGCommon.h"
-#include "DGDefs.h"
-
-/**
- *  @defgroup Reservoirs Reservoirs
- *  @brief Reservoirs service module. Maintains reservoir set points and handles reservoir related commands from the HD.
- *
- *  @addtogroup Reservoirs
- *  @{
- */
-
-// ********** public definitions **********
+#include "DGDefs.h"
 
+/**
+ *  @defgroup Reservoirs Reservoirs
+ *  @brief Reservoirs service module. Maintains reservoir set points and handles reservoir related commands from the HD.
+ *
+ *  @addtogroup Reservoirs
+ *  @{
+ */
+
+// ********** public definitions **********
+
 #pragma pack(push,1)
 
 /// Drain command data structure.
@@ -48,35 +48,39 @@
     U32 rejectCode;         ///< Reason code for rejecting the command
 } DG_CMD_RESPONSE_T;
 
-#pragma pack(pop)
-
-// ********** public function prototypes **********
-
-void initReservoirs( void );
-void execReservoirs( void );
+#pragma pack(pop)
 
+// ********** public function prototypes **********
+
+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 stopDrainCmd( void );                                          // handle stop 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 );
+
+void resetReservoirsLowestWeight( void );
+
 DG_RESERVOIR_ID_T getInactiveReservoir( void );
 F32 getReservoirWeight( DG_RESERVOIR_ID_T reservoirId );
-
-BOOL hasTargetFillVolumeBeenReached( DG_RESERVOIR_ID_T reservoirId );
+
+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