Index: sources/canbus/messageinterpreter.h =================================================================== diff -u -r12f922a6c61b7014345a441e2836e12fd3b0d00e -rfeb3423b373dc2a2c4267ef9fcb4d924d738423d --- sources/canbus/messageinterpreter.h (.../messageinterpreter.h) (revision 12f922a6c61b7014345a441e2836e12fd3b0d00e) +++ sources/canbus/messageinterpreter.h (.../messageinterpreter.h) (revision feb3423b373dc2a2c4267ef9fcb4d924d738423d) @@ -35,22 +35,42 @@ { Q_OBJECT - bool interpretMessage_HD(const Message &vMessage, GuiActionType &vActionId, QVariantList &vData) __attribute_warn_unused_result__; - bool interpretMessage_DG(const Message &vMessage, GuiActionType &vActionId, QVariantList &vData) __attribute_warn_unused_result__; + void printUnhandled (const Message &vMessage); - 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 getPowerOffData (const Message &vMessage, quint8 &vShowHide) __attribute_warn_unused_result__; + bool interpretMessage_HD (const Message &vMessage , GuiActionType &vActionId, QVariantList &vData) __attribute_warn_unused_result__; + bool interpretMessage_DG (const Message &vMessage , GuiActionType &vActionId, QVariantList &vData) __attribute_warn_unused_result__; - void printUnhandled (const Message &vMessage); + 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__; + + // ---- 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__; + + + // ---- 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__; + + public: explicit MessageInterpreter(QObject *parent = nullptr); // interpret the data into GUI understandable Actions/Data - bool interpretMessage(const Can_Id vCan_Id, const Message &vMessage, GuiActionType &vActionId, QVariantList &vData) __attribute_warn_unused_result__; - bool interpretMessage(const GuiActionType &vActionId, const QVariantList &vData, QByteArray &vPayload) __attribute_warn_unused_result__; + bool interpretMessage(const Can_Id vCan_Id, const Message &vMessage, GuiActionType &vActionId, QVariantList &vData) __attribute_warn_unused_result__; + bool interpretMessage(const GuiActionType &vActionId, const QVariantList &vData, QByteArray &vPayload) __attribute_warn_unused_result__; signals: