Index: dialin/squish/denaliMessages.py
===================================================================
diff -u -r91dc90bd009bdbf5621dcaa1bc12ab3d691673f7 -ra9df49289acd7d4627f2ff49a329e69adbb866c7
--- dialin/squish/denaliMessages.py	(.../denaliMessages.py)	(revision 91dc90bd009bdbf5621dcaa1bc12ab3d691673f7)
+++ dialin/squish/denaliMessages.py	(.../denaliMessages.py)	(revision a9df49289acd7d4627f2ff49a329e69adbb866c7)
@@ -30,9 +30,11 @@
     SALINE_BOLUS_STATE_MAX_DELIVERED        = 3 # Maximum saline bolus volume reached - no more saline bolus deliveries allowed
     
     # UF states
-    # UI only cares about the actual state and _NOT could be any other state
-    UF_PAUSED_STATE_NOT      = 0
-    UF_PAUSED_STATE          = 1
+    UF_START_STATE                          = 0 # Start state of the ultrafiltration state machine
+    UF_PAUSED_STATE                         = 1 # Paused state of the ultrafiltration state machine
+    UF_RUNNING_STATE                        = 2 # Running state of the ultrafiltration state machine
+    UF_OFF_STATE                            = 3 # Completed/off state of the ultrafiltration state machine
+    UF_COMPLETED_STATE                      = 4 # Completed state of ultrafiltration state machine
     
     # Sub Mode
     # UI only cares about the actual state and _NOT could be any other state
@@ -77,7 +79,8 @@
     AdjustDurationReq       =    22
     AdjustDurationRsp       =    27
 
-    AdjustUltrafiltrationStateReq   = 16 # Req and Rsp are the same in this specific message
+    AdjustUltrafiltrationStateReq   = 16 
+    AdjustUltrafiltrationStateRsp   = 65 
     AdjustUltrafiltrationEditReq    = 17
     AdjustUltrafiltrationEditRsp    = 19
     AdjustUltrafiltrationConfirmReq = 21
@@ -415,49 +418,60 @@
     waitForMessageToBeSent()
 
 
-def buildTreatmentAdjustUltrafiltrationStateResponse(vState):
+def buildTreatmentAdjustUltrafiltrationStateResponse(vAccepted, vReason, vState):
     """
     the Treatment ultrafiltration adjustment response message builder method
-    | MSG  | CAN ID | M.Box | Type | Ack | Src | Dest | Description              | #1:(U08)  |
-    |:----:|:------:|:-----:|:----:|:---:|:---:|:----:|:-----------:             |:--:       |
-    |0x1000| 0x100  | 9     | Rsp  |  N  | HD  | UI   | Generic response ACK/NAK | mAccepted |
-    :param vState: (-128<int<127) Ultrafiltration State
+    | MSG | CAN ID | M.Box | Type | Ack | Src | Dest | Description              |
+    |:---:|:------:|:-----:|:----:|:---:|:---:|:----:|:------------------------:|
+    | 65  | 0x020  | 6     | Rsp  | Y   | HD  | UI   | UF Pause/Resume Response |
+    
+    | Payload  ||
+    |          ||
+    | #1:(U32) | \ref Data::mAccepted |
+    | #2:(U32) | \ref Data::mReason   |
+    | #3:(U32) | \ref Data::mState    |
+    :param vAccepted: (int) boolean accept/reject response
+    :param vReason: (int) rejection reason
+    :param vState: (int) Ultrafiltration State
     :return: (str) built message frame(s)
     """
