Index: sources/canbus/MessageInterpreter.cpp
===================================================================
diff -u -r57ea732311e6f4c746974f5a52316f63dec23ca8 -rbf9223700613ced6c377f3e3a7b4de8367c30474
--- sources/canbus/MessageInterpreter.cpp	(.../MessageInterpreter.cpp)	(revision 57ea732311e6f4c746974f5a52316f63dec23ca8)
+++ sources/canbus/MessageInterpreter.cpp	(.../MessageInterpreter.cpp)	(revision bf9223700613ced6c377f3e3a7b4de8367c30474)
@@ -200,7 +200,6 @@
         vCanId =  Can::Can_Id::eChlid_UI_TD ;
     vPayload.clear();
     int length = vData.length();
-
     // DEBUG: LOG_EVENT(QString("0x%0").arg(vActionId, 4, 16,QChar('0')));
     switch (vActionId) { // notice we are in transmit mode
     case Gui::GuiActionType::ID_Acknow: // len: 0, can have zero len
@@ -227,11 +226,14 @@
     case Gui::GuiActionType::ID_AdjustServiceModeReq                    : INTERPRET_TRSMT_MT_MESSAGE(AdjustServiceModeRequestData                   ); break;
     case Gui::GuiActionType::ID_AdjustVersionsUIRsp                     : INTERPRET_TRANSMIT_MESSAGE(AdjustVersionsResponseData                     ); break;
     case Gui::GuiActionType::ID_AdjustVersionsUIReq                     : INTERPRET_TRANSMIT_MESSAGE(AdjustVersionsRequestData                      ); break;
-    case Gui::GuiActionType::ID_AdjustHDDateTimeReq                     : INTERPRET_TRANSMIT_MESSAGE(AdjustHDDateTimeRequestData                    ); break;
-    case Gui::GuiActionType::ID_AdjustDGDateTimeReq                     : INTERPRET_TRANSMIT_MESSAGE(AdjustDGDateTimeRequestData                    ); break;
+    case Gui::GuiActionType::ID_AdjustTDDateTimeReq                     : INTERPRET_TRANSMIT_MESSAGE(AdjustTDDateTimeRequestData                    ); break;
+    case Gui::GuiActionType::ID_AdjustDDDateTimeReq                     : INTERPRET_TRANSMIT_MESSAGE(AdjustDDDateTimeRequestData                    ); break;
     case Gui::GuiActionType::ID_AdjustServiceDatesReq                   : INTERPRET_TRSMT_MT_MESSAGE(AdjustServiceDatesRequestData                  ); break;
     case Gui::GuiActionType::ID_HDUsageInfoReq                          : INTERPRET_TRSMT_MT_MESSAGE(HDUsageInfoRequestData                         ); break;
-    case Gui::GuiActionType::ID_AdjustInstitutionalRecordReq            : INTERPRET_TRSMT_MT_MESSAGE(AdjustInstitutionalRequestData                 ); break;
+    case Gui::GuiActionType::ID_AdjustInstitutionalRecordReq            : INTERPRET_TRANSMIT_MESSAGE(AdjustInstitutionalRequestData                 ); break;
+    case Gui::GuiActionType::ID_InstitutionalRecordReq                  : INTERPRET_TRSMT_MT_MESSAGE(InstitutionalRequestData                       ); break;
+    case Gui::GuiActionType::ID_AdjustAdvancedInstitutionalRecordReq    : INTERPRET_TRANSMIT_MESSAGE(AdjustAdvancedInstitutionalRequestData         ); break;
+    case Gui::GuiActionType::ID_AdvancedInstitutionalRecordReq          : INTERPRET_TRSMT_MT_MESSAGE(AdvancedInstitutionalRequestData               ); break;
     // Pre-Treatment
     case Gui::GuiActionType::ID_AdjustInitTreatmentReq                  : INTERPRET_TRANSMIT_MESSAGE(AdjustInitTreatmentRequestData                 ); break;
     case Gui::GuiActionType::ID_AdjustParametersValidationReq           : INTERPRET_TRANSMIT_MESSAGE(AdjustParametersValidationRequestData          ); break;
@@ -246,19 +248,31 @@
     case Gui::GuiActionType::ID_AdjustPatientConnectionConfirmReq       : INTERPRET_TRSMT_MT_MESSAGE(AdjustPatientConnectionConfirmRequestData      ); break;
     case Gui::GuiActionType::ID_AdjustStartTreatmentReq                 : INTERPRET_TRSMT_MT_MESSAGE(AdjustStartTreatmentRequestData                ); break;
     // in-treatment
-    case Gui::GuiActionType::ID_AdjustDurationReq                       : INTERPRET_TRANSMIT_MESSAGE(AdjustDurationRequestData                      ); break;
+    case Gui::GuiActionType::ID_AdjustBloodPrimeReq                     : INTERPRET_TRANSMIT_MESSAGE(AdjustBloodPrimeRequestData                    ); break;
+    case Gui::GuiActionType::ID_AdjustBolusVolumeReq                    : INTERPRET_TRANSMIT_MESSAGE(AdjustBolusVolumeRequestData                   ); break;
+    case Gui::GuiActionType::ID_AdjustDurationEditReq                   : INTERPRET_TRANSMIT_MESSAGE(AdjustDurationEditRequestData                  ); break;
+    case Gui::GuiActionType::ID_AdjustDurationConfirmReq                : INTERPRET_TRANSMIT_MESSAGE(AdjustDurationConfirmRequestData               ); break;
+    case Gui::GuiActionType::ID_AdjustSetPointsReq                      : INTERPRET_TRANSMIT_MESSAGE(AdjustSetPointsRequestData                     ); break;
+    case Gui::GuiActionType::ID_AdjustBloodFlowRateReq                  : INTERPRET_TRANSMIT_MESSAGE(AdjustBloodFlowRateRequestData                 ); break;
+    case Gui::GuiActionType::ID_AdjustDialysateFlowRateReq              : INTERPRET_TRANSMIT_MESSAGE(AdjustDialysateFlowRateRequestData             ); break;
+    case Gui::GuiActionType::ID_AdjustDialysateTemperatureReq           : INTERPRET_TRANSMIT_MESSAGE(AdjustDialysateTemperatureRequestData          ); break;
+
     case Gui::GuiActionType::ID_AdjustBloodDialysateReq                 : INTERPRET_TRANSMIT_MESSAGE(AdjustBloodDialysateRequestData                ); break;
     case Gui::GuiActionType::ID_AdjustPressuresLimitsReq                : INTERPRET_TRANSMIT_MESSAGE(AdjustPressuresLimitsRequestData               ); break;
     case Gui::GuiActionType::ID_AdjustSalineReq                         : INTERPRET_TRANSMIT_MESSAGE(AdjustSalineRequestData                        ); break;
+    case Gui::GuiActionType::ID_AdjustVitalsReq                         : INTERPRET_TRSMT_MT_MESSAGE(AdjustVitalsRequestData                        ); break;
     case Gui::GuiActionType::ID_AdjustHeparinReq                        : INTERPRET_TRANSMIT_MESSAGE(AdjustHeparinRequestData                       ); break;
     // in-treatment - ultrafiltration
     case Gui::GuiActionType::ID_AdjustUltrafiltrationStateReq           : INTERPRET_TRANSMIT_MESSAGE(AdjustUltrafiltrationStateRequestData          ); break;
     case Gui::GuiActionType::ID_AdjustUltrafiltrationEditReq            : INTERPRET_TRANSMIT_MESSAGE(AdjustUltrafiltrationEditRequestData           ); break;
     case Gui::GuiActionType::ID_AdjustUltrafiltrationConfirmReq         : INTERPRET_TRANSMIT_MESSAGE(AdjustUltrafiltrationConfirmRequestData        ); break;
+    case Gui::GuiActionType::ID_AdjustIsolatedUFDurationEditReq         : INTERPRET_TRANSMIT_MESSAGE(AdjustIsolatedUFDurationEditRequestData        ); break;
+    case Gui::GuiActionType::ID_AdjustIsolatedUFVolumeEditReq           : INTERPRET_TRANSMIT_MESSAGE(AdjustIsolatedUFVolumeEditRequestData          ); break;
+    case Gui::GuiActionType::ID_AdjustIsolatedUFConfirmReq              : INTERPRET_TRSMT_MT_MESSAGE(AdjustIsolatedUFConfirmRequestData             ); break;
     // End-Treatment
     case Gui::GuiActionType::ID_AdjustRinsebackReq                      : INTERPRET_TRANSMIT_MESSAGE(AdjustRinsebackRequestData                     ); break;
     case Gui::GuiActionType::ID_AdjustRecirculateReq                    : INTERPRET_TRANSMIT_MESSAGE(AdjustRecirculateRequestData                   ); break;
-    case Gui::GuiActionType::ID_AdjustTreatmentEndReq                   : INTERPRET_TRANSMIT_MESSAGE(AdjustTreatmentEndRequestData                  ); break;
+    case Gui::GuiActionType::ID_AdjustTreatmentEndReq                   : INTERPRET_TRSMT_MT_MESSAGE(AdjustTreatmentEndRequestData                  ); break;
     // Post-Treatment
     case Gui::GuiActionType::ID_AdjustPatientDisconnectNotifyReq        : INTERPRET_TRSMT_MT_MESSAGE(AdjustPatientDisconnectionNotifyRequestData    ); break;
     case Gui::GuiActionType::ID_AdjustPatientDisconnectConfirmReq       : INTERPRET_TRSMT_MT_MESSAGE(AdjustPatientDisconnectionConfirmRequestData   ); break;
@@ -307,14 +321,14 @@
             return Can_Source::eCan_TD;
 
         case eChlid_DD_TD   :
+        case eChlid_DD_FP   :
       //case eChlid_DD_UI   : // has duplicate value as eChlid_DD_Sync
         case eChlid_DD_Alarm:
         case eChlid_DD_Sync :
             if (vText) *vText = "DD";
             return Can_Source::eCan_DD;
 
-        case eChlid_DD_FP   :
-      //case eChlid_FP_UI   :
+        //case eChlid_FP_UI   : // has duplicate value as eChlid_FP_Sync
         case eChlid_FP_Alarm:
         case eChlid_FP_Sync :
             if (vText) *vText = "FP";
@@ -357,18 +371,18 @@
             return Can_Id::eChlid_UI_TD;
 
       //case eChlid_DD_UI   : // has duplicate value as eChlid_DD_Sync
+        case eChlid_DD_FP   :
         case eChlid_DD_Alarm:
         case eChlid_DD_Sync :
             if (vText) *vText = "DD";
             return Can_Id::eChlid_UI_DD;
 
      // FP is not designed to directly communicate with UI
-      //case eChlid_DD_FP   :
-      //case eChlid_FP_UI   :
-      //case eChlid_FP_Alarm:
-      //case eChlid_FP_Sync :
-      //     if (vText) *vText = "FP";
-      //     return Can_Id::eChlid_UI_Sync;
+      //case eChlid_FP_UI   : // has duplicate value as eChlid_FP_Sync
+      case eChlid_FP_Alarm:
+      case eChlid_FP_Sync :
+           if (vText) *vText = "FP";
+           return Can_Id::eChlid_UI_Sync;
 
         case eDialin_TD     :
         case eTD_Dialin     :
@@ -411,8 +425,9 @@
 
     if ( ! gLogUnhandledOnly ) {
         switch (identifySource(vMessage.can_id)) {
-        case Can_Source::eCan_TD: ok = interpretMessage_HD(vMessage, vData); break;
-        case Can_Source::eCan_DD: ok = interpretMessage_DG(vMessage, vData); break;
+        case Can_Source::eCan_TD: ok = interpretMessage_TD(vMessage, vData); break;
+        case Can_Source::eCan_DD: ok = interpretMessage_DD(vMessage, vData); break;
+        case Can_Source::eCan_FP: ok = interpretMessage_FP(vMessage, vData); break;
         default                 :      printUnhandled     (vMessage       ); break; // ok is false, the individual interpreters for ?HD/DG should not be called, and it should be done here.
         }
     }
@@ -424,9 +439,9 @@
 }
 
 /*!
- * \brief   MessageInterpreter::interpretMessage_HD
+ * \brief   MessageInterpreter::interpretMessage_TD
  * \details This method will be called
- *          for received messages from HD to interpret the vMessage of type Message
+ *          for received messages from TD to interpret the vMessage of type Message
  *          to vData of type QVariantList which UI understands regarding the Can_Id.
  * \param   vMessage  - The complete message of type Message which needs to be interpreted.
  * \param   vActionId - The ActionId of GuiActionType which will be extracted from vMessage.
@@ -436,7 +451,7 @@
  * \return  true if the message CANBus channel is in the range which can be interpreted, false otherwise.
  *          This return value will be used later to emit MessageDispatcher::didActionReceive signal or not
  */
