Index: sources/canbus/messageinterpreter.h
===================================================================
diff -u -r296e0e140bfeb193a9f571873afa6934143b1075 -r4a6abe765f03feae8100ec660aa04aa218d4dfa3
--- sources/canbus/messageinterpreter.h	(.../messageinterpreter.h)	(revision 296e0e140bfeb193a9f571873afa6934143b1075)
+++ sources/canbus/messageinterpreter.h	(.../messageinterpreter.h)	(revision 4a6abe765f03feae8100ec660aa04aa218d4dfa3)
@@ -48,28 +48,22 @@
     bool getDialysateInletFlowData
                                 (const Message &vMessage        , Model::DialysateFlow &vData)                              __attribute_warn_unused_result__;
     bool    dialysateInletFlowData
-                                (const Message &vMessage, QVariantList &vData)                                              __attribute_warn_unused_result__;
+                                (const Message &vMessage        , QVariantList &vData)                                      __attribute_warn_unused_result__;
 
 
     // ---- Dialysate Outlet FlowData
     bool getDialysateOutletFlowData
-                                (const Message &vMessage        ,
-                                 Types::F32    &vRefUFVol       , Types::F32 &vMeasUFVol        ,
-                                 Types::F32    &vRotorSpeed     , Types::F32 &vMotorSpeed       ,
-                                 Types::F32    &vMotorCtlSpeed  , Types::F32 &vMotorCtlCurrent  , Types::F32 &vPWMDtCycle)  __attribute_warn_unused_result__;
+                                (const Message &vMessage        , Model::OutletFlow &vData)                                 __attribute_warn_unused_result__;
     bool    dialysateOutletFlowData
-                                (const Message &vMessage, QVariantList &vData)                                              __attribute_warn_unused_result__;
+                                (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::AlarmStatus &vData)                                __attribute_warn_unused_result__;
+    bool    alarmStatus         (const Message &vMessage        , QVariantList &vData)                                      __attribute_warn_unused_result__;
 
     // ---- Treatment Time
     bool getTreatmentTime       (const Message &vMessage,
-                                 Types::U32 &vTotal, Types::U32 &vElapsed, Types::U32 &vRemaining);
+                                 Model::TreatmentTime &vData);
     bool treatmentTime          (const Message &vMessage, QVariantList &vData);
 
 public:
@@ -80,10 +74,8 @@
     bool interpretMessage(const Gui::GuiActionType &vActionId, const QVariantList &vData, QByteArray &vPayload)             __attribute_warn_unused_result__;
 
 signals:
-    void didActionReceive(const     BloodFlowData &vData);
-    void didActionReceive(const DialysateFlowData &vData);
+    ACTION_RECEIVE_SIGNALS
 
-
 public slots:
 };