Index: sources/canbus/MessageInterpreter.cpp
===================================================================
diff -u -r96854524927f212c24b9e4a253baeff2e672228f -re0412efcf85964a18ec52ad80f233c45998eb45a
--- sources/canbus/MessageInterpreter.cpp	(.../MessageInterpreter.cpp)	(revision 96854524927f212c24b9e4a253baeff2e672228f)
+++ sources/canbus/MessageInterpreter.cpp	(.../MessageInterpreter.cpp)	(revision e0412efcf85964a18ec52ad80f233c45998eb45a)
@@ -25,27 +25,27 @@
 using namespace Can;
 using namespace Model;
 
-#define DEBUG_RECEIVE_SIGNAL(vID, vMODEL) // qDebug() << vID << vMODEL;
+#define DEBUG_SIGNAL(vID, vMODEL) // qDebug() << vID << vMODEL;
 
 
 // a macro to simplify the transmit message
 // would be better later to be replaced by a template method
 // like the notify method of received messages
-#define INTERPRET_RECEIVED_MESSAGE(vMODEL)                          \
+#define INTERPRET_TRANSMIT_MESSAGE(vMODEL)                          \
     if ( ! length ) { logInvalidLength(vActionId); return false; }  \
     vCanId = vMODEL::canid();                                       \
     vPayload = Format::fromVariant(vData);                          \
     LOG_EVENT(vMODEL::toString(vData));                             \
-    DEBUG_RECEIVE_SIGNAL(0, typeid(vMODEL).name())
+    DEBUG_SIGNAL(0, typeid(vMODEL).name())
 
-// another version of the INTERPRET_RECEIVED_MESSAGE for empty messages
+// another version of the INTERPRET_TRANSMIT_MESSAGE for empty messages
 // same later improvements apply to this MACRO as well.
-#define INTERPRET_RECVD_MT_MESSAGE(vMODEL)                          \
+#define INTERPRET_TRSMT_MT_MESSAGE(vMODEL)                          \
     if (   length ) { logInvalidLength(vActionId); return false; }  \
     vCanId = vMODEL::canid();                                       \
     vPayload = Format::fromVariant(vData);                          \
     LOG_EVENT(vMODEL::toString(vData));                             \
