Index: sources/canbus/messageinterpreter.h =================================================================== diff -u -r426208cdb707400759bdc663b871ece9d1208aed -r296e0e140bfeb193a9f571873afa6934143b1075 --- sources/canbus/messageinterpreter.h (.../messageinterpreter.h) (revision 426208cdb707400759bdc663b871ece9d1208aed) +++ sources/canbus/messageinterpreter.h (.../messageinterpreter.h) (revision 296e0e140bfeb193a9f571873afa6934143b1075) @@ -18,6 +18,7 @@ // Project #include "messageglobals.h" +#include "model.h" namespace Can { @@ -40,18 +41,12 @@ bool getPowerOffData (const Message &vMessage , quint8 &vShowHide) __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::BloodFlow &vData) __attribute_warn_unused_result__; + bool bloodFlowData (const Message &vMessage , QVariantList &vData) __attribute_warn_unused_result__; // ---- Dialysate Inlet FlowData bool getDialysateInletFlowData - (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__; + (const Message &vMessage , Model::DialysateFlow &vData) __attribute_warn_unused_result__; bool dialysateInletFlowData (const Message &vMessage, QVariantList &vData) __attribute_warn_unused_result__; @@ -85,7 +80,10 @@ 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); + public slots: };