Index: sources/canbus/MessageInterpreter.cpp
===================================================================
diff -u -r4fab8841b1040c8eaa406713ff9bdc8c65b7b6ac -r2c9421bd6da03c7e0bd0bfa1f49fa95c2bd18a95
--- sources/canbus/MessageInterpreter.cpp	(.../MessageInterpreter.cpp)	(revision 4fab8841b1040c8eaa406713ff9bdc8c65b7b6ac)
+++ sources/canbus/MessageInterpreter.cpp	(.../MessageInterpreter.cpp)	(revision 2c9421bd6da03c7e0bd0bfa1f49fa95c2bd18a95)
@@ -348,14 +348,12 @@
     case Gui::GuiActionType::ID_AlarmCleared                    : ok = alarmCleared                 (vMessage, vData); break; // TODO : implement notify<>()
 
     // Adjustment Response Messages
-    case Gui::GuiActionType::ID_AdjustDurationRsp               : ok = notify<Model::MAdjustDurationResponse      >(vMessage, vData, Gui::GuiActionType::ID_AdjustDurationRsp      ); break;
-    case Gui::GuiActionType::ID_AdjustBloodDialysateRsp         : ok = notify<Model::MAdjustBloodDialysateResponse>(vMessage, vData, Gui::GuiActionType::ID_AdjustBloodDialysateRsp); break;
-    case Gui::GuiActionType::ID_AdjustSalineRsp                 : ok = notify<Model::MAdjustSalineResponse        >(vMessage, vData, Gui::GuiActionType::ID_AdjustSalineRsp        ); break;
+    case Gui::GuiActionType::ID_AdjustDurationRsp               : ok = notify<Model::MAdjustDurationResponse                >(vMessage, vData, Gui::GuiActionType::ID_AdjustDurationRsp             ); break;
+    case Gui::GuiActionType::ID_AdjustBloodDialysateRsp         : ok = notify<Model::MAdjustBloodDialysateResponse          >(vMessage, vData, Gui::GuiActionType::ID_AdjustBloodDialysateRsp       ); break;
+    case Gui::GuiActionType::ID_AdjustSalineRsp                 : ok = notify<Model::MAdjustSalineResponse                  >(vMessage, vData, Gui::GuiActionType::ID_AdjustSalineRsp               ); break;
+    case Gui::GuiActionType::ID_AdjustUltrafiltrationStateRsp   : ok = notify<Model::MAdjustUltrafiltrationStateResponse    >(vMessage, vData, Gui::GuiActionType::ID_AdjustUltrafiltrationStateRsp ); break;
 
-    // ok = notify<Model::MAdjustUltrafiltrationStateResponse>(vMessage, vData, Gui::GuiActionType::ID_AdjustUltrafiltrationStateReq); break;
-    // this message has been inherited from MAbstract and should use notify but since the response message is not standard can't use notify yet.
-    // when received gets payload len error and can't be interpreted. (Needs FW modification)
-    case Gui::GuiActionType::ID_AdjustUltrafiltrationStateReq   : ok = adjustUltrafiltrationState   (vMessage, vData); break; // TODO : implement notify<>()
+    // these need to be standard and use notify as well
     case Gui::GuiActionType::ID_AdjustUltrafiltrationEditRsp    : ok = adjustUltrafiltrationEdit    (vMessage, vData); break; // TODO : implement notify<>()
     case Gui::GuiActionType::ID_AdjustUltrafiltrationConfirmRsp : ok = adjustUltrafiltrationConfirm (vMessage, vData); break; // TODO : implement notify<>()
 
@@ -463,7 +461,7 @@
 
     Model::MAlarmStatus mData;
     ok = mData.fromByteArray(vMessage.data);
-    LOG_EVENT("HD," + mData.toString());
+    LOG_EVENT("HD," + mData.toString()); // TODO: Not Standard
 
     mData.toVariantList(vData);
     emit didActionReceive(mData.data());
@@ -488,7 +486,7 @@
 
     Model::MAlarmTriggered mData;
     ok = mData.fromByteArray(vMessage.data);
-    LOG_EVENT("HD," + mData.toString());
+    LOG_EVENT("HD," + mData.toString()); // TODO: Not Standard
 
     mData.toVariantList(vData);
     emit didActionReceive(mData.data());
@@ -524,7 +522,7 @@
 // ---------- ---------- ---------- ---------- ---------- Adjustments ---------- ---------- ---------- ---------- ---------- //
 
 /*!
- * \brief   MessageInterpreter::ultrafiltrationState
+ * \brief   MessageInterpreter::adjustUltrafiltrationState
  * \details This method interprets Treatment Ultrafiltration State Adjustment Response message data
  *          in vMessage of type Message.
  * \param   vMessage    - The vMessage of type Message which contains all the data,
@@ -535,9 +533,7 @@
 bool MessageInterpreter::adjustUltrafiltrationState(const Message &vMessage, QVariantList &vData)
 {
     bool ok = false;
-    // TODO : In HD the Ultrafiltration State change shall have the rejection reason like other responses.
-    if ( ! isType           (vMessage, Gui::GuiActionType::ID_AdjustUltrafiltrationStateReq) ) return ok;
-    if ( ! isPayloadLenValid(vMessage, Gui::GuiActionType::ID_AcknowGeneric                ) ) return ok; // This is an exception It has to be changed.
+    if ( ! isValidMessage(vMessage, Gui::GuiActionType::ID_AdjustUltrafiltrationStateRsp) ) return ok;
 
     Model::MAdjustUltrafiltrationStateResponse mData;
     ok = mData.fromByteArray(vMessage.data);
@@ -565,7 +561,7 @@
 
     Model::MAdjustUltrafiltrationEditResponse mData;
     ok = mData.fromByteArray(vMessage.data);
-    LOG_EVENT("HD," + mData.toString());
+    LOG_EVENT("HD," + mData.toString()); // TODO: Not Standard
 
     mData.toVariantList(vData);
     emit didActionReceive(mData.data());
@@ -589,7 +585,7 @@
 
     Model::MAdjustUltrafiltrationConfirmResponse mData;
     ok = mData.fromByteArray(vMessage.data);
-    LOG_EVENT("HD," + mData.toString());
+    LOG_EVENT("HD," + mData.toString()); // TODO: Not Standard
 
     mData.toVariantList(vData);
     emit didActionReceive(mData.data());
@@ -606,8 +602,7 @@
  */
 bool MessageInterpreter::createTreatmentRespData(const Message &vMessage, QVariantList &vData) {
     bool ok = false;
-    if ( ! isType           (vMessage, Gui::GuiActionType::ID_CreateTreatmentRsp) ) return ok;
-    if ( ! isPayloadLenValid(vMessage, Gui::GuiActionType::ID_CreateTreatmentRsp) ) return ok;
+    if ( ! isValidMessage(vMessage, Gui::GuiActionType::ID_CreateTreatmentRsp) ) return ok;
 
     Model::MTreatmentParametersResponse mData;
     ok = mData.fromByteArray(vMessage.data);