-bool MessageInterpreter::interpretMessage_HD(const Message &vMessage, QVariantList &vData)
+bool MessageInterpreter::interpretMessage_TD(const Message &vMessage, QVariantList &vData)
 {
     bool ok = false;
     vData.clear();
@@ -465,10 +480,15 @@
     case Gui::GuiActionType::ID_AdjustVersionsTDRsp                 : ok = notify<Model::MAdjustVersionsTDResponse                  >(vMessage, vData, Gui::GuiActionType::ID_AdjustVersionsTDRsp               ); break;
     case Gui::GuiActionType::ID_AdjustSerialTDRsp                   : ok = notify<Model::MAdjustSerialNumberTDResponse              >(vMessage, vData, Gui::GuiActionType::ID_AdjustSerialTDRsp                 ); break;
     case Gui::GuiActionType::ID_AdjustServiceDatesHDRsp             : ok = notify<Model::MAdjustServiceDatesHDResponse              >(vMessage, vData, Gui::GuiActionType::ID_AdjustServiceDatesHDRsp           ); break;
-    case Gui::GuiActionType::ID_AdjustHDDateTimeRsp                 : ok = notify<Model::MAdjustHDDateTimeResponse                  >(vMessage, vData, Gui::GuiActionType::ID_AdjustHDDateTimeRsp               ); break;
+    case Gui::GuiActionType::ID_AdjustTDDateTimeRsp                 : ok = notify<Model::MAdjustTDDateTimeResponse                  >(vMessage, vData, Gui::GuiActionType::ID_AdjustTDDateTimeRsp               ); break;
     case Gui::GuiActionType::ID_HDUsageInfoRsp                      : ok = notify<Model::MHDUsageInfoResponse                       >(vMessage, vData, Gui::GuiActionType::ID_HDUsageInfoRsp                    ); break;
     case Gui::GuiActionType::ID_AdjustInstitutionalRecordRsp        : ok = notify<Model::MAdjustInstitutionalRecordResponse         >(vMessage, vData, Gui::GuiActionType::ID_AdjustInstitutionalRecordRsp      ); break;
-    // ----- States
+    case Gui::GuiActionType::ID_InstitutionalRecordRsp              : ok = notify<Model::MInstitutionalRecordResponse               >(vMessage, vData, Gui::GuiActionType::ID_InstitutionalRecordRsp            ); break;
+    case Gui::GuiActionType::ID_AdjustAdvancedInstitutionalRecordRsp: ok = notify<Model::MAdjustAdvancedInstitutionalRecordResponse >(vMessage, vData, Gui::GuiActionType::ID_AdjustAdvancedInstitutionalRecordRsp); break;
+    case Gui::GuiActionType::ID_AdvancedInstitutionalRecordRsp      : ok = notify<Model::MAdvancedInstitutionalRecordResponse       >(vMessage, vData, Gui::GuiActionType::ID_AdvancedInstitutionalRecordRsp    ); break;
+
+
+        // ----- States
     case Gui::GuiActionType::ID_TDOpModeData                        : ok = notify<Model::MTDOpMode                                  >(vMessage, vData, Gui::GuiActionType::ID_TDOpModeData                      ); break;
     case Gui::GuiActionType::ID_PreTreatmentStates                  : ok = notify<Model::MPreTreatmentStates                        >(vMessage, vData, Gui::GuiActionType::ID_PreTreatmentStates                ); break;
     case Gui::GuiActionType::ID_TreatmentStates                     : ok = notify<Model::MTreatmentStates                           >(vMessage, vData, Gui::GuiActionType::ID_TreatmentStates                   ); break;
@@ -513,23 +533,36 @@
     case Gui::GuiActionType::ID_DialysateOutletFlow                 : ok = notify<Model::MOutletFlow                                >(vMessage, vData, Gui::GuiActionType::ID_DialysateOutletFlow               ); break;
     case Gui::GuiActionType::ID_PressureOcclusion                   : ok = notify<Model::MPressureOcclusion                         >(vMessage, vData, Gui::GuiActionType::ID_PressureOcclusion                 ); break;
     case Gui::GuiActionType::ID_Saline                              : ok = notify<Model::MTreatmentSaline                           >(vMessage, vData, Gui::GuiActionType::ID_Saline                            ); break;
+    case Gui::GuiActionType::ID_Vitals                              : ok = notify<Model::MTreatmentVitals                           >(vMessage, vData, Gui::GuiActionType::ID_Vitals                            ); break;
     case Gui::GuiActionType::ID_Heparin                             : ok = notify<Model::MTreatmentHeparin                          >(vMessage, vData, Gui::GuiActionType::ID_Heparin                           ); break;
     case Gui::GuiActionType::ID_Rinseback                           : ok = notify<Model::MTreatmentRinseback                        >(vMessage, vData, Gui::GuiActionType::ID_Rinseback                         ); break;
     case Gui::GuiActionType::ID_Recirculate                         : ok = notify<Model::MTreatmentRecirculate                      >(vMessage, vData, Gui::GuiActionType::ID_Recirculate                       ); break;
     case Gui::GuiActionType::ID_BloodPrime                          : ok = notify<Model::MTreatmentBloodPrime                       >(vMessage, vData, Gui::GuiActionType::ID_BloodPrime                        ); break;
     case Gui::GuiActionType::ID_TreatmentStop                       : ok = notify<Model::MTreatmentStop                             >(vMessage, vData, Gui::GuiActionType::ID_TreatmentStop                     ); break;
     case Gui::GuiActionType::ID_Ultrafiltration                     : ok = notify<Model::MTreatmentUltrafiltration                  >(vMessage, vData, Gui::GuiActionType::ID_Ultrafiltration                   ); break;
+    case Gui::GuiActionType::ID_IsolatedUF                          : ok = notify<Model::MTreatmentIsolatedUF                       >(vMessage, vData, Gui::GuiActionType::ID_IsolatedUF                        ); break;
     case Gui::GuiActionType::ID_TreatmentParametersSetPointData     : ok = notify<Model::MTreatmentParametersSetPoint               >(vMessage, vData, Gui::GuiActionType::ID_TreatmentParametersSetPointData   ); break;
     // ----- In-Treatment Adjust
-    case Gui::GuiActionType::ID_AdjustDurationRsp                   : ok = notify<Model::MAdjustDurationResponse                    >(vMessage, vData, Gui::GuiActionType::ID_AdjustDurationRsp                 ); break;
+    case Gui::GuiActionType::ID_AdjustBloodPrimeRsp                 : ok = notify<Model::MAdjustBloodPrimeResponse                  >(vMessage, vData, Gui::GuiActionType::ID_AdjustBloodPrimeRsp               ); break;
+    case Gui::GuiActionType::ID_AdjustDurationEditRsp               : ok = notify<Model::MAdjustDurationEditResponse                >(vMessage, vData, Gui::GuiActionType::ID_AdjustDurationEditRsp             ); break;
+    case Gui::GuiActionType::ID_AdjustDurationConfirmRsp            : ok = notify<Model::MAdjustDurationConfirmResponse             >(vMessage, vData, Gui::GuiActionType::ID_AdjustDurationConfirmRsp          ); break;
+    case Gui::GuiActionType::ID_AdjustSetPointsRsp                  : ok = notify<Model::MAdjustSetPointsResponse                   >(vMessage, vData, Gui::GuiActionType::ID_AdjustSetPointsRsp                ); break;
+    case Gui::GuiActionType::ID_AdjustBloodFlowRateRsp              : ok = notify<Model::MAdjustBloodFlowRateResponse               >(vMessage, vData, Gui::GuiActionType::ID_AdjustBloodFlowRateRsp            ); break;
+    case Gui::GuiActionType::ID_AdjustDialysateFlowRateRsp          : ok = notify<Model::MAdjustDialysateFlowRateResponse           >(vMessage, vData, Gui::GuiActionType::ID_AdjustDialysateFlowRateRsp        ); break;
+    case Gui::GuiActionType::ID_AdjustDialysateTemperatureRsp       : ok = notify<Model::MAdjustDialysateTemperatureResponse        >(vMessage, vData, Gui::GuiActionType::ID_AdjustDialysateTemperatureRsp     ); break;
+    case Gui::GuiActionType::ID_AdjustBolusVolumeRsp                : ok = notify<Model::MAdjustBolusVolumeResponse                 >(vMessage, vData, Gui::GuiActionType::ID_AdjustBolusVolumeRsp              ); break;
     case Gui::GuiActionType::ID_AdjustBloodDialysateRsp             : ok = notify<Model::MAdjustBloodDialysateResponse              >(vMessage, vData, Gui::GuiActionType::ID_AdjustBloodDialysateRsp           ); break;
     case Gui::GuiActionType::ID_AdjustPressuresLimitsRsp            : ok = notify<Model::MAdjustPressuresLimitsResponse             >(vMessage, vData, Gui::GuiActionType::ID_AdjustPressuresLimitsRsp          ); break;
     case Gui::GuiActionType::ID_AdjustSalineRsp                     : ok = notify<Model::MAdjustSalineResponse                      >(vMessage, vData, Gui::GuiActionType::ID_AdjustSalineRsp                   ); break;
+    case Gui::GuiActionType::ID_AdjustVitalsRsp                     : ok = notify<Model::MAdjustVitalsResponse                      >(vMessage, vData, Gui::GuiActionType::ID_AdjustVitalsRsp                   ); break;
     case Gui::GuiActionType::ID_AdjustUltrafiltrationStateRsp       : ok = notify<Model::MAdjustUltrafiltrationStateResponse        >(vMessage, vData, Gui::GuiActionType::ID_AdjustUltrafiltrationStateRsp     ); break;
     case Gui::GuiActionType::ID_AdjustHeparinRsp                    : ok = notify<Model::MAdjustHeparinResponse                     >(vMessage, vData, Gui::GuiActionType::ID_AdjustHeparinRsp                  ); break;
     case Gui::GuiActionType::ID_AdjustRinsebackRsp                  : ok = notify<Model::MAdjustRinsebackResponse                   >(vMessage, vData, Gui::GuiActionType::ID_AdjustRinsebackRsp                ); break;
     case Gui::GuiActionType::ID_AdjustRecirculateRsp                : ok = notify<Model::MAdjustRecirculateResponse                 >(vMessage, vData, Gui::GuiActionType::ID_AdjustRecirculateRsp              ); break;
     case Gui::GuiActionType::ID_AdjustTreatmentEndRsp               : ok = notify<Model::MAdjustTreatmentEndResponse                >(vMessage, vData, Gui::GuiActionType::ID_AdjustTreatmentEndRsp             ); break;
+    case Gui::GuiActionType::ID_AdjustIsolatedUFDurationEditRsp     : ok = notify<Model::MAdjustIsolatedUFDurationEditResponse      >(vMessage, vData, Gui::GuiActionType::ID_AdjustIsolatedUFDurationEditRsp   ); break;
+    case Gui::GuiActionType::ID_AdjustIsolatedUFVolumeEditRsp       : ok = notify<Model::MAdjustIsolatedUFVolumeEditResponse        >(vMessage, vData, Gui::GuiActionType::ID_AdjustIsolatedUFVolumeEditRsp     ); break;
+    case Gui::GuiActionType::ID_AdjustIsolatedUFConfirmRsp          : ok = notify<Model::MAdjustIsolatedUFConfirmResponse           >(vMessage, vData, Gui::GuiActionType::ID_AdjustIsolatedUFConfirmRsp        ); break;
 
     // ----- Post-Treatment Adjust
     case Gui::GuiActionType::ID_AdjustPatientDisconnectConfirmRsp   : ok = notify<Model::MAdjustPatientDisconnectionConfirmResponse >(vMessage, vData, Gui::GuiActionType::ID_AdjustPatientDisconnectConfirmRsp ); break;
@@ -543,8 +576,8 @@
     case Gui::GuiActionType::ID_AdjustDisinfectModeRsp              : ok = notify<Model::MAdjustDisinfectModeResponse               >(vMessage, vData, Gui::GuiActionType::ID_AdjustDisinfectModeRsp            ); break;
     case Gui::GuiActionType::ID_AdjustDisinfectStartRsp             : ok = notify<Model::MAdjustDisinfectStartResponse              >(vMessage, vData, Gui::GuiActionType::ID_AdjustDisinfectStartRsp           ); break;
     // these need to be standard and use notify as well
-    case Gui::GuiActionType::ID_AdjustUltrafiltrationEditRsp        : ok = adjustUltrafiltrationEdit                                 (vMessage, vData);     /* TODO : implement notify<>() */                      break;
-    case Gui::GuiActionType::ID_AdjustUltrafiltrationConfirmRsp     : ok = adjustUltrafiltrationConfirm                              (vMessage, vData);     /* TODO : implement notify<>() */                      break;
+    case Gui::GuiActionType::ID_AdjustUltrafiltrationEditRsp        : ok = notify<Model::MAdjustUltrafiltrationEditResponse         >(vMessage, vData, Gui::GuiActionType::ID_AdjustUltrafiltrationEditRsp      ); break;
+    case Gui::GuiActionType::ID_AdjustUltrafiltrationConfirmRsp     : ok = notify<Model::MAdjustUltrafiltrationConfirmResponse      >(vMessage, vData, Gui::GuiActionType::ID_AdjustUltrafiltrationConfirmRsp   ); break;
 
     // ----- Alarms
     case Gui::GuiActionType::ID_AlarmStatus                         : ok = notify<Model::MAlarmStatus                           >(vMessage, vData, Gui::GuiActionType::ID_AlarmStatus                           ); break;
@@ -563,9 +596,9 @@
 }
 
 /*!
- * \brief   MessageInterpreter::interpretMessage_DG
+ * \brief   MessageInterpreter::interpretMessage_DD
  * \details This method will be called
- *          for received messages from DG to interpret the vMessage of type Message
+ *          for received messages from DD to interpret the vMessage of type Message
  *          to vData of type QVariantList which UI understands regarding the Can_Id.
  * \param   vMessage  - The complete message of type Message which needs to be interpreted.
  * \param   vActionId - The ActionId of GuiActionType which will be extracted from vMessage.
@@ -575,7 +608,7 @@
  * \return  true if the message CANBus channel is in the range which can be interpreted, false otherwise.
  *          This return value will be used later to emit MessageDispatcher::didActionReceive signal or not
  */