-    msg = messageBuilder.buildMessage(GuiActionType.AdjustUltrafiltrationStateReq, 1 * 4 , False,
+    msg = messageBuilder.buildMessage(GuiActionType.AdjustUltrafiltrationStateRsp, 3 * 4 , False,
+        utils.toI32(vAccepted),
+        utils.toI32(vReason),
         utils.toI32(vState)
     )
     return messageBuilder.toFrames(msg)
 
 
-def setTreatmentAdjustUltrafiltrationStateResponse(vState):
+def setTreatmentAdjustUltrafiltrationStateResponse(vAccepted, vReason, vState):
     """
     the Treatment ultrafiltration adjustment response message setter/sender method
-    this is actually the Generic response ACK/NAK message
-    :param vState: (-128<int<127) Ultrafiltration State
+    :param vAccepted: (int) boolean accept/reject response
+    :param vReason: (int) rejection reason
+    :param vState: (int) Ultrafiltration State
     :return: none
     """
-    frames = buildTreatmentAdjustUltrafiltrationStateResponse(vState)
+    frames = buildTreatmentAdjustUltrafiltrationStateResponse(vAccepted, vReason, vState)
     frames = messageBuilder.toCandumpFormat(frames)
     for frame in frames:
         subprocess.call(['cansend', 'can0', '020#{}'.format(frame)])
     waitForMessageToBeSent()
 
 
-def setTreatmentAdjustUltrafiltrationAccepted():
+def setTreatmentAdjustUltrafiltrationAccepted(vState):
     """
     a convenient method for setTreatmentAdjustUltrafiltrationStateResponse which sends accept true
     :return: none
     """
-    setTreatmentAdjustUltrafiltrationStateResponse( EResponse.Accepted )
+    setTreatmentAdjustUltrafiltrationStateResponse( EResponse.Accepted, 0, vState )
 
 
-def setTreatmentAdjustUltrafiltrationRejected():
+def setTreatmentAdjustUltrafiltrationRejected(vReason, vState):
     """
     a convenient method for setTreatmentAdjustUltrafiltrationStateResponse which sends accept false
     :return: none
     """
-    setTreatmentAdjustUltrafiltrationStateResponse( EResponse.Rejected )
+    setTreatmentAdjustUltrafiltrationStateResponse( EResponse.Rejected, vReason, vState )
 
 
 def buildTreatmentAdjustUltrafiltrationEditResponse(vAccepted, vReason, vVolume, vDuration, vDurationDiff, vRate, vRateDiff, vRateOld):
@@ -662,22 +676,22 @@
 def buildPressureOcclusionData(vArterialPressure, vVenousPressure, vBloodPumpOcclusion, vDialysateInletPumpOcclusion, vDialysateOutletPumpOcclusion):
     """
     the Pressure/Occlusion Data messages builder mehtod
-    | MSG  | CAN ID | Box | Type   | Ack | Src | Dst | Description            | #1:(F32)                     | #2:(F32)                   | #3:(F32)                       | #4:(F32)                                | #5:(F32)                                 |
+    | MSG  | CAN ID | Box | Type   | Ack | Src | Dst | Description            | #1:(F32)                     | #2:(F32)                   | #3:(U32)                       | #4:(U32)                                | #5:(U32)                                 |
     |:----:|:------:|:---:|:------:|:---:|:---:|:---:|:-----------:           |:--:                          |:--:                        |:--:                            |:--:                                     |:--:                                      |
     |0x0900| 0x040  | 7   | 1 Hz   | N   | HD  | All | PressureOcclusion Data | \ref Data::mArterialPressure | \ref Data::mVenousPressure | \ref Data::mBloodPumpOcclusion | \ref Data::mDialysateInletPumpOcclusion | \ref Data::mDialysateOutletPumpOcclusion |
     :param vArterialPressure: (float) Arterial Pressure
     :param vVenousPressure: (float) Venous Pressure
-    :param vBloodPumpOcclusion: (float) Blood Pump Occlusion
-    :param vDialysateInletPumpOcclusion: (float) Dialysate Inlet Pump Occlusion
-    :param vDialysateOutletPumpOcclusion: (float) Dialysate Outlet Pump Occlusion
+    :param vBloodPumpOcclusion: (uint) Blood Pump Occlusion
+    :param vDialysateInletPumpOcclusion: (uint) Dialysate Inlet Pump Occlusion
+    :param vDialysateOutletPumpOcclusion: (uint) Dialysate Outlet Pump Occlusion
     :return: (str) built message frame(s)
     """
     msg = messageBuilder.buildMessage( 0x0009, 4+4+4+4+4, False,
         utils.toF32(vArterialPressure            ),
         utils.toF32(vVenousPressure              ),
-        utils.toF32(vBloodPumpOcclusion          ),
-        utils.toF32(vDialysateInletPumpOcclusion ),
-        utils.toF32(vDialysateOutletPumpOcclusion))
+        utils.toI32(vBloodPumpOcclusion          ),
+        utils.toI32(vDialysateInletPumpOcclusion ),
+        utils.toI32(vDialysateOutletPumpOcclusion))
     return messageBuilder.toFrames(msg)
 
 
