Index: sources/canbus/messageinterpreter.h =================================================================== diff -u -r6ae83fa9a1a3204864fc5b50fe906ac09e9c1ea5 -r30f83b2813e68ae3c2806399bf808b642c215b67 --- sources/canbus/messageinterpreter.h (.../messageinterpreter.h) (revision 6ae83fa9a1a3204864fc5b50fe906ac09e9c1ea5) +++ sources/canbus/messageinterpreter.h (.../messageinterpreter.h) (revision 30f83b2813e68ae3c2806399bf808b642c215b67) @@ -41,40 +41,29 @@ friend class ::tst_messaging; friend class ::tst_logging; - 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; - void printUnhandled(const Message &vMessage ) const; + 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; - bool interpretMessage_HD(const Message &vMessage, QVariantList &vData) __attribute_warn_unused_result__; - bool interpretMessage_DG(const Message &vMessage, QVariantList &vData) __attribute_warn_unused_result__; + void printUnhandled (const Message &vMessage ) const; + bool prepareData (const Message &vMessage, Gui::GuiActionType vID, Model::MAbstract &vModel, QVariantList &vData); + bool interpretMessage_HD (const Message &vMessage, QVariantList &vData) __attribute_warn_unused_result__; + bool interpretMessage_DG (const Message &vMessage, QVariantList &vData) __attribute_warn_unused_result__; + // ----- Debug - bool canbusFaultCountData(const Message &vMessage, QVariantList &vData) __attribute_warn_unused_result__; + bool canbusFaultCountData (const Message &vMessage, QVariantList &vData) __attribute_warn_unused_result__; - // ----- Data - // ----- - HD - bool treatmentTimeData(const Message &vMessage, QVariantList &vData) __attribute_warn_unused_result__; - bool bloodFlowData(const Message &vMessage, QVariantList &vData) __attribute_warn_unused_result__; - bool dialysateInletFlowData(const Message &vMessage, QVariantList &vData) __attribute_warn_unused_result__; - bool dialysateOutletFlowData(const Message &vMessage, QVariantList &vData) __attribute_warn_unused_result__; - bool treatmentRangesData(const Message &vMessage, QVariantList &vData) __attribute_warn_unused_result__; - bool pressureOcclusionData(const Message &vMessage, QVariantList &vData) __attribute_warn_unused_result__; - bool treatmentStateData(const Message &vMessage, QVariantList &vData) __attribute_warn_unused_result__; - // ----- Events // ----- - HD - bool powerOff(const Message &vMessage, QVariantList &vData) __attribute_warn_unused_result__; - 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__; + bool powerOff (const Message &vMessage, QVariantList &vData) __attribute_warn_unused_result__; + 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__; // ----- - DG - bool prepareData (const Message &vMessage, Gui::GuiActionType vID, Model::MAbstract &vModel, QVariantList &vData); // ----- Adjustments - bool adjustDuration (const Message &vMessage, QVariantList &vData) __attribute_warn_unused_result__; - bool adjustBloodDialysate (const Message &vMessage, QVariantList &vData) __attribute_warn_unused_result__; 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__; @@ -89,7 +78,6 @@ signals: ACTION_RECEIVE_SIGNALS -public slots: }; }