Index: sources/canbus/frameinterface.cpp =================================================================== diff -u -r862dc0590b73c618fac73dce2c976e3526e0404a -r805119c460b4a266d6401c8705f4427e7fbe270f --- sources/canbus/frameinterface.cpp (.../frameinterface.cpp) (revision 862dc0590b73c618fac73dce2c976e3526e0404a) +++ sources/canbus/frameinterface.cpp (.../frameinterface.cpp) (revision 805119c460b4a266d6401c8705f4427e7fbe270f) @@ -1,6 +1,6 @@ /*! * - * Copyright (c) 2019-2019 Diality Inc. - All Rights Reserved. + * 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, @@ -25,9 +25,12 @@ // namespace using namespace Can; + /*! - * \brief FrameInterface Constructor - * \param parent + * \brief FrameInterface::FrameInterface + * \details Constructor + * \param parent - QObject parent owner object. + * Qt handles the children destruction by their parent objects life-cycle. */ FrameInterface::FrameInterface(QObject *parent) : QObject(parent) { } @@ -68,8 +71,11 @@ */ void FrameInterface::quit() { + // coco begin validated: Application termination is not correctly done in coco!!! + // it has been tested and works perfectly fine in normal run. quitThread(); } +// coco end /*! * \brief FrameInterface connections definition @@ -112,11 +118,15 @@ */ void FrameInterface::quitThread() { + // coco begin validated: Application termination is not correctly done in coco!!! + // it has been tested and works perfectly fine in normal run. + if ( ! _thread ) return; // runs in thread moveToThread(qApp->thread()); } +// coco end /*! * \brief FrameInterface::transmitFrame @@ -160,19 +170,18 @@ channelGroup = ChannelGroup::eChannel_Ignores; break; - case eChlid_HD : + case eChlid_HD_UI : case eChlid_HD_Alarm : case eChlid_DG_Alarm : case eChlid_HD_Sync : case eChlid_DG_Sync : //case eChlid_DG_UI : // has duplicate value as eChlid_DG_Alarm - //case eChlid_UI_DG : // has duplicate value as eChlid_UI_Sync channelGroup = ChannelGroup::eChannel_Listens; break; case eChlid_UI_Alarm : case eChlid_UI_Sync : - case eChlid_UI : + //case eChlid_UI_DG : channelGroup = ChannelGroup::eChannel_Outputs; break; @@ -190,12 +199,12 @@ * \details This the slot connected to the MessageDispatcher didFrameTransmit signal. * When a frame needs to be send to CANBUS, * this slot will call transmitFrame method to do the job. - * \param vCan_ID - CANBUS Can Id target of the frame. + * \param vCan_Id - CANBUS Can Id target of the frame. * \param vData - The data which this frame will carry. */ -void FrameInterface::onFrameTransmit(Can_Id vCan_ID, const QByteArray &vData) +void FrameInterface::onFrameTransmit(Can_Id vCan_Id, const QByteArray &vData) { - transmitFrame(vCan_ID, vData); + transmitFrame(vCan_Id, vData); } /*! @@ -222,6 +231,6 @@ return; } - Can_Id mCanId = static_cast(mFrameId); - emit didFrameReceive(mCanId, vFrame.payload()); + Can_Id mCan_Id = static_cast(mFrameId); + emit didFrameReceive(mCan_Id, vFrame.payload()); }