Index: firmware/App/HDCommon.h
===================================================================
diff -u -r0785222033c051524fbe19e49c08ba7f3f7a347c -r4a22fc18a17947587613273eb8cc08fd8c95beb8
--- firmware/App/HDCommon.h	(.../HDCommon.h)	(revision 0785222033c051524fbe19e49c08ba7f3f7a347c)
+++ firmware/App/HDCommon.h	(.../HDCommon.h)	(revision 4a22fc18a17947587613273eb8cc08fd8c95beb8)
@@ -33,6 +33,7 @@
 #define UF_TEST_ENABLED                     1           // ultrafiltration test build (hard codes treatment params, re-purposes off/stop buttons)
 #define UF_TEST_WITH_DG                     1           // ultrafiltration test build (sets up DG in standby mode)
 #ifndef _VECTORCAST_
+//    #define DISABLE_UI_TREATMENT_WORKFLOW   1           // disable UI treatment workflow
 //    #define RM46_EVAL_BOARD_TARGET          1           // limited build runs on RM46 eval board
 //    #define BREADBOARD_TARGET               1           // old breadboard system build - no longer used?
 //    #define SIMULATE_UI                     1           // build w/o requirement that UI be there
Index: firmware/App/Modes/ModePostTreat.c
===================================================================
diff -u -rd91a24c730aeb5cd7e3eba9ef4eca78e442911f8 -r4a22fc18a17947587613273eb8cc08fd8c95beb8
--- firmware/App/Modes/ModePostTreat.c	(.../ModePostTreat.c)	(revision d91a24c730aeb5cd7e3eba9ef4eca78e442911f8)
+++ firmware/App/Modes/ModePostTreat.c	(.../ModePostTreat.c)	(revision 4a22fc18a17947587613273eb8cc08fd8c95beb8)
@@ -59,18 +59,6 @@
  *************************************************************************/
 void transitionToPostTreatmentMode( void )
 {
-    // temporary test code.  TODO - remove later
-#ifndef UF_TEST_ENABLED
-#ifndef RUN_PUMPS_OPEN_LOOP
-    setBloodPumpTargetFlowRate( 100, MOTOR_DIR_REVERSE, PUMP_CONTROL_MODE_CLOSED_LOOP );
-    setDialInPumpTargetFlowRate( 100, MOTOR_DIR_REVERSE, PUMP_CONTROL_MODE_CLOSED_LOOP );
-#else
-    setBloodPumpTargetFlowRate( 100, MOTOR_DIR_REVERSE, PUMP_CONTROL_MODE_OPEN_LOOP );
-    setDialInPumpTargetFlowRate( 100, MOTOR_DIR_REVERSE, PUMP_CONTROL_MODE_OPEN_LOOP );
-#endif
-    setDialOutPumpTargetRate( 100, MOTOR_DIR_REVERSE, PUMP_CONTROL_MODE_OPEN_LOOP );
-#else
-#endif
 #ifdef RM46_EVAL_BOARD_TARGET
     start = getMSTimerCount();
 #endif
Index: firmware/App/Modes/ModePreTreat.c
===================================================================
diff -u -rd91a24c730aeb5cd7e3eba9ef4eca78e442911f8 -r4a22fc18a17947587613273eb8cc08fd8c95beb8
--- firmware/App/Modes/ModePreTreat.c	(.../ModePreTreat.c)	(revision d91a24c730aeb5cd7e3eba9ef4eca78e442911f8)
+++ firmware/App/Modes/ModePreTreat.c	(.../ModePreTreat.c)	(revision 4a22fc18a17947587613273eb8cc08fd8c95beb8)
@@ -59,18 +59,6 @@
 *************************************************************************/
 void transitionToPreTreatmentMode( void )
 {
-   // temporary test code.  TODO - remove later
-#ifndef UF_TEST_ENABLED
-#ifndef RUN_PUMPS_OPEN_LOOP
-    setBloodPumpTargetFlowRate( 0, MOTOR_DIR_FORWARD, PUMP_CONTROL_MODE_CLOSED_LOOP );
-    setDialInPumpTargetFlowRate( 0, MOTOR_DIR_FORWARD, PUMP_CONTROL_MODE_CLOSED_LOOP );
-#else
-    setBloodPumpTargetFlowRate( 0, MOTOR_DIR_FORWARD, PUMP_CONTROL_MODE_OPEN_LOOP );
-    setDialInPumpTargetFlowRate( 0, MOTOR_DIR_FORWARD, PUMP_CONTROL_MODE_OPEN_LOOP );
-#endif
-    setDialOutPumpTargetRate( 0, MOTOR_DIR_FORWARD, PUMP_CONTROL_MODE_CLOSED_LOOP );
-#else
-#endif
 #ifdef RM46_EVAL_BOARD_TARGET
     start = getMSTimerCount();
 #endif
@@ -86,14 +74,14 @@
 *************************************************************************/
 U32 execPreTreatmentMode( void )
 {
-   BOOL stop = isStopButtonPressed();
+    BOOL stop = isStopButtonPressed();
 
 #ifndef UF_TEST_ENABLED
-   if ( TRUE == stop )
+    if ( TRUE == stop )
 #endif
-   {
-      requestNewOperationMode( MODE_TREA );
-   }
+    {
+        requestNewOperationMode( MODE_TREA );
+    }
 #ifdef RM46_EVAL_BOARD_TARGET
     if ( TRUE == didTimeout( start, 5000U ) )
     {
Index: firmware/App/Modes/ModeStandby.c
===================================================================
diff -u -rd91a24c730aeb5cd7e3eba9ef4eca78e442911f8 -r4a22fc18a17947587613273eb8cc08fd8c95beb8
--- firmware/App/Modes/ModeStandby.c	(.../ModeStandby.c)	(revision d91a24c730aeb5cd7e3eba9ef4eca78e442911f8)
+++ firmware/App/Modes/ModeStandby.c	(.../ModeStandby.c)	(revision 4a22fc18a17947587613273eb8cc08fd8c95beb8)
@@ -116,9 +116,9 @@
             // temporary test code - TODO - remove later
             if ( TRUE == isDGCommunicating() )
             {
-                //homeBloodPump();
-                //homeDialInPump();
-                //homeDialOutPump();
+                homeBloodPump();
+                homeDialInPump();
+                homeDialOutPump();
                 cmdSetDGDialysateTargetTemps( 39.0, 37.0 );
                 cmdSetDGActiveReservoir( DG_RESERVOIR_2 );
                 cmdStartDG();
Index: firmware/App/Modes/ModeTreatment.c
===================================================================
diff -u -r0785222033c051524fbe19e49c08ba7f3f7a347c -r4a22fc18a17947587613273eb8cc08fd8c95beb8
--- firmware/App/Modes/ModeTreatment.c	(.../ModeTreatment.c)	(revision 0785222033c051524fbe19e49c08ba7f3f7a347c)
+++ firmware/App/Modes/ModeTreatment.c	(.../ModeTreatment.c)	(revision 4a22fc18a17947587613273eb8cc08fd8c95beb8)
@@ -22,12 +22,13 @@
 #include "DialInFlow.h"
 #include "DialOutFlow.h"
 #include "Dialysis.h"
-#include "TaskGeneral.h"
+#include "ModeTreatment.h"
+#include "ModeTreatmentParams.h"
 #include "OperationModes.h"
 #include "SystemCommMessages.h"
+#include "TaskGeneral.h"
 #include "Timers.h"
 #include "TreatmentStop.h"
-#include "ModeTreatment.h"
 #ifdef RM46_EVAL_BOARD_TARGET
     #include "Timers.h"
     static U32 start;
@@ -135,17 +136,6 @@
     // initialize treatment sub-modes each time we transition to treatment mode
     initDialysis();
     initTreatmentStop();
-   // temporary test code.  TODO - remove later
-#ifndef UF_TEST_ENABLED
-#ifndef RUN_PUMPS_OPEN_LOOP
-    setBloodPumpTargetFlowRate( 400, MOTOR_DIR_REVERSE, PUMP_CONTROL_MODE_CLOSED_LOOP );
-    setDialInPumpTargetFlowRate( 400, MOTOR_DIR_REVERSE, PUMP_CONTROL_MODE_CLOSED_LOOP );
-#else
-    setBloodPumpTargetFlowRate( 400, MOTOR_DIR_REVERSE, PUMP_CONTROL_MODE_OPEN_LOOP );
-    setDialInPumpTargetFlowRate( 400, MOTOR_DIR_REVERSE, PUMP_CONTROL_MODE_OPEN_LOOP );
-#endif
-    setDialOutPumpTargetRate( 400, MOTOR_DIR_REVERSE, PUMP_CONTROL_MODE_OPEN_LOOP );
-#endif
 #ifdef RM46_EVAL_BOARD_TARGET
     // TODO - temporary test code for eval board
     start = getMSTimerCount();
@@ -198,9 +188,9 @@
  *************************************************************************/
 U32 execTreatmentMode( void )
 {
-#ifndef UF_TEST_ENABLED
     BOOL stop = isStopButtonPressed();
 
+#ifdef DISABLE_UI_TREATMENT_WORKFLOW
     if ( TRUE == stop )
     {
         requestNewOperationMode( MODE_POST );
@@ -293,12 +283,21 @@
     treatmentTimeMS = 0;
     lastTreatmentTimeStamp = getMSTimerCount();
 
-    // get prescription settings TODO - hard-coded for now
+
+#ifndef DISABLE_UI_TREATMENT_WORKFLOW
+    presTreatmentTimeSecs = SEC_PER_MIN * getTreatmentParameterU32( TREATMENT_PARAM_TREATMENT_DURATION );
+    presBloodFlowRate = getTreatmentParameterU32( TREATMENT_PARAM_BLOOD_FLOW );
+    presDialysateFlowRate = getTreatmentParameterU32( TREATMENT_PARAM_DIALYSATE_FLOW );
+    presMaxUFVolumeML = getTreatmentParameterF32( TREATMENT_PARAM_UF_VOLUME );
+    presUFRate = presMaxUFVolumeML / (F32)getTreatmentParameterU32( TREATMENT_PARAM_TREATMENT_DURATION );
+#else
+    // TODO - test code
     presTreatmentTimeSecs = 14400;
     presBloodFlowRate = 300;
     presDialysateFlowRate = 300;
     presMaxUFVolumeML = 2400.0;
     presUFRate = 0.0;
+#endif
 
     // kick dialysis sub-mode off
     setDialysisParams( presBloodFlowRate, presDialysateFlowRate, presMaxUFVolumeML, presUFRate );