Index: firmware/App/Modes/StateTxDialysis.c
===================================================================
diff -u -r79c2105d7ec35f3caeb977f6e2cc1b494853d211 -r289696b3b5e15120cfecbe447ff45ef093959056
--- firmware/App/Modes/StateTxDialysis.c	(.../StateTxDialysis.c)	(revision 79c2105d7ec35f3caeb977f6e2cc1b494853d211)
+++ firmware/App/Modes/StateTxDialysis.c	(.../StateTxDialysis.c)	(revision 289696b3b5e15120cfecbe447ff45ef093959056)
@@ -22,12 +22,12 @@
 #include "DDInterface.h"
 #include "Messaging.h"
 #include "ModeTreatment.h"
-#include "ModeTxParams.h"
 //#include "NVDataMgmt.h"
 #include "OperationModes.h"
 #include "StateTxDialysis.h"
-//#include "Switches.h"
+#include "Switches.h"
 #include "TaskGeneral.h"
+#include "TxParams.h"
 #include "Valves.h"
 
 /**
@@ -101,19 +101,20 @@
  *************************************************************************/
 void transitionToDialysis( void )
 {
-    PUMP_CONTROL_MODE_T mode = PUMP_CONTROL_MODE_CLOSED_LOOP;
+    F32 dialTemp = getTreatmentParameterF32( TREATMENT_PARAM_DIALYSATE_TEMPERATURE );
+    U32 acidType = getTreatmentParameterU32( TREATMENT_PARAM_ACID_CONCENTRATE );
+    U32 bicbType = getTreatmentParameterU32( TREATMENT_PARAM_BICARB_CONCENTRATE );
 
-//    doorClosedRequired( TRUE, TRUE );
+    doorClosedRequired( TRUE );
 
     // Set user alarm recovery actions allowed in this sub-mode
     setAlarmUserActionEnabled( ALARM_USER_ACTION_RESUME, TRUE );
     setAlarmUserActionEnabled( ALARM_USER_ACTION_RINSEBACK, TRUE );
     setAlarmUserActionEnabled( ALARM_USER_ACTION_END_TREATMENT, TRUE );
 
     // Set actuators as appropriate for state
-    cmdStartGenerateDialysate( setDialysateFlowRate, setUFRateLHr, getTreatmentParameterF32( TREATMENT_PARAM_DIALYSATE_TEMPERATURE ), FALSE,
-                               (ACID_CONCENTRATE_TYPE_T)getTreatmentParameterU32( TREATMENT_PARAM_ACID_CONCENTRATE ),
-                               (BICARB_CONCENTRATE_TYPE_T)getTreatmentParameterU32( TREATMENT_PARAM_BICARB_CONCENTRATE ) );
+    cmdStartGenerateDialysate( setDialysateFlowRate, setUFRateLHr, dialTemp, FALSE,
+                               (ACID_CONCENTRATE_TYPE_T)acidType, (BICARB_CONCENTRATE_TYPE_T)bicbType );
     transitionToDialysisState( currentDialysisState );
 
     // Set substate for event
@@ -216,7 +217,7 @@
  * The setDialysisDDParams function sets the dialysate rate and ultrafiltration
  * volume and rate parameters.
  * @details \b Inputs: none
- * @details \b Outputs: setDialysateFlowRate, setDialysateFlowRate, setUFRateLHr
+ * @details \b Outputs: setDialysateFlowRate, setUFVolumeL, setUFRateLHr
  * @param qd target dialysate flow rate (in mL/min)
  * @param ufVol target ultrafiltration volume (in L)
  * @param quf target ultrafiltration flow rate (in L/hr)
@@ -225,7 +226,7 @@
 void setDialysisDDParams( U32 qd, F32 ufVol, F32 quf )
 {
     setDialysateFlowRate = qd;
-    setDialysateFlowRate = ufVol;
+    setUFVolumeL = ufVol;
     setUFRateLHr = quf;
 }
 
@@ -260,9 +261,9 @@
         // Handle request to resume ultrafiltration
         if ( TRUE == payload )
         {
-            ufResumeRequested = TRUE;
             if ( ( MODE_TREA == currMode ) && ( TREATMENT_DIALYSIS_STATE == trtState ) && ( DIALYSIS_UF_PAUSED_STATE == currentDialysisState ) )
             {
+                ufResumeRequested = TRUE;
                 response.accepted = TRUE;
                 if ( setUFRateLHr > 0.0 )
                 {
@@ -275,7 +276,7 @@
                 {
                     response.rejectionReason = REQUEST_REJECT_REASON_NOT_IN_TREATMENT_MODE;
                 }
-                else if ( ( TREATMENT_DIALYSIS_STATE != trtState ) || ( DIALYSIS_UF_PAUSED_STATE != currentDialysisState ) )
+                else if ( TREATMENT_DIALYSIS_STATE != trtState )
                 {
                     response.rejectionReason = REQUEST_REJECT_REASON_INVALID_TREATMENT_STATE;
                 }
@@ -288,9 +289,9 @@
         // Handle request to pause ultrafiltration
         else
         {
-            ufPauseRequested = TRUE;
             if ( ( MODE_TREA == currMode ) && ( TREATMENT_DIALYSIS_STATE == trtState ) && ( DIALYSIS_UF_STATE == currentDialysisState ) )
             {
+                ufPauseRequested = TRUE;
                 response.accepted = TRUE;
                 if ( setUFRateLHr > 0.0 )
                 {
@@ -303,7 +304,7 @@
                 {
                     response.rejectionReason = REQUEST_REJECT_REASON_NOT_IN_TREATMENT_MODE;
                 }
-                else if ( ( TREATMENT_DIALYSIS_STATE != trtState ) || ( DIALYSIS_UF_STATE != currentDialysisState ) )
+                else if ( TREATMENT_DIALYSIS_STATE != trtState )
                 {
                     response.rejectionReason = REQUEST_REJECT_REASON_INVALID_TREATMENT_STATE;
                 }