-bool MessageInterpreter::interpretMessage_DG(const Message &vMessage, QVariantList &vData)
+bool MessageInterpreter::interpretMessage_DD(const Message &vMessage, QVariantList &vData)
 {
     bool    ok = false;
     vData.clear();
@@ -611,7 +644,7 @@
     case Gui::GuiActionType::ID_AdjustVersionsDDRsp         : ok = notify<Model::MAdjustVersionsDDResponse      >(vMessage, vData, Gui::GuiActionType::ID_AdjustVersionsDDRsp           ); break;
     case Gui::GuiActionType::ID_AdjustSerialDDRsp           : ok = notify<Model::MAdjustSerialNumberDDResponse  >(vMessage, vData, Gui::GuiActionType::ID_AdjustSerialDDRsp             ); break;
     case Gui::GuiActionType::ID_AdjustServiceDatesDGRsp     : ok = notify<Model::MAdjustServiceDatesDGResponse  >(vMessage, vData, Gui::GuiActionType::ID_AdjustServiceDatesDGRsp       ); break;
-    case Gui::GuiActionType::ID_AdjustDGDateTimeRsp         : ok = notify<Model::MAdjustDGDateTimeResponse      >(vMessage, vData, Gui::GuiActionType::ID_AdjustDGDateTimeRsp           ); break;
+    case Gui::GuiActionType::ID_AdjustDDDateTimeRsp         : ok = notify<Model::MAdjustDDDateTimeResponse      >(vMessage, vData, Gui::GuiActionType::ID_AdjustDDDateTimeRsp           ); break;
     case Gui::GuiActionType::ID_AdjustDGCleaningUsageRsp    : ok = notify<Model::MAdjustDGCleaningUsageResponse >(vMessage, vData, Gui::GuiActionType::ID_AdjustDGCleaningUsageRsp      ); break;
     // RO Water
     case Gui::GuiActionType::ID_DuetRoWaterStatDGq          : ok = notify<Model::MDuetRoWaterStatDGq            >(vMessage, vData, Gui::GuiActionType::ID_DuetRoWaterStatDGq            ); break;
@@ -624,6 +657,47 @@
     return ok;
 }
 
