Index: firmware/App/Modes/ModeStandby.c
===================================================================
diff -u -r8b8fff67b95805272f37855346d600599aaec03d -rcd3af1ebb7396ba3b2bec1d779510d29c30014f4
--- firmware/App/Modes/ModeStandby.c	(.../ModeStandby.c)	(revision 8b8fff67b95805272f37855346d600599aaec03d)
+++ firmware/App/Modes/ModeStandby.c	(.../ModeStandby.c)	(revision cd3af1ebb7396ba3b2bec1d779510d29c30014f4)
@@ -249,7 +249,7 @@
     // go to standby solo mode if HD is turned off or stops communicating.
     if ( FALSE == isTDCommunicating() )
     {   // TODO if HD comm loss, should we wait an hour or so before going to solo standby?
-        requestNewOperationMode( DG_MODE_SOLO );
+        //requestNewOperationMode( DG_MODE_SOLO );
     }
     // if HD requests water sample, go to water sample state
 //    else if ( TRUE == flushFilterRequest )
@@ -273,7 +273,7 @@
 //    else if ( TRUE == pendingStartDGHeatDisinfectRequest )
 //    {
 //        pendingStartDGHeatDisinfectRequest = FALSE;
-//        requestNewOperationMode( DG_MODE_HEAT );
+//        requestNewOperationMode( DD_MODE_HEAT );
 //    }
 //    else if ( TRUE == pendingStartDGChemicalDisinfectRequest )
 //    {
@@ -284,7 +284,7 @@
 //    {
 //        pendingStartDGHeatDisinfectActiveCoolRequest = FALSE;
 //
-//        requestNewOperationMode( DG_MODE_HCOL );
+//        requestNewOperationMode( DD_MODE_HCOL );
 //    }
 //    else if ( TRUE == pendingStartDGChemicalDisinfectFlushRequest )
 //    {
@@ -294,7 +294,7 @@
 //    else if ( TRUE == pendingStartDGROPermeateSampleRequest )
 //    {
 //        pendingStartDGROPermeateSampleRequest = FALSE;
-//        requestNewOperationMode( DG_MODE_ROPS );
+//        requestNewOperationMode( DD_MODE_ROPS );
 //    }
 
     return state;
@@ -435,7 +435,7 @@
 //    switch ( sampleWaterCmd )
 //    {
 //        case SAMPLE_WATER_CMD_STOP:
-//            if ( ( DG_MODE_STAN == getCurrentOperationMode() ) && ( DG_STANDBY_MODE_STATE_SAMPLE_WATER == standbyState ) )
+//            if ( ( DD_MODE_STAN == getCurrentOperationMode() ) && ( DG_STANDBY_MODE_STATE_SAMPLE_WATER == standbyState ) )
 //            {
 //                stopSampleWaterRequest = TRUE;
 //                cmdResponse.rejected   = FALSE;
@@ -444,7 +444,7 @@
 //            break;
 //
 //        case SAMPLE_WATER_CMD_START:
-//            if ( ( DG_MODE_STAN == getCurrentOperationMode() ) && ( DG_STANDBY_MODE_STATE_FLUSH_FILTER_IDLE == standbyState ) )
+//            if ( ( DD_MODE_STAN == getCurrentOperationMode() ) && ( DG_STANDBY_MODE_STATE_FLUSH_FILTER_IDLE == standbyState ) )
 //            {
 //                startSampleWaterRequest = TRUE;
 //                cmdResponse.rejected    = FALSE;
@@ -453,7 +453,7 @@
 //            break;
 //
 //        case SAMPLE_WATER_CMD_FLUSH:
-//            if ( ( DG_MODE_STAN == getCurrentOperationMode() ) && ( DG_STANDBY_MODE_STATE_IDLE == standbyState ) )
+//            if ( ( DD_MODE_STAN == getCurrentOperationMode() ) && ( DG_STANDBY_MODE_STATE_IDLE == standbyState ) )
 //            {
 //                flushFilterRequest     = TRUE;
 //                cmdResponse.rejected   = FALSE;
@@ -462,7 +462,7 @@
 //            break;
 //
 //        case SAMPLE_WATER_CMD_END:
-//            if ( DG_MODE_STAN == getCurrentOperationMode() )
+//            if ( DD_MODE_STAN == getCurrentOperationMode() )
 //            {
 //                endSampleWaterRequest  = TRUE;
 //                cmdResponse.rejected   = FALSE;
