Index: sources/canbus/messagedispatcher.h =================================================================== diff -u -r0e87420e50dd94c37eb25f289ef3262e0e45d7f4 -r939d1bae9a394697d46ca913a2dc3442bf8ef82f --- sources/canbus/messagedispatcher.h (.../messagedispatcher.h) (revision 0e87420e50dd94c37eb25f289ef3262e0e45d7f4) +++ sources/canbus/messagedispatcher.h (.../messagedispatcher.h) (revision 939d1bae9a394697d46ca913a2dc3442bf8ef82f) @@ -127,7 +127,6 @@ Sequence txCount(); Sequence rxCount(); - signals: /*! * \brief didActionReceive @@ -144,15 +143,15 @@ * \details Emits when a message requires * \param vData */ - void didActionReceive (const Message &vMessage); + void didActionReceive (const Message &vMessage); - /** - * @brief didAcknowReceive - * @details if the type the received message id is and Acknow this signal will be emitted - * @param vData - the data of the Acknow message which is the message Sequence + /*! + * \brief didAcknowReceive + * \details if the type the received message id is and Acknow this signal will be emitted + * \param vData - the data of the Acknow message which is the message Sequence * which we got the Ack for. */ - void didAcknowReceive (Sequence vSequence); + void didAcknowReceive (Sequence vSequence); /*! * \brief didAcknowTransmit @@ -161,30 +160,25 @@ * \param vFrameList - the frames which has been send * and will be used to be send on retries. */ - void didAcknowTransmit(Sequence vSequence, Can_Id vCan_Id, const FrameList &vFrameList); + void didAcknowTransmit(Can_Id vCan_Id, Sequence vSequence, const FrameList &vFrameList); /*! - * \brief didFramesTransmit - * \details when this signal is emitted frame(s) in the vFramesList - * will be queued to be sent. - * \param vFrameList - list of the frame(s) to be sent. - */ - void didFramesTransmit(Can_Id vCan_Id, const FrameList &vFrameList); - - /*! * \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 vCan_Id - Target channel of the CANBUS message * \param vPayload - The payload of the message to be sent */ - void didFrameTransmit (Can_Id vCan_Id, 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 vCan_Id, const QByteArray &vPayload); - void onFramesTransmit (Can_Id vCan_Id, const FrameList &vFrameList); + void onFrameReceive (Can_Id vCan_Id, const QByteArray &vPayload); + // + void onFramesTransmit (Can_Id vCan_Id, Sequence vSequence, const FrameList &vFrameList); + void onFailedTransmit ( Sequence vSequence); + // An Action has been requested to be transmitted. void onActionTransmit (GuiActionType vActionId, const QVariantList &vData);