Index: sources/canbus/messagedispatcher.h =================================================================== diff -u -r805119c460b4a266d6401c8705f4427e7fbe270f -r44a85c96ab55e424866ec4cca0270aa218355f82 --- sources/canbus/messagedispatcher.h (.../messagedispatcher.h) (revision 805119c460b4a266d6401c8705f4427e7fbe270f) +++ sources/canbus/messagedispatcher.h (.../messagedispatcher.h) (revision 44a85c96ab55e424866ec4cca0270aa218355f82) @@ -1,15 +1,16 @@ /*! - * + * * Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved. - * copyright - * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, - * IN PART OR IN WHOLE, - * WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER. - * - * file messagepacker.h - * date 12/9/2019 - * author Behrouz NematiPour - * + * \copyright + * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN + * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER. + * + * \file messagedispatcher.h + * \author (last) Peter Lucia + * \date (last) 25-Jun-2020 + * \author (original) Behrouz NematiPour + * \date (original) 09-Dec-2019 + * */ #pragma once @@ -27,6 +28,7 @@ // forward declarations class tst_canbus; class tst_acknow; +class tst_messaging; // since this class is the interface between GUI and Can // it needs to use Gui namespace otherwise it makes code hard to read. @@ -87,6 +89,7 @@ // friends friend class ::tst_canbus; friend class ::tst_acknow; + friend class ::tst_messaging; QHash _messageList; @@ -99,7 +102,14 @@ QThread *_thread = nullptr; bool _init = false; - QList _needsAcknow {}; // no action needs Acknow for now + QList _needsAcknow { + GuiActionType::AdjustBloodDialysateReq , + GuiActionType::AdjustDurationReq , + GuiActionType::AlarmSilenceReq , + GuiActionType::AdjustUltrafiltrationStateReq , + GuiActionType::AdjustUltrafiltrationEditReq , + GuiActionType::AdjustUltrafiltrationConfirmReq , + }; // Singleton SINGLETON(MessageDispatcher) @@ -175,6 +185,13 @@ */ void didFrameTransmit (Can_Id vCan_Id, const QByteArray &vPayload); + /*! + * \brief didFailedTransmit + * \details When a message fails to transmit to the HD, emit this signal. + * \param vSequence - The message Sequence we that failed to send. + */ + void didFailedTransmit(Sequence vSequence); + private slots: // A Frame has been received from CanInterface void onFrameReceive (Can_Id vCan_Id, const QByteArray &vPayload); @@ -186,6 +203,10 @@ // An Action has been requested to be transmitted. void onActionTransmit (GuiActionType vActionId, const QVariantList &vData); + // ---- Signal/Slots + ADJUST_TRANSMT_MODEL_BRIDGE_DEFINITIONS_NOEMIT + ACTION_RECEIVE_MODEL_BRIDGE_DEFINITIONS + }; }