Index: firmware/App/Services/Reservoirs.h
===================================================================
diff -u -re12f1b3d41ae133bc0975fcb126e431c2bedda59 -rc71859467ae9ff4058d9fc4abeae23ee86a7cb69
--- firmware/App/Services/Reservoirs.h	(.../Reservoirs.h)	(revision e12f1b3d41ae133bc0975fcb126e431c2bedda59)
+++ firmware/App/Services/Reservoirs.h	(.../Reservoirs.h)	(revision c71859467ae9ff4058d9fc4abeae23ee86a7cb69)
@@ -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
@@ -111,6 +112,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 );
@@ -122,7 +124,8 @@
 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 );