Index: sources/canbus/MessageInterpreter.cpp
===================================================================
diff -u -r87be1a4b3a1d19c60b37908f1cba8e310799a963 -rf723048b0efe2edf7cb08b9bba2ef67c55917503
--- sources/canbus/MessageInterpreter.cpp	(.../MessageInterpreter.cpp)	(revision 87be1a4b3a1d19c60b37908f1cba8e310799a963)
+++ sources/canbus/MessageInterpreter.cpp	(.../MessageInterpreter.cpp)	(revision f723048b0efe2edf7cb08b9bba2ef67c55917503)
@@ -230,7 +230,10 @@
     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;
@@ -245,20 +248,32 @@
     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_AdjustPressuresWideningReq              : INTERPRET_TRSMT_MT_MESSAGE(AdjustPressuresWideningRequestData             ); 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;
@@ -469,7 +484,12 @@
     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;
@@ -521,18 +541,30 @@
     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_AdjustPressuresWideningRsp          : ok = notify<Model::MAdjustPressuresWideningResponse           >(vMessage, vData, Gui::GuiActionType::ID_AdjustPressuresWideningRsp        ); 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;
@@ -546,8 +578,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;
@@ -649,7 +681,6 @@
         LOG_APPED(QString("FP,CheckIn," + QVariant(vData).toStringList().join(',')));                                                                                                      break;
 
     // FP data messages
-    case Gui::GuiActionType::ID_FPValvesStatesData          : ok = notify<Model::MFPValvesStates                >(vMessage, vData, Gui::GuiActionType::ID_FPValvesStatesData        ); break;
     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;
@@ -700,54 +731,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.