Index: sources/canbus/messagehandler.h =================================================================== diff -u -rb2ebb6f71cf9b0c2ba68a47776e5b220b165b21c -r272bb81655222b2bf0c3c7099523c0b658eb9cb8 --- sources/canbus/messagehandler.h (.../messagehandler.h) (revision b2ebb6f71cf9b0c2ba68a47776e5b220b165b21c) +++ sources/canbus/messagehandler.h (.../messagehandler.h) (revision 272bb81655222b2bf0c3c7099523c0b658eb9cb8) @@ -24,7 +24,7 @@ // Project #include "main.h" -#include "guiactions.h" +#include "guiglobals.h" #include "messagebuilder.h" // Define @@ -37,9 +37,6 @@ using namespace Gui; namespace Can { -#define CAN_FRAME_LENGTH 8 -#define MAX_PAYLOAD_IN_HEADER_FRAME 3 - class MessageHandler : public QObject { Q_OBJECT @@ -62,18 +59,17 @@ bool ignoreChannel(const QCanBusFrame &vFrame); - // interpret the data into GUI understandable Actions/Data - bool interpretData(const Message &vMessage, GuiActionType &vActionId, GuiActionData &vData); + bool interpretData(const Message &vMessage, GuiActionType &vActionId, QVariantList &vData); private slots: // Should be private for thread safety and is connected internally. - void onActionTransmit(GuiActionType vAction, const QByteArray &vData); // UI => HD/DG + void onActionTransmit(GuiActionType vAction, const QVariantList &vData); // UI => HD/DG void onFrameReceive (const QCanBusFrame &vFrame ); // UI <= HD/DG void onMainTimerTimeout(); signals: - void didActionReceive (GuiActionType vAction, GuiActionData vData); // UI <= HD/DG + void didActionReceive (GuiActionType vAction, const QVariantList &vData); // UI <= HD/DG void didFrameTransmit (const QCanBusFrame &vFrame ); // UI => HD/DG }; }