Index: sources/canbus/messagedispatcher.h =================================================================== diff -u -re58b907a69d4ca7daa77d69791593b886d1b80e8 -r8c69137f18382bdc55a5678e6ed44a7683fe4dea --- sources/canbus/messagedispatcher.h (.../messagedispatcher.h) (revision e58b907a69d4ca7daa77d69791593b886d1b80e8) +++ sources/canbus/messagedispatcher.h (.../messagedispatcher.h) (revision 8c69137f18382bdc55a5678e6ed44a7683fe4dea) @@ -113,9 +113,9 @@ void initThread(QThread &vThread); void quitThread(); - void actionTransmit(GuiActionType vActionId, const QVariantList &vData); + void actionTransmit(GuiActionType vActionId, const QVariantList &vData, Sequence vSequence = 0); - bool buildMessage (Can_Id vCanId, const QByteArray &vPayload); + bool buildMessage (Can_Id vCan_Id, const QByteArray &vPayload); bool interpretMessage(const Message &vMessage); signals: /*! @@ -141,20 +141,20 @@ * @param vData - the data of the Acknow message which is the message Sequence * which we got the Ack for. */ - void didAcknowReceive(const QVariantList &vData); + void didAcknowReceive(const Sequence &vSequence); /*! * \brief didFrameTransmit * \details When a message is requested to be transmitted this signal is emitted * on successful interpretation and building the message into frames - * \param vCanId - Target channel of the CANBUS message + * \param vCan_Id - Target channel of the CANBUS message * \param vPayload - The payload of the message to be sent */ - void didFrameTransmit(Can_Id vCanId , const QByteArray &vPayload); + void didFrameTransmit(Can_Id vCan_Id , const QByteArray &vPayload); private slots: // A Frame has been received from CanInterface - void onFrameReceive (Can_Id vCanId , const QByteArray &vPayload); + void onFrameReceive (Can_Id vCan_Id , const QByteArray &vPayload); // An Action has been requested to be transmitted. void onActionTransmit(GuiActionType vActionId, const QVariantList &vData);