Index: sources/canbus/messageinterpreter.cpp
===================================================================
diff -u -r5387db3e9735f3bbf768906858dbcd725cf23528 -r24dfaab03aaabc7b7714c5a4264dfbfca65aa41a
--- sources/canbus/messageinterpreter.cpp	(.../messageinterpreter.cpp)	(revision 5387db3e9735f3bbf768906858dbcd725cf23528)
+++ sources/canbus/messageinterpreter.cpp	(.../messageinterpreter.cpp)	(revision 24dfaab03aaabc7b7714c5a4264dfbfca65aa41a)
@@ -144,9 +144,9 @@
     QString mActionIdHexString = Format::toHexString(vMessage.actionId, false, eLenMessageIDDigits);
     QString logMessage = tr("Unhandled Message ID (HD)") + '\n' +
                          QString("%1 # %2   %3")
-                         .arg(int(vMessage.can_id), 3, 16, QChar('0'))
-                         .arg(mActionIdHexString)
-                         .arg(QString(vMessage.data.toHex('.')));
+                             .arg(int(vMessage.can_id), 3, 16, QChar('0'))
+                             .arg(mActionIdHexString)
+                             .arg(QString(vMessage.data.toHex('.')));
     LOG_DEBUG(logMessage);
 }
 
@@ -187,87 +187,116 @@
     vPayload.clear();
     int count = vData.length();
 
