Index: sources/canbus/messageinterpreter.h
===================================================================
diff -u -r057d3ef4e29c63235040c5cfe8c6421ef7787d6a -r846a9ebc350e33be4affab3cc4c136248900015d
--- sources/canbus/messageinterpreter.h	(.../messageinterpreter.h)	(revision 057d3ef4e29c63235040c5cfe8c6421ef7787d6a)
+++ sources/canbus/messageinterpreter.h	(.../messageinterpreter.h)	(revision 846a9ebc350e33be4affab3cc4c136248900015d)
@@ -1,14 +1,15 @@
 /*!
  *
  * 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.
+ * \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
- * date    12/11/2019
- * author  Behrouz NematiPour
+ * \file messageinterpreter.h
+ * \author (last) Behrouz NematiPour
+ * \date (last) 03-Aug-2020
+ * \author (original) Behrouz NematiPour
+ * \date (original) 13-Dec-2019
  *
  */
 #pragma once
@@ -18,8 +19,12 @@
 
 // Project
 #include "messageglobals.h"
-#include "mmodel.h"
+#include "MModel.h"
 
+// forward declaration
+class tst_messaging;
+class tst_logging;
+
 namespace Can {
 
 /*!
@@ -33,35 +38,45 @@
 {
     Q_OBJECT
 
-    void printUnhandled         (const Message &vMessage);
+    // friend
+    friend class ::tst_messaging;
+    friend class ::tst_logging;
 
-    bool interpretMessage_HD    (const Message &vMessage, QVariantList &vData)                                      __attribute_warn_unused_result__;
-    bool interpretMessage_DG    (const Message &vMessage, QVariantList &vData)                                      __attribute_warn_unused_result__;
+    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;
 
-    // ---- PowerOff
-    bool            getPowerOffData(const Message &vMessage, Model::MPowerOff  &vData)                              __attribute_warn_unused_result__;
-    bool               powerOffData(const Message &vMessage, QVariantList      &vData)                              __attribute_warn_unused_result__;
+    void logInvalidLength               (const Gui::GuiActionType &vActionId);
 
-    // ---- BloodFlowData
-    bool           getBloodFlowData(const Message &vMessage, Model::MBloodFlow  &vData)                             __attribute_warn_unused_result__;
-    bool              bloodFlowData(const Message &vMessage, QVariantList       &vData)                             __attribute_warn_unused_result__;
+    void printUnhandled                 (const Message &vMessage                          ) const;
+    void logReceivedMessage             (const Model::MAbstract &vModel);
 
-    // ---- Dialysate Inlet FlowData
-    bool  getDialysateInletFlowData(const Message &vMessage, Model::DialysateFlow &vData)                           __attribute_warn_unused_result__;
-    bool     dialysateInletFlowData(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__;
 
-    // ---- 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__;
+    // ----- Debug
+    bool canbusFaultCountData           (const Message &vMessage, QVariantList &vData) __attribute_warn_unused_result__;
 
-    // ---- AlarmStatus
-    bool            getAlarmStatus (const Message &vMessage, Model::MAlarmStatus &vData)                            __attribute_warn_unused_result__;
-    bool               alarmStatus (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__;
 
-    // ---- Treatment Time
-    bool getTreatmentTime       (const Message &vMessage, Model::MTreatmentTime &vData);
-    bool treatmentTime          (const Message &vMessage, QVariantList          &vData);
+    // ----- - DG
 
+    // ----- 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__;
+
+    template<typename TModel>
+    bool notify                         (const Message &vMessage, QVariantList &vData, Gui::GuiActionType vIdCheck) __attribute_warn_unused_result__;
+
+
+    // ---- Create Treatment Response Data
+    bool    createTreatmentRespData             (const Message &vMessage, QVariantList              &vData) __attribute_warn_unused_result__;
+
 public:
     explicit MessageInterpreter(QObject *parent = nullptr);
 
@@ -72,7 +87,6 @@
 signals:
     ACTION_RECEIVE_SIGNALS
 
-public slots:
 };
 
 }