@@ -513,7 +513,7 @@
 {
     BOOL result = FALSE;
 
-    if ( ( DG_MODE_STAN == getCurrentOperationMode() ) && ( standbyState != DG_STANDBY_MODE_STATE_IDLE ) )
+    if ( ( DD_MODE_STAN == getCurrentOperationMode() ) && ( standbyState != DG_STANDBY_MODE_STATE_IDLE ) )
     {
         result = TRUE;
         initStandbyMode();
@@ -536,7 +536,7 @@
     BOOL result = FALSE;
 
 //    // If DG is in standby mode or in the solo mode and the standby mode is in Idle state, request DG flush
-//    if ( ( DG_MODE_STAN == getCurrentOperationMode() ) && ( DG_STANDBY_MODE_STATE_IDLE == standbyState ) || ( DG_MODE_SOLO == getCurrentOperationMode() ) )
+//    if ( ( DD_MODE_STAN == getCurrentOperationMode() ) && ( DG_STANDBY_MODE_STATE_IDLE == standbyState ) || ( DG_MODE_SOLO == getCurrentOperationMode() ) )
 //    {
 //        DG_CMD_RESPONSE_T cmdResponse;
 //        DG_USAGE_INFO_RECORD_T usageInfo;
@@ -596,7 +596,7 @@
     BOOL status = FALSE;
 
 //    // If DG is in standby mode and the standby mode is in Idle state or if DG is in solo mode, request DG heat disinfect
-//    if ( ( ( DG_MODE_STAN == getCurrentOperationMode() ) && ( DG_STANDBY_MODE_STATE_IDLE == standbyState ) ) || ( DG_MODE_SOLO == getCurrentOperationMode() ) )
+//    if ( ( ( DD_MODE_STAN == getCurrentOperationMode() ) && ( DG_STANDBY_MODE_STATE_IDLE == standbyState ) ) || ( DG_MODE_SOLO == getCurrentOperationMode() ) )
 //    {
 //        DG_CMD_RESPONSE_T cmdResponse;
 //        DG_USAGE_INFO_RECORD_T usageInfo;
@@ -657,7 +657,7 @@
     BOOL status = FALSE;
 
 //    // If DG is in standby mode and the standby mode is in Idle state or if DG is in solo mode, request DG heat disinfect
-//    if ( ( DG_MODE_STAN == getCurrentOperationMode() ) && ( DG_STANDBY_MODE_STATE_IDLE == standbyState ) || ( DG_MODE_SOLO == getCurrentOperationMode() ) )
+//    if ( ( DD_MODE_STAN == getCurrentOperationMode() ) && ( DG_STANDBY_MODE_STATE_IDLE == standbyState ) || ( DG_MODE_SOLO == getCurrentOperationMode() ) )
 //    {
 //        DG_CMD_RESPONSE_T cmdResponse;
 //        DG_USAGE_INFO_RECORD_T usageInfo;
@@ -718,7 +718,7 @@
 
 //    // If DG is in standby mode and the standby mode is in Idle, request chemical disinfect
 //    // Chemical disinfect cannot be run in solo mode because the user has to confirm that the acid is inserted or removed
-//    if ( ( DG_MODE_STAN == getCurrentOperationMode() ) && ( DG_STANDBY_MODE_STATE_IDLE == standbyState ) )
+//    if ( ( DD_MODE_STAN == getCurrentOperationMode() ) && ( DG_STANDBY_MODE_STATE_IDLE == standbyState ) )
 //    {
 //        DG_CMD_RESPONSE_T cmdResponse;
 //
@@ -770,7 +770,7 @@
 //
 //    // If DG is in standby mode and the standby mode is in Idle, request chemical disinfect flush
 //    // Chemical disinfect flush cannot be run in solo mode because the user has to confirm that the acid is inserted or removed
-//    if ( ( DG_MODE_STAN == getCurrentOperationMode() ) && ( DG_STANDBY_MODE_STATE_IDLE == standbyState ) )
+//    if ( ( DD_MODE_STAN == getCurrentOperationMode() ) && ( DG_STANDBY_MODE_STATE_IDLE == standbyState ) )
 //    {
 //        OPN_CLS_STATE_T concCap = getSwitchStatus( CONCENTRATE_CAP );
 //        OPN_CLS_STATE_T diaCap  = getSwitchStatus( DIALYSATE_CAP );
@@ -823,7 +823,7 @@
 //    cmdResponse.rejectCode = DG_CMD_REQUEST_REJECT_REASON_NONE;
 //
 //    // If DG is in standby mode and the standby mode is in Idle, request RO permeate sample
-//    if ( ( DG_MODE_STAN == getCurrentOperationMode() ) && ( DG_STANDBY_MODE_STATE_IDLE == standbyState ) )
+//    if ( ( DD_MODE_STAN == getCurrentOperationMode() ) && ( DG_STANDBY_MODE_STATE_IDLE == standbyState ) )
 //    {
 //        DG_USAGE_INFO_RECORD_T usageInfo;
 //        OPN_CLS_STATE_T concCap = getSwitchStatus( CONCENTRATE_CAP );