Index: sources/canbus/messagebuilder.h =================================================================== diff -u -r1732e83d2a0308b9c706f37d6d7724a364bbff2a -r460df093c4475816fc25d6b4c3ebfc50424ccca3 --- sources/canbus/messagebuilder.h (.../messagebuilder.h) (revision 1732e83d2a0308b9c706f37d6d7724a364bbff2a) +++ sources/canbus/messagebuilder.h (.../messagebuilder.h) (revision 460df093c4475816fc25d6b4c3ebfc50424ccca3) @@ -50,27 +50,36 @@ { Q_OBJECT - void addSyncByte ( QByteArray &vPayload); - void addActionId ( QByteArray &vPayload, GuiActionType vAction); - void addData ( QByteArray &vPayload, GuiActionType vAction, const QByteArray &vData); - void addCRC ( QByteArray &vPayload); - void addPadding ( QByteArray &vPayload); + bool _enableConsoleOut = false; - quint8 calcCRC (const QByteArray &vData); - bool checkCRC (const QByteArray &vData); + void addSyncByte ( QByteArray &vPayload); + void addActionId ( QByteArray &vPayload, GuiActionType vAction); + void addData ( QByteArray &vPayload, GuiActionType vAction, const QByteArray &vData); + void addCRC ( QByteArray &vPayload); + void addPadding ( QByteArray &vPayload); - bool hasSyncByte ( QByteArray &vPayload); - GuiActionType getActionId ( QByteArray &vPayload); - int getLength ( QByteArray &vPayload); - QByteArray getData ( QByteArray &vPayload, int vLen); + quint8 calcCRC (const QByteArray &vData); + bool checkCRC (const QByteArray &vData); + bool hasSyncByte ( QByteArray &vPayload); + QByteArray getHeader (const QByteArray &vPayload); + GuiActionType getActionId ( QByteArray &vPayload); + int getLength ( QByteArray &vPayload); + QByteArray getData ( QByteArray &vPayload, int vLen); + + void printPayload(const QByteArray &vPayload, bool vIsHeader, Can_Id vCan_Id, bool vUseColor = true); + void consoleOut (const QByteArray &vPayload, bool vIsHeader, Can_Id vCan_Id, bool vUseColor = true); + public: explicit MessageBuilder(QObject *parent = nullptr); // build message to be sent frame by frame FrameList buildFrames ( GuiActionType vAction , const QByteArray &vData); // build message from received frames - bool buildMessage (const QByteArray &vPayload, Message &vMessage); + bool buildMessage (const QByteArray &vPayload, Message &vMessage, Can_Id vCan_Id); + + void enableConsoleOut( bool vEnabled) { _enableConsoleOut = vEnabled; } + signals: public slots: