Index: firmware/App/Modes/ModeStandby.c
===================================================================
diff -u -r9302e1bd2413cbf99e80ac51aac38502d94801d9 -rc6f3b01d1b0a5e3fdf480a7ee205ca349e10d6d2
--- firmware/App/Modes/ModeStandby.c	(.../ModeStandby.c)	(revision 9302e1bd2413cbf99e80ac51aac38502d94801d9)
+++ firmware/App/Modes/ModeStandby.c	(.../ModeStandby.c)	(revision c6f3b01d1b0a5e3fdf480a7ee205ca349e10d6d2)
@@ -43,12 +43,14 @@
 
 // ********** private data **********
 
-static HD_STANDBY_STATE_T currentStandbyState;                     ///< Current state (sub-mode) of standby mode.
+static HD_STANDBY_STATE_T currentStandbyState;                      ///< Current state (sub-mode) of standby mode.
 
+static BOOL treatStartReqReceived = FALSE;                          ///< Flag indicates user has requested initiation of a treatment
+
 // ********** private function prototypes **********
 
-/*************************************************************************
- * @brief initStandbyMode
+/*********************************************************************//**
+ * @brief
  * The initStandbyMode function initializes the Standby Mode module.
  * @details
  * Inputs : none
@@ -58,10 +60,11 @@
 void initStandbyMode( void )
 {
     currentStandbyState = STANDBY_START_STATE;
+    treatStartReqReceived = FALSE;
 }
 
-/*************************************************************************
- * @brief transitionToStandbyMode
+/*********************************************************************//**
+ * @brief
  * The transitionToStandbyMode function prepares for transition to standby mode.
  * @details
  * Inputs : none
@@ -74,21 +77,20 @@
     initStandbyMode();
     initDGInterface();
 
-#ifndef UF_TEST_ENABLED
+    // pumps should be off
     setBloodPumpTargetFlowRate( 0, MOTOR_DIR_FORWARD, PUMP_CONTROL_MODE_CLOSED_LOOP );
     setDialInPumpTargetFlowRate( 0, MOTOR_DIR_FORWARD, PUMP_CONTROL_MODE_CLOSED_LOOP );
-    setDialOutPumpTargetRate( 0, MOTOR_DIR_FORWARD, PUMP_CONTROL_MODE_OPEN_LOOP );
+    setDialOutPumpTargetRate( 0, MOTOR_DIR_FORWARD, PUMP_CONTROL_MODE_CLOSED_LOOP );
+#ifdef EMC_TEST_BUILD
+    enableValvesPIDControl(0); // enable valves
 #endif
 #ifdef RM46_EVAL_BOARD_TARGET
     start = getMSTimerCount();
 #endif
-#ifdef EMC_TEST_BUILD     // TODO - test code
-    enableValvesPIDControl(0); // enable valves
-#endif
 }
 
-/*************************************************************************
- * @brief execStandbyMode
+/*********************************************************************//**
+ * @brief
  * The execStandbyMode function executes the Standby Mode state machine.
  * @details
  * Inputs : none
@@ -101,7 +103,7 @@
     static U32 toggle = 0;
     static BOOL button_state = FALSE;
 #endif
-BOOL stop = isStopButtonPressed();
+    BOOL stop = isStopButtonPressed();
     DG_OP_MODE_T dgOpMode = getDGOpMode();  // TODO - the DG mode & sub-mode come as a pair at interval - they MUST be kept together.
     U32 dgSubMode = getDGSubMode();
 
@@ -200,14 +202,19 @@
     switch ( currentStandbyState )
     {
         case STANDBY_START_STATE:
+            currentStandbyState = STANDBY_WAIT_FOR_TREATMENT_STATE;
             // temporary test code - TODO - remove later
             homeBloodPump();
             homeDialInPump();
             homeDialOutPump();
-            currentStandbyState = STANDBY_WAIT_FOR_TREATMENT_STATE;
             break;
 
         case STANDBY_WAIT_FOR_TREATMENT_STATE:
+            if ( TRUE == treatStartReqReceived )
+            {
+                requestNewOperationMode( MODE_TPAR );
+                treatStartReqReceived = FALSE;
+            }
             // TODO - test code
             if ( TRUE == stop )
             {
@@ -255,8 +262,6 @@
                             break;
                     }
                 }
-#else
-                requestNewOperationMode( MODE_TPAR );
 #endif
             }
 #ifdef EMC_TEST_BUILD
@@ -281,4 +286,26 @@
     return currentStandbyState;
 }
 
+/*********************************************************************//**
+ * @brief
+ * The signalUserStartingTreatment function handles user initiation of a \n
+ * treatment.
+ * @details
+ * Inputs : none
+ * Outputs : requested mode transition to treatment parameters mode
+ * @return TRUE if signal accepted, FALSE if not
+ *************************************************************************/
+BOOL signalUserStartingTreatment( void )
+{
+    BOOL result = FALSE;
+
+    if ( ( MODE_STAN == getCurrentOperationMode() ) && ( STANDBY_WAIT_FOR_TREATMENT_STATE == currentStandbyState ) )
+    {
+        treatStartReqReceived = TRUE;
+        result = TRUE;
+    }
+
+    return result;
+}
+
 /**@}*/