+/*!
+ * \brief   MessageInterpreter::interpretMessage_FP
+ * \details This method will be called
+ *          for received messages from FP to interpret the vMessage of type Message
+ *          to vData of type QVariantList which UI understands regarding the Can_Id.
+ * \param   vMessage  - The complete message of type Message which needs to be interpreted.
+ * \param   vActionId - The ActionId of GuiActionType which will be extracted from vMessage.
+ * \param   vData     - The values of QVariantList which is understandable for UI
+ *                      and has been extracted from hex values of the CANBus Message Payload
+ *                      in vMessage of type Message regarding each Message Id definition.
+ * \return  true if the message CANBus channel is in the range which can be interpreted, false otherwise.
+ *          This return value will be used later to emit MessageDispatcher::didActionReceive signal or not
+ */
+bool MessageInterpreter::interpretMessage_FP(const Message &vMessage, QVariantList &vData)
+{
+    bool    ok = false;
+    vData.clear();
+    switch (vMessage.actionId) { // notice we are in receive mode
+    case Gui::GuiActionType::ID_Acknow                      : ok = true;                                                                    /* TODO : implement notify<>() */              break;
+        LOG_APPED(QString("FP,CheckIn," + QVariant(vData).toStringList().join(',')));                                                                                                      break;
+
+    // FP data messages
+    case Gui::GuiActionType::ID_FPROPumpData                : ok = notify<Model::MFPROPump                      >(vMessage, vData, Gui::GuiActionType::ID_FPROPumpData              ); break;
+    case Gui::GuiActionType::ID_FPPressuresData             : ok = notify<Model::MFPPressures                   >(vMessage, vData, Gui::GuiActionType::ID_FPPressuresData           ); break;
+    case Gui::GuiActionType::ID_FPLevelData                 : ok = notify<Model::MFPLevel                       >(vMessage, vData, Gui::GuiActionType::ID_FPLevelData               ); break;
+    case Gui::GuiActionType::ID_FPFlowSensorData            : ok = notify<Model::MFPFlow                        >(vMessage, vData, Gui::GuiActionType::ID_FPFlowSensorData          ); break;
+    case Gui::GuiActionType::ID_FPConductivityData          : ok = notify<Model::MFPConductivity                >(vMessage, vData, Gui::GuiActionType::ID_FPConductivityData        ); break;
+    case Gui::GuiActionType::ID_FPTemperaturesData          : ok = notify<Model::MFPTemperature                 >(vMessage, vData, Gui::GuiActionType::ID_FPTemperaturesData        ); break;
+    case Gui::GuiActionType::ID_FPROBoosterPumpData         : ok = notify<Model::MFPBoostPump                   >(vMessage, vData, Gui::GuiActionType::ID_FPROBoosterPumpData       ); break;
+
+    // FP Response Messages
+    case Gui::GuiActionType::ID_AdjustVersionsFPRsp         : ok = notify<Model::MAdjustVersionsFPResponse      >(vMessage, vData, Gui::GuiActionType::ID_AdjustVersionsFPRsp       ); break;
+
+    // unhandled messages: these will only be logged as received message
+    // there has nothing been defined for these messages.
+    default                                                 :      printUnhandled                                (vMessage                                                          ); break;
+    }
+
+    return ok;
+}
+
 // ---------- ---------- Message handlers ---------- ---------- //
 
 // ---------- ---------- ---------- ---------- ---------- Debug ---------- ---------- ---------- ---------- ---------- //
