Index: firmware/App/Modes/ModeStandby.c
===================================================================
diff -u -rde5a0d43bdef611d963d11855bc958a8d8899a09 -r101bf85b0b425e919b01b4b7fabcbd15fd5bbde5
--- firmware/App/Modes/ModeStandby.c	(.../ModeStandby.c)	(revision de5a0d43bdef611d963d11855bc958a8d8899a09)
+++ firmware/App/Modes/ModeStandby.c	(.../ModeStandby.c)	(revision 101bf85b0b425e919b01b4b7fabcbd15fd5bbde5)
@@ -26,45 +26,50 @@
 #include "SystemComm.h"
 #include "SystemCommMessages.h"
 #include "ModeStandby.h"
+#ifdef EMC_TEST_BUILD     // TODO - test code
+#include "FPGA.h"
+#endif
 #ifdef RM46_EVAL_BOARD_TARGET
     #include "Timers.h"
     static U32 start;
 #endif
 
-    /**
-     *  @addtogroup HDStandbyMode
-     *  @{
-     */
+/**
+ *  @addtogroup HDStandbyMode
+ *  @{
+ */
 
-    // ********** private definitions **********
+// ********** private definitions **********
 
 // ********** 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
  * Outputs : Standby Mode module initialized.
- * @param none
  * @return none
  *************************************************************************/
 void initStandbyMode( void )
 {
     currentStandbyState = STANDBY_START_STATE;
+    treatStartReqReceived = FALSE;
 }
 
-/*************************************************************************
- * @brief transitionToStandbyMode
+/*********************************************************************//**
+ * @brief
  * The transitionToStandbyMode function prepares for transition to standby mode.
  * @details
  * Inputs : none
- * Outputs :
- * @param none
+ * Outputs : Standby Mode module re-initialized, DG interface initialized,
+ * blood & dialysate pumps shut off.
  * @return none
  *************************************************************************/
 void transitionToStandbyMode( void )
@@ -73,32 +78,33 @@
     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
 }
 
-/*************************************************************************
- * @brief execStandbyMode
+/*********************************************************************//**
+ * @brief
  * The execStandbyMode function executes the Standby Mode state machine.
  * @details
- * Inputs : none
- * Outputs :
- * @param none
+ * Inputs : currentStandbyState
+ * Outputs : currentStandbyState
  * @return current state (sub-mode)
  *************************************************************************/
 U32 execStandbyMode( void )
 {
 #ifdef EMC_TEST_BUILD
-    static BOOL toggle = FALSE;
+    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();
 
@@ -172,6 +178,11 @@
             break;
 
         case STANDBY_WAIT_FOR_TREATMENT_STATE:
+            if ( TRUE == treatStartReqReceived )
+            {
+                requestNewOperationMode( MODE_TPAR );
+                treatStartReqReceived = FALSE;
+            }
             // TODO - test code
             if ( TRUE == stop )
             {
@@ -197,36 +208,66 @@
     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 )
             {
 #ifdef EMC_TEST_BUILD
                 if ( stop != button_state )
                 {
-                    toggle = ( toggle == TRUE ? FALSE : TRUE );
-                    if ( TRUE == toggle )
+                    toggle = INC_WRAP( toggle, 0, 3 );
+                    switch ( toggle )
                     {
-                        setBloodPumpTargetFlowRate( 500, MOTOR_DIR_FORWARD, PUMP_CONTROL_MODE_OPEN_LOOP );
-                        setDialInPumpTargetFlowRate( 500, MOTOR_DIR_FORWARD, PUMP_CONTROL_MODE_OPEN_LOOP );
-                        setDialOutPumpTargetRate( 500, MOTOR_DIR_FORWARD, PUMP_CONTROL_MODE_OPEN_LOOP );
+                        case 0: // pumps and valves off
+                            setDialyzerInletValvePosition( 0 );
+                            setDialyzerOutletValvePosition( 0 );
+                            setVenousBloodValvePosition( 0 );
+                            setArterialBloodValvePosition( 0 );
+                            break;
+
+                        case 1: // pumps on, valves off
+                            setBloodPumpTargetFlowRate( 500, MOTOR_DIR_FORWARD, PUMP_CONTROL_MODE_OPEN_LOOP );
+                            setDialInPumpTargetFlowRate( 500, MOTOR_DIR_FORWARD, PUMP_CONTROL_MODE_OPEN_LOOP );
+                            setDialOutPumpTargetRate( 500, MOTOR_DIR_FORWARD, PUMP_CONTROL_MODE_OPEN_LOOP );
+                            break;
+
+                        case 2: // pumps on, valves on
+                            setDialyzerInletValvePosition( 12000 );
+                            setDialyzerOutletValvePosition( 12000 );
+                            setVenousBloodValvePosition( 12000 );
+                            setArterialBloodValvePosition( 12000 );
+                            break;
+
+                        case 3: // pumps off, valves on
+                            setBloodPumpTargetFlowRate( 0, MOTOR_DIR_FORWARD, PUMP_CONTROL_MODE_OPEN_LOOP );
+                            setDialInPumpTargetFlowRate( 0, MOTOR_DIR_FORWARD, PUMP_CONTROL_MODE_OPEN_LOOP );
+                            setDialOutPumpTargetRate( 0, MOTOR_DIR_FORWARD, PUMP_CONTROL_MODE_OPEN_LOOP );
+                            break;
+
+                        default: // shouldn't get here, reset if we do
+                            toggle = 0;
+                            setBloodPumpTargetFlowRate( 0, MOTOR_DIR_FORWARD, PUMP_CONTROL_MODE_OPEN_LOOP );
+                            setDialInPumpTargetFlowRate( 0, MOTOR_DIR_FORWARD, PUMP_CONTROL_MODE_OPEN_LOOP );
+                            setDialOutPumpTargetRate( 0, MOTOR_DIR_FORWARD, PUMP_CONTROL_MODE_OPEN_LOOP );
+                            setDialyzerInletValvePosition( 0 );
+                            setDialyzerOutletValvePosition( 0 );
+                            setVenousBloodValvePosition( 0 );
+                            setArterialBloodValvePosition( 0 );
+                            break;
                     }
-                    else
-                    {
-                        setBloodPumpTargetFlowRate( 0, MOTOR_DIR_FORWARD, PUMP_CONTROL_MODE_OPEN_LOOP );
-                        setDialInPumpTargetFlowRate( 0, MOTOR_DIR_FORWARD, PUMP_CONTROL_MODE_OPEN_LOOP );
-                        setDialOutPumpTargetRate( 0, MOTOR_DIR_FORWARD, PUMP_CONTROL_MODE_OPEN_LOOP );
-                    }
                 }
-#else
-                requestNewOperationMode( MODE_TPAR );
 #endif
             }
 #ifdef EMC_TEST_BUILD
@@ -251,4 +292,27 @@
     return currentStandbyState;
 }
 
+/*********************************************************************//**
+ * @brief
+ * The signalUserStartingTreatment function handles user initiation of a
+ * 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;
+    }
+    sendTreatmentStartResponseMsg( result, 0 ); // TODO - provide reason code if rejected
+
+    return result;
+}
+
 /**@}*/