diff --git a/Otarcik_CAN/Makefile.Debug b/Otarcik_CAN/Makefile.Debug index fcf6b8f..8c1a3d7 100644 --- a/Otarcik_CAN/Makefile.Debug +++ b/Otarcik_CAN/Makefile.Debug @@ -569,6 +569,7 @@ debug/moc_MainWindow.cpp: Sources/MainWindow.h \ Sources/CloudLogging/CloudParams.h \ Sources/Gui/CANViewerPage.h \ Sources/Gui/LoggingSettingsPage.h \ + Sources/GeneralSystemParams.h \ Sources/Gui/CCANWatchdogSettingsPage.h \ Sources/CANBus/CANWatchdogConfig.h \ debug/moc_predefs.h \ @@ -991,6 +992,7 @@ debug/moc_OtarcikCan.cpp: Sources/OtarcikCan.h \ Sources/CloudLogging/CloudParams.h \ Sources/Gui/CANViewerPage.h \ Sources/Gui/LoggingSettingsPage.h \ + Sources/GeneralSystemParams.h \ Sources/Gui/CCANWatchdogSettingsPage.h \ Sources/CANBus/CANWatchdogConfig.h \ Sources/GeneralMessagesLogDispatcher.h \ @@ -1736,6 +1738,8 @@ debug/moc_LoggingSettingsPage.cpp: Sources/Gui/LoggingSettingsPage.h \ C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtGui/qtouchdevice.h \ Sources/CloudLogging/CloudParams.h \ C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/QString \ + Sources/GeneralSystemParams.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/QDataStream \ debug/moc_predefs.h \ C:/Qt/Qt5.14.2/5.14.2/mingw73_64/bin/moc.exe C:\Qt\Qt5.14.2\5.14.2\mingw73_64\bin\moc.exe $(DEFINES) --include D:/Main/Dev/YULTek/Otarcik_CAN/debug/moc_predefs.h -IC:/Qt/Qt5.14.2/5.14.2/mingw73_64/mkspecs/win32-g++ -ID:/Main/Dev/YULTek/Otarcik_CAN -ID:/Main/Dev/YULTek/Otarcik_CAN -ID:/Main/Dev/YULTek/Otarcik_CAN/Sources -ID:/Main/Dev/YULTek/Otarcik_CAN/Sources/Gui -ID:/Main/Dev/YULTek/Otarcik_CAN/Sources/PCAN -ID:/Main/Dev/YULTek/Otarcik_CAN/Sources/KVASER -ID:/Main/Dev/YULTek/Otarcik_CAN/Sources/CANDatabase -ID:/Main/Dev/YULTek/Otarcik_CAN/Sources/CANBus -ID:/Main/Dev/YULTek/Otarcik_CAN/Sources/CloudLogging -IC:/Qt/Qt5.14.2/5.14.2/mingw73_64/include -IC:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets -IC:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtGui -IC:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtANGLE -IC:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtMqtt -IC:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtNetwork -IC:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtSerialPort -IC:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore -IC:/Qt/Qt5.14.2/Tools/mingw730_64/lib/gcc/x86_64-w64-mingw32/7.3.0/include/c++ -IC:/Qt/Qt5.14.2/Tools/mingw730_64/lib/gcc/x86_64-w64-mingw32/7.3.0/include/c++/x86_64-w64-mingw32 -IC:/Qt/Qt5.14.2/Tools/mingw730_64/lib/gcc/x86_64-w64-mingw32/7.3.0/include/c++/backward -IC:/Qt/Qt5.14.2/Tools/mingw730_64/lib/gcc/x86_64-w64-mingw32/7.3.0/include -IC:/Qt/Qt5.14.2/Tools/mingw730_64/lib/gcc/x86_64-w64-mingw32/7.3.0/include-fixed -IC:/Qt/Qt5.14.2/Tools/mingw730_64/x86_64-w64-mingw32/include Sources\Gui\LoggingSettingsPage.h -o debug\moc_LoggingSettingsPage.cpp @@ -2983,6 +2987,7 @@ debug/main.o: Sources/main.cpp C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidget Sources/CloudLogging/CloudParams.h \ Sources/Gui/CANViewerPage.h \ Sources/Gui/LoggingSettingsPage.h \ + Sources/GeneralSystemParams.h \ Sources/Gui/CCANWatchdogSettingsPage.h \ Sources/CANBus/CANWatchdogConfig.h \ Sources/GeneralMessagesLogDispatcher.h \ @@ -3337,6 +3342,7 @@ debug/MainWindow.o: Sources/MainWindow.cpp Sources/MainWindow.h \ Sources/CloudLogging/CloudParams.h \ Sources/Gui/CANViewerPage.h \ Sources/Gui/LoggingSettingsPage.h \ + Sources/GeneralSystemParams.h \ Sources/Gui/CCANWatchdogSettingsPage.h \ Sources/CANBus/CANWatchdogConfig.h \ ui_MainWindow.h \ @@ -3818,6 +3824,7 @@ debug/OtarcikCan.o: Sources/OtarcikCan.cpp Sources/OtarcikCan.h \ Sources/CloudLogging/CloudParams.h \ Sources/Gui/CANViewerPage.h \ Sources/Gui/LoggingSettingsPage.h \ + Sources/GeneralSystemParams.h \ Sources/Gui/CCANWatchdogSettingsPage.h \ Sources/CANBus/CANWatchdogConfig.h \ Sources/GeneralMessagesLogDispatcher.h \ @@ -4256,7 +4263,218 @@ debug/CANViewerPage.o: Sources/Gui/CANViewerPage.cpp Sources/Gui/CANViewerPage.h C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/QTableWidget \ C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/qtablewidget.h \ C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/qtableview.h \ - Sources/defines.h + Sources/defines.h \ + Sources/CANBus/CANDevice.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/QObject \ + Sources/CANBus/CANAnalyzer.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/QTimer \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qtimer.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qbasictimer.h \ + Sources/PCANInterface.h \ + Sources/CANDatabase/CANDatabase.h \ + Sources/KVASER/kvaDbLib.h \ + Sources/CANBus/CANDeviceConfig.h \ + Sources/CANBus/CANDataLogger.h \ + Sources/CloudLogging/MQTTMessage.h \ + Sources/CloudLogging/MQTTClientWrapper.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtMqtt/QtMqtt \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtMqtt/QtMqttDepends \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/QtCore \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/QtCoreDepends \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qabstractanimation.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qabstracteventdispatcher.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qabstractnativeeventfilter.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qabstractproxymodel.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qabstractstate.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qabstracttransition.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qanimationgroup.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qarraydataops.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qarraydatapointer.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qbitarray.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qbuffer.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qbytearraymatcher.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qcache.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qcalendar.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qcborarray.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qcborvalue.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qdatetime.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qcborcommon.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/quuid.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qcbormap.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qcborstream.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qfloat16.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qcollator.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qcommandlineoption.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qcommandlineparser.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qconcatenatetablesproxymodel.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qcryptographichash.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qdeadlinetimer.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qelapsedtimer.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qdir.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qfileinfo.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qdiriterator.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qeasingcurve.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qendian.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qeventtransition.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qexception.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qfactoryinterface.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qfileselector.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/QStringList \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qfilesystemwatcher.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qfinalstate.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qfuture.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qfutureinterface.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qrunnable.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qresultstore.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qfuturesynchronizer.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qfuturewatcher.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qhistorystate.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qidentityproxymodel.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qisenum.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qjsonarray.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qjsonvalue.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qjsondocument.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qjsonobject.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qlibrary.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qlibraryinfo.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qversionnumber.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qlinkedlist.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qlockfile.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qloggingcategory.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qmath.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qmessageauthenticationcode.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qmetaobject.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qmimedata.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qmimedatabase.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qmimetype.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qobjectcleanuphandler.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qoperatingsystemversion.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qparallelanimationgroup.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qpauseanimation.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qplugin.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qpointer.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qpluginloader.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qprocess.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qpropertyanimation.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qvariantanimation.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qqueue.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qrandom.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qreadwritelock.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qresource.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qsavefile.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qscopedvaluerollback.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qscopeguard.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qsemaphore.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qsequentialanimationgroup.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qsettings.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qsharedmemory.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qsignalmapper.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qsignaltransition.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qsocketnotifier.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qsortfilterproxymodel.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qstack.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qstandardpaths.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qstate.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qstatemachine.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qstorageinfo.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qstringlistmodel.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qsystemsemaphore.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qtemporarydir.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qtemporaryfile.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qtextboundaryfinder.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qtextcodec.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qthread.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qthreadpool.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qthreadstorage.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qtimeline.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qtimezone.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qtranslator.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qtransposeproxymodel.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qtypetraits.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qwaitcondition.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qwineventnotifier.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qxmlstream.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qtcoreversion.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtNetwork/QtNetwork \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtNetwork/QtNetworkDepends \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtNetwork/qtnetworkglobal.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtNetwork/qtnetwork-config.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtNetwork/qabstractnetworkcache.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtNetwork/qnetworkrequest.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/QSharedDataPointer \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/QUrl \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtNetwork/qabstractsocket.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtNetwork/qauthenticator.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtNetwork/qdnslookup.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtNetwork/qdtls.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtNetwork/qsslsocket.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtNetwork/qtcpsocket.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtNetwork/qsslerror.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtNetwork/qsslcertificate.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtNetwork/qssl.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/QFlags \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtNetwork/qhostaddress.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtNetwork/qhostinfo.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtNetwork/qhstspolicy.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtNetwork/qhttp2configuration.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtNetwork/qhttpmultipart.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/QIODevice \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtNetwork/QNetworkRequest \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtNetwork/qlocalserver.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtNetwork/qlocalsocket.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtNetwork/qnetworkaccessmanager.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/QVector \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtNetwork/QSslConfiguration \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtNetwork/qsslconfiguration.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtNetwork/QSslPreSharedKeyAuthenticator \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtNetwork/qsslpresharedkeyauthenticator.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/QMetaType \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtNetwork/qnetworkconfigmanager.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtNetwork/qnetworkconfiguration.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtNetwork/qnetworkcookie.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtNetwork/qnetworkcookiejar.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtNetwork/qnetworkdatagram.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtNetwork/qnetworkdiskcache.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtNetwork/qnetworkinterface.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtNetwork/qnetworkproxy.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtNetwork/qnetworkreply.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtNetwork/QNetworkAccessManager \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtNetwork/qnetworksession.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtNetwork/qocspresponse.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtNetwork/qpassworddigestor.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/QCryptographicHash \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtNetwork/qsctpserver.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtNetwork/qtcpserver.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtNetwork/qsctpsocket.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtNetwork/qsslcertificateextension.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtNetwork/qsslcipher.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtNetwork/qssldiffiehellmanparameters.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtNetwork/qsslellipticcurve.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/QHash \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtNetwork/qsslkey.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtNetwork/qudpsocket.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtNetwork/qtnetworkversion.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtMqtt/qmqttglobal.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtMqtt/qmqttauthenticationproperties.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtMqtt/qmqtttype.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/QDebug \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/QPair \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtMqtt/qmqttclient.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtMqtt/qmqttconnectionproperties.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtMqtt/qmqttpublishproperties.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtMqtt/qmqttsubscription.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtMqtt/qmqttmessage.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtMqtt/qmqtttopicname.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/QExplicitlySharedDataPointer \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtMqtt/qmqtttopicfilter.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtMqtt/qmqttsubscriptionproperties.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/QSharedPointer \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtNetwork/QTcpSocket \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtMqtt/qtmqttversion.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtMqtt/QMqttClient \ + Sources/CloudLogging/CloudParams.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtGui/QClipboard \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtGui/qclipboard.h $(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug\CANViewerPage.o Sources\Gui\CANViewerPage.cpp debug/CANDatabase.o: Sources/CANDatabase/CANDatabase.cpp Sources/defines.h \ @@ -4681,6 +4899,7 @@ debug/SystemConfig.o: Sources/SystemConfig.cpp Sources/SystemConfig.h \ Sources/CloudLogging/CloudParams.h \ C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/QFile \ Sources/CANBus/CANWatchdogConfig.h \ + Sources/GeneralSystemParams.h \ Sources/GeneralMessagesLogDispatcher.h \ Sources/Gui/GeneralStatusPage.h \ C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/QWidget \ @@ -5105,6 +5324,7 @@ debug/CANbusSettingsPage.o: Sources/Gui/CANbusSettingsPage.cpp Sources/Gui/CANbu Sources/SystemConfig.h \ C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/QFile \ Sources/CANBus/CANWatchdogConfig.h \ + Sources/GeneralSystemParams.h \ Sources/OtarcikCan.h \ Sources/MainWindow.h \ C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/QMainWindow \ @@ -5224,6 +5444,8 @@ debug/LoggingSettingsPage.o: Sources/Gui/LoggingSettingsPage.cpp Sources/Gui/Log C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtGui/qtouchdevice.h \ Sources/CloudLogging/CloudParams.h \ C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/QString \ + Sources/GeneralSystemParams.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/QDataStream \ ui_LoggingSettingsPage.h \ C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/QVariant \ C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/QApplication \ @@ -5275,7 +5497,6 @@ debug/LoggingSettingsPage.o: Sources/Gui/LoggingSettingsPage.cpp Sources/Gui/Log C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/QList \ Sources/CANBus/CANMessage.h \ C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/QByteArray \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/QDataStream \ Sources/PCAN/PCANBasic.h \ Sources/CANBus/CANSignal.h \ C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/QtGlobal \ @@ -5841,6 +6062,7 @@ debug/CANAnalyzer.o: Sources/CANBus/CANAnalyzer.cpp Sources/CANBus/CANAnalyzer.h Sources/CloudLogging/CloudParams.h \ Sources/Gui/CANViewerPage.h \ Sources/Gui/LoggingSettingsPage.h \ + Sources/GeneralSystemParams.h \ Sources/Gui/CCANWatchdogSettingsPage.h \ Sources/CANBus/CANWatchdogConfig.h \ Sources/SystemConfig.h @@ -6194,6 +6416,7 @@ debug/CANDevice.o: Sources/CANBus/CANDevice.cpp Sources/CANBus/CANDevice.h \ Sources/Gui/CANbusSettingsPage.h \ Sources/Gui/CANViewerPage.h \ Sources/Gui/LoggingSettingsPage.h \ + Sources/GeneralSystemParams.h \ Sources/Gui/CCANWatchdogSettingsPage.h \ Sources/CANBus/CANWatchdogConfig.h \ Sources/GeneralMessagesLogDispatcher.h \ @@ -7110,6 +7333,7 @@ debug/MQTTClientWrapper.o: Sources/CloudLogging/MQTTClientWrapper.cpp Sources/Cl Sources/CANBus/CANDataLogger.h \ Sources/Gui/CANViewerPage.h \ Sources/Gui/LoggingSettingsPage.h \ + Sources/GeneralSystemParams.h \ Sources/Gui/CCANWatchdogSettingsPage.h \ Sources/CANBus/CANWatchdogConfig.h \ Sources/GeneralMessagesLogDispatcher.h \ @@ -7493,6 +7717,7 @@ debug/CCANWatchdogSettingsPage.o: Sources/Gui/CCANWatchdogSettingsPage.cpp Sourc Sources/Gui/CANbusSettingsPage.h \ Sources/Gui/CANViewerPage.h \ Sources/Gui/LoggingSettingsPage.h \ + Sources/GeneralSystemParams.h \ Sources/GeneralMessagesLogDispatcher.h \ C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/QFile \ Sources/SystemConfig.h diff --git a/Otarcik_CAN/Makefile.Release b/Otarcik_CAN/Makefile.Release index f864e80..aa0dfb8 100644 --- a/Otarcik_CAN/Makefile.Release +++ b/Otarcik_CAN/Makefile.Release @@ -569,6 +569,7 @@ release/moc_MainWindow.cpp: Sources/MainWindow.h \ Sources/CloudLogging/CloudParams.h \ Sources/Gui/CANViewerPage.h \ Sources/Gui/LoggingSettingsPage.h \ + Sources/GeneralSystemParams.h \ Sources/Gui/CCANWatchdogSettingsPage.h \ Sources/CANBus/CANWatchdogConfig.h \ release/moc_predefs.h \ @@ -991,6 +992,7 @@ release/moc_OtarcikCan.cpp: Sources/OtarcikCan.h \ Sources/CloudLogging/CloudParams.h \ Sources/Gui/CANViewerPage.h \ Sources/Gui/LoggingSettingsPage.h \ + Sources/GeneralSystemParams.h \ Sources/Gui/CCANWatchdogSettingsPage.h \ Sources/CANBus/CANWatchdogConfig.h \ Sources/GeneralMessagesLogDispatcher.h \ @@ -1736,6 +1738,8 @@ release/moc_LoggingSettingsPage.cpp: Sources/Gui/LoggingSettingsPage.h \ C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtGui/qtouchdevice.h \ Sources/CloudLogging/CloudParams.h \ C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/QString \ + Sources/GeneralSystemParams.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/QDataStream \ release/moc_predefs.h \ C:/Qt/Qt5.14.2/5.14.2/mingw73_64/bin/moc.exe C:\Qt\Qt5.14.2\5.14.2\mingw73_64\bin\moc.exe $(DEFINES) --include D:/Main/Dev/YULTek/Otarcik_CAN/release/moc_predefs.h -IC:/Qt/Qt5.14.2/5.14.2/mingw73_64/mkspecs/win32-g++ -ID:/Main/Dev/YULTek/Otarcik_CAN -ID:/Main/Dev/YULTek/Otarcik_CAN -ID:/Main/Dev/YULTek/Otarcik_CAN/Sources -ID:/Main/Dev/YULTek/Otarcik_CAN/Sources/Gui -ID:/Main/Dev/YULTek/Otarcik_CAN/Sources/PCAN -ID:/Main/Dev/YULTek/Otarcik_CAN/Sources/KVASER -ID:/Main/Dev/YULTek/Otarcik_CAN/Sources/CANDatabase -ID:/Main/Dev/YULTek/Otarcik_CAN/Sources/CANBus -ID:/Main/Dev/YULTek/Otarcik_CAN/Sources/CloudLogging -IC:/Qt/Qt5.14.2/5.14.2/mingw73_64/include -IC:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets -IC:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtGui -IC:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtANGLE -IC:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtMqtt -IC:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtNetwork -IC:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtSerialPort -IC:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore -IC:/Qt/Qt5.14.2/Tools/mingw730_64/lib/gcc/x86_64-w64-mingw32/7.3.0/include/c++ -IC:/Qt/Qt5.14.2/Tools/mingw730_64/lib/gcc/x86_64-w64-mingw32/7.3.0/include/c++/x86_64-w64-mingw32 -IC:/Qt/Qt5.14.2/Tools/mingw730_64/lib/gcc/x86_64-w64-mingw32/7.3.0/include/c++/backward -IC:/Qt/Qt5.14.2/Tools/mingw730_64/lib/gcc/x86_64-w64-mingw32/7.3.0/include -IC:/Qt/Qt5.14.2/Tools/mingw730_64/lib/gcc/x86_64-w64-mingw32/7.3.0/include-fixed -IC:/Qt/Qt5.14.2/Tools/mingw730_64/x86_64-w64-mingw32/include Sources\Gui\LoggingSettingsPage.h -o release\moc_LoggingSettingsPage.cpp @@ -2983,6 +2987,7 @@ release/main.o: Sources/main.cpp C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidg Sources/CloudLogging/CloudParams.h \ Sources/Gui/CANViewerPage.h \ Sources/Gui/LoggingSettingsPage.h \ + Sources/GeneralSystemParams.h \ Sources/Gui/CCANWatchdogSettingsPage.h \ Sources/CANBus/CANWatchdogConfig.h \ Sources/GeneralMessagesLogDispatcher.h \ @@ -3337,6 +3342,7 @@ release/MainWindow.o: Sources/MainWindow.cpp Sources/MainWindow.h \ Sources/CloudLogging/CloudParams.h \ Sources/Gui/CANViewerPage.h \ Sources/Gui/LoggingSettingsPage.h \ + Sources/GeneralSystemParams.h \ Sources/Gui/CCANWatchdogSettingsPage.h \ Sources/CANBus/CANWatchdogConfig.h \ ui_MainWindow.h \ @@ -3818,6 +3824,7 @@ release/OtarcikCan.o: Sources/OtarcikCan.cpp Sources/OtarcikCan.h \ Sources/CloudLogging/CloudParams.h \ Sources/Gui/CANViewerPage.h \ Sources/Gui/LoggingSettingsPage.h \ + Sources/GeneralSystemParams.h \ Sources/Gui/CCANWatchdogSettingsPage.h \ Sources/CANBus/CANWatchdogConfig.h \ Sources/GeneralMessagesLogDispatcher.h \ @@ -4256,7 +4263,218 @@ release/CANViewerPage.o: Sources/Gui/CANViewerPage.cpp Sources/Gui/CANViewerPage C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/QTableWidget \ C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/qtablewidget.h \ C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/qtableview.h \ - Sources/defines.h + Sources/defines.h \ + Sources/CANBus/CANDevice.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/QObject \ + Sources/CANBus/CANAnalyzer.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/QTimer \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qtimer.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qbasictimer.h \ + Sources/PCANInterface.h \ + Sources/CANDatabase/CANDatabase.h \ + Sources/KVASER/kvaDbLib.h \ + Sources/CANBus/CANDeviceConfig.h \ + Sources/CANBus/CANDataLogger.h \ + Sources/CloudLogging/MQTTMessage.h \ + Sources/CloudLogging/MQTTClientWrapper.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtMqtt/QtMqtt \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtMqtt/QtMqttDepends \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/QtCore \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/QtCoreDepends \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qabstractanimation.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qabstracteventdispatcher.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qabstractnativeeventfilter.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qabstractproxymodel.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qabstractstate.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qabstracttransition.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qanimationgroup.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qarraydataops.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qarraydatapointer.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qbitarray.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qbuffer.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qbytearraymatcher.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qcache.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qcalendar.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qcborarray.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qcborvalue.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qdatetime.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qcborcommon.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/quuid.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qcbormap.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qcborstream.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qfloat16.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qcollator.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qcommandlineoption.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qcommandlineparser.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qconcatenatetablesproxymodel.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qcryptographichash.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qdeadlinetimer.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qelapsedtimer.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qdir.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qfileinfo.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qdiriterator.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qeasingcurve.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qendian.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qeventtransition.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qexception.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qfactoryinterface.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qfileselector.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/QStringList \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qfilesystemwatcher.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qfinalstate.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qfuture.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qfutureinterface.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qrunnable.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qresultstore.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qfuturesynchronizer.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qfuturewatcher.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qhistorystate.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qidentityproxymodel.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qisenum.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qjsonarray.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qjsonvalue.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qjsondocument.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qjsonobject.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qlibrary.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qlibraryinfo.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qversionnumber.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qlinkedlist.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qlockfile.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qloggingcategory.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qmath.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qmessageauthenticationcode.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qmetaobject.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qmimedata.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qmimedatabase.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qmimetype.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qobjectcleanuphandler.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qoperatingsystemversion.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qparallelanimationgroup.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qpauseanimation.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qplugin.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qpointer.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qpluginloader.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qprocess.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qpropertyanimation.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qvariantanimation.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qqueue.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qrandom.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qreadwritelock.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qresource.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qsavefile.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qscopedvaluerollback.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qscopeguard.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qsemaphore.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qsequentialanimationgroup.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qsettings.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qsharedmemory.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qsignalmapper.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qsignaltransition.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qsocketnotifier.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qsortfilterproxymodel.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qstack.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qstandardpaths.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qstate.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qstatemachine.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qstorageinfo.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qstringlistmodel.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qsystemsemaphore.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qtemporarydir.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qtemporaryfile.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qtextboundaryfinder.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qtextcodec.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qthread.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qthreadpool.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qthreadstorage.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qtimeline.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qtimezone.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qtranslator.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qtransposeproxymodel.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qtypetraits.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qwaitcondition.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qwineventnotifier.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qxmlstream.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qtcoreversion.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtNetwork/QtNetwork \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtNetwork/QtNetworkDepends \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtNetwork/qtnetworkglobal.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtNetwork/qtnetwork-config.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtNetwork/qabstractnetworkcache.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtNetwork/qnetworkrequest.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/QSharedDataPointer \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/QUrl \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtNetwork/qabstractsocket.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtNetwork/qauthenticator.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtNetwork/qdnslookup.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtNetwork/qdtls.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtNetwork/qsslsocket.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtNetwork/qtcpsocket.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtNetwork/qsslerror.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtNetwork/qsslcertificate.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtNetwork/qssl.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/QFlags \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtNetwork/qhostaddress.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtNetwork/qhostinfo.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtNetwork/qhstspolicy.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtNetwork/qhttp2configuration.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtNetwork/qhttpmultipart.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/QIODevice \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtNetwork/QNetworkRequest \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtNetwork/qlocalserver.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtNetwork/qlocalsocket.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtNetwork/qnetworkaccessmanager.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/QVector \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtNetwork/QSslConfiguration \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtNetwork/qsslconfiguration.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtNetwork/QSslPreSharedKeyAuthenticator \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtNetwork/qsslpresharedkeyauthenticator.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/QMetaType \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtNetwork/qnetworkconfigmanager.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtNetwork/qnetworkconfiguration.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtNetwork/qnetworkcookie.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtNetwork/qnetworkcookiejar.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtNetwork/qnetworkdatagram.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtNetwork/qnetworkdiskcache.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtNetwork/qnetworkinterface.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtNetwork/qnetworkproxy.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtNetwork/qnetworkreply.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtNetwork/QNetworkAccessManager \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtNetwork/qnetworksession.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtNetwork/qocspresponse.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtNetwork/qpassworddigestor.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/QCryptographicHash \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtNetwork/qsctpserver.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtNetwork/qtcpserver.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtNetwork/qsctpsocket.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtNetwork/qsslcertificateextension.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtNetwork/qsslcipher.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtNetwork/qssldiffiehellmanparameters.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtNetwork/qsslellipticcurve.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/QHash \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtNetwork/qsslkey.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtNetwork/qudpsocket.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtNetwork/qtnetworkversion.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtMqtt/qmqttglobal.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtMqtt/qmqttauthenticationproperties.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtMqtt/qmqtttype.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/QDebug \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/QPair \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtMqtt/qmqttclient.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtMqtt/qmqttconnectionproperties.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtMqtt/qmqttpublishproperties.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtMqtt/qmqttsubscription.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtMqtt/qmqttmessage.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtMqtt/qmqtttopicname.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/QExplicitlySharedDataPointer \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtMqtt/qmqtttopicfilter.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtMqtt/qmqttsubscriptionproperties.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/QSharedPointer \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtNetwork/QTcpSocket \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtMqtt/qtmqttversion.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtMqtt/QMqttClient \ + Sources/CloudLogging/CloudParams.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtGui/QClipboard \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtGui/qclipboard.h $(CXX) -c $(CXXFLAGS) $(INCPATH) -o release\CANViewerPage.o Sources\Gui\CANViewerPage.cpp release/CANDatabase.o: Sources/CANDatabase/CANDatabase.cpp Sources/defines.h \ @@ -4681,6 +4899,7 @@ release/SystemConfig.o: Sources/SystemConfig.cpp Sources/SystemConfig.h \ Sources/CloudLogging/CloudParams.h \ C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/QFile \ Sources/CANBus/CANWatchdogConfig.h \ + Sources/GeneralSystemParams.h \ Sources/GeneralMessagesLogDispatcher.h \ Sources/Gui/GeneralStatusPage.h \ C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/QWidget \ @@ -5105,6 +5324,7 @@ release/CANbusSettingsPage.o: Sources/Gui/CANbusSettingsPage.cpp Sources/Gui/CAN Sources/SystemConfig.h \ C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/QFile \ Sources/CANBus/CANWatchdogConfig.h \ + Sources/GeneralSystemParams.h \ Sources/OtarcikCan.h \ Sources/MainWindow.h \ C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/QMainWindow \ @@ -5224,6 +5444,8 @@ release/LoggingSettingsPage.o: Sources/Gui/LoggingSettingsPage.cpp Sources/Gui/L C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtGui/qtouchdevice.h \ Sources/CloudLogging/CloudParams.h \ C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/QString \ + Sources/GeneralSystemParams.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/QDataStream \ ui_LoggingSettingsPage.h \ C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/QVariant \ C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/QApplication \ @@ -5275,7 +5497,6 @@ release/LoggingSettingsPage.o: Sources/Gui/LoggingSettingsPage.cpp Sources/Gui/L C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/QList \ Sources/CANBus/CANMessage.h \ C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/QByteArray \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/QDataStream \ Sources/PCAN/PCANBasic.h \ Sources/CANBus/CANSignal.h \ C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/QtGlobal \ @@ -5841,6 +6062,7 @@ release/CANAnalyzer.o: Sources/CANBus/CANAnalyzer.cpp Sources/CANBus/CANAnalyzer Sources/CloudLogging/CloudParams.h \ Sources/Gui/CANViewerPage.h \ Sources/Gui/LoggingSettingsPage.h \ + Sources/GeneralSystemParams.h \ Sources/Gui/CCANWatchdogSettingsPage.h \ Sources/CANBus/CANWatchdogConfig.h \ Sources/SystemConfig.h @@ -6194,6 +6416,7 @@ release/CANDevice.o: Sources/CANBus/CANDevice.cpp Sources/CANBus/CANDevice.h \ Sources/Gui/CANbusSettingsPage.h \ Sources/Gui/CANViewerPage.h \ Sources/Gui/LoggingSettingsPage.h \ + Sources/GeneralSystemParams.h \ Sources/Gui/CCANWatchdogSettingsPage.h \ Sources/CANBus/CANWatchdogConfig.h \ Sources/GeneralMessagesLogDispatcher.h \ @@ -7110,6 +7333,7 @@ release/MQTTClientWrapper.o: Sources/CloudLogging/MQTTClientWrapper.cpp Sources/ Sources/CANBus/CANDataLogger.h \ Sources/Gui/CANViewerPage.h \ Sources/Gui/LoggingSettingsPage.h \ + Sources/GeneralSystemParams.h \ Sources/Gui/CCANWatchdogSettingsPage.h \ Sources/CANBus/CANWatchdogConfig.h \ Sources/GeneralMessagesLogDispatcher.h \ @@ -7493,6 +7717,7 @@ release/CCANWatchdogSettingsPage.o: Sources/Gui/CCANWatchdogSettingsPage.cpp Sou Sources/Gui/CANbusSettingsPage.h \ Sources/Gui/CANViewerPage.h \ Sources/Gui/LoggingSettingsPage.h \ + Sources/GeneralSystemParams.h \ Sources/GeneralMessagesLogDispatcher.h \ C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/QFile \ Sources/SystemConfig.h diff --git a/Otarcik_CAN/Sources/CANBus/CANDataLogger.cpp b/Otarcik_CAN/Sources/CANBus/CANDataLogger.cpp index 6d41318..47d0fe0 100644 --- a/Otarcik_CAN/Sources/CANBus/CANDataLogger.cpp +++ b/Otarcik_CAN/Sources/CANBus/CANDataLogger.cpp @@ -146,22 +146,24 @@ CMQTTMessage CCANDataLogger::GetMQTTMessage(CCANMessage *Msg, bool Format ) QString SignalData; CCANSignal Signal = Msg->mSignalsList.at(signal); +#ifdef FORCE_FLOAT_REPRESENTATION //JFM 2023-06-16 changé pour forcer toujours à float SignalData = QString("\"%1\":%2").arg(Signal.mSignalName).arg(Signal.mPhysicalValue,0,'f',1); - -// if(Signal.mValueType == CCANSignal::CAN_SIGNAL_TYPE_UNSIGNED_INT) -// { -// SignalData = QString("\"%1\":%2").arg(Signal.mSignalName).arg((quint64)Signal.mPhysicalValue); -// } -// else if(Signal.mValueType == CCANSignal::CAN_SIGNAL_TYPE_SIGNED_INT) -// { -// SignalData = QString("\"%1\":%2").arg(Signal.mSignalName).arg((qint64)Signal.mPhysicalValue); -// } -// else if(Signal.mValueType == CCANSignal::CAN_SIGNAL_TYPE_32_BIT_FLOAT || -// Signal.mValueType == CCANSignal::CAN_SIGNAL_TYPE_64_BIT_DOUBLE) -// { -// SignalData = QString("\"%1\":%2").arg(Signal.mSignalName).arg(Signal.mPhysicalValue,0,'f',1); -// } +#else + if(Signal.mValueType == CCANSignal::CAN_SIGNAL_TYPE_UNSIGNED_INT) + { + SignalData = QString("\"%1\":%2").arg(Signal.mSignalName).arg((quint64)Signal.mPhysicalValue); + } + else if(Signal.mValueType == CCANSignal::CAN_SIGNAL_TYPE_SIGNED_INT) + { + SignalData = QString("\"%1\":%2").arg(Signal.mSignalName).arg((qint64)Signal.mPhysicalValue); + } + else if(Signal.mValueType == CCANSignal::CAN_SIGNAL_TYPE_32_BIT_FLOAT || + Signal.mValueType == CCANSignal::CAN_SIGNAL_TYPE_64_BIT_DOUBLE) + { + SignalData = QString("\"%1\":%2").arg(Signal.mSignalName).arg(Signal.mPhysicalValue,0,'f',1); + } +#endif MsgPayload.append(SignalData); if(signal < Msg->mSignalsList.size()-1) diff --git a/Otarcik_CAN/Sources/CANBus/CANDevice.cpp b/Otarcik_CAN/Sources/CANBus/CANDevice.cpp index de56e55..b0ddfe7 100644 --- a/Otarcik_CAN/Sources/CANBus/CANDevice.cpp +++ b/Otarcik_CAN/Sources/CANBus/CANDevice.cpp @@ -11,12 +11,6 @@ CCANDevice::CCANDevice(QObject *parent) mMessagesListLoaded = false; mCANAnalyzer.mDevicePtr = this; mProgramPtr = 0; -// mCANDeviceDatabaseFilename.clear(); -// mCANDeviceID = -1; -// mCANDeviceBaudrate = -1; -// mDeviceDescription.clear(); -// mDeviceName.clear(); -// mDevicePollPeriod = 0; } CCANDevice::CCANDevice(CCANDeviceConfig &SysConfig, CMQTTClientWrapper *MQTTClient, QString DeviceTopicPrefix) @@ -30,12 +24,6 @@ CCANDevice::CCANDevice(CCANDeviceConfig &SysConfig, CMQTTClientWrapper *MQTTClie mCANMQTTClient = MQTTClient; mDeviceTopicPrefix = DeviceTopicPrefix; -// mCANDeviceID = SysConfig.mCANDeviceID; -// mCANDeviceBaudrate = SysConfig.mCANDeviceBaudrate; -// mCANDeviceDatabaseFilename = SysConfig.mCANDeviceDatabaseFilename; -// mDeviceName = SysConfig.mDeviceName; -// mDeviceDescription = SysConfig.mDeviceDescription; -// mDevicePollPeriod = SysConfig.mDevicePollPeriod; } CCANDevice::~CCANDevice() @@ -61,7 +49,6 @@ int CCANDevice::Init() if(mCANDatabase.BuildMessageList(&mMessageList,mDeviceConfigInfo.mDeviceName) == RET_OK) { mMessagesListLoaded = true; - mProgramPtr->InitCANViewer(&mMessageList,this); } else { @@ -107,7 +94,7 @@ int CCANDevice::Init(QString DatabaseFileName, TPCANHandle CANDeviceID, TPCANBau int CCANDevice::NewMessageParsed(int BufferSize) { mCANDataLogger.LogNewData(&mMessageList); - mProgramPtr->UpdateCANViewerDataRequest(&mMessageList,mDeviceConfigInfo.mDeviceName); + mProgramPtr->UpdateCANViewerDataRequest(&mMessageList); mProgramPtr->UpdateCANModuleStatusRequest(mDeviceConfigInfo.mDeviceName,"NOUPDATE",QString("%1").arg(BufferSize)); for(int i = 0; i < mMessageList.size(); i++) diff --git a/Otarcik_CAN/Sources/Gui/CANViewerPage.ui b/Otarcik_CAN/Sources/Gui/CANViewerPage.ui index f8c3855..5fdcaf0 100644 --- a/Otarcik_CAN/Sources/Gui/CANViewerPage.ui +++ b/Otarcik_CAN/Sources/Gui/CANViewerPage.ui @@ -51,11 +51,24 @@ 1190 60 - 501 + 451 411 + + + + 1210 + 480 + 80 + 22 + + + + Copier + + diff --git a/Otarcik_CAN/Sources/Gui/GeneralStatusPage.cpp b/Otarcik_CAN/Sources/Gui/GeneralStatusPage.cpp index 55de466..115b9b9 100644 --- a/Otarcik_CAN/Sources/Gui/GeneralStatusPage.cpp +++ b/Otarcik_CAN/Sources/Gui/GeneralStatusPage.cpp @@ -16,6 +16,9 @@ CGeneralStatusPage::CGeneralStatusPage(QWidget *parent) : ui->mCANModuleStatusTableWdgt->setColumnCount(3); ui->mCANModuleStatusTableWdgt->setHorizontalHeaderLabels(QStringList() << "Nom" << "Statut" << "Buffer"); + + ui->mPuckCANConStatLbl->setVisible(false); + ui->mPuckCANLbl->setVisible(false); } CGeneralStatusPage::~CGeneralStatusPage() @@ -142,6 +145,13 @@ int CGeneralStatusPage::SetCANConnectionStatus(bool Connected) return RET_OK; } +int CGeneralStatusPage::ClearCANModuleStatusTable() +{ + ui->mCANModuleStatusTableWdgt->clearContents(); + ui->mCANModuleStatusTableWdgt->setRowCount(0); + return RET_OK; +} + int CGeneralStatusPage::UpdateCANModuleStatus(QString ModuleName, QString ModuleStatus, QString Buffer) { QList Items = ui->mCANModuleStatusTableWdgt->findItems(ModuleName,Qt::MatchFixedString); diff --git a/Otarcik_CAN/Sources/Gui/GeneralStatusPage.h b/Otarcik_CAN/Sources/Gui/GeneralStatusPage.h index f630643..86e3d04 100644 --- a/Otarcik_CAN/Sources/Gui/GeneralStatusPage.h +++ b/Otarcik_CAN/Sources/Gui/GeneralStatusPage.h @@ -33,6 +33,7 @@ public: int SetMQTTConnectionStatus(bool Connected); int SetCANConnectionStatus(bool Connected); int UpdateCANModuleStatus(QString ModuleName, QString ModuleStatus, QString Buffer); + int ClearCANModuleStatusTable(); private: diff --git a/Otarcik_CAN/Sources/MainWindow.cpp b/Otarcik_CAN/Sources/MainWindow.cpp index e6a0141..096c6c8 100644 --- a/Otarcik_CAN/Sources/MainWindow.cpp +++ b/Otarcik_CAN/Sources/MainWindow.cpp @@ -22,7 +22,7 @@ CMainWindow::CMainWindow(QWidget *parent) : ui(new Ui::CMainWindow) { ui->setupUi(this); - QMainWindow::statusBar()->showMessage("V1.00"); + QMainWindow::statusBar()->showMessage("V1.01"); mGeneralStatusPage = new CGeneralStatusPage(this); mMainWindowWidget = new QTabWidget(this); diff --git a/Otarcik_CAN/Sources/OtarcikCan.h b/Otarcik_CAN/Sources/OtarcikCan.h index c2acf80..2f41ad1 100644 --- a/Otarcik_CAN/Sources/OtarcikCan.h +++ b/Otarcik_CAN/Sources/OtarcikCan.h @@ -25,8 +25,7 @@ public: int Start(); - int InitCANViewer(QList *MsgList, CCANDevice *Device); - int UpdateCANViewerDataRequest(QList *MsgList, QString DeviceName); + int UpdateCANViewerDataRequest(QList *MsgList); int SaveCANDevicesConfigRequest(QList *DevicesConfigList); diff --git a/Otarcik_CAN/Sources/defines.h b/Otarcik_CAN/Sources/defines.h index e547837..c358682 100644 --- a/Otarcik_CAN/Sources/defines.h +++ b/Otarcik_CAN/Sources/defines.h @@ -7,6 +7,7 @@ #define MQTT_CLIENT_RECONNECT_TIMEOUT 5000 //Time in ms between reconnect attemps to MQTT broker when connection is lost //#define USE_TOPIC_PREFIX +#define FORCE_FLOAT_REPRESENTATION enum eOtarcikGeneralReturns { diff --git a/Otarcik_CAN/Sources/main.cpp b/Otarcik_CAN/Sources/main.cpp index d998adf..66de021 100644 --- a/Otarcik_CAN/Sources/main.cpp +++ b/Otarcik_CAN/Sources/main.cpp @@ -5,6 +5,7 @@ int main(int argc, char *argv[]) { + QApplication::setStyle("windows"); QApplication a(argc, argv); COtarcikCan OtarcikCanProgram; //Instanciate the program diff --git a/Otarcik_CAN/debug/moc_CANViewerPage.cpp b/Otarcik_CAN/debug/moc_CANViewerPage.cpp index 3ad0e12..25f67da 100644 --- a/Otarcik_CAN/debug/moc_CANViewerPage.cpp +++ b/Otarcik_CAN/debug/moc_CANViewerPage.cpp @@ -22,8 +22,8 @@ QT_BEGIN_MOC_NAMESPACE QT_WARNING_PUSH QT_WARNING_DISABLE_DEPRECATED struct qt_meta_stringdata_CCANViewerPage_t { - QByteArrayData data[3]; - char stringdata0[40]; + QByteArrayData data[4]; + char stringdata0[73]; }; #define QT_MOC_LITERAL(idx, ofs, len) \ Q_STATIC_BYTE_ARRAY_DATA_HEADER_INITIALIZER_WITH_OFFSET(len, \ @@ -34,11 +34,12 @@ static const qt_meta_stringdata_CCANViewerPage_t qt_meta_stringdata_CCANViewerPa { QT_MOC_LITERAL(0, 0, 14), // "CCANViewerPage" QT_MOC_LITERAL(1, 15, 23), // "MessageSelectionChanged" -QT_MOC_LITERAL(2, 39, 0) // "" +QT_MOC_LITERAL(2, 39, 0), // "" +QT_MOC_LITERAL(3, 40, 32) // "CopyJSONToClipboardButtonPressed" }, "CCANViewerPage\0MessageSelectionChanged\0" - "" + "\0CopyJSONToClipboardButtonPressed" }; #undef QT_MOC_LITERAL @@ -48,7 +49,7 @@ static const uint qt_meta_data_CCANViewerPage[] = { 8, // revision 0, // classname 0, 0, // classinfo - 1, 14, // methods + 2, 14, // methods 0, 0, // properties 0, 0, // enums/sets 0, 0, // constructors @@ -56,9 +57,11 @@ static const uint qt_meta_data_CCANViewerPage[] = { 0, // signalCount // slots: name, argc, parameters, tag, flags - 1, 0, 19, 2, 0x0a /* Public */, + 1, 0, 24, 2, 0x0a /* Public */, + 3, 0, 25, 2, 0x0a /* Public */, // slots: parameters + QMetaType::Void, QMetaType::Void, 0 // eod @@ -71,6 +74,7 @@ void CCANViewerPage::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _ Q_UNUSED(_t) switch (_id) { case 0: _t->MessageSelectionChanged(); break; + case 1: _t->CopyJSONToClipboardButtonPressed(); break; default: ; } } @@ -106,13 +110,13 @@ int CCANViewerPage::qt_metacall(QMetaObject::Call _c, int _id, void **_a) if (_id < 0) return _id; if (_c == QMetaObject::InvokeMetaMethod) { - if (_id < 1) + if (_id < 2) qt_static_metacall(this, _c, _id, _a); - _id -= 1; + _id -= 2; } else if (_c == QMetaObject::RegisterMethodArgumentMetaType) { - if (_id < 1) + if (_id < 2) *reinterpret_cast(_a[0]) = -1; - _id -= 1; + _id -= 2; } return _id; } diff --git a/Otarcik_CAN/release/Otarcik_CAN.exe b/Otarcik_CAN/release/Otarcik_CAN.exe index c822837..892ef45 100644 Binary files a/Otarcik_CAN/release/Otarcik_CAN.exe and b/Otarcik_CAN/release/Otarcik_CAN.exe differ diff --git a/Otarcik_CAN/ui_CANViewerPage.h b/Otarcik_CAN/ui_CANViewerPage.h index 8666316..18ba6f0 100644 --- a/Otarcik_CAN/ui_CANViewerPage.h +++ b/Otarcik_CAN/ui_CANViewerPage.h @@ -26,6 +26,7 @@ public: QPushButton *mClearCANDataBtn; QTableWidget *mCANSignalTableWidget; QPlainTextEdit *mJSonSignalViewTxtEdit; + QPushButton *mCopyJSonToClipboardBtn; void setupUi(QWidget *CCANViewerPage) { @@ -43,7 +44,10 @@ public: mCANSignalTableWidget->setGeometry(QRect(720, 60, 451, 411)); mJSonSignalViewTxtEdit = new QPlainTextEdit(CCANViewerPage); mJSonSignalViewTxtEdit->setObjectName(QString::fromUtf8("mJSonSignalViewTxtEdit")); - mJSonSignalViewTxtEdit->setGeometry(QRect(1190, 60, 501, 411)); + mJSonSignalViewTxtEdit->setGeometry(QRect(1190, 60, 451, 411)); + mCopyJSonToClipboardBtn = new QPushButton(CCANViewerPage); + mCopyJSonToClipboardBtn->setObjectName(QString::fromUtf8("mCopyJSonToClipboardBtn")); + mCopyJSonToClipboardBtn->setGeometry(QRect(1210, 480, 80, 22)); retranslateUi(CCANViewerPage); @@ -54,6 +58,7 @@ public: { CCANViewerPage->setWindowTitle(QCoreApplication::translate("CCANViewerPage", "Form", nullptr)); mClearCANDataBtn->setText(QCoreApplication::translate("CCANViewerPage", "Reset", nullptr)); + mCopyJSonToClipboardBtn->setText(QCoreApplication::translate("CCANViewerPage", "Copier", nullptr)); } // retranslateUi }; diff --git a/PWD.txt b/PWD.txt index 14cc2db..08c4f62 100644 --- a/PWD.txt +++ b/PWD.txt @@ -8,4 +8,4 @@ Windows PC Axiomtek: user yultek pwd:Otarcik! childhood nickname : otarcik EMQX Login: YULTekDev pwd: PaceST25! -Login: JFMDev pwd:PaceST25! \ No newline at end of file +Login: JFMDev pwd:PaceST25! diff --git a/TODO.txt b/TODO.txt index 04d95c8..f1d98b1 100644 --- a/TODO.txt +++ b/TODO.txt @@ -7,11 +7,11 @@ x Ajouter la taille du quue du module CAN dans l'onglet statut x Implémenter une liste de messages MQTT non envoyés pour ne pas perdre de messages provenant du CAN x Ajouter la gestion du Client ID MQTT - Implémenter le watchdog CAN -- Valider pourquoi le MQTT ne se connecte pas au reboot +x Valider pourquoi le MQTT ne se connecte pas au reboot x Valider pourquoi le MQTT ne se reconnecte pas après une déconnexion - Corriger le UTF pour l'affichage des degrés dans le tableau - Ajouter une indication du nombre de secondes depuis la dernière lecture -- Ajouter un affichage des payloads JSON -- Contrôler le niveau de log -- Assurer de ne pas avoir à redémarrer le soft quand on change un paramètre CAN (CAN data repopulate) -- Implémenter le CAN Watchdog +x Ajouter un affichage des payloads JSON +x Contrôler le niveau de log +x Assurer de ne pas avoir à redémarrer le soft quand on change un paramètre CAN (CAN data repopulate) +