Index: firmware/App/Services/Reservoirs.h
===================================================================
diff -u -re7e9ea67b63911dc9d8d46166fdd09e102111e3f -rbcd09003e1a633e3491fea89e901935a27c20c13
--- firmware/App/Services/Reservoirs.h	(.../Reservoirs.h)	(revision e7e9ea67b63911dc9d8d46166fdd09e102111e3f)
+++ firmware/App/Services/Reservoirs.h	(.../Reservoirs.h)	(revision bcd09003e1a633e3491fea89e901935a27c20c13)
@@ -7,8 +7,8 @@
 *
 * @file    Reservoirs.h
 *
-* @author  (last)      Dara Navaei
-* @date    (last)      07-Mar-2023
+* @author  (last)      Michael Garthwaite
+* @date    (last)      17-Aug-2023
 *
 * @author  (original)  Sean
 * @date    (original)  18-Mar-2020
@@ -35,6 +35,7 @@
 
 #define MAX_RESERVOIR_VOLUME_ML         2000            ///< Maximum reservoir volume in mL.
 #define RESERVOIR_EXTRA_TEMPERATURE     2.0F            ///< Reservoirs extra margin temperature.
+#define BAD_FLUSH_FILL_TARGET_VOLUME_ML 1000            ///< Target fill volume in the bad flush fill state in milliliters.
 
 /// Fill command data structure.
 typedef struct
@@ -83,9 +84,6 @@
     F32 tempAvgFill;                                    ///< Average fill temperature
     F32 tempLastFill;                                   ///< Last fill temperature
     F32 timereservoirFill;                              ///< Reservoir fill time in milliseconds
-    F32 tempRsrvr0ActualTrimmer;                        ///< Temperature actual reservoir in C.
-    F32 tempFillMixAvgTrimmer;                          ///< Temperature fill mix average trimmer in C.
-    F32 tempRsrvrEndFillTrimmer;                        ///< Temperature reservoir end fill trimmer in C.
 } RESERVOIR_DATA_T;
 
 // ********** public function prototypes **********
@@ -111,6 +109,7 @@
 void setDialysateHeatingParameters( DG_CMD_DIALYSATE_HEATING_PARAMS_T params );
 U32  getTargetFillVolumeML( void );
 F32  getTargetFillFlowRateLPM( void );
+U32  getTargetDrainVolumeML( void );
 F32  getPrimaryHeaterTargetTemperature( void );
 F32  getReservoirCurrentTemperature( void );
 F32  getTargetDialysateFlowLPM( void );
@@ -119,9 +118,11 @@
 DG_RESERVOIR_VOLUME_RECORD_T getReservoirsCalRecord( void );
 void getAcidConcentrateCalRecord( DG_ACID_CONCENTRATES_RECORD_T* acidRecord );
 void getBicarbConcentrateCalRecord( DG_BICARB_CONCENTRATES_RECORD_T* bicarbRecord );
+void getFillChemicalCondRecord( DG_CHEMICALS_FILL_COND_CAL_RECORD_T* fillRecord );
 
 BOOL hasTargetFillVolumeBeenReached( DG_RESERVOIR_ID_T reservoirId );
-BOOL hasTargetDrainVolumeBeenReached( DG_RESERVOIR_ID_T reservoirId, U32 timeout );
+BOOL hasTargetDrainToZeroBeenReached( DG_RESERVOIR_ID_T reservoirId, U32 timeout );
+BOOL hasTargetDrainToVolumeBeenReached( DG_RESERVOIR_ID_T reservoirId, U32 targetVolumeML, U32 timeoutMS );
 void tareLoadCellsAtEmpty( DG_RESERVOIR_ID_T reservoirId );
 BOOL isReservoirTarePending( void );
 void initDrainParameters( DG_RESERVOIR_ID_T reservoirId );
@@ -133,7 +134,9 @@
 BOOL testSetReservoirDrainVolumeMlOverride( U32 value );
 BOOL testResetReservoirDrainVolumeMlOverride( void );
 BOOL testTareReservoir( U32 value );
-BOOL testSetDialysateMixingRatios( F32 acid, F32 bicarb );
+BOOL testSetDialysateMixingRatios( F32 acid, F32 bicarb );
+BOOL testSetReservoirDataPublishIntervalOverride( U32 value );
+BOOL testResetReservoirDataPublishIntervalOverride( void );
 
 /**@}*/