Index: firmware/App/Modes/StateTxDialysis.c
===================================================================
diff -u -r176f16b02f39ff31985a03b3546fc57e690f3306 -r1a3a2f806bb81b05f67f80efb94f1d82ce174c09
--- firmware/App/Modes/StateTxDialysis.c	(.../StateTxDialysis.c)	(revision 176f16b02f39ff31985a03b3546fc57e690f3306)
+++ firmware/App/Modes/StateTxDialysis.c	(.../StateTxDialysis.c)	(revision 1a3a2f806bb81b05f67f80efb94f1d82ce174c09)
@@ -231,17 +231,17 @@
 }
 
 /*********************************************************************//**
- * @brief
- * The signalPauseResumeUF function handles a request to pause or resume
- * ultrafiltration.
- * @details \b Message \b Sent: MSG_ID_TD_UF_PAUSE_RESUME_RESPONSE
- * @details \b Message \b Sent: UF_START_PAUSE_EVENT / UF_START_RESUME_EVENT
- * @details \b Inputs: currentDialysisState, setUFRateLHr
- * @details \b Outputs: ufPauseRequested, ufResumeRequested
- * @param message Message from UI which includes a flag indicating whether
- * to pause or resume ultrafiltration.
- * @return TRUE if pause
- *************************************************************************/
+* @brief
+* The signalPauseResumeUF function handles a request to pause or resume
+* ultrafiltration.
+* @details \b Message \b Sent: MSG_ID_TD_UF_PAUSE_RESUME_RESPONSE
+* @details \b Message \b Sent: UF_START_PAUSE_EVENT / UF_START_RESUME_EVENT
+* @details \b Inputs: currentDialysisState, setUFRateLHr
+* @details \b Outputs: ufPauseRequested, ufResumeRequested
+* @param message Message from UI which includes a flag indicating whether
+* to pause or resume ultrafiltration.
+* @return TRUE if pause
+*************************************************************************/
 BOOL signalPauseResumeUF( MESSAGE_T *message )
 {
     TREATMENT_STATE_T trtState = getTreatmentState();
@@ -254,73 +254,73 @@
     // Verify payload length is valid
     if ( sizeof( BOOL ) == message->hdr.payloadLen )
     {
-        BOOL requestedState = FALSE;
+        BOOL payload;
 
-        memcpy( &requestedState, message->payload, sizeof( requestedState ) );
+        memcpy( &payload, message->payload, sizeof( BOOL ) );
 
         // Handle request to resume ultrafiltration
-        if ( requestedState == FALSE )
+        if ( TRUE == payload )
         {
             if ( ( MODE_TREA == currMode ) && ( TREATMENT_DIALYSIS_STATE == trtState ) && ( DIALYSIS_UF_PAUSED_STATE == currentDialysisState ) )
             {
                 ufResumeRequested = TRUE;
                 response.accepted = TRUE;
-
-                if ( setUFRateLHr > 0.0F )
+                if ( setUFRateLHr > 0.0 )
                 {
-                    // sendTreatmentLogEventData( UF_START_RESUME_EVENT, 0.0F, setUFRateLHr );
+                    //sendTreatmentLogEventData( UF_START_RESUME_EVENT, 0.0, setUFRateLHr );
                 }
             }
-            else if ( MODE_TREA != currMode )
-            {
-                response.rejectionReason = REQUEST_REJECT_REASON_NOT_IN_TREATMENT_MODE;
-            }
-            else if ( TREATMENT_DIALYSIS_STATE != trtState )
-            {
-                response.rejectionReason = REQUEST_REJECT_REASON_INVALID_TREATMENT_STATE;
-            }
             else
             {
-                response.rejectionReason = REQUEST_REJECT_REASON_UF_NOT_PAUSED;
+                if ( MODE_TREA != currMode )
+                {
+                    response.rejectionReason = REQUEST_REJECT_REASON_NOT_IN_TREATMENT_MODE;
+                }
+                else if ( TREATMENT_DIALYSIS_STATE != trtState )
+                {
+                    response.rejectionReason = REQUEST_REJECT_REASON_INVALID_TREATMENT_STATE;
+                }
+                else
+                {
+                    response.rejectionReason = REQUEST_REJECT_REASON_UF_NOT_PAUSED;
+                }
             }
         }
         // Handle request to pause ultrafiltration
-        else if ( requestedState == TRUE )
+        else
         {
             if ( ( MODE_TREA == currMode ) && ( TREATMENT_DIALYSIS_STATE == trtState ) && ( DIALYSIS_UF_STATE == currentDialysisState ) )
             {
                 ufPauseRequested = TRUE;
                 response.accepted = TRUE;
-
-                if ( setUFRateLHr > 0.0F )
+                if ( setUFRateLHr > 0.0 )
                 {
-                    // sendTreatmentLogEventData( UF_PAUSE_EVENT, setUFRateLHr, 0.0F );
+                    //sendTreatmentLogEventData( UF_PAUSE_EVENT, setUFRateLHr, 0.0 );
                 }
             }
-            else if ( MODE_TREA != currMode )
-            {
-                response.rejectionReason = REQUEST_REJECT_REASON_NOT_IN_TREATMENT_MODE;
-            }
-            else if ( TREATMENT_DIALYSIS_STATE != trtState )
-            {
-                response.rejectionReason = REQUEST_REJECT_REASON_INVALID_TREATMENT_STATE;
-            }
             else
             {
-                response.rejectionReason = REQUEST_REJECT_REASON_UF_NOT_IN_PROGESS;
+                if ( MODE_TREA != currMode )
+                {
+                    response.rejectionReason = REQUEST_REJECT_REASON_NOT_IN_TREATMENT_MODE;
+                }
+                else if ( TREATMENT_DIALYSIS_STATE != trtState )
+                {
+                    response.rejectionReason = REQUEST_REJECT_REASON_INVALID_TREATMENT_STATE;
+                }
+                else
+                {
+                    response.rejectionReason = REQUEST_REJECT_REASON_UF_NOT_IN_PROGESS;
+                }
             }
         }
-        else
-        {
-            response.rejectionReason = REQUEST_REJECT_REASON_PARAM_OUT_OF_RANGE;
-        }
     }
     else
     {
-        response.rejectionReason = REQUEST_REJECT_REASON_INVALID_REQUEST_FORMAT;
+        response.rejectionReason = REQUEST_REJECT_REASON_PARAM_OUT_OF_RANGE;
     }
 
-    // Send response
+    // Send response w/ reason code if rejected
     sendMessage( MSG_ID_TD_UF_PAUSE_RESUME_RESPONSE, COMM_BUFFER_OUT_CAN_TD_2_UI, (U08*)(&response), sizeof( UI_RESPONSE_PAYLOAD_T ) );
 
     return response.accepted;