Index: sources/canbus/messageinterpreter.h
===================================================================
diff -u -rc71deaab48699cffdf9db816dfac2778d79c2238 -rd1907168ef46faa6de1ada400cad789f8379041f
--- sources/canbus/messageinterpreter.h	(.../messageinterpreter.h)	(revision c71deaab48699cffdf9db816dfac2778d79c2238)
+++ sources/canbus/messageinterpreter.h	(.../messageinterpreter.h)	(revision d1907168ef46faa6de1ada400cad789f8379041f)
@@ -1,16 +1,16 @@
 /*!
- * 
+ *
  * Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved.
  * \copyright
  * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN
  * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER.
- * 
+ *
  * \file messageinterpreter.h
  * \author (last) Behrouz NemaiPour
  * \date (last) 22-Jun-2020
  * \author (original) Behrouz NematiPour
  * \date (original) 13-Dec-2019
- * 
+ *
  */
 #pragma once
 
@@ -19,7 +19,7 @@
 
 // Project
 #include "messageglobals.h"
-#include "mmodel.h"
+#include "MModel.h"
 
 // forward declaration
 class tst_messaging;
@@ -42,71 +42,38 @@
     friend class ::tst_messaging;
     friend class ::tst_logging;
 
-    bool                      isType(const Message &vMessage, Gui::GuiActionType vType) const;
-    bool           isPayloadLenValid(const Message &vMessage, Gui::GuiActionType vType) const;
+    bool isType                         (const Message &vMessage, Gui::GuiActionType vType) const;
+    bool isPayloadLenValid              (const Message &vMessage, Gui::GuiActionType vType) const;
+    bool isValidMessage                 (const Message &vMessage, Gui::GuiActionType vType) const;
 
-    void              printUnhandled(const Message &vMessage);
+    void logInvalidLength               (const Gui::GuiActionType &vActionId);
 
-    bool         interpretMessage_HD(const Message &vMessage, QVariantList              &vData) __attribute_warn_unused_result__;
-    bool         interpretMessage_DG(const Message &vMessage, QVariantList              &vData) __attribute_warn_unused_result__;
+    void printUnhandled                 (const Message &vMessage                          ) const;
+    void logReceivedMessage             (const Model::MAbstract &vModel);
 
-    // ---- PowerOff
-    bool             getPowerOffData(const Message &vMessage, Model::MPowerOff          &vData) __attribute_warn_unused_result__;
-    bool                powerOffData(const Message &vMessage, QVariantList              &vData) __attribute_warn_unused_result__;
+    bool interpretMessage_HD            (const Message &vMessage, QVariantList &vData) __attribute_warn_unused_result__;
+    bool interpretMessage_DG            (const Message &vMessage, QVariantList &vData) __attribute_warn_unused_result__;
 
-    // ---- BloodFlowData
-    bool            getBloodFlowData(const Message &vMessage, Model::MBloodFlow         &vData) __attribute_warn_unused_result__;
-    bool               bloodFlowData(const Message &vMessage, QVariantList              &vData) __attribute_warn_unused_result__;
+    // ----- Debug
+    bool canbusFaultCountData           (const Message &vMessage, QVariantList &vData) __attribute_warn_unused_result__;
 
-    // ---- Dialysate Inlet FlowData
-    bool   getDialysateInletFlowData(const Message &vMessage, Model::MDialysateFlow     &vData) __attribute_warn_unused_result__;
-    bool      dialysateInletFlowData(const Message &vMessage, QVariantList              &vData) __attribute_warn_unused_result__;
+    // ----- Events
+    // ----- - HD
+    bool alarmStatus                    (const Message &vMessage, QVariantList &vData) __attribute_warn_unused_result__;
+    bool alarmTriggered                 (const Message &vMessage, QVariantList &vData) __attribute_warn_unused_result__;
+    bool alarmCleared                   (const Message &vMessage, QVariantList &vData) __attribute_warn_unused_result__;
 