@@ -655,54 +729,6 @@
 
 // ---------- ---------- ---------- ---------- ---------- Adjustments ---------- ---------- ---------- ---------- ---------- //
 /*!
- * \brief   MessageInterpreter::adjustUltrafiltrationEditData
- * \details This method interprets Treatment Ultrafiltration Volume 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 Volume Adjustment Response data
- * \return  true if the data can be extracted as defined for Treatment Ultrafiltration Volume Adjustment Response Message ID
- */
-bool MessageInterpreter::adjustUltrafiltrationEdit(const Message &vMessage, QVariantList &vData)
-{
-    bool ok = false;
-    if ( ! isValidMessage(vMessage, Gui::GuiActionType::ID_AdjustUltrafiltrationEditRsp) ) return ok;
-
-    Model::MAdjustUltrafiltrationEditResponse mData;
-    ok = mData.fromByteArray(vMessage.data);
-    LOG_APPED("HD," + mData.toString()); // TODO : Not Standard
-
-    mData.toVariantList(vData);
-    emit didActionReceive(mData.data());
-
-    return ok;
-}
-
-/*!
- * \brief   MessageInterpreter::adjustUltrafiltrationConfirmData
- * \details This method interprets Treatment Ultrafiltration Volume Adjustment Confirm 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 Volume Adjustment Confirm Response data
- * \return  true if the data can be extracted as defined for Treatment Ultrafiltration Volume Adjustment Confirm Response Message ID
- */
-bool MessageInterpreter::adjustUltrafiltrationConfirm(const Message &vMessage, QVariantList &vData)
-{
-    bool ok = false;
-    if ( ! isValidMessage(vMessage, Gui::GuiActionType::ID_AdjustUltrafiltrationConfirmRsp) ) return ok;
-
-    Model::MAdjustUltrafiltrationConfirmResponse mData;
-    ok = mData.fromByteArray(vMessage.data);
-    LOG_APPED("HD," + mData.toString()); // TODO : Not Standard
-
-    mData.toVariantList(vData);
-    emit didActionReceive(mData.data());
-
-    return ok;
-}
-
-/*!
  * \brief   MessageInterpreter::updateUnhandledMessages
  * \return  this method is converting the general settings messages/unhandled (Storage::Settings_Category_MessagesUnhandled) group of settings to the message interpreter specific map structure.
  *          it is done for performance to keep the lookup table shorter and faster.