Index: sources/canbus/messageinterpreter.cpp
===================================================================
diff -u -r524fee2471717bf627eae41c6a599c9b5f4fbe55 -r6616f7b9b88efffa42ab605833d296afb76d3cb1
--- sources/canbus/messageinterpreter.cpp	(.../messageinterpreter.cpp)	(revision 524fee2471717bf627eae41c6a599c9b5f4fbe55)
+++ sources/canbus/messageinterpreter.cpp	(.../messageinterpreter.cpp)	(revision 6616f7b9b88efffa42ab605833d296afb76d3cb1)
@@ -115,13 +115,13 @@
         }
         break;
 
-    case Gui::GuiActionType::UltrafiltrationState:
+    case Gui::GuiActionType::AdjustUltrafiltrationStateReq:
         if (count) {
             vPayload = Format::fromVariant(vData);
         }
         break;
 
-    case Gui::GuiActionType::AdjustUltrafiltrationReq:
+    case Gui::GuiActionType::AdjustUltrafiltrationEditReq:
         if (count) {
             vPayload = Format::fromVariant(vData);
         }
@@ -258,21 +258,25 @@
         break;
 
     case Gui::GuiActionType::AdjustBloodDialysateRsp:
-        ok = adjustBloodDialysateData   (vMessage, vData);
+        ok = adjustBloodDialysateData           (vMessage, vData);
         break;
 
     case Gui::GuiActionType::AdjustDurationRsp:
-        ok = adjustDurationData         (vMessage, vData);
+        ok = adjustDurationData                 (vMessage, vData);
         break;
 
-    case Gui::GuiActionType::AdjustUltrafiltrationRsp:
-        ok = adjustUltrafiltrationData  (vMessage, vData);
+    case Gui::GuiActionType::AdjustUltrafiltrationStateReq: // AcknowGeneric : Generic Acknow respose
+        ok = adjustUltrafiltrationStateData     (vMessage, vData);
         break;
 
-    case Gui::GuiActionType::UltrafiltrationState: // AcknowGeneric : Generic Acknow respose
-        ok = ultrafiltrationState       (vMessage, vData);
+    case Gui::GuiActionType::AdjustUltrafiltrationEditRsp:
+        ok = adjustUltrafiltrationEditData      (vMessage, vData);
         break;
 
+    case Gui::GuiActionType::AdjustUltrafiltrationConfirmRsp:
+        ok = adjustUltrafiltrationConfirmData   (vMessage, vData);
+        break;
+
      // unhandles messages: these will only be logged as received message
     // there has nothing been defined for these messages.
     case Gui::GuiActionType::AlarmTriggered:
@@ -514,10 +518,10 @@
 }
 
 /*!
- * \brief MessageInterpreter::getDialysateOutletFlowData
- * \param vMessage  - The vMessage of type Message which contains all the data, require to be interpreted.
- * \param vData     - Treatment Time data
- * \return true if the message can be successfully converted to the Blood Flow data elements.
+ * \brief   MessageInterpreter::getDialysateOutletFlowData
+ * \param   vMessage  - The vMessage of type Message which contains all the data, require to be interpreted.
+ * \param   vData     - Treatment Time data
+ * \return  true if the message can be successfully converted to the Blood Flow data elements.
  */
 bool MessageInterpreter::getTreatmentTime( const Message &vMessage , Model::MTreatmentTime &vData)
 {
@@ -532,16 +536,15 @@
     }
 
     vData.fromByteArray(vMessage.data);
-
     return true;
 }
 
 /*!
- * \brief MessageInterpreter::treatmentTime
+ * \brief   MessageInterpreter::treatmentTime
  * \details Used the getTreatmentTime method and converts each parameter
  *          in vData of type QVaranitList, to be used in the GUI
  *          Also logs the data
- * \param vMessage   - The message
+ * \param   vMessage   - The message
  * \param   vData    - the output data
  * \return  return value of the method getDialysateOutletFlowData
  */
