Index: firmware/App/Controllers/DGInterface.h
===================================================================
diff -u -r6811f0251b0fa7d27c3e6d5eb16ade2bc88a3204 -r32f48aca25ae69089c2cf77936239cce6daac229
--- firmware/App/Controllers/DGInterface.h	(.../DGInterface.h)	(revision 6811f0251b0fa7d27c3e6d5eb16ade2bc88a3204)
+++ firmware/App/Controllers/DGInterface.h	(.../DGInterface.h)	(revision 32f48aca25ae69089c2cf77936239cce6daac229)
@@ -32,7 +32,7 @@
 
 // ********** public definitions **********
 
-#define DRAIN_RESERVOIR_TO_VOLUME_ML        200     ///< Drain reservoir to this volume (in mL) during treatment.
+#define DRAIN_RESERVOIR_TO_VOLUME_ML        0       ///< Drain reservoir to this volume (in mL) during treatment.
 #ifndef V1_5_SYSTEM
 #define FILL_RESERVOIR_TO_VOLUME_ML         1700    ///< Fill reservoir to this volume (in mL) during treatment.
 #else
@@ -148,14 +148,17 @@
 void cmdStopDG( void );
 void cmdSetDGActiveReservoir( DG_RESERVOIR_ID_T resID );
 void cmdChangeDGValveSetting( DG_VALVE_SETTING_ID_T valveSettingID );
-void cmdStartDGFill( U32 fillToVolMl );
+void cmdStartDGFill( U32 fillToVolMl );
+void cmdStopDGFill( void );
 void cmdStartDGDrain( U32 drainToVolMl, BOOL tareLoadCell );
 void cmdStartDGTrimmerHeater( void );
-void cmdStopDGTrimmerHeater( void );
-void cmdDGSampleWater( void );
+void cmdStopDGTrimmerHeater( void );
+void cmdDGSampleWater( SAMPLE_WATER_CMD_T cmd );
 
 void handleDGCommandResponse( DG_CMD_RESPONSE_T *dgCmdRespPtr );
 BOOL getDGCommandResponse( U32 commandID, DG_CMD_RESPONSE_T *cmdRespPtr );
+
+void checkDGRestart( void );
 
 BOOL testSetDialOutLoadCellWeightOverride( U32 sensor, F32 value );
 BOOL testResetDialOutLoadCellWeightOverride( U32 sensor );