Index: sources/canbus/MessageInterpreter.cpp
===================================================================
diff -u -rdf74454a7a75eb63ac577739c1fd0f179e479f44 -r746e2c890e9c4c38f6f5703c1c4e55fc6248385a
--- sources/canbus/MessageInterpreter.cpp	(.../MessageInterpreter.cpp)	(revision df74454a7a75eb63ac577739c1fd0f179e479f44)
+++ sources/canbus/MessageInterpreter.cpp	(.../MessageInterpreter.cpp)	(revision 746e2c890e9c4c38f6f5703c1c4e55fc6248385a)
@@ -37,6 +37,14 @@
     LOG_EVENT(vMODEL::toString(vData));                             \
     DEBUG_RECEIVE_SIGNAL(0, typeid(vMODEL).name())
 
+// another version of the INTERPRET_RECEIVED_MESSAGE for empty messages
+// same later improvements apply to this MACRO as well.
+#define INTERPRET_RECVD_MT_MESSAGE(vMODEL)                          \
+    if (   length ) { logInvalidLength(vActionId); return false; }  \
+    vPayload = Format::fromVariant(vData);                          \
+    LOG_EVENT(vMODEL::toString(vData));                             \
+    DEBUG_RECEIVE_SIGNAL(0, typeid(vMODEL).name())
+
 /*!
  * \brief MessageInterpreter::MessageInterpreter
  * \details Constructor
@@ -220,30 +228,24 @@
     // 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;
+    // 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;
     // pre-Treatment
     case Gui::GuiActionType::ID_TreatmentStartReq                   : INTERPRET_RECEIVED_MESSAGE(TreatmentStartRequestData              ); break;
     case Gui::GuiActionType::ID_TreatmentConfirmReq                 : INTERPRET_RECEIVED_MESSAGE(TreatmentConfirmRequestData            ); break;
-
-    case Gui::GuiActionType::ID_TreatmentEndReq:
-        if ( length != 0 ) { logInvalidLength(vActionId); return false; }
-        vPayload = Format::fromVariant(vData);
-        LOG_EVENT(TreatmentEndRequestData::toString(vData));
-        break;
-
+    case Gui::GuiActionType::ID_TreatmentEndReq                     : INTERPRET_RECVD_MT_MESSAGE(TreatmentEndRequestData                ); break;
     case Gui::GuiActionType::ID_TreatmentCreateReq                  : INTERPRET_RECEIVED_MESSAGE(AdjustTreatmentParametersRequestData   ); 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_AlarmClearedConditionReq            : INTERPRET_RECEIVED_MESSAGE(AlarmClearedConditionRequestData       ); 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_AdjustPressuresLimitsReq            : INTERPRET_RECEIVED_MESSAGE(AdjustPressuresLimitsRequestData       ); break;
-
     default:
         QString mActionIdHexString = Format::toHexString(vActionId);
         LOG_DEBUG(mSenderID + tr("Unknown transmit Message with ID '%1'").arg(mActionIdHexString));