Index: firmware/App/Controllers/DGInterface.c
===================================================================
diff -u -r44a100f8e5210a02c23b8fcc4527d8e96d577381 -ra69fcb7945b0300b47ce3287f8cb22c7c26171dc
--- firmware/App/Controllers/DGInterface.c	(.../DGInterface.c)	(revision 44a100f8e5210a02c23b8fcc4527d8e96d577381)
+++ firmware/App/Controllers/DGInterface.c	(.../DGInterface.c)	(revision a69fcb7945b0300b47ce3287f8cb22c7c26171dc)
@@ -104,6 +104,7 @@
 static U32 dgReservoirDrainVolumeTargetSet = 0;                 ///< Drain-to volume commanded.
 static U32 resUseTimer = 0;                                     ///< Used to track time pumping from active reservoir (for volume used calculation).
 static F32 resUseVolumeMl = 0.0;                                ///< Accumulated volume used from active reservoir.
+static DG_DISINFECT_UI_STATES_T disinfectsStatus;               ///< DG disinfects status.
 
 // DG command response
 static DG_CMD_RESPONSE_T dgCmdResp[ NUM_OF_DG_COMMANDS ];       ///< Keep the latest DG command response for each command.
@@ -255,7 +256,7 @@
             {
                 if ( DG_RECIRCULATE_MODE_STATE_RECIRC_WATER == dgSubMode )
                 {
-                    cmdStartDGDrain( DRAIN_RESERVOIR_TO_VOLUME_ML, FALSE );
+                    cmdStartDGDrain( DRAIN_RESERVOIR_TO_VOLUME_ML, TRUE );
                 }
             }
             else if ( DG_MODE_DRAI == dgOpMode )
@@ -542,8 +543,31 @@
 
 /*********************************************************************//**
  * @brief
- * The getReservoirWeight function gets the load cell weight of a given
- * reservoir.
+ * The getDialysateTemperature function gets the latest dialysate temperature.
+ * @details Inputs: dgDialysateTemp
+ * @details Outputs: none
+ * @return the current dialysate temperature
+ *************************************************************************/
+F32 getDialysateTemperature( void )
+{
+    return dgDialysateTemp;
+}
+
+/*********************************************************************//**
+ * @brief
+ * The getDGDisinfectsStates function returns the DG disinfects readings.
+ * @details Inputs: none
+ * @details Outputs: disinfectsStatus
+ * @return the current DG disinfects readings
+ *************************************************************************/
+DG_DISINFECT_UI_STATES_T getDGDisinfectsStates( void )
+{
+    return disinfectsStatus;
+}
+
+/*********************************************************************//**
+ * @brief
+ * The getReservoirWeight function gets the load cell weight of a given reservoir.
  * @details Inputs: loadCellWeightInGrams[]
  * @details Outputs: none
  * @param resID ID of reservoir to get weight for
@@ -562,7 +586,7 @@
  * The setDGOpMode function sets the latest DG operating mode reported by
  * the DG.
  * @details Inputs: none
- * @details Outputs: dgCurrentOpMode
+ * @details Outputs: dgCurrentOpMode, dgSubMode
  * @param opMode operating mode reported by DG
  * @param subMode sub-mode (current state) of operating mode reported by DG
  * @return none
@@ -724,6 +748,20 @@
     updateReservoirVolumes( res1Primary, res2Primary );
 }
 
+/*********************************************************************//**
+ * @brief
+ * The setDGDisinfectsStates function sets the latest disinfects states
+ * from DG.
+ * @details Inputs: none
+ * @details Outputs: disinfectsStatus
+ * @param states latest DG disinfects state readings
+ * @return none
+ *************************************************************************/
+void setDGDisinfectsStates( DG_DISINFECT_UI_STATES_T states )
+{
+    memcpy( &disinfectsStatus, &states, sizeof(DG_DISINFECT_UI_STATES_T) );
+}
+
 /*********************************************************************//**
  * @brief
  * The cmdSetDGDialysateTargetTemps function sends a target dialysate
@@ -751,7 +789,8 @@
  *************************************************************************/
 void cmdStartDG( void )
 {
-    dgStartCommandSent = TRUE;
+    dgStartCommandSent = TRUE;
+
     sendDGStartStopCommand( START_DG_CMD );
 }
 
@@ -765,7 +804,8 @@
  *************************************************************************/
 void cmdStopDG( void )
 {
-    dgStarted = FALSE;
+    dgStarted = FALSE;
+
     sendDGStartStopCommand( STOP_DG_CMD );
 }
 
@@ -780,7 +820,8 @@
 void cmdStartDGTrimmerHeater( void )
 {
     dgTrimmerHeaterOn = TRUE;
-    dgCmdResp[ DG_CMD_START_TRIMMER_HEATER ].commandID = DG_CMD_NONE;
+    dgCmdResp[ DG_CMD_START_TRIMMER_HEATER ].commandID = DG_CMD_NONE;
+
     sendDGStartStopTrimmerHeaterCommand( START_DG_CMD, dgTrimmerTempSet );
 }
 
@@ -796,6 +837,7 @@
 {
     dgTrimmerHeaterOn = FALSE;
     dgCmdResp[ DG_CMD_STOP_TRIMMER_HEATER ].commandID = DG_CMD_NONE;
+
     sendDGStartStopTrimmerHeaterCommand( STOP_DG_CMD, 0 );
 }
 
@@ -813,7 +855,8 @@
     if ( resID < NUM_OF_DG_RESERVOIRS )
     {
         dgActiveReservoirSet = resID;
-        dgCmdResp[ DG_CMD_SWITCH_RESERVOIR ].commandID = DG_CMD_NONE;
+        dgCmdResp[ DG_CMD_SWITCH_RESERVOIR ].commandID = DG_CMD_NONE;
+
         sendDGSwitchReservoirCommand( (U32)resID );
     }
     else
