Index: firmware/App/Controllers/DGInterface.h
===================================================================
diff -u -rb4bc2e0337b358ee180650101d98e18346bf7c22 -r91aa11a47f3b3c744cbbfd9e9c1bd240263aa1bd
--- firmware/App/Controllers/DGInterface.h	(.../DGInterface.h)	(revision b4bc2e0337b358ee180650101d98e18346bf7c22)
+++ firmware/App/Controllers/DGInterface.h	(.../DGInterface.h)	(revision 91aa11a47f3b3c744cbbfd9e9c1bd240263aa1bd)
@@ -32,12 +32,10 @@
 
 // ********** public definitions **********
 
-#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
-#define FILL_RESERVOIR_TO_VOLUME_ML         1300    ///< Fill reservoir to this volume (in mL) during treatment.
-#endif
+#define DRAIN_RESERVOIR_TO_VOLUME_ML            0       ///< Drain reservoir to this volume (in mL) during treatment.
+#define FILL_RESERVOIR_TO_VOLUME_ML             1700    ///< Fill reservoir to this volume (in mL) during treatment.
+#define FILL_RESERVOIR_TO_VOLUME_LOW_FLOW_ML    1300    ///< Fill reservoir to this volume (in mL) during treatment if dialysate flow is slow.
+#define SLOW_DIALYSATE_FLOW_ML_MIN              250     ///< Threshold for slow dialysate flow designation.
 
 /// Enumeration of DG pressure sensors.
 typedef enum DG_PressureSensors
@@ -113,6 +111,14 @@
     U32 rejectCode;                                 ///< Reason code for rejecting the command
 } DG_CMD_RESPONSE_T;
 
+/// DG heat/chemical disinfects and flush state for UI structure.
+typedef struct DG_Disinfects
+{
+    U32 chemDisinfectUIState;                       ///< DG chemical disinfect UI state
+    U32 heatDisinfectUIState;                       ///< DG heat disinfect UI state
+    U32 flushUIState;                               ///< DG flush UI state
+} DG_DISINFECT_UI_STATES_T;
+
 // ********** public function prototypes **********
 
 void initDGInterface( void );
@@ -133,7 +139,9 @@
 F32 getDGROPumpFlowRateMlMin( void );
 U32 getDGDrainPumpRPMSetPt( void );
 F32 getLoadCellWeight( LOAD_CELL_ID_T loadCellID );
+F32 getReservoirWeight( DG_RESERVOIR_ID_T resID );
 F32 getReservoirWeightLargeFilter( DG_RESERVOIR_ID_T resID );
+DG_DISINFECT_UI_STATES_T getDGDisinfectsStates( void );
 
 void setDGOpMode( U32 opMode, U32 subMode );
 void setDialysateTemperatureReadings( F32 temp1, F32 temp2 );
@@ -143,6 +151,7 @@
 void setDGROPumpData( U32 presSetPt, F32 flowRate );
 void setDGDrainPumpData( U32 rpmSetPt );
 void setNewLoadCellReadings( F32 res1Primary, F32 res1Backup, F32 res2Primary, F32 res2Backup );
+void setDGDisinfectsStates( DG_DISINFECT_UI_STATES_T states );
 
 void cmdSetDGDialysateTargetTemps( F32 primaryHtrTemp, F32 trimmerHtrTemp );
 void cmdStartDG( void );
@@ -155,6 +164,12 @@
 void cmdStartDGTrimmerHeater( void );
 void cmdStopDGTrimmerHeater( void );
 void cmdDGSampleWater( SAMPLE_WATER_CMD_T cmd );
+void cmdStartDGFlush( void );
+void cmdStopDGFlush( void );
+void cmdStartDGHeatDisinfect( void );
+void cmdStopDGHeatDisinfect( void );
+void cmdStartDGChemicalDisinfect( void );
+void cmdStopDGChemicalDisinfect( void );
 
 void handleDGCommandResponse( DG_CMD_RESPONSE_T *dgCmdRespPtr );
 BOOL getDGCommandResponse( U32 commandID, DG_CMD_RESPONSE_T *cmdRespPtr );