-    // ---- Dialysate Outlet FlowData
-    bool  getDialysateOutletFlowData(const Message &vMessage, Model::MOutletFlow        &vData) __attribute_warn_unused_result__;
-    bool     dialysateOutletFlowData(const Message &vMessage, QVariantList              &vData) __attribute_warn_unused_result__;
+    // ----- - DG
 
-    // ---- AlarmStatus
-    bool              getAlarmStatus(const Message &vMessage, Model::MAlarmStatus       &vData) __attribute_warn_unused_result__;
-    bool                 alarmStatus(const Message &vMessage, QVariantList              &vData) __attribute_warn_unused_result__;
+    // ----- Adjustments
+    bool adjustUltrafiltrationState     (const Message &vMessage, QVariantList &vData) __attribute_warn_unused_result__;
+    bool adjustUltrafiltrationEdit      (const Message &vMessage, QVariantList &vData) __attribute_warn_unused_result__;
+    bool adjustUltrafiltrationConfirm   (const Message &vMessage, QVariantList &vData) __attribute_warn_unused_result__;
 
-    // ---- Treatment Time
-    bool            getTreatmentTime(const Message &vMessage, Model::MTreatmentTime     &vData) __attribute_warn_unused_result__;
-    bool               treatmentTime(const Message &vMessage, QVariantList              &vData) __attribute_warn_unused_result__;
+    template<typename TModel>
+    bool notify                         (const Message &vMessage, QVariantList &vData, Gui::GuiActionType vIdCheck) __attribute_warn_unused_result__;
 
-    // ---- Treatment Pressure/Occlusion
-    bool    getPressureOcclusionData(const Message &vMessage, Model::MPressureOcclusion &vData) __attribute_warn_unused_result__;
-    bool       pressureOcclusionData(const Message &vMessage, QVariantList              &vData) __attribute_warn_unused_result__;
 
-    // ---- Treatment Ranges
-    bool         treatmentRangesData(const Message &vMessage, QVariantList              &vData) __attribute_warn_unused_result__;
-
-    // ---- Load Cell Readings
-    bool        loadCellReadingsData(const Message &vMessage, QVariantList              &vData) __attribute_warn_unused_result__;
-
-    // ---- canbus Fault Count
-    bool        canbusFaultCountData(const Message &vMessage, QVariantList              &vData) __attribute_warn_unused_result__;
-
-    // ---- Temperature Sensors
-    bool      temperatureSensorsData(const Message &vMessage, QVariantList              &vData) __attribute_warn_unused_result__;
-
-    // ~~~~ Adjustments ~~~~
-    // ---- Treatment Adjust response for Blood/Dialysate Flow Rate
-    bool    adjustBloodDialysateData            (const Message &vMessage, QVariantList              &vData) __attribute_warn_unused_result__;
-
-    // ---- Treatment Adjust response for Treatment Duration
-    bool    adjustDurationData                  (const Message &vMessage, QVariantList              &vData) __attribute_warn_unused_result__;
-
-    // ---- Treatment Adjust response for Treatment Ultrafiltration
-    bool    adjustUltrafiltrationEditData       (const Message &vMessage, QVariantList              &vData) __attribute_warn_unused_result__;
-
-    // ---- Treatment Adjust response for Treatment Ultrafiltration
-    bool    adjustUltrafiltrationConfirmData    (const Message &vMessage, QVariantList              &vData) __attribute_warn_unused_result__;
-
-    // ---- Treatment Adjust response for Treatment Ultrafiltration state (Pause / Resume) change
-    bool    adjustUltrafiltrationStateData      (const Message &vMessage, QVariantList              &vData) __attribute_warn_unused_result__;
-
-
     // ---- Create Treatment Response Data
     bool    createTreatmentRespData             (const Message &vMessage, QVariantList              &vData) __attribute_warn_unused_result__;
 
@@ -120,7 +87,6 @@
 signals:
     ACTION_RECEIVE_SIGNALS
 
-public slots:
 };
 
 }