-    DEBUG_RECEIVE_SIGNAL(0, typeid(vMODEL).name())
+    DEBUG_SIGNAL(0, typeid(vMODEL).name())
 
 /*!
  * \brief MessageInterpreter::MessageInterpreter
@@ -81,7 +81,7 @@
     // coco end
     emit didActionReceive(tModel.data());
     logReceivedMessage(tModel);
-    DEBUG_RECEIVE_SIGNAL(vIdCheck, typeid(TModel).name())
+    DEBUG_SIGNAL(vIdCheck, typeid(TModel).name())
     return ok;
 }
 
@@ -221,7 +221,7 @@
         if ( length ) { // this message has a variable length
             vPayload = Format::fromVariant(vData[0]);
         }
-        LOG_EVENT(mSenderID + QString("CheckIn"));
+        // LOG_EVENT(mSenderID + QString("CheckIn"));
         break;
 
     case Gui::GuiActionType::ID_RawData: // len: 255, can have any len
@@ -231,32 +231,40 @@
         LOG_EVENT(mSenderID + QString("RawData"));
         break;
 
-    case Gui::GuiActionType::ID_PowerOff                            : INTERPRET_RECEIVED_MESSAGE(AdjustPowerOffRequestData                  ); break;
-    case Gui::GuiActionType::ID_AdjustVersionsReq                   : INTERPRET_RECVD_MT_MESSAGE(AdjustVersionsRequestData                  ); break;
+    case Gui::GuiActionType::ID_PowerOff                            : INTERPRET_TRANSMIT_MESSAGE(AdjustPowerOffRequestData                  ); break;
+    case Gui::GuiActionType::ID_AdjustVersionsReq                   : INTERPRET_TRSMT_MT_MESSAGE(AdjustVersionsRequestData                  ); break;
     // in-treatment
-    case Gui::GuiActionType::ID_AdjustDurationReq                   : INTERPRET_RECEIVED_MESSAGE(AdjustDurationRequestData                  ); break;
-    case Gui::GuiActionType::ID_AdjustBloodDialysateReq             : INTERPRET_RECEIVED_MESSAGE(AdjustBloodDialysateRequestData            ); break;
-    case Gui::GuiActionType::ID_AdjustPressuresLimitsReq            : INTERPRET_RECEIVED_MESSAGE(AdjustPressuresLimitsRequestData           ); break;
-    case Gui::GuiActionType::ID_AdjustSalineReq                     : INTERPRET_RECEIVED_MESSAGE(AdjustSalineRequestData                    ); break;
-    case Gui::GuiActionType::ID_AdjustHeparinReq                    : INTERPRET_RECEIVED_MESSAGE(AdjustHeparinRequestData                   ); break;
+    case Gui::GuiActionType::ID_AdjustDurationReq                   : INTERPRET_TRANSMIT_MESSAGE(AdjustDurationRequestData                  ); 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_AdjustHeparinReq                    : INTERPRET_TRANSMIT_MESSAGE(AdjustHeparinRequestData                   ); break;
     // in-treatment - ultrafiltration
-    case Gui::GuiActionType::ID_AdjustUltrafiltrationInitReq        : INTERPRET_RECEIVED_MESSAGE(AdjustUltrafiltrationInitRequestData       ); break;    
-    case Gui::GuiActionType::ID_AdjustUltrafiltrationStateReq       : INTERPRET_RECEIVED_MESSAGE(AdjustUltrafiltrationStateRequestData      ); break;
-    case Gui::GuiActionType::ID_AdjustUltrafiltrationEditReq        : INTERPRET_RECEIVED_MESSAGE(AdjustUltrafiltrationEditRequestData       ); break;
-    case Gui::GuiActionType::ID_AdjustUltrafiltrationConfirmReq     : INTERPRET_RECEIVED_MESSAGE(AdjustUltrafiltrationConfirmRequestData    ); break;
+    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;
     // Post-Treatment
-    case Gui::GuiActionType::ID_AdjustRinsebackReq                  : INTERPRET_RECEIVED_MESSAGE(AdjustRinsebackRequestData                 ); break;
-    case Gui::GuiActionType::ID_AdjustRecirculateReq                : INTERPRET_RECEIVED_MESSAGE(AdjustRecirculateRequestData               ); break;
-    case Gui::GuiActionType::ID_AdjustTreatmentEndReq               : INTERPRET_RECEIVED_MESSAGE(AdjustTreatmentEndRequestData              ); break;
-    // pre-Treatment
-    case Gui::GuiActionType::ID_StartTreatmentReq                   : INTERPRET_RECEIVED_MESSAGE(StartTreatmentRequestData                  ); break;
-    case Gui::GuiActionType::ID_ConfirmTreatmentReq                 : INTERPRET_RECEIVED_MESSAGE(ConfirmTreatmentRequestData                ); break;
-    case Gui::GuiActionType::ID_CreateTreatmentReq                  : INTERPRET_RECEIVED_MESSAGE(AdjustTreatmentParametersRequestData       ); break;
+    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;
+    // Pre-Treatment
+    case Gui::GuiActionType::ID_AdjustInitTreatmentReq              : INTERPRET_TRANSMIT_MESSAGE(AdjustInitTreatmentRequestData             ); break;
+    case Gui::GuiActionType::ID_AdjustParametersValidationReq       : INTERPRET_TRANSMIT_MESSAGE(AdjustParametersValidationRequestData      ); break;
+    case Gui::GuiActionType::ID_AdjustParametersConfirmReq          : INTERPRET_TRANSMIT_MESSAGE(AdjustParametersConfirmRequestData         ); break;
+    case Gui::GuiActionType::ID_AdjustWaterSampleReq                : INTERPRET_TRANSMIT_MESSAGE(AdjustWaterSampleRequestData               ); break;
+    case Gui::GuiActionType::ID_AdjustWaterSampleResultReq          : INTERPRET_TRANSMIT_MESSAGE(AdjustWaterSampleResultRequestData         ); break;
+    case Gui::GuiActionType::ID_AdjustConsumablesConfirmReq         : INTERPRET_TRANSMIT_MESSAGE(AdjustConsumablesConfirmRequestData        ); break;
+    case Gui::GuiActionType::ID_AdjustDisposablesConfirmReq         : INTERPRET_TRANSMIT_MESSAGE(AdjustDisposablesConfirmRequestData        ); break;
+    case Gui::GuiActionType::ID_AdjustDisposablesPrimeReq           : INTERPRET_TRANSMIT_MESSAGE(AdjustDisposablesPrimeRequestData          ); break;
+    case Gui::GuiActionType::ID_AdjustUltrafiltrationInitReq        : INTERPRET_TRANSMIT_MESSAGE(AdjustUltrafiltrationInitRequestData       ); break;
+    case Gui::GuiActionType::ID_AdjustPatientConnectionBeginReq     : INTERPRET_TRANSMIT_MESSAGE(AdjustPatientConnectionBeginRequestData    ); break;
+    case Gui::GuiActionType::ID_AdjustPatientConnectionConfirmReq   : INTERPRET_TRANSMIT_MESSAGE(AdjustPatientConnectionConfirmRequestData  ); break;
+    case Gui::GuiActionType::ID_AdjustStartTreatmentReq             : INTERPRET_TRANSMIT_MESSAGE(AdjustStartTreatmentRequestData            ); break;
     // alarms
-    case Gui::GuiActionType::ID_AlarmSilenceReq                     : INTERPRET_RECEIVED_MESSAGE(AlarmSilenceRequestData                    ); break;
-    case Gui::GuiActionType::ID_AlarmUserActionReq                  : INTERPRET_RECEIVED_MESSAGE(AlarmUserActionRequestData                 ); break;
+    case Gui::GuiActionType::ID_AlarmSilenceReq                     : INTERPRET_TRANSMIT_MESSAGE(AlarmSilenceRequestData                    ); break;
+    case Gui::GuiActionType::ID_AlarmUserActionReq                  : INTERPRET_TRANSMIT_MESSAGE(AlarmUserActionRequestData                 ); break;
     // coco begin validated: Manually tested. This model class is a placeholder for the message 63(0x3F00) and there is no use case for this now.
-    case Gui::GuiActionType::ID_AlarmClearedConditionReq            : INTERPRET_RECEIVED_MESSAGE(AlarmClearedConditionRequestData           ); break;
+    case Gui::GuiActionType::ID_AlarmClearedConditionReq            : INTERPRET_TRANSMIT_MESSAGE(AlarmClearedConditionRequestData           ); break;
     // coco end
     default:
         QString mActionIdHexString = Format::toHexString(vActionId);
@@ -339,36 +347,41 @@
     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_HDAccelerometerData             : ok = notify<Model::MHDAccelerometer                       >(vMessage, vData, Gui::GuiActionType::ID_HDAccelerometerData           ); break;
-    // ----- Datum - Pre-Treatment progress
-    case Gui::GuiActionType::ID_SelfTestNoCartridge             : ok = notify<Model::MPreTreatmentSelfTestNoCartridge       >(vMessage, vData, Gui::GuiActionType::ID_SelfTestNoCartridge           ); break;
-    case Gui::GuiActionType::ID_SelfTestDry                     : ok = notify<Model::MPreTreatmentSelfTestDry               >(vMessage, vData, Gui::GuiActionType::ID_SelfTestDry                   ); break;
-    case Gui::GuiActionType::ID_DisposablesPrime                : ok = notify<Model::MPreTreatmentPrime                     >(vMessage, vData, Gui::GuiActionType::ID_DisposablesPrime              ); break;
+    // ----- Pre-Treatment - Datum - Progress
+    case Gui::GuiActionType::ID_SelfTestNoCartridgeData         : ok = notify<Model::MPreTreatmentSelfTestNoCartridge       >(vMessage, vData, Gui::GuiActionType::ID_SelfTestNoCartridgeData       ); break;
+    case Gui::GuiActionType::ID_SelfTestDryData                 : ok = notify<Model::MPreTreatmentSelfTestDry               >(vMessage, vData, Gui::GuiActionType::ID_SelfTestDryData               ); break;
+    case Gui::GuiActionType::ID_DisposablesPrimeData            : ok = notify<Model::MPreTreatmentDisposablePrime           >(vMessage, vData, Gui::GuiActionType::ID_DisposablesPrimeData          ); break;
+    // ----- Pre-Treatment - Adjust
+    case Gui::GuiActionType::ID_AdjustInitTreatmentRsp              : ok = notify<Model::MAdjustInitTreatmentResponse               >(vMessage, vData, Gui::GuiActionType::ID_AdjustInitTreatmentRsp            ); break;
+    case Gui::GuiActionType::ID_AdjustParametersValidationRsp       : ok = notify<Model::MAdjustParametersValidationResponse        >(vMessage, vData, Gui::GuiActionType::ID_AdjustParametersValidationRsp     ); break;
+    case Gui::GuiActionType::ID_AdjustWaterSampleRsp                : ok = notify<Model::MAdjustWaterSampleResponse                 >(vMessage, vData, Gui::GuiActionType::ID_AdjustWaterSampleRsp              ); break;
+    case Gui::GuiActionType::ID_AdjustDisposablesPrimeRsp           : ok = notify<Model::MAdjustDisposablePrimeResponse             >(vMessage, vData, Gui::GuiActionType::ID_AdjustDisposablesPrimeRsp         ); break;
+    case Gui::GuiActionType::ID_AdjustUltrafiltrationInitRsp        : ok = notify<Model::MAdjustUltrafiltrationInitResponse         >(vMessage, vData, Gui::GuiActionType::ID_AdjustUltrafiltrationInitRsp      ); break;
+    case Gui::GuiActionType::ID_AdjustPatientConnectionBeginRsp     : ok = notify<Model::MAdjustPatientConnectionBeginResponse      >(vMessage, vData, Gui::GuiActionType::ID_AdjustPatientConnectionBeginRsp   ); break;
+    case Gui::GuiActionType::ID_AdjustPatientConnectionConfirmRsp   : ok = notify<Model::MAdjustPatientConnectionConfirmResponse    >(vMessage, vData, Gui::GuiActionType::ID_AdjustPatientConnectionConfirmRsp ); break;
+    case Gui::GuiActionType::ID_AdjustStartTreatmentRsp             : ok = notify<Model::MAdjustStartTreatmentResponse              >(vMessage, vData, Gui::GuiActionType::ID_AdjustStartTreatmentRsp           ); break;
 
     // ----- Events
     case Gui::GuiActionType::ID_Acknow                          : ok = true;                                                     break; // TODO : implement notify<>()
     case Gui::GuiActionType::ID_PowerOff                        : ok = notify<Model::MPowerOff                              >(vMessage, vData, Gui::GuiActionType::ID_PowerOff                      ); break;
     case Gui::GuiActionType::ID_ShuttingDown                    : ok = true; LOG_EVENT("HD,ShuttingDown");                       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;
     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_AdjustUltrafiltrationInitRsp    : ok = notify<Model::MAdjustUltrafiltrationInitResponse     >(vMessage, vData, Gui::GuiActionType::ID_AdjustUltrafiltrationInitRsp  ); 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_AdjustHDVersionsRsp             : ok = notify<Model::MAdjustHDVersionsResponse              >(vMessage, vData, Gui::GuiActionType::ID_AdjustHDVersionsRsp    ); break;
+    case Gui::GuiActionType::ID_AdjustHDVersionsRsp             : ok = notify<Model::MAdjustHDVersionsResponse              >(vMessage, vData, Gui::GuiActionType::ID_AdjustHDVersionsRsp           ); break;
 
     // 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<>()
 
-    case Gui::GuiActionType::ID_StartTreatmentRsp               : ok = notify<Model::MStartTreatmentResponse                >(vMessage, vData, Gui::GuiActionType::ID_StartTreatmentRsp             ); break;
-
     // Alarms
     case Gui::GuiActionType::ID_AlarmStatus                     : ok = notify<Model::MAlarmStatus                           >(vMessage, vData, Gui::GuiActionType::ID_AlarmStatus                   ); break;
     case Gui::GuiActionType::ID_AlarmTriggered                  : ok = notify<Model::MAlarmTriggered                        >(vMessage, vData, Gui::GuiActionType::ID_AlarmTriggered                ); break;
@@ -420,7 +433,7 @@
     case Gui::GuiActionType::ID_DGDebugText             : ok = notify<Model::MDGDebugText        >(vMessage, vData, Gui::GuiActionType::ID_DGDebugText           ); break;
     case Gui::GuiActionType::ID_DGAccelerometerData     : ok = notify<Model::MDGAccelerometer    >(vMessage, vData, Gui::GuiActionType::ID_DGAccelerometerData   ); break;
     // ----- Datum - Pre-Treatment progress
-    case Gui::GuiActionType::ID_DGFilterFlush           : ok = notify<Model::MDGFilterFlush      >(vMessage, vData, Gui::GuiActionType::ID_DGFilterFlush         ); break;
+    case Gui::GuiActionType::ID_DGFilterFlushData       : ok = notify<Model::MDGFilterFlush      >(vMessage, vData, Gui::GuiActionType::ID_DGFilterFlushData     ); break;
 
     // DG Response Messages
     case Gui::GuiActionType::ID_AdjustDGVersionsRsp     : ok = notify<Model::MAdjustDGVersionsResponse  >(vMessage, vData, Gui::GuiActionType::ID_AdjustDGVersionsRsp    ); break;