@@ -742,46 +745,71 @@
 }
 
 /*!
- * \brief   MessageInterpreter::adjustUltrafiltrationData
+ * \brief   MessageInterpreter::ultrafiltrationState
+ * \details This method interprets Treatment Ultrafiltration state change Response message data
+ *          in vMessage of type Message.
+ * \param   vMessage    - The vMessage of type Message which contains all the data,
+ *                        require to be interpreted.
+ * \param   vData       - Treatment Ultrafiltration state change Response data
+ * \return  true if the data can be extracted as defined for Treatment Duration Adjustment Response Message ID
+ */
+bool MessageInterpreter::adjustUltrafiltrationStateData(const Message &vMessage, QVariantList &vData)
+{
+    bool ok = false;
+    if ( ! isType           (vMessage, Gui::GuiActionType::AdjustUltrafiltrationStateReq) ) return ok;
+    if ( ! isPayloadLenValid(vMessage, Gui::GuiActionType::AcknowGeneric                ) ) return ok;
+
+    Model::MUltrafiltrationStateResponse mData;
+    ok = mData.fromByteArray(vMessage.data);
+    LOG_DATUM(mData.toString());
+
+    mData.toVariantList(vData);
+    emit didActionReceive(mData.data());
+
+    return ok;
+}
+
+/*!
+ * \brief   MessageInterpreter::adjustUltrafiltrationEditData
  * \details This method interprets Treatment Ultrafiltration Adjustment Response message data
  *          in vMessage of type Message.
  * \param   vMessage    - The vMessage of type Message which contains all the data,
  *                        require to be interpreted.
  * \param   vData       - Treatment Duration Adjustment Response data
  * \return  true if the data can be extracted as defined for Treatment Ultrafiltration Adjustment Response Message ID
  */
-bool MessageInterpreter::adjustUltrafiltrationData(const Message &vMessage, QVariantList &vData)
+bool MessageInterpreter::adjustUltrafiltrationEditData(const Message &vMessage, QVariantList &vData)
 {
     bool ok = false;
-    if ( ! isType           (vMessage, Gui::GuiActionType::AdjustUltrafiltrationRsp) ) return ok;
-    if ( ! isPayloadLenValid(vMessage, Gui::GuiActionType::AdjustUltrafiltrationRsp) ) return ok;
+    if ( ! isType           (vMessage, Gui::GuiActionType::AdjustUltrafiltrationEditRsp) ) return ok;
+    if ( ! isPayloadLenValid(vMessage, Gui::GuiActionType::AdjustUltrafiltrationEditRsp) ) return ok;
 
-    Model::MAdjustUltrafiltrationResponse mData;
+    Model::MAdjustUltrafiltrationEditResponse mData;
     ok = mData.fromByteArray(vMessage.data);
     LOG_DATUM(mData.toString());
-    qDebug() << mData.toString();
+
     mData.toVariantList(vData);
     emit didActionReceive(mData.data());
 
     return ok;
 }
 
 /*!
- * \brief   MessageInterpreter::ultrafiltrationState
- * \details This method interprets Treatment Ultrafiltration state change Response message data
+ * \brief   MessageInterpreter::adjustUltrafiltrationConfirmData
+ * \details This method interprets Treatment Ultrafiltration Adjustment Response message data
  *          in vMessage of type Message.
  * \param   vMessage    - The vMessage of type Message which contains all the data,
  *                        require to be interpreted.
- * \param   vData       - Treatment Ultrafiltration state change Response data
- * \return  true if the data can be extracted as defined for Treatment Duration Adjustment Response Message ID
+ * \param   vData       - Treatment Duration Adjustment Response data
+ * \return  true if the data can be extracted as defined for Treatment Ultrafiltration Adjustment Response Message ID
  */
-bool MessageInterpreter::ultrafiltrationState(const Message &vMessage, QVariantList &vData)
+bool MessageInterpreter::adjustUltrafiltrationConfirmData(const Message &vMessage, QVariantList &vData)
 {
     bool ok = false;
-    if ( ! isType           (vMessage, Gui::GuiActionType::UltrafiltrationState) ) return ok;
-    if ( ! isPayloadLenValid(vMessage, Gui::GuiActionType::AcknowGeneric       ) ) return ok;
+    if ( ! isType           (vMessage, Gui::GuiActionType::AdjustUltrafiltrationConfirmRsp) ) return ok;
+    if ( ! isPayloadLenValid(vMessage, Gui::GuiActionType::AdjustUltrafiltrationConfirmRsp) ) return ok;
 
-    Model::MUltrafiltrationStateResponse mData;
+    Model::MAdjustUltrafiltrationConfirmResponse mData;
     ok = mData.fromByteArray(vMessage.data);
     LOG_DATUM(mData.toString());
 
@@ -790,4 +818,3 @@
 
     return ok;
 }
-