Index: firmware/App/Modes/ModeTreatment.c
===================================================================
diff -u -rce3e0696642099164fa482c864509c67ce65579b -rac05209d7b6c65b22359754eced5ad2672d3092a
--- firmware/App/Modes/ModeTreatment.c	(.../ModeTreatment.c)	(revision ce3e0696642099164fa482c864509c67ce65579b)
+++ firmware/App/Modes/ModeTreatment.c	(.../ModeTreatment.c)	(revision ac05209d7b6c65b22359754eced5ad2672d3092a)
@@ -32,10 +32,6 @@
 #include "TreatmentStop.h"
 #include "Utilities.h"
 #include "Valves.h"
-#ifdef RM46_EVAL_BOARD_TARGET
-    #include "Timers.h"
-    static U32 start;
-#endif
 
 /**
  *  @addtogroup HDTreatmentMode
@@ -144,11 +140,6 @@
     setAlarmUserActionEnabled( ALARM_USER_ACTION_RESUME, TRUE );
     setAlarmUserActionEnabled( ALARM_USER_ACTION_RINSEBACK, TRUE );
     setAlarmUserActionEnabled( ALARM_USER_ACTION_END_TREATMENT, TRUE );
-
-#ifdef RM46_EVAL_BOARD_TARGET
-    // TODO - temporary test code for eval board
-    start = getMSTimerCount();
-#endif
 }
 
 /*********************************************************************//**
@@ -226,6 +217,10 @@
             switch ( currentTreatmentState )
             {
                 case TREATMENT_STOP_STATE:
+                    lastTreatmentTimeStamp = getMSTimerCount();
+                    startDialysis();
+                    transitionToDialysis();
+                    currentTreatmentState = TREATMENT_DIALYSIS_STATE;
                     break;
 
                 case TREATMENT_RINSEBACK_PAUSE_STATE:
@@ -274,11 +269,7 @@
 
     if ( TRUE == stop )
     {
-#ifndef DISABLE_UI_TREATMENT_WORKFLOW
         activateAlarmNoData( ALARM_ID_TREATMENT_STOPPED_BY_USER );
-#else
-        requestNewOperationMode( MODE_POST );
-#endif
     }
 
     // treatment mode state machine
@@ -342,13 +333,6 @@
     // call various execs for treatment mode
     execTreatmentReservoirMgmt();
     execAirTrapMonitorTreatment();
-#ifdef RM46_EVAL_BOARD_TARGET
-    // TODO - temporary test code for eval board - move to next mode after 5 min
-    if ( TRUE == didTimeout( start, 300000U ) )
-    {
-        requestNewOperationMode( MODE_POST );
-    }
-#endif
 
     return currentTreatmentState;
 }
@@ -369,20 +353,11 @@
     treatmentTimeMS = 0;
     lastTreatmentTimeStamp = getMSTimerCount();
 
-#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 ) * (F32)ML_PER_LITER;
     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 );