Index: firmware/App/Modes/ModeStandby.c
===================================================================
diff -u -r0b87f7e6142dc3710db5c32a0c7c6694343dd717 -r2112e3143003eaf9584d4be068f7ca89b33c941a
--- firmware/App/Modes/ModeStandby.c	(.../ModeStandby.c)	(revision 0b87f7e6142dc3710db5c32a0c7c6694343dd717)
+++ firmware/App/Modes/ModeStandby.c	(.../ModeStandby.c)	(revision 2112e3143003eaf9584d4be068f7ca89b33c941a)
@@ -20,7 +20,9 @@
 #include "DGInterface.h"
 #include "DialInFlow.h"
 #include "DialOutFlow.h"
+#include "Dialysis.h"
 #include "OperationModes.h"
+#include "SystemComm.h"
 #include "SystemCommMessages.h"
 #include "ModeStandby.h"
 #ifdef RM46_EVAL_BOARD_TARGET
@@ -106,22 +108,26 @@
     {
         case STANDBY_START_STATE:
             // temporary test code - TODO - remove later
-            homeBloodPump();
-            homeDialInPump();
-            homeDialOutPump();
-            cmdSetDGDialysateTargetTemps( 39.0, 37.0 );
-            cmdSetDGActiveReservoir( DG_RESERVOIR_2 );
-            cmdStartDG();
-            currentStandbyState = STANDBY_FLUSH_DG_LINES_STATE;
+            if ( TRUE == isDGCommunicating() )
+            {
+                //homeBloodPump();
+                //homeDialInPump();
+                //homeDialOutPump();
+                cmdSetDGDialysateTargetTemps( 39.0, 37.0 );
+                cmdSetDGActiveReservoir( DG_RESERVOIR_2 );
+                cmdStartDG();
+                currentStandbyState = STANDBY_FLUSH_DG_LINES_STATE;
+            }
             break;
 
         case STANDBY_FLUSH_DG_LINES_STATE:
             // temporary test code - TODO - remove later
+            cmdSetDGActiveReservoir( DG_RESERVOIR_2 );
             if ( DG_MODE_CIRC == dgOpMode )
             {
                 if ( DG_RECIRCULATE_MODE_STATE_RECIRC_WATER == dgSubMode )
                 {
-                    cmdStartDGDrain( 100 );
+                    cmdStartDGDrain( 200 );
                 }
             }
             else if ( DG_MODE_DRAI == dgOpMode )
@@ -161,7 +167,6 @@
             // temporary test code - TODO - remove later
             if ( DG_MODE_CIRC == dgOpMode )
             {
-                cmdSetDGActiveReservoir( DG_RESERVOIR_1 );
                 currentStandbyState = STANDBY_WAIT_FOR_TREATMENT_STATE;
             }
             break;
@@ -170,10 +175,12 @@
             // TODO - test code
             if ( TRUE == stop )
             {
-                if ( DG_MODE_CIRC == getDGOpMode() )
+                if ( DG_MODE_CIRC == dgOpMode )
                 {
                     if ( DG_RECIRCULATE_MODE_STATE_RECIRC_WATER == dgSubMode )
                     {
+                        setStartReservoirVolume();
+                        cmdSetDGActiveReservoir( DG_RESERVOIR_1 );
                         requestNewOperationMode( MODE_PRES );
                     }
                 }