+    LOG_EVENT(QString("%0").arg(vActionId));
+
     switch (vActionId) { // notice we are in transmit mode
-    case Gui::GuiActionType::ID_Acknow: // len: 0, can have zero len
-        break; // No data, Just registered
+        case Gui::GuiActionType::ID_Acknow: // len: 0, can have zero len
+          break; // No data, Just registered
 
+        case Gui::GuiActionType::ID_KeepAlive: // len: 255, can have any len
+        {
+            if ( count ) { // this message has a variable length
+                vPayload = Format::fromVariant(vData[0]);
+            }
+            LOG_EVENT(mSenderID + QString("CheckIn"));
+        } break;
 
-    case Gui::GuiActionType::ID_KeepAlive: // len: 255, can have any len
-        if ( count ) { // this message has a variable length
-            vPayload = Format::fromVariant(vData[0]);
-        }
-        LOG_EVENT(mSenderID + QString("CheckIn"));
-        break;
+        case Gui::GuiActionType::ID_RawData: // len: 255, can have any len
+        {
+            if ( count ) { // this message has a variable length
+                vPayload = Format::fromVariant(vData[0]);
+            }
+            LOG_EVENT(mSenderID + QString("RawData"));
 
-    case Gui::GuiActionType::ID_RawData: // len: 255, can have any len
-        if ( count ) { // this message has a variable length
-            vPayload = Format::fromVariant(vData[0]);
-        }
-        LOG_EVENT(mSenderID + QString("RawData"));
-        break;
+        } break;
 
-    case Gui::GuiActionType::ID_PowerOff:
-        if ( ! count ) { logInvalidLength(vActionId); return false; }
-        vPayload += Format::fromVariant(vData);
-        LOG_EVENT(AdjustPowerOffRequestData::toString(vData));
-        break;
+        case Gui::GuiActionType::ID_PowerOff:
+        {
+            if ( ! count ) { logInvalidLength(vActionId); return false; }
+            vPayload += Format::fromVariant(vData);
+            LOG_EVENT(AdjustPowerOffRequestData::toString(vData));
 
-    case Gui::GuiActionType::ID_AdjustBloodDialysateReq:
-        if ( ! count ) { logInvalidLength(vActionId); return false; }
-        vPayload = Format::fromVariant(vData);
-        LOG_EVENT(AdjustBloodDialysateRequestData::toString(vData));
-        break;
+        } break;
 
-    case Gui::GuiActionType::ID_AdjustDurationReq:
-        if ( ! count ) { logInvalidLength(vActionId); return false; }
-        vPayload = Format::fromVariant(vData);
-        LOG_EVENT(AdjustDurationRequestData::toString(vData));
-        break;
+        case Gui::GuiActionType::ID_AdjustBloodDialysateReq:
+        {
+            if ( ! count ) { logInvalidLength(vActionId); return false; }
+            vPayload = Format::fromVariant(vData);
+            LOG_EVENT(AdjustBloodDialysateRequestData::toString(vData));
+        } break;
 
-    case Gui::GuiActionType::ID_AdjustUltrafiltrationStateReq:
-        if ( ! count ) { logInvalidLength(vActionId); return false; }
-        vPayload = Format::fromVariant(vData);
-        LOG_EVENT(AdjustUltrafiltrationStateRequestData::toString(vData));
-        break;
+        case Gui::GuiActionType::ID_AdjustDurationReq:
+        {
+            if ( ! count ) { logInvalidLength(vActionId); return false; }
+            vPayload = Format::fromVariant(vData);
+            LOG_EVENT(AdjustDurationRequestData::toString(vData));
+        } break;
 
-    case Gui::GuiActionType::ID_AdjustUltrafiltrationEditReq:
-        if ( ! count ) { logInvalidLength(vActionId); return false; }
-        vPayload = Format::fromVariant(vData);
-        LOG_EVENT(AdjustUltrafiltrationEditRequestData::toString(vData));
-        break;
+        case Gui::GuiActionType::ID_AdjustUltrafiltrationStateReq: {
+            if ( ! count ) { logInvalidLength(vActionId); return false; }
+            vPayload = Format::fromVariant(vData);
+            LOG_EVENT(AdjustUltrafiltrationStateRequestData::toString(vData));
+        } break;
 
-    case Gui::GuiActionType::ID_AdjustUltrafiltrationConfirmReq:
-        if ( ! count ) { logInvalidLength(vActionId); return false; }
-        vPayload = Format::fromVariant(vData);
-        LOG_EVENT(AdjustUltrafiltrationConfirmRequestData::toString(vData));
-        break;
+        case Gui::GuiActionType::ID_AdjustUltrafiltrationEditReq: {
+            if ( ! count ) { logInvalidLength(vActionId); return false; }
+            vPayload = Format::fromVariant(vData);
+            LOG_EVENT(AdjustUltrafiltrationEditRequestData::toString(vData));
+        } break;
 
-    case Gui::GuiActionType::ID_AdjustSalineReq:
-        if ( ! count ) { logInvalidLength(vActionId); return false; }
-        vPayload = Format::fromVariant(vData);
-        LOG_EVENT(AdjustSalineRequestData::toString(vData));
-        break;
+        case Gui::GuiActionType::ID_AdjustUltrafiltrationConfirmReq: {
+            if ( ! count ) { logInvalidLength(vActionId); return false; }
+            vPayload = Format::fromVariant(vData);
+            LOG_EVENT(AdjustUltrafiltrationConfirmRequestData::toString(vData));
+        } break;
 
-    case Gui::GuiActionType::ID_AlarmSilenceReq:
-        if ( ! count ) { logInvalidLength(vActionId); return false; }
-        vPayload = Format::fromVariant(vData);
-        LOG_EVENT(AlarmSilenceRequestData::toString(vData));
-        break;
+        case Gui::GuiActionType::ID_AdjustSalineReq: {
+            if ( ! count ) { logInvalidLength(vActionId); return false; }
+            vPayload = Format::fromVariant(vData);
+            LOG_EVENT(AdjustSalineRequestData::toString(vData));
+        } break;
 
-    case Gui::GuiActionType::ID_CreateTreatmentReq: {
-        if ( ! count ) { logInvalidLength(vActionId); return false; }
-        vPayload = Format::fromVariant(vData);
-        MAdjustTreatmentParametersRequest params;
-        params.fromVariantList(vData);
-        LOG_EVENT(params.toString());
-    } break;
+        case Gui::GuiActionType::ID_AlarmSilenceReq: {
+            if ( ! count ) { logInvalidLength(vActionId); return false; }
+            vPayload = Format::fromVariant(vData);
+            LOG_EVENT(AlarmSilenceRequestData::toString(vData));
+        } break;
 
-    default: {
-        QString mActionIdHexString = Format::toHexString(vActionId);
-        LOG_DEBUG(mSenderID + tr("Unknown transmit Message with ID '%1'").arg(mActionIdHexString));
-        ok = false;
-    } break;
+        case Gui::GuiActionType::ID_AlarmUserAckReq: {
+            if ( ! count ) { logInvalidLength(vActionId); return false; }
+            vPayload = Format::fromVariant(vData);
+            LOG_EVENT(AlarmAcknowledgeRequestData::toString(vData));
+        } break;
 
+        case Gui::GuiActionType::ID_StartTreatmentReq: {
+            if ( ! count ) { logInvalidLength(vActionId); return false; }
+            vPayload = Format::fromVariant(vData);
+            LOG_EVENT(StartTreatmentRequestData::toString(vData));
+        } break;
+
+        case Gui::GuiActionType::ID_ConfirmTreatmentReq: {
+            if ( count != 0 ) { logInvalidLength(vActionId); return false; }
+            vPayload = Format::fromVariant(vData);
+            LOG_EVENT(ConfirmTreatmentRequestData::toString(vData));
+        } break;
+
+        case Gui::GuiActionType::ID_EndTreatmentReq: {
+            if ( count != 0 ) { logInvalidLength(vActionId); return false; }
+            vPayload = Format::fromVariant(vData);
+            LOG_EVENT(EndTreatmentRequestData::toString(vData));
+        } break;
+
+        case Gui::GuiActionType::ID_CreateTreatmentReq: {
+            if ( ! count ) { logInvalidLength(vActionId); return false; }
+            vPayload = Format::fromVariant(vData);
+            LOG_EVENT(AdjustTreatmentParametersRequestData::toString(vData));
+        } break;
+
+        default: {
+            QString mActionIdHexString = Format::toHexString(vActionId);
+            LOG_DEBUG(mSenderID + tr("Unknown transmit Message with ID '%1'").arg(mActionIdHexString));
+            ok = false;
+        } break;
     }
     return ok;
 }
