Index: firmware/App/Services/Reservoirs.h
===================================================================
diff -u -r669f36cf32c3b500aa2fd5b08c58ee5e6b2e7f08 -rd5f2ac4d84453feb1b782f35f9d69432977a95f6
--- firmware/App/Services/Reservoirs.h	(.../Reservoirs.h)	(revision 669f36cf32c3b500aa2fd5b08c58ee5e6b2e7f08)
+++ firmware/App/Services/Reservoirs.h	(.../Reservoirs.h)	(revision d5f2ac4d84453feb1b782f35f9d69432977a95f6)
@@ -7,8 +7,8 @@
 *
 * @file    Reservoirs.h
 *
-* @author  (last)      Dara Navaei
-* @date    (last)      07-Mar-2022
+* @author  (last)      Michael Garthwaite
+* @date    (last)      08-Aug-2022
 *
 * @author  (original)  Sean
 * @date    (original)  18-Mar-2020
@@ -20,6 +20,7 @@
 
 #include "DGCommon.h"
 #include "DGDefs.h"
+#include "HDDefs.h"
 #include "NVDataMgmt.h"
 
 /**
@@ -70,6 +71,13 @@
     F32 dialysateFlowLPM;                               ///< Dialysate flow rate in L/min
 } DG_CMD_DIALYSATE_HEATING_PARAMS_T;
 
+/// HD mode and HD submode
+typedef struct
+{
+    HD_OP_MODE_T hdMode;                                ///< HD mode
+    U32 hdSubMode;                                      ///< HD submode
+} HD_MODE_SUB_MODE_T;
+
 /// Reservoir data struct.
 typedef struct
 {
@@ -104,18 +112,23 @@
 void startDrainCmd( DRAIN_CMD_T drainCmd );                         // handle drain command from HD
 void stopDrainCmd( void );                                          // handle stop drain command from HD
 
+void setHDOperationMode( U32 mode, U32 subMode );
+void getHDOperationMode( HD_MODE_SUB_MODE_T* mode );
+
 DG_RESERVOIR_ID_T getInactiveReservoir( void );
 F32  getReservoirWeight( DG_RESERVOIR_ID_T reservoirId );
 
 void setDialysateHeatingParameters( DG_CMD_DIALYSATE_HEATING_PARAMS_T params );
 U32  getTargetFillVolumeML( void );
 F32  getTargetFillFlowRateLPM( void );
-F32  getReservoirActualTemperature( void );
 F32  getPrimaryHeaterTargetTemperature( void );
-F32  getTrimmerHeaterTargetTemperature( void );
+F32  getReservoirCurrentTemperature( void );
 F32  getTargetDialysateFlowLPM( void );
+F32  getTrimmerHeaterTargetTemperature( void );
 
 DG_RESERVOIR_VOLUME_RECORD_T getReservoirsCalRecord( void );
+void getAcidConcentrateCalRecord( DG_ACID_CONCENTRATES_RECORD_T* acidRecord );
+void getBicarbConcentrateCalRecord( DG_BICARB_CONCENTRATES_RECORD_T* bicarbRecord );
 
 BOOL hasTargetFillVolumeBeenReached( DG_RESERVOIR_ID_T reservoirId );
 BOOL hasTargetDrainVolumeBeenReached( DG_RESERVOIR_ID_T reservoirId, U32 timeout );
@@ -128,7 +141,8 @@
 BOOL testSetReservoirFillVolumeMlOverride( U32 value );
 BOOL testResetReservoirFillVolumeMlOverride( void );
 BOOL testSetReservoirDrainVolumeMlOverride( U32 value );
-BOOL testResetReservoirDrainVolumeMlOverride( void );
+BOOL testResetReservoirDrainVolumeMlOverride( void );
+BOOL testTareReservoir( U32 value );
 
 /**@}*/