Index: sources/Threads.cpp =================================================================== diff -u -r61f16c988a159401c92730b4cbfca5085c77222f -r6c6f1f5d466badd9b4fd67be7c907234c342b2a2 --- sources/Threads.cpp (.../Threads.cpp) (revision 61f16c988a159401c92730b4cbfca5085c77222f) +++ sources/Threads.cpp (.../Threads.cpp) (revision 6c6f1f5d466badd9b4fd67be7c907234c342b2a2) @@ -1,15 +1,15 @@ /*! * - * Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved. + * Copyright (c) 2020-2023 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 Threads.cpp - * \author (last) Behrouz NematiPour - * \date (last) 31-Aug-2020 - * \author (original) Behrouz NematiPour - * \date (original) 26-Aug-2020 + * \file Threads.cpp + * \author (last) Behrouz NematiPour + * \date (last) 11-Aug-2022 + * \author (original) Behrouz NematiPour + * \date (original) 26-Aug-2020 * */ #include "Threads.h" @@ -20,7 +20,6 @@ // Application #include "MessageGlobals.h" -#include "Logger.h" /*! * \details All the Thread has been and shall be defined in here @@ -35,8 +34,10 @@ QThread _DeviceController_Thread; QThread _Logger_Thread ; QThread _Application_Thread ; + QThread _Gui_Thread ; QThread _Wifi_Thread ; - + QThread _Bluetooth_Thread ; + QThread _CloudSync_Thread ; /*! * \brief registerTypes * \details this method has to be called before any class which uses these types @@ -48,6 +49,7 @@ { // Logger : This is required for Signal/Slots in threading. qRegisterMetaType("LogType"); + qRegisterMetaType("Logger::LogType"); // CanInterface : This is required for Signal/Slots in threading. qRegisterMetaType("QCanBusFrame"); @@ -69,13 +71,13 @@ */ void quitThread(QThread &vThread) { - // coco begin validated: Application termination is not correctly done in coco!!! + // disabled coco begin validated: Application termination is not correctly done in coco!!! // it has been tested and works perfectly fine in normal run. // runs in main thread vThread.quit(); // validated vThread.wait(); // validated } - // coco end + // disabled coco end /*! * \brief quitThreads @@ -85,15 +87,18 @@ */ void quitThreads() { - // coco begin validated: Application termination is not correctly done in coco!!! + // disabled coco begin validated: Application termination is not correctly done in coco!!! // it has been tested and works perfectly fine in normal run. + quitThread(_CloudSync_Thread ); quitThread(_CanFrame_Thread ); quitThread(_CanAcknow_Thread ); quitThread(_CanMessage_Thread ); quitThread(_DeviceController_Thread ); - quitThread(_Logger_Thread ); + quitThread(_Bluetooth_Thread ); quitThread(_Wifi_Thread ); quitThread(_Application_Thread ); + quitThread(_Gui_Thread ); + quitThread(_Logger_Thread ); } - // coco end + // disabled coco end }