@@ -686,9 +700,9 @@
     the Pressure/Occlusion Data messages setter/sender mehtod
     :param vArterialPressure: (float) Arterial Pressure
     :param vVenousPressure: (float) Venous Pressure
-    :param vBloodPumpOcclusion: (float) Blood Pump Occlusion
-    :param vDialysateInletPumpOcclusion: (float) Dialysate Inlet Pump Occlusion
-    :param vDialysateOutletPumpOcclusion: (float) Dialysate Outlet Pump Occlusion
+    :param vBloodPumpOcclusion: (uint) Blood Pump Occlusion
+    :param vDialysateInletPumpOcclusion: (uint) Dialysate Inlet Pump Occlusion
+    :param vDialysateOutletPumpOcclusion: (uint) Dialysate Outlet Pump Occlusion
     :return: none
     """
     frames = buildPressureOcclusionData(vArterialPressure, vVenousPressure, vBloodPumpOcclusion, vDialysateInletPumpOcclusion, vDialysateOutletPumpOcclusion)
@@ -1058,7 +1072,7 @@
     starting the treatment for user convenience since Tx is not by default running
     :return: none
     """
-    setTreatmentStatesData(txStates.TREATMENT_DIALYSIS_STATE, txStates.UF_PAUSED_STATE_NOT, txStates.SALINE_BOLUS_STATE_IDLE)
+    setTreatmentStatesData(txStates.TREATMENT_DIALYSIS_STATE, txStates.UF_OFF_STATE, txStates.SALINE_BOLUS_STATE_IDLE)
 
 
 def buildHDOperationModeData(vOpMode):
@@ -1121,33 +1135,36 @@
     waitForMessageToBeSent()
 
 
-def buildSalineBolusResponse(vAccepted, vReason, vTarget):
+def buildSalineBolusResponse(vAccepted, vReason, vTarget, vState):
     """
     the Saline Bolus Response message builder method
-    | MSG | CAN ID | M.Box | Type | Ack | Src | Dest | Description           | #1:(U32)             | #2:(U32)            | #3:(U32)            |
-    |:---:|:------:|:-----:|:----:|:---:|:---:|:----:|:---------------------:|:--------------------:|:-------------------:|:-------------------:|
-    | 20  | 0x020  | 6     | Rsp  | Y   | HD  | UI   | Saline Bolus Response | \ref Data::mAccepted | \ref Data::mReason  | \ref Data::mTarget  |
+    | MSG | CAN ID | M.Box | Type | Ack | Src | Dest | Description           | #1:(U32)             | #2:(U32)            | #3:(U32)            | #3:(U32)            |
+    |:---:|:------:|:-----:|:----:|:---:|:---:|:----:|:---------------------:|:--------------------:|:-------------------:|:-------------------:|:-------------------:|
+    | 20  | 0x020  | 6     | Rsp  | Y   | HD  | UI   | Saline Bolus Response | \ref Data::mAccepted | \ref Data::mReason  | \ref Data::mTarget  | \ref Data::mState   |
     :param vAccepted: (int) boolean accept/reject response
     :param vReason: (int) rejection reason
     :param vTarget: (int) Saline Bolus Target Volume
+    :param vState: (int) Saline Bolus current State
     :return: (str) built message frame(s)
     """
-    msg = messageBuilder.buildMessage( 0x0014, 4+4+4, True,
+    msg = messageBuilder.buildMessage( 0x0014, 4+4+4+4, True,
         utils.toI32(vAccepted),
         utils.toI32(vReason  ),
-        utils.toI32(vTarget  ))
+        utils.toI32(vTarget  ),
+        utils.toI32(vState   ))
     return messageBuilder.toFrames(msg)
 
 
-def setSalineBolusResponse(vAccepted, vReason, vTarget):
+def setSalineBolusResponse(vAccepted, vReason, vTarget, vState):
     """
     the Saline Bolus Response message setter/sender method
     :param vAccepted: (int) boolean accept/reject response
     :param vReason: (int) rejection reason
     :param vTarget: (int) Saline Bolus Target Volume
+    :param vState: (int) Saline Bolus current State
     :return: none
     """
-    frames = buildSalineBolusResponse(vAccepted, vReason, vTarget)
+    frames = buildSalineBolusResponse(vAccepted, vReason, vTarget, vState)
     frames = messageBuilder.toCandumpFormat(frames)
     for frame in frames:
         subprocess.call(['cansend', 'can0', '020#{}'.format(frame)])