@@ -836,6 +879,7 @@
     if ( valveSettingID < NUM_OF_DG_VALVE_SETTTINGS )
     {
         dgCmdResp[ DG_CMD_VALVE_SETTING ].commandID = DG_CMD_NONE;
+
         sendDGChangeValveSettingCommand( (U32)valveSettingID );
     }
     else
@@ -855,7 +899,8 @@
 void cmdStartDGFill( U32 fillToVolMl )
 {
     dgCmdResp[ DG_CMD_START_FILL ].commandID = DG_CMD_NONE;
-    dgReservoirFillVolumeTargetSet = fillToVolMl;
+    dgReservoirFillVolumeTargetSet = fillToVolMl;
+
     sendDGFillCommand( DG_CMD_START, fillToVolMl );
 }
 
@@ -870,6 +915,7 @@
 {
     dgCmdResp[ DG_CMD_STOP_FILL ].commandID = DG_CMD_NONE;
     dgReservoirFillVolumeTargetSet = 0;
+
     sendDGFillCommand( DG_CMD_STOP, 0 );
 }
 
@@ -889,7 +935,8 @@
     dgCmdResp[ DG_CMD_START_DRAIN ].commandID = DG_CMD_NONE;
     payload.drainToVolumeML = drainToVolMl;
     payload.tareLoadCells = tareLoadCell;
-    dgReservoirDrainVolumeTargetSet = drainToVolMl;
+    dgReservoirDrainVolumeTargetSet = drainToVolMl;
+
     sendDGDrainCommand( &payload );
 }
 
@@ -903,10 +950,106 @@
 void cmdDGSampleWater( SAMPLE_WATER_CMD_T cmd )
 {
     sendDGSampleWaterCommand( cmd );
+}
+
+/*********************************************************************//**
+ * @brief
+ * The cmdStartDGFlush function sends a start flush command message to
+ * the DG.
+ * @details Inputs: none
+ * @details Outputs: start flush mode command sent to DG.
+ * @return none
+ *************************************************************************/
+void cmdStartDGFlush( void )
+{
+    BOOL start = TRUE;
+    dgCmdResp[ DG_CMD_START_FLUSH ].commandID = DG_CMD_NONE;
+
+    sendDGStartFlushModeCommand( start );
+}
+
+/*********************************************************************//**
+ * @brief
+ * The cmdStopDGFlush function sends a stop flush command message to
+ * the DG.
+ * @details Inputs: none
+ * @details Outputs: stop flush mode command sent to DG.
+ * @return none
+ *************************************************************************/
+void cmdStopDGFlush( void )
+{
+    BOOL start = FALSE;
+    dgCmdResp[ DG_CMD_STOP_FLUSH ].commandID = DG_CMD_NONE;
+
+    sendDGStartFlushModeCommand( start );
+}
+
+/*********************************************************************//**
+ * @brief
+ * The cmdStartDGHeatDisinfect function sends a start heat disinfect
+ * command message to the DG.
+ * @details Inputs: none
+ * @details Outputs: start heat disinfect mode command sent to DG.
+ * @return none
+ *************************************************************************/
+void cmdStartDGHeatDisinfect( void )
+{
+    BOOL start = TRUE;
+    dgCmdResp[ DG_CMD_START_HEAT_DISINFECT ].commandID = DG_CMD_NONE;
+
+    sendDGStartHeatDisinfectModeCommand( start );
+}
+
+/*********************************************************************//**
+ * @brief
+ * The cmdStopDGHeatDisinfect function sends a stop heat disinfect
+ * command message to the DG.
+ * @details Inputs: none
+ * @details Outputs: stop heat disinfect mode command sent to DG.
+ * @return none
+ *************************************************************************/
+void cmdStopDGHeatDisinfect( void )
+{
+    BOOL start = FALSE;
+    dgCmdResp[ DG_CMD_STOP_HEAT_DISINFECT ].commandID = DG_CMD_NONE;
+
+    sendDGStartHeatDisinfectModeCommand( start );
+}
+
+/*********************************************************************//**
+ * @brief
+ * The cmdStartDGChemicalDisinfect function sends a start chemical disinfect
+ * command message to the DG.
+ * @details Inputs: none
+ * @details Outputs: start chemical disinfect mode command sent to DG.
+ * @return none
+ *************************************************************************/
+void cmdStartDGChemicalDisinfect( void )
+{
+    BOOL start = TRUE;
+    dgCmdResp[ DG_CMD_START_CHEM_DISINFECT ].commandID = DG_CMD_NONE;
+
+    sendDGStartChemicalDisinfectModeCommand( start );
 }
 
 /*********************************************************************//**
  * @brief
+ * The cmdStopDGChemicalDisinfect function sends a stop chemical disinfect
+ * command message to the DG.
+ * @details Inputs: none
+ * @details Outputs: stop chemical disinfect mode command sent to DG.
+ * @return none
+ *************************************************************************/
+void cmdStopDGChemicalDisinfect( void )
+{
+    BOOL start = FALSE;
+    dgCmdResp[ DG_CMD_STOP_CHEM_DISINFECT ].commandID = DG_CMD_NONE;
+
+    sendDGStartChemicalDisinfectModeCommand( start );
+}
+
+/*********************************************************************//**
+ * @brief
  * The handleDGCommandResponse function processes the latest DG command response.
  * @details Inputs: none
  * @details Outputs: process command response from DG