Index: sources/canbus/messageinterpreter.h
===================================================================
diff -u -r8c69137f18382bdc55a5678e6ed44a7683fe4dea -r057d3ef4e29c63235040c5cfe8c6421ef7787d6a
--- sources/canbus/messageinterpreter.h	(.../messageinterpreter.h)	(revision 8c69137f18382bdc55a5678e6ed44a7683fe4dea)
+++ sources/canbus/messageinterpreter.h	(.../messageinterpreter.h)	(revision 057d3ef4e29c63235040c5cfe8c6421ef7787d6a)
@@ -18,6 +18,7 @@
 
 // Project
 #include "messageglobals.h"
+#include "mmodel.h"
 
 namespace Can {
 
@@ -34,42 +35,42 @@
 
     void printUnhandled         (const Message &vMessage);
 
-    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 interpretMessage_HD    (const Message &vMessage, QVariantList &vData)                                      __attribute_warn_unused_result__;
+    bool interpretMessage_DG    (const Message &vMessage, QVariantList &vData)                                      __attribute_warn_unused_result__;
 
-    bool getPowerOffData        (const Message &vMessage        , quint8     &vShowHide)                                    __attribute_warn_unused_result__;
+    // ---- PowerOff
+    bool            getPowerOffData(const Message &vMessage, Model::MPowerOff  &vData)                              __attribute_warn_unused_result__;
+    bool               powerOffData(const Message &vMessage, QVariantList      &vData)                              __attribute_warn_unused_result__;
 
     // ---- BloodFlowData
-    bool getBloodFlowData       (const Message &vMessage        ,
-                                 Types::S32    &vFlowSetPoint   ,
-                                 Types::F32    &vMeasuredFlow   , Types::F32 &vRotorSpeed       , Types::F32 &vMotorSpeed,
-                                 Types::F32    &vMotorCtlSpeed  , Types::F32 &vMotorCtlCurrent  , Types::F32 &vPWMDtCycle)  __attribute_warn_unused_result__;
-    bool    bloodFlowData       (const Message &vMessage, QVariantList &vData)                                              __attribute_warn_unused_result__;
+    bool           getBloodFlowData(const Message &vMessage, Model::MBloodFlow  &vData)                             __attribute_warn_unused_result__;
+    bool              bloodFlowData(const Message &vMessage, QVariantList       &vData)                             __attribute_warn_unused_result__;
 
-    // ---- Dialysate FlowData
-    bool getDialysateFlowData   (const Message &vMessage        ,
-                                 Types::S32    &vFlowSetPoint   ,
-                                 Types::F32    &vMeasuredFlow   , Types::F32 &vRotorSpeed       , Types::F32 &vMotorSpeed,
-                                 Types::F32    &vMotorCtlSpeed  , Types::F32 &vMotorCtlCurrent  , Types::F32 &vPWMDtCycle)  __attribute_warn_unused_result__;
-    bool    dialysateFlowData   (const Message &vMessage, QVariantList &vData)                                              __attribute_warn_unused_result__;
+    // ---- 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__;
 
+    // ---- 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__;
 
     // ---- AlarmStatus
-    bool getAlarmStatus         (const Message &vMessage        ,
-                                 Types::U32    &vState          , Types::U32 &vTop              ,
-                                 Types::U32    &vMuteTimeout    , Types::U32 &vEscalatesIn      ,
-                                 Types::Flags  &vFlags                                                                   )  __attribute_warn_unused_result__;
-    bool    alarmStatus         (const Message &vMessage, QVariantList &vData)                                              __attribute_warn_unused_result__;
+    bool            getAlarmStatus (const Message &vMessage, Model::MAlarmStatus &vData)                            __attribute_warn_unused_result__;
+    bool               alarmStatus (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);
 
 public:
     explicit MessageInterpreter(QObject *parent = nullptr);
 
     // interpret the data into GUI understandable Actions/Data
-    bool interpretMessage(const Message &vMessage, QVariantList &vData)                                                     __attribute_warn_unused_result__;
-    bool interpretMessage(const Gui::GuiActionType &vActionId, const QVariantList &vData, QByteArray &vPayload)             __attribute_warn_unused_result__;
+    bool interpretMessage(const Message &vMessage, QVariantList &vData)                                             __attribute_warn_unused_result__;
+    bool interpretMessage(const Gui::GuiActionType &vActionId, const QVariantList &vData, QByteArray &vPayload)     __attribute_warn_unused_result__;
 
 signals:
+    ACTION_RECEIVE_SIGNALS
 
 public slots:
 };