Index: firmware/App/Controllers/DGInterface.c
===================================================================
diff -u -r06f7d5571359c1707fc32bb4e2f2e23f6ea32a2e -r5c4e4f9f8080e0232ca026a25801d4c26090e298
--- firmware/App/Controllers/DGInterface.c	(.../DGInterface.c)	(revision 06f7d5571359c1707fc32bb4e2f2e23f6ea32a2e)
+++ firmware/App/Controllers/DGInterface.c	(.../DGInterface.c)	(revision 5c4e4f9f8080e0232ca026a25801d4c26090e298)
@@ -25,7 +25,7 @@
 #include "ModeInitPOST.h"
 #include "ModeTreatment.h"
 #include "ModeTreatmentParams.h"
-#include "OperationModes.h"
+#include "OperationModes.h"
 #include "PersistentAlarm.h"
 #include "SystemComm.h"
 #include "SystemCommMessages.h"
@@ -58,12 +58,12 @@
 
 // ********** private data **********
 
-// DG status
-static DG_OP_MODE_T dgCurrentOpMode;                                        ///< Current DG operation mode.
+// DG status
+static DG_OP_MODE_T dgCurrentOpMode;                                        ///< Current DG operation mode.
 static U32 dgSubMode;                                                       ///< Current state (sub-mode) of current DG operation mode.
-static BOOL dgStartCommandSent;                                             ///< Flag indicates command to start DG has been sent.
-static BOOL dgStarted;                                                      ///< Flag indicates whether we have commanded the DG to start or stop.
-static BOOL dgTrimmerHeaterOn;                                              ///< Flag indicates whether we have commanded the DG to start or stop the trimmer heater.
+static BOOL dgStartCommandSent;                                             ///< Flag indicates command to start DG has been sent.
+static BOOL dgStarted;                                                      ///< Flag indicates whether we have commanded the DG to start or stop.
+static BOOL dgTrimmerHeaterOn;                                              ///< Flag indicates whether we have commanded the DG to start or stop the trimmer heater.
 
 // DG sensor data
 static F32 dgDialysateTemp;                                                 ///< Dialysate temperature reported by the DG.
@@ -128,8 +128,8 @@
     U32 i, j;
 
     // NOTE: the active reservoir is set to reservoir 1 since DG will send active reservoir 1 as active on power up
-    dgStarted                       = FALSE;
-    dgTrimmerHeaterOn               = FALSE;
+    dgStarted                       = FALSE;
+    dgTrimmerHeaterOn               = FALSE;
     dgTrimmerTempSet                = 0.0F;
     dgTrimmerTempCheckTimerCtr      = 0;
     dgActiveReservoirSet            = DG_RESERVOIR_2;
@@ -481,14 +481,14 @@
 
 /*********************************************************************//**
  * @brief
- * The getDialysateTemperature function gets the latest dialysate temperature.
- * @details Inputs: dgDialysateTemp
+ * The getDGDisinfectsStates function returns the DG disinfects readings.
+ * @details Inputs: none
  * @details Outputs: none
- * @return the latest dialysate temperature
+ * @return the current DG disinfects readings
  *************************************************************************/
-F32 getDialysateTemperature( void )
+DG_DISINFECT_UI_STATES_T getDGDisinfectsStates( void )
 {
-    return dgDialysateTemp;
+    return disinfectsStatus;
 }
 
 /*********************************************************************//**
@@ -532,14 +532,14 @@
 
 /*********************************************************************//**
  * @brief
- * The getDGDisinfectsStates function returns the DG disinfects readings.
- * @details Inputs: disinfectsStatus
+ * The getDialysateTemperature function returns the DG dialysate temperature.
+ * @details Inputs: dgDialysateTemp
  * @details Outputs: none
- * @return the current DG disinfects readings
+ * @return the latest dialysate temperature
  *************************************************************************/
-DG_DISINFECT_UI_STATES_T getDGDisinfectsStates( void )
+F32 getDialysateTemperature( void )
 {
-    return disinfectsStatus;
+    return dgDialysateTemp;
 }
 
 /*********************************************************************//**
@@ -1018,6 +1018,7 @@
 void cmdStartDGFlush( void )
 {
     BOOL start = TRUE;
+
     dgCmdResp[ DG_CMD_START_FLUSH ].commandID = DG_CMD_NONE;
 
     sendDGStartFlushModeCommand( start );
@@ -1034,6 +1035,7 @@
 void cmdStopDGFlush( void )
 {
     BOOL start = FALSE;
+
     dgCmdResp[ DG_CMD_STOP_FLUSH ].commandID = DG_CMD_NONE;
 
     sendDGStartFlushModeCommand( start );
@@ -1050,6 +1052,7 @@
 void cmdStartDGHeatDisinfect( void )
 {
     BOOL start = TRUE;
+
     dgCmdResp[ DG_CMD_START_HEAT_DISINFECT ].commandID = DG_CMD_NONE;
 
     sendDGStartHeatDisinfectModeCommand( start );
@@ -1066,6 +1069,7 @@
 void cmdStopDGHeatDisinfect( void )
 {
     BOOL start = FALSE;
+
     dgCmdResp[ DG_CMD_STOP_HEAT_DISINFECT ].commandID = DG_CMD_NONE;
 
     sendDGStartHeatDisinfectModeCommand( start );
@@ -1082,6 +1086,7 @@
 void cmdStartDGChemicalDisinfect( void )
 {
     BOOL start = TRUE;
+
     dgCmdResp[ DG_CMD_START_CHEM_DISINFECT ].commandID = DG_CMD_NONE;
     sendDGStartChemicalDisinfectModeCommand( start );
 }
@@ -1097,6 +1102,7 @@
 void cmdStopDGChemicalDisinfect( void )
 {
     BOOL start = FALSE;
+
     dgCmdResp[ DG_CMD_STOP_CHEM_DISINFECT ].commandID = DG_CMD_NONE;
     sendDGStartChemicalDisinfectModeCommand( start );
 }
@@ -1112,6 +1118,7 @@
 void cmdStartDGChemicalFlushDisinfect( void )
 {
     BOOL start = TRUE;
+
     dgCmdResp[ DG_CMD_START_CHEM_DISINFECT_FLUSH ].commandID = DG_CMD_NONE;
     sendDGStartStopChemicalDisinfectFlushModeCommand( start );
 }
@@ -1127,6 +1134,7 @@
 void cmdStopDGChemFlushDisinfect( void )
 {
     BOOL start = FALSE;
+
     dgCmdResp[ DG_CMD_STOP_CHEM_DISINFECT_FLUSH ].commandID = DG_CMD_NONE;
     sendDGStartStopChemicalDisinfectFlushModeCommand( start );
 }