Index: firmware/App/Controllers/DGInterface.h
===================================================================
diff -u -r981de1f5228152ec6877aceae3d66ebf5efc7101 -r6419179374edcd65da462de84e8aeaefb7e20320
--- firmware/App/Controllers/DGInterface.h	(.../DGInterface.h)	(revision 981de1f5228152ec6877aceae3d66ebf5efc7101)
+++ firmware/App/Controllers/DGInterface.h	(.../DGInterface.h)	(revision 6419179374edcd65da462de84e8aeaefb7e20320)
@@ -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
@@ -120,18 +120,19 @@
 void execDGInterfaceMonitor( void );
 
 void initTreatmentReservoirMgmt( void );
-void execTreatmentReservoirMgmt( void );
+void dialysisResumed( void );
+void execTreatmentReservoirMgmt( void );
 
 DG_OP_MODE_T getDGOpMode( void );
 U32 getDGSubMode( void );
 DG_RESERVOIR_ID_T getDGActiveReservoir( void );
 DG_RESERVOIR_ID_T getDGInactiveReservoir( void );
+BOOL hasDGCompletedReservoirSwitch( void );
 F32 getDGPressure( DG_PRESSURE_SENSORS_T sensorID );
 U32 getDGROPumpPressureSetPt( void );
 F32 getDGROPumpFlowRateMlMin( void );
 U32 getDGDrainPumpRPMSetPt( void );
-F32 getLoadCellWeightInGrams( LOAD_CELL_ID_T loadCellID );
-F32 getReservoirWeightSmallFilter( DG_RESERVOIR_ID_T resID );
+F32 getLoadCellWeight( LOAD_CELL_ID_T loadCellID );
 F32 getReservoirWeightLargeFilter( DG_RESERVOIR_ID_T resID );
 
 void setDGOpMode( U32 opMode, U32 subMode );
@@ -148,15 +149,16 @@
 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 );
-
+
 BOOL testSetDialOutLoadCellWeightOverride( U32 sensor, F32 value );
 BOOL testResetDialOutLoadCellWeightOverride( U32 sensor );