@@ -334,6 +363,7 @@
     case Gui::GuiActionType::ID_TreatmentRanges                 : ok = notify<Model::MTreatmentRanges             >(vMessage, vData, Gui::GuiActionType::ID_TreatmentRanges        ); break;
     case Gui::GuiActionType::ID_PressureOcclusion               : ok = notify<Model::MPressureOcclusion           >(vMessage, vData, Gui::GuiActionType::ID_PressureOcclusion      ); break;
     case Gui::GuiActionType::ID_TreatmentStates                 : ok = notify<Model::MTreatmentStates             >(vMessage, vData, Gui::GuiActionType::ID_TreatmentStates        ); break;
+    case Gui::GuiActionType::ID_PrimingData                     : ok = notify<Model::MPrimingData                 >(vMessage, vData, Gui::GuiActionType::ID_PrimingData            ); break;
     case Gui::GuiActionType::ID_Saline                          : ok = notify<Model::MTreatmentSaline             >(vMessage, vData, Gui::GuiActionType::ID_Saline                 ); break;
 
     // ----- Events
@@ -346,6 +376,7 @@
     case Gui::GuiActionType::ID_AlarmStatus                     : ok = alarmStatus                  (vMessage, vData); break; // TODO : implement notify<>()
     case Gui::GuiActionType::ID_AlarmTriggered                  : ok = alarmTriggered               (vMessage, vData); break; // TODO : implement notify<>()
     case Gui::GuiActionType::ID_AlarmCleared                    : ok = alarmCleared                 (vMessage, vData); break; // TODO : implement notify<>()
+    case Gui::GuiActionType::ID_CreateTreatmentRsp              : ok = notify<Model::MTreatmentParametersResponse >(vMessage, vData, Gui::GuiActionType::ID_CreateTreatmentRsp     ); break;
 
     // Adjustment Response Messages
     case Gui::GuiActionType::ID_AdjustDurationRsp               : ok = notify<Model::MAdjustDurationResponse      >(vMessage, vData, Gui::GuiActionType::ID_AdjustDurationRsp      ); break;
@@ -359,11 +390,12 @@
     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<>()
 
-    case Gui::GuiActionType::ID_CreateTreatmentRsp              : ok = createTreatmentRespData      (vMessage, vData); break;
-    // unhandles messages: these will only be logged as received message
+    case Gui::GuiActionType::ID_StartTreatmentRsp               : ok = notify<Model::MStartTreatmentResponse>      (vMessage, vData, Gui::GuiActionType::ID_StartTreatmentRsp      ); break;
+    case Gui::GuiActionType::ID_EndTreatmentRsp                 : ok = notify<Model::MEndTreatmentResponse>        (vMessage, vData, Gui::GuiActionType::ID_EndTreatmentRsp        ); break;
 
+    // unhandles messages: these will only be logged as received message
     // there has nothing been defined for these messages.
-    default                                                     :      printUnhandled                   (vMessage       ); break;
+    default                                                 :      printUnhandled                   (vMessage       ); break;
     }
 
     return ok;
@@ -596,26 +628,3 @@
 
     return ok;
 }
-
-/*!
- * \brief   MessageInterpreter::createTreatmentRespData
- *  Checks the validity of the create treatment response data.
- * \param   vMessage - The message
- * \param   vData    - the output data
- * \return  true if ok, false otherwise
- */
-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;
-
-    Model::MTreatmentParametersResponse mData;
-    ok = mData.fromByteArray(vMessage.data);
-    LOG_DATUM(mData.toString());
-
-    mData.toVariantList(vData);
-    emit didActionReceive(mData.data());
-
-    return ok;
-
-}