Index: sources/canbus/messagehandler.h =================================================================== diff -u -r212de04bcfd9c0ec4c13faca1d4227a8ae30e978 -r2085b749d1d0aafe823e840f5aa0bc88a340798a --- sources/canbus/messagehandler.h (.../messagehandler.h) (revision 212de04bcfd9c0ec4c13faca1d4227a8ae30e978) +++ sources/canbus/messagehandler.h (.../messagehandler.h) (revision 2085b749d1d0aafe823e840f5aa0bc88a340798a) @@ -128,50 +128,39 @@ void init(); private: - void connection(); + void initConnections(); void checked_in(); // TODO : needs to be renamed and called from the main timer to tell HD, UI is alive + void transmitFrame(MessageHandler::Can_Id vCan_Id, GuiActionType vAction, GuiActionData vData = GuiActionData::NoData); + // build message to be sent - QByteArray buildMessage (GuiActionType vAction , GuiActionData vData = GuiActionData::NoData); - void addSyncByte (QByteArray &vPayload ); - void addActionId (QByteArray &vPayload , GuiActionType vAction); - void addLegth (QByteArray &vPayload , GuiActionType vAction); - void addData (QByteArray &vPayload , GuiActionData vData = GuiActionData::NoData); - void addCRC (QByteArray &vPayload ); - void addPadding (QByteArray &vPayload ); + QByteArray buildMessage (GuiActionType vAction , GuiActionData vData = GuiActionData::NoData); + void addSyncByte (QByteArray &vPayload); + void addActionId (QByteArray &vPayload, GuiActionType vAction); + void addLegth (QByteArray &vPayload, GuiActionType vAction); + void addData (QByteArray &vPayload, GuiActionData vData = GuiActionData::NoData); + void addCRC (QByteArray &vPayload); + void addPadding (QByteArray &vPayload); - quint8 calcCRC (const QByteArray &vData ); - bool checkCRC (const QByteArray &vData , quint8 vCRC); + quint8 calcCRC (const QByteArray &vData); + bool checkCRC (const QByteArray &vData, quint8 vCRC); // strip message to its parts QByteArray stripMessage (const QCanBusFrame &vFrame ); - bool hasSyncByte (QByteArray &vPayload ); - GuiActionType getActionId (QByteArray &vPayload ); - quint8 getLength (QByteArray &vPayload ); - QByteArray getData (QByteArray &vPayload , quint8 vLen , bool *ok = nullptr ); + bool hasSyncByte (QByteArray &vPayload); + GuiActionType getActionId (QByteArray &vPayload); + quint8 getLength (QByteArray &vPayload); + QByteArray getData (QByteArray &vPayload, quint8 vLen , bool *ok = nullptr ); - - // 0 - command definition - // 0.0- Can ID - // 0.1- command id - // 0.2- command payload length - // 1 - create, frame, schedule, send - // 2 - read, categorize, buffer, act - -private slots: // Should be private for thread safety and is connected internally. - void onActionRequest (GuiActionType vAction); // UI => HD/DG - void onActionPerform (GuiActionType vAction, GuiActionData vData); // UI <= HD/DG - - void onRead (const QCanBusFrame &vFrame); - protected: virtual void timerEvent(QTimerEvent *event) override; -signals: - void didActionConfirm(GuiActionType vAction, GuiActionData vData); // UI <= HD/DG - void didActionCommand(GuiActionType vAction ); // UI <= HD/DG +private slots: // Should be private for thread safety and is connected internally. + void onActionTransmit(GuiActionType vAction, GuiActionData vData); // UI => HD/DG + void onFrameReceive (const QCanBusFrame &vFrame ); // UI <= HD/DG - void didActionRequest(const QCanBusFrame &vFrame ); // UI => HD/DG - void didActionPerform(const QCanBusFrame &vFrame ); // UI => HD/DG +signals: + void didActionReceive (GuiActionType vAction, GuiActionData vData); // UI <= HD/DG + void didFrameTransmit (const QCanBusFrame &vFrame ); // UI => HD/DG }; }