diff --git a/Otarcik_CAN/Makefile.Debug b/Otarcik_CAN/Makefile.Debug index 94f2af3..a38a5f6 100644 --- a/Otarcik_CAN/Makefile.Debug +++ b/Otarcik_CAN/Makefile.Debug @@ -71,6 +71,7 @@ SOURCES = Sources\main.cpp \ debug\moc_CANAnalyzer.cpp \ debug\moc_CANViewerPage.cpp \ debug\moc_CANDatabase.cpp \ + debug\moc_CANDBMessage.cpp \ debug\moc_CANDevice.cpp OBJECTS = debug/main.o \ debug/MainWindow.o \ @@ -94,6 +95,7 @@ OBJECTS = debug/main.o \ debug/moc_CANAnalyzer.o \ debug/moc_CANViewerPage.o \ debug/moc_CANDatabase.o \ + debug/moc_CANDBMessage.o \ debug/moc_CANDevice.o DIST = Sources\MainWindow.h \ @@ -147,7 +149,7 @@ dist: $(ZIP) Otarcik_CAN.zip $(SOURCES) $(DIST) Otarcik_CAN.pro C:\Qt\Qt5.14.2\5.14.2\mingw73_64\mkspecs\features\spec_pre.prf C:\Qt\Qt5.14.2\5.14.2\mingw73_64\mkspecs\qdevice.pri C:\Qt\Qt5.14.2\5.14.2\mingw73_64\mkspecs\features\device_config.prf C:\Qt\Qt5.14.2\5.14.2\mingw73_64\mkspecs\common\sanitize.conf C:\Qt\Qt5.14.2\5.14.2\mingw73_64\mkspecs\common\gcc-base.conf C:\Qt\Qt5.14.2\5.14.2\mingw73_64\mkspecs\common\g++-base.conf C:\Qt\Qt5.14.2\5.14.2\mingw73_64\mkspecs\common\angle.conf C:\Qt\Qt5.14.2\5.14.2\mingw73_64\mkspecs\features\win32\windows_vulkan_sdk.prf C:\Qt\Qt5.14.2\5.14.2\mingw73_64\mkspecs\common\windows-vulkan.conf C:\Qt\Qt5.14.2\5.14.2\mingw73_64\mkspecs\common\g++-win32.conf C:\Qt\Qt5.14.2\5.14.2\mingw73_64\mkspecs\common\windows-desktop.conf C:\Qt\Qt5.14.2\5.14.2\mingw73_64\mkspecs\qconfig.pri C:\Qt\Qt5.14.2\5.14.2\mingw73_64\mkspecs\modules\qt_lib_3danimation.pri C:\Qt\Qt5.14.2\5.14.2\mingw73_64\mkspecs\modules\qt_lib_3danimation_private.pri C:\Qt\Qt5.14.2\5.14.2\mingw73_64\mkspecs\modules\qt_lib_3dcore.pri C:\Qt\Qt5.14.2\5.14.2\mingw73_64\mkspecs\modules\qt_lib_3dcore_private.pri C:\Qt\Qt5.14.2\5.14.2\mingw73_64\mkspecs\modules\qt_lib_3dextras.pri C:\Qt\Qt5.14.2\5.14.2\mingw73_64\mkspecs\modules\qt_lib_3dextras_private.pri C:\Qt\Qt5.14.2\5.14.2\mingw73_64\mkspecs\modules\qt_lib_3dinput.pri C:\Qt\Qt5.14.2\5.14.2\mingw73_64\mkspecs\modules\qt_lib_3dinput_private.pri C:\Qt\Qt5.14.2\5.14.2\mingw73_64\mkspecs\modules\qt_lib_3dlogic.pri C:\Qt\Qt5.14.2\5.14.2\mingw73_64\mkspecs\modules\qt_lib_3dlogic_private.pri C:\Qt\Qt5.14.2\5.14.2\mingw73_64\mkspecs\modules\qt_lib_3dquick.pri C:\Qt\Qt5.14.2\5.14.2\mingw73_64\mkspecs\modules\qt_lib_3dquick_private.pri C:\Qt\Qt5.14.2\5.14.2\mingw73_64\mkspecs\modules\qt_lib_3dquickanimation.pri C:\Qt\Qt5.14.2\5.14.2\mingw73_64\mkspecs\modules\qt_lib_3dquickanimation_private.pri C:\Qt\Qt5.14.2\5.14.2\mingw73_64\mkspecs\modules\qt_lib_3dquickextras.pri C:\Qt\Qt5.14.2\5.14.2\mingw73_64\mkspecs\modules\qt_lib_3dquickextras_private.pri C:\Qt\Qt5.14.2\5.14.2\mingw73_64\mkspecs\modules\qt_lib_3dquickinput.pri C:\Qt\Qt5.14.2\5.14.2\mingw73_64\mkspecs\modules\qt_lib_3dquickinput_private.pri C:\Qt\Qt5.14.2\5.14.2\mingw73_64\mkspecs\modules\qt_lib_3dquickrender.pri C:\Qt\Qt5.14.2\5.14.2\mingw73_64\mkspecs\modules\qt_lib_3dquickrender_private.pri C:\Qt\Qt5.14.2\5.14.2\mingw73_64\mkspecs\modules\qt_lib_3dquickscene2d.pri C:\Qt\Qt5.14.2\5.14.2\mingw73_64\mkspecs\modules\qt_lib_3dquickscene2d_private.pri C:\Qt\Qt5.14.2\5.14.2\mingw73_64\mkspecs\modules\qt_lib_3drender.pri C:\Qt\Qt5.14.2\5.14.2\mingw73_64\mkspecs\modules\qt_lib_3drender_private.pri C:\Qt\Qt5.14.2\5.14.2\mingw73_64\mkspecs\modules\qt_lib_accessibility_support_private.pri C:\Qt\Qt5.14.2\5.14.2\mingw73_64\mkspecs\modules\qt_lib_axbase.pri C:\Qt\Qt5.14.2\5.14.2\mingw73_64\mkspecs\modules\qt_lib_axbase_private.pri C:\Qt\Qt5.14.2\5.14.2\mingw73_64\mkspecs\modules\qt_lib_axcontainer.pri C:\Qt\Qt5.14.2\5.14.2\mingw73_64\mkspecs\modules\qt_lib_axcontainer_private.pri C:\Qt\Qt5.14.2\5.14.2\mingw73_64\mkspecs\modules\qt_lib_axserver.pri C:\Qt\Qt5.14.2\5.14.2\mingw73_64\mkspecs\modules\qt_lib_axserver_private.pri C:\Qt\Qt5.14.2\5.14.2\mingw73_64\mkspecs\modules\qt_lib_bluetooth.pri C:\Qt\Qt5.14.2\5.14.2\mingw73_64\mkspecs\modules\qt_lib_bluetooth_private.pri C:\Qt\Qt5.14.2\5.14.2\mingw73_64\mkspecs\modules\qt_lib_bootstrap_private.pri C:\Qt\Qt5.14.2\5.14.2\mingw73_64\mkspecs\modules\qt_lib_concurrent.pri C:\Qt\Qt5.14.2\5.14.2\mingw73_64\mkspecs\modules\qt_lib_concurrent_private.pri C:\Qt\Qt5.14.2\5.14.2\mingw73_64\mkspecs\modules\qt_lib_core.pri C:\Qt\Qt5.14.2\5.14.2\mingw73_64\mkspecs\modules\qt_lib_core_private.pri C:\Qt\Qt5.14.2\5.14.2\mingw73_64\mkspecs\modules\qt_lib_dbus.pri C:\Qt\Qt5.14.2\5.14.2\mingw73_64\mkspecs\modules\qt_lib_dbus_private.pri C:\Qt\Qt5.14.2\5.14.2\mingw73_64\mkspecs\modules\qt_lib_designer.pri C:\Qt\Qt5.14.2\5.14.2\mingw73_64\mkspecs\modules\qt_lib_designer_private.pri C:\Qt\Qt5.14.2\5.14.2\mingw73_64\mkspecs\modules\qt_lib_designercomponents_private.pri C:\Qt\Qt5.14.2\5.14.2\mingw73_64\mkspecs\modules\qt_lib_devicediscovery_support_private.pri C:\Qt\Qt5.14.2\5.14.2\mingw73_64\mkspecs\modules\qt_lib_edid_support_private.pri C:\Qt\Qt5.14.2\5.14.2\mingw73_64\mkspecs\modules\qt_lib_egl_support_private.pri C:\Qt\Qt5.14.2\5.14.2\mingw73_64\mkspecs\modules\qt_lib_eventdispatcher_support_private.pri C:\Qt\Qt5.14.2\5.14.2\mingw73_64\mkspecs\modules\qt_lib_fb_support_private.pri C:\Qt\Qt5.14.2\5.14.2\mingw73_64\mkspecs\modules\qt_lib_fontdatabase_support_private.pri C:\Qt\Qt5.14.2\5.14.2\mingw73_64\mkspecs\modules\qt_lib_gamepad.pri C:\Qt\Qt5.14.2\5.14.2\mingw73_64\mkspecs\modules\qt_lib_gamepad_private.pri C:\Qt\Qt5.14.2\5.14.2\mingw73_64\mkspecs\modules\qt_lib_gui.pri C:\Qt\Qt5.14.2\5.14.2\mingw73_64\mkspecs\modules\qt_lib_gui_private.pri C:\Qt\Qt5.14.2\5.14.2\mingw73_64\mkspecs\modules\qt_lib_help.pri C:\Qt\Qt5.14.2\5.14.2\mingw73_64\mkspecs\modules\qt_lib_help_private.pri C:\Qt\Qt5.14.2\5.14.2\mingw73_64\mkspecs\modules\qt_lib_httpserver.pri C:\Qt\Qt5.14.2\5.14.2\mingw73_64\mkspecs\modules\qt_lib_httpserver_private.pri C:\Qt\Qt5.14.2\5.14.2\mingw73_64\mkspecs\modules\qt_lib_location.pri C:\Qt\Qt5.14.2\5.14.2\mingw73_64\mkspecs\modules\qt_lib_location_private.pri C:\Qt\Qt5.14.2\5.14.2\mingw73_64\mkspecs\modules\qt_lib_mqtt.pri C:\Qt\Qt5.14.2\5.14.2\mingw73_64\mkspecs\modules\qt_lib_mqtt_private.pri C:\Qt\Qt5.14.2\5.14.2\mingw73_64\mkspecs\modules\qt_lib_multimedia.pri C:\Qt\Qt5.14.2\5.14.2\mingw73_64\mkspecs\modules\qt_lib_multimedia_private.pri C:\Qt\Qt5.14.2\5.14.2\mingw73_64\mkspecs\modules\qt_lib_multimediawidgets.pri C:\Qt\Qt5.14.2\5.14.2\mingw73_64\mkspecs\modules\qt_lib_multimediawidgets_private.pri C:\Qt\Qt5.14.2\5.14.2\mingw73_64\mkspecs\modules\qt_lib_network.pri C:\Qt\Qt5.14.2\5.14.2\mingw73_64\mkspecs\modules\qt_lib_network_private.pri C:\Qt\Qt5.14.2\5.14.2\mingw73_64\mkspecs\modules\qt_lib_nfc.pri C:\Qt\Qt5.14.2\5.14.2\mingw73_64\mkspecs\modules\qt_lib_nfc_private.pri C:\Qt\Qt5.14.2\5.14.2\mingw73_64\mkspecs\modules\qt_lib_opengl.pri C:\Qt\Qt5.14.2\5.14.2\mingw73_64\mkspecs\modules\qt_lib_opengl_private.pri C:\Qt\Qt5.14.2\5.14.2\mingw73_64\mkspecs\modules\qt_lib_openglextensions.pri C:\Qt\Qt5.14.2\5.14.2\mingw73_64\mkspecs\modules\qt_lib_openglextensions_private.pri C:\Qt\Qt5.14.2\5.14.2\mingw73_64\mkspecs\modules\qt_lib_packetprotocol_private.pri C:\Qt\Qt5.14.2\5.14.2\mingw73_64\mkspecs\modules\qt_lib_platformcompositor_support_private.pri C:\Qt\Qt5.14.2\5.14.2\mingw73_64\mkspecs\modules\qt_lib_positioning.pri C:\Qt\Qt5.14.2\5.14.2\mingw73_64\mkspecs\modules\qt_lib_positioning_private.pri C:\Qt\Qt5.14.2\5.14.2\mingw73_64\mkspecs\modules\qt_lib_positioningquick.pri C:\Qt\Qt5.14.2\5.14.2\mingw73_64\mkspecs\modules\qt_lib_positioningquick_private.pri C:\Qt\Qt5.14.2\5.14.2\mingw73_64\mkspecs\modules\qt_lib_printsupport.pri C:\Qt\Qt5.14.2\5.14.2\mingw73_64\mkspecs\modules\qt_lib_printsupport_private.pri C:\Qt\Qt5.14.2\5.14.2\mingw73_64\mkspecs\modules\qt_lib_qml.pri C:\Qt\Qt5.14.2\5.14.2\mingw73_64\mkspecs\modules\qt_lib_qml_private.pri C:\Qt\Qt5.14.2\5.14.2\mingw73_64\mkspecs\modules\qt_lib_qmldebug_private.pri C:\Qt\Qt5.14.2\5.14.2\mingw73_64\mkspecs\modules\qt_lib_qmldevtools_private.pri C:\Qt\Qt5.14.2\5.14.2\mingw73_64\mkspecs\modules\qt_lib_qmlmodels.pri C:\Qt\Qt5.14.2\5.14.2\mingw73_64\mkspecs\modules\qt_lib_qmlmodels_private.pri C:\Qt\Qt5.14.2\5.14.2\mingw73_64\mkspecs\modules\qt_lib_qmltest.pri C:\Qt\Qt5.14.2\5.14.2\mingw73_64\mkspecs\modules\qt_lib_qmltest_private.pri C:\Qt\Qt5.14.2\5.14.2\mingw73_64\mkspecs\modules\qt_lib_qmlworkerscript.pri C:\Qt\Qt5.14.2\5.14.2\mingw73_64\mkspecs\modules\qt_lib_qmlworkerscript_private.pri C:\Qt\Qt5.14.2\5.14.2\mingw73_64\mkspecs\modules\qt_lib_qtmultimediaquicktools_private.pri C:\Qt\Qt5.14.2\5.14.2\mingw73_64\mkspecs\modules\qt_lib_quick.pri C:\Qt\Qt5.14.2\5.14.2\mingw73_64\mkspecs\modules\qt_lib_quick_private.pri C:\Qt\Qt5.14.2\5.14.2\mingw73_64\mkspecs\modules\qt_lib_quickcontrols2.pri C:\Qt\Qt5.14.2\5.14.2\mingw73_64\mkspecs\modules\qt_lib_quickcontrols2_private.pri C:\Qt\Qt5.14.2\5.14.2\mingw73_64\mkspecs\modules\qt_lib_quickparticles_private.pri C:\Qt\Qt5.14.2\5.14.2\mingw73_64\mkspecs\modules\qt_lib_quickshapes_private.pri C:\Qt\Qt5.14.2\5.14.2\mingw73_64\mkspecs\modules\qt_lib_quicktemplates2.pri C:\Qt\Qt5.14.2\5.14.2\mingw73_64\mkspecs\modules\qt_lib_quicktemplates2_private.pri C:\Qt\Qt5.14.2\5.14.2\mingw73_64\mkspecs\modules\qt_lib_quickwidgets.pri C:\Qt\Qt5.14.2\5.14.2\mingw73_64\mkspecs\modules\qt_lib_quickwidgets_private.pri C:\Qt\Qt5.14.2\5.14.2\mingw73_64\mkspecs\modules\qt_lib_remoteobjects.pri C:\Qt\Qt5.14.2\5.14.2\mingw73_64\mkspecs\modules\qt_lib_remoteobjects_private.pri C:\Qt\Qt5.14.2\5.14.2\mingw73_64\mkspecs\modules\qt_lib_repparser.pri C:\Qt\Qt5.14.2\5.14.2\mingw73_64\mkspecs\modules\qt_lib_repparser_private.pri C:\Qt\Qt5.14.2\5.14.2\mingw73_64\mkspecs\modules\qt_lib_scxml.pri C:\Qt\Qt5.14.2\5.14.2\mingw73_64\mkspecs\modules\qt_lib_scxml_private.pri C:\Qt\Qt5.14.2\5.14.2\mingw73_64\mkspecs\modules\qt_lib_sensors.pri C:\Qt\Qt5.14.2\5.14.2\mingw73_64\mkspecs\modules\qt_lib_sensors_private.pri C:\Qt\Qt5.14.2\5.14.2\mingw73_64\mkspecs\modules\qt_lib_serialbus.pri C:\Qt\Qt5.14.2\5.14.2\mingw73_64\mkspecs\modules\qt_lib_serialbus_private.pri C:\Qt\Qt5.14.2\5.14.2\mingw73_64\mkspecs\modules\qt_lib_serialport.pri C:\Qt\Qt5.14.2\5.14.2\mingw73_64\mkspecs\modules\qt_lib_serialport_private.pri C:\Qt\Qt5.14.2\5.14.2\mingw73_64\mkspecs\modules\qt_lib_sql.pri C:\Qt\Qt5.14.2\5.14.2\mingw73_64\mkspecs\modules\qt_lib_sql_private.pri C:\Qt\Qt5.14.2\5.14.2\mingw73_64\mkspecs\modules\qt_lib_sslserver.pri C:\Qt\Qt5.14.2\5.14.2\mingw73_64\mkspecs\modules\qt_lib_sslserver_private.pri C:\Qt\Qt5.14.2\5.14.2\mingw73_64\mkspecs\modules\qt_lib_svg.pri C:\Qt\Qt5.14.2\5.14.2\mingw73_64\mkspecs\modules\qt_lib_svg_private.pri C:\Qt\Qt5.14.2\5.14.2\mingw73_64\mkspecs\modules\qt_lib_testlib.pri C:\Qt\Qt5.14.2\5.14.2\mingw73_64\mkspecs\modules\qt_lib_testlib_private.pri C:\Qt\Qt5.14.2\5.14.2\mingw73_64\mkspecs\modules\qt_lib_texttospeech.pri C:\Qt\Qt5.14.2\5.14.2\mingw73_64\mkspecs\modules\qt_lib_texttospeech_private.pri C:\Qt\Qt5.14.2\5.14.2\mingw73_64\mkspecs\modules\qt_lib_theme_support_private.pri C:\Qt\Qt5.14.2\5.14.2\mingw73_64\mkspecs\modules\qt_lib_uiplugin.pri C:\Qt\Qt5.14.2\5.14.2\mingw73_64\mkspecs\modules\qt_lib_uitools.pri C:\Qt\Qt5.14.2\5.14.2\mingw73_64\mkspecs\modules\qt_lib_uitools_private.pri C:\Qt\Qt5.14.2\5.14.2\mingw73_64\mkspecs\modules\qt_lib_vulkan_support_private.pri C:\Qt\Qt5.14.2\5.14.2\mingw73_64\mkspecs\modules\qt_lib_webchannel.pri C:\Qt\Qt5.14.2\5.14.2\mingw73_64\mkspecs\modules\qt_lib_webchannel_private.pri C:\Qt\Qt5.14.2\5.14.2\mingw73_64\mkspecs\modules\qt_lib_websockets.pri C:\Qt\Qt5.14.2\5.14.2\mingw73_64\mkspecs\modules\qt_lib_websockets_private.pri C:\Qt\Qt5.14.2\5.14.2\mingw73_64\mkspecs\modules\qt_lib_widgets.pri C:\Qt\Qt5.14.2\5.14.2\mingw73_64\mkspecs\modules\qt_lib_widgets_private.pri C:\Qt\Qt5.14.2\5.14.2\mingw73_64\mkspecs\modules\qt_lib_windowsuiautomation_support_private.pri C:\Qt\Qt5.14.2\5.14.2\mingw73_64\mkspecs\modules\qt_lib_winextras.pri C:\Qt\Qt5.14.2\5.14.2\mingw73_64\mkspecs\modules\qt_lib_winextras_private.pri C:\Qt\Qt5.14.2\5.14.2\mingw73_64\mkspecs\modules\qt_lib_xml.pri C:\Qt\Qt5.14.2\5.14.2\mingw73_64\mkspecs\modules\qt_lib_xml_private.pri C:\Qt\Qt5.14.2\5.14.2\mingw73_64\mkspecs\modules\qt_lib_xmlpatterns.pri C:\Qt\Qt5.14.2\5.14.2\mingw73_64\mkspecs\modules\qt_lib_xmlpatterns_private.pri C:\Qt\Qt5.14.2\5.14.2\mingw73_64\mkspecs\modules\qt_lib_zlib_private.pri C:\Qt\Qt5.14.2\5.14.2\mingw73_64\mkspecs\features\qt_functions.prf C:\Qt\Qt5.14.2\5.14.2\mingw73_64\mkspecs\features\qt_config.prf C:\Qt\Qt5.14.2\5.14.2\mingw73_64\mkspecs\win32-g++\qmake.conf C:\Qt\Qt5.14.2\5.14.2\mingw73_64\mkspecs\features\spec_post.prf ..\..\.qmake.stash C:\Qt\Qt5.14.2\5.14.2\mingw73_64\mkspecs\features\exclusive_builds.prf C:\Qt\Qt5.14.2\5.14.2\mingw73_64\mkspecs\features\toolchain.prf C:\Qt\Qt5.14.2\5.14.2\mingw73_64\mkspecs\features\default_pre.prf C:\Qt\Qt5.14.2\5.14.2\mingw73_64\mkspecs\features\win32\default_pre.prf C:\Qt\Qt5.14.2\5.14.2\mingw73_64\mkspecs\features\resolve_config.prf C:\Qt\Qt5.14.2\5.14.2\mingw73_64\mkspecs\features\exclusive_builds_post.prf C:\Qt\Qt5.14.2\5.14.2\mingw73_64\mkspecs\features\default_post.prf C:\Qt\Qt5.14.2\5.14.2\mingw73_64\mkspecs\features\build_pass.prf C:\Qt\Qt5.14.2\5.14.2\mingw73_64\mkspecs\features\qml_debug.prf C:\Qt\Qt5.14.2\5.14.2\mingw73_64\mkspecs\features\precompile_header.prf C:\Qt\Qt5.14.2\5.14.2\mingw73_64\mkspecs\features\warn_on.prf C:\Qt\Qt5.14.2\5.14.2\mingw73_64\mkspecs\features\qt.prf C:\Qt\Qt5.14.2\5.14.2\mingw73_64\mkspecs\features\resources_functions.prf C:\Qt\Qt5.14.2\5.14.2\mingw73_64\mkspecs\features\resources.prf C:\Qt\Qt5.14.2\5.14.2\mingw73_64\mkspecs\features\moc.prf C:\Qt\Qt5.14.2\5.14.2\mingw73_64\mkspecs\features\win32\opengl.prf C:\Qt\Qt5.14.2\5.14.2\mingw73_64\mkspecs\features\uic.prf C:\Qt\Qt5.14.2\5.14.2\mingw73_64\mkspecs\features\qmake_use.prf C:\Qt\Qt5.14.2\5.14.2\mingw73_64\mkspecs\features\file_copies.prf C:\Qt\Qt5.14.2\5.14.2\mingw73_64\mkspecs\features\win32\windows.prf C:\Qt\Qt5.14.2\5.14.2\mingw73_64\mkspecs\features\testcase_targets.prf C:\Qt\Qt5.14.2\5.14.2\mingw73_64\mkspecs\features\exceptions.prf C:\Qt\Qt5.14.2\5.14.2\mingw73_64\mkspecs\features\yacc.prf C:\Qt\Qt5.14.2\5.14.2\mingw73_64\mkspecs\features\lex.prf Otarcik_CAN.pro C:\Qt\Qt5.14.2\5.14.2\mingw73_64\lib\Qt5Widgets.prl C:\Qt\Qt5.14.2\5.14.2\mingw73_64\lib\Qt5Gui.prl C:\Qt\Qt5.14.2\5.14.2\mingw73_64\lib\Qt5Mqtt.prl C:\Qt\Qt5.14.2\5.14.2\mingw73_64\lib\Qt5Network.prl C:\Qt\Qt5.14.2\5.14.2\mingw73_64\lib\Qt5SerialPort.prl C:\Qt\Qt5.14.2\5.14.2\mingw73_64\lib\Qt5Core.prl C:\Qt\Qt5.14.2\5.14.2\mingw73_64\lib\qtmain.prl C:\Qt\Qt5.14.2\5.14.2\mingw73_64\mkspecs\features\data\dummy.cpp Sources\MainWindow.h Sources\PCANInterface.h Sources\OtarcikCan.h Sources\Gui\GeneralStatusPage.h Sources\GeneralMessagesLogDispatcher.h Sources\defines.h Sources\Gui\ProgramSettingsPage.h Sources\KVASER\kvaDbLib.h Sources\PCAN\PCANBasic.h Sources\CANAnalyzer.h Sources\CANMessage.h Sources\Gui\CANViewerPage.h Sources\CANDatabase\CANDatabase.h Sources\CANDatabase\CANDBMessage.h Sources\CANDatabase\CANDBSignal.h Sources\CANDevice.h Sources\main.cpp Sources\MainWindow.cpp Sources\PCANInterface.cpp Sources\OtarcikCan.cpp Sources\Gui\GeneralStatusPage.cpp Sources\GeneralMessagesLogDispatcher.cpp Sources\Gui\ProgramSettingsPage.cpp Sources\CANAnalyzer.cpp Sources\CANMessage.cpp Sources\Gui\CANViewerPage.cpp Sources\CANDatabase\CANDatabase.cpp Sources\CANDatabase\CANDBMessage.cpp Sources\CANDatabase\CANDBSignal.cpp Sources\CANDevice.cpp Sources\Gui\MainWindow.ui Sources\Gui\GeneralStatusPage.ui Sources\Gui\ProgramSettingsPage.ui Sources\Gui\CANViewerPage.ui clean: compiler_clean - -$(DEL_FILE) debug\main.o debug\MainWindow.o debug\PCANInterface.o debug\OtarcikCan.o debug\GeneralStatusPage.o debug\GeneralMessagesLogDispatcher.o debug\ProgramSettingsPage.o debug\CANAnalyzer.o debug\CANMessage.o debug\CANViewerPage.o debug\CANDatabase.o debug\CANDBMessage.o debug\CANDBSignal.o debug\CANDevice.o debug\moc_MainWindow.o debug\moc_PCANInterface.o debug\moc_OtarcikCan.o debug\moc_GeneralStatusPage.o debug\moc_ProgramSettingsPage.o debug\moc_CANAnalyzer.o debug\moc_CANViewerPage.o debug\moc_CANDatabase.o debug\moc_CANDevice.o + -$(DEL_FILE) debug\main.o debug\MainWindow.o debug\PCANInterface.o debug\OtarcikCan.o debug\GeneralStatusPage.o debug\GeneralMessagesLogDispatcher.o debug\ProgramSettingsPage.o debug\CANAnalyzer.o debug\CANMessage.o debug\CANViewerPage.o debug\CANDatabase.o debug\CANDBMessage.o debug\CANDBSignal.o debug\CANDevice.o debug\moc_MainWindow.o debug\moc_PCANInterface.o debug\moc_OtarcikCan.o debug\moc_GeneralStatusPage.o debug\moc_ProgramSettingsPage.o debug\moc_CANAnalyzer.o debug\moc_CANViewerPage.o debug\moc_CANDatabase.o debug\moc_CANDBMessage.o debug\moc_CANDevice.o distclean: clean -$(DEL_FILE) $(DESTDIR_TARGET) @@ -171,9 +173,9 @@ compiler_moc_predefs_clean: debug/moc_predefs.h: C:/Qt/Qt5.14.2/5.14.2/mingw73_64/mkspecs/features/data/dummy.cpp g++ -fno-keep-inline-dllexport -g -Wall -Wextra -Wextra -dM -E -o debug\moc_predefs.h C:\Qt\Qt5.14.2\5.14.2\mingw73_64\mkspecs\features\data\dummy.cpp -compiler_moc_header_make_all: debug/moc_MainWindow.cpp debug/moc_PCANInterface.cpp debug/moc_OtarcikCan.cpp debug/moc_GeneralStatusPage.cpp debug/moc_ProgramSettingsPage.cpp debug/moc_CANAnalyzer.cpp debug/moc_CANViewerPage.cpp debug/moc_CANDatabase.cpp debug/moc_CANDevice.cpp +compiler_moc_header_make_all: debug/moc_MainWindow.cpp debug/moc_PCANInterface.cpp debug/moc_OtarcikCan.cpp debug/moc_GeneralStatusPage.cpp debug/moc_ProgramSettingsPage.cpp debug/moc_CANAnalyzer.cpp debug/moc_CANViewerPage.cpp debug/moc_CANDatabase.cpp debug/moc_CANDBMessage.cpp debug/moc_CANDevice.cpp compiler_moc_header_clean: - -$(DEL_FILE) debug\moc_MainWindow.cpp debug\moc_PCANInterface.cpp debug\moc_OtarcikCan.cpp debug\moc_GeneralStatusPage.cpp debug\moc_ProgramSettingsPage.cpp debug\moc_CANAnalyzer.cpp debug\moc_CANViewerPage.cpp debug\moc_CANDatabase.cpp debug\moc_CANDevice.cpp + -$(DEL_FILE) debug\moc_MainWindow.cpp debug\moc_PCANInterface.cpp debug\moc_OtarcikCan.cpp debug\moc_GeneralStatusPage.cpp debug\moc_ProgramSettingsPage.cpp debug\moc_CANAnalyzer.cpp debug\moc_CANViewerPage.cpp debug\moc_CANDatabase.cpp debug\moc_CANDBMessage.cpp debug\moc_CANDevice.cpp debug/moc_MainWindow.cpp: Sources/MainWindow.h \ C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/QMainWindow \ C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/qmainwindow.h \ @@ -735,9 +737,10 @@ debug/moc_ProgramSettingsPage.cpp: Sources/Gui/ProgramSettingsPage.h \ 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 -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\ProgramSettingsPage.h -o debug\moc_ProgramSettingsPage.cpp debug/moc_CANAnalyzer.cpp: Sources/CANAnalyzer.h \ - Sources/defines.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/QObject \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qobject.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qobjectdefs.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qnamespace.h \ C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qglobal.h \ C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qconfig-bootstrapped.h \ C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qconfig.h \ @@ -759,10 +762,6 @@ debug/moc_CANAnalyzer.cpp: Sources/CANAnalyzer.h \ C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qmutex.h \ C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qnumeric.h \ C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qversiontagging.h \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qbasictimer.h \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qnamespace.h \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qobject.h \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qobjectdefs.h \ C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qobjectdefs_impl.h \ C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qstring.h \ C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qchar.h \ @@ -791,6 +790,10 @@ debug/moc_CANAnalyzer.cpp: Sources/CANAnalyzer.h \ C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qvarlengtharray.h \ C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qcontainerfwd.h \ C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qobject_impl.h \ + Sources/defines.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 \ C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/QList \ Sources/CANMessage.h \ C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/QByteArray \ @@ -974,6 +977,77 @@ debug/moc_CANDatabase.cpp: Sources/CANDatabase/CANDatabase.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 -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\CANDatabase\CANDatabase.h -o debug\moc_CANDatabase.cpp +debug/moc_CANDBMessage.cpp: Sources/CANDatabase/CANDBMessage.h \ + Sources/CANDatabase/CANDBSignal.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/QList \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qlist.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qalgorithms.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qglobal.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qconfig-bootstrapped.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qconfig.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qtcore-config.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qsystemdetection.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qprocessordetection.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qcompilerdetection.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qtypeinfo.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qsysinfo.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qlogging.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qflags.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qatomic.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qbasicatomic.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qatomic_bootstrap.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qgenericatomic.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qatomic_cxx11.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qatomic_msvc.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qglobalstatic.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qmutex.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qnumeric.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qversiontagging.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qiterator.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qrefcount.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qarraydata.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qhashfunctions.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qstring.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qchar.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qbytearray.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qnamespace.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qstringliteral.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qstringalgorithms.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qstringview.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qstringbuilder.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qpair.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qvector.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qcontainertools_impl.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qpoint.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qbytearraylist.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qstringlist.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qregexp.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qstringmatcher.h \ + Sources/CANAnalyzer.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/QObject \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qobject.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qobjectdefs.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qobjectdefs_impl.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qcoreevent.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qscopedpointer.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qmetatype.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qvarlengtharray.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qcontainerfwd.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qobject_impl.h \ + Sources/defines.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/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 \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qdatastream.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qiodevice.h \ + Sources/PCAN/PCANBasic.h \ + 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 -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\CANDatabase\CANDBMessage.h -o debug\moc_CANDBMessage.cpp + debug/moc_CANDevice.cpp: Sources/CANDevice.h \ C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/QObject \ C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qobject.h \ @@ -1998,9 +2072,10 @@ debug/ProgramSettingsPage.o: Sources/Gui/ProgramSettingsPage.cpp Sources/Gui/Pro $(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug\ProgramSettingsPage.o Sources\Gui\ProgramSettingsPage.cpp debug/CANAnalyzer.o: Sources/CANAnalyzer.cpp Sources/CANAnalyzer.h \ - Sources/defines.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/QObject \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qobject.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qobjectdefs.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qnamespace.h \ C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qglobal.h \ C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qconfig-bootstrapped.h \ C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qconfig.h \ @@ -2022,10 +2097,6 @@ debug/CANAnalyzer.o: Sources/CANAnalyzer.cpp Sources/CANAnalyzer.h \ C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qmutex.h \ C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qnumeric.h \ C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qversiontagging.h \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qbasictimer.h \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qnamespace.h \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qobject.h \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qobjectdefs.h \ C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qobjectdefs_impl.h \ C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qstring.h \ C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qchar.h \ @@ -2054,6 +2125,10 @@ debug/CANAnalyzer.o: Sources/CANAnalyzer.cpp Sources/CANAnalyzer.h \ C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qvarlengtharray.h \ C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qcontainerfwd.h \ C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qobject_impl.h \ + Sources/defines.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 \ C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/QList \ Sources/CANMessage.h \ C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/QByteArray \ @@ -2062,7 +2137,6 @@ debug/CANAnalyzer.o: Sources/CANAnalyzer.cpp Sources/CANAnalyzer.h \ C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qiodevice.h \ Sources/PCAN/PCANBasic.h \ Sources/PCANInterface.h \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/QObject \ Sources/GeneralMessagesLogDispatcher.h \ C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/QString \ Sources/Gui/GeneralStatusPage.h \ @@ -2449,7 +2523,28 @@ debug/CANDBMessage.o: Sources/CANDatabase/CANDBMessage.cpp Sources/CANDatabase/C C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qbytearraylist.h \ C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qstringlist.h \ C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qregexp.h \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qstringmatcher.h + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qstringmatcher.h \ + Sources/CANAnalyzer.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/QObject \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qobject.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qobjectdefs.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qobjectdefs_impl.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qcoreevent.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qscopedpointer.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qmetatype.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qvarlengtharray.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qcontainerfwd.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qobject_impl.h \ + Sources/defines.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/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 \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qdatastream.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qiodevice.h \ + Sources/PCAN/PCANBasic.h $(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug\CANDBMessage.o Sources\CANDatabase\CANDBMessage.cpp debug/CANDBSignal.o: Sources/CANDatabase/CANDBSignal.cpp Sources/CANDatabase/CANDBSignal.h @@ -2549,6 +2644,9 @@ debug/moc_CANViewerPage.o: debug/moc_CANViewerPage.cpp debug/moc_CANDatabase.o: debug/moc_CANDatabase.cpp $(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug\moc_CANDatabase.o debug\moc_CANDatabase.cpp +debug/moc_CANDBMessage.o: debug/moc_CANDBMessage.cpp + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug\moc_CANDBMessage.o debug\moc_CANDBMessage.cpp + debug/moc_CANDevice.o: debug/moc_CANDevice.cpp $(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug\moc_CANDevice.o debug\moc_CANDevice.cpp diff --git a/Otarcik_CAN/Makefile.Release b/Otarcik_CAN/Makefile.Release index 7769891..cd9b202 100644 --- a/Otarcik_CAN/Makefile.Release +++ b/Otarcik_CAN/Makefile.Release @@ -71,6 +71,7 @@ SOURCES = Sources\main.cpp \ release\moc_CANAnalyzer.cpp \ release\moc_CANViewerPage.cpp \ release\moc_CANDatabase.cpp \ + release\moc_CANDBMessage.cpp \ release\moc_CANDevice.cpp OBJECTS = release/main.o \ release/MainWindow.o \ @@ -94,6 +95,7 @@ OBJECTS = release/main.o \ release/moc_CANAnalyzer.o \ release/moc_CANViewerPage.o \ release/moc_CANDatabase.o \ + release/moc_CANDBMessage.o \ release/moc_CANDevice.o DIST = Sources\MainWindow.h \ @@ -147,7 +149,7 @@ dist: $(ZIP) Otarcik_CAN.zip $(SOURCES) $(DIST) Otarcik_CAN.pro C:\Qt\Qt5.14.2\5.14.2\mingw73_64\mkspecs\features\spec_pre.prf C:\Qt\Qt5.14.2\5.14.2\mingw73_64\mkspecs\qdevice.pri C:\Qt\Qt5.14.2\5.14.2\mingw73_64\mkspecs\features\device_config.prf C:\Qt\Qt5.14.2\5.14.2\mingw73_64\mkspecs\common\sanitize.conf C:\Qt\Qt5.14.2\5.14.2\mingw73_64\mkspecs\common\gcc-base.conf C:\Qt\Qt5.14.2\5.14.2\mingw73_64\mkspecs\common\g++-base.conf C:\Qt\Qt5.14.2\5.14.2\mingw73_64\mkspecs\common\angle.conf C:\Qt\Qt5.14.2\5.14.2\mingw73_64\mkspecs\features\win32\windows_vulkan_sdk.prf C:\Qt\Qt5.14.2\5.14.2\mingw73_64\mkspecs\common\windows-vulkan.conf C:\Qt\Qt5.14.2\5.14.2\mingw73_64\mkspecs\common\g++-win32.conf C:\Qt\Qt5.14.2\5.14.2\mingw73_64\mkspecs\common\windows-desktop.conf C:\Qt\Qt5.14.2\5.14.2\mingw73_64\mkspecs\qconfig.pri C:\Qt\Qt5.14.2\5.14.2\mingw73_64\mkspecs\modules\qt_lib_3danimation.pri C:\Qt\Qt5.14.2\5.14.2\mingw73_64\mkspecs\modules\qt_lib_3danimation_private.pri C:\Qt\Qt5.14.2\5.14.2\mingw73_64\mkspecs\modules\qt_lib_3dcore.pri C:\Qt\Qt5.14.2\5.14.2\mingw73_64\mkspecs\modules\qt_lib_3dcore_private.pri C:\Qt\Qt5.14.2\5.14.2\mingw73_64\mkspecs\modules\qt_lib_3dextras.pri C:\Qt\Qt5.14.2\5.14.2\mingw73_64\mkspecs\modules\qt_lib_3dextras_private.pri C:\Qt\Qt5.14.2\5.14.2\mingw73_64\mkspecs\modules\qt_lib_3dinput.pri C:\Qt\Qt5.14.2\5.14.2\mingw73_64\mkspecs\modules\qt_lib_3dinput_private.pri C:\Qt\Qt5.14.2\5.14.2\mingw73_64\mkspecs\modules\qt_lib_3dlogic.pri C:\Qt\Qt5.14.2\5.14.2\mingw73_64\mkspecs\modules\qt_lib_3dlogic_private.pri C:\Qt\Qt5.14.2\5.14.2\mingw73_64\mkspecs\modules\qt_lib_3dquick.pri C:\Qt\Qt5.14.2\5.14.2\mingw73_64\mkspecs\modules\qt_lib_3dquick_private.pri C:\Qt\Qt5.14.2\5.14.2\mingw73_64\mkspecs\modules\qt_lib_3dquickanimation.pri C:\Qt\Qt5.14.2\5.14.2\mingw73_64\mkspecs\modules\qt_lib_3dquickanimation_private.pri C:\Qt\Qt5.14.2\5.14.2\mingw73_64\mkspecs\modules\qt_lib_3dquickextras.pri C:\Qt\Qt5.14.2\5.14.2\mingw73_64\mkspecs\modules\qt_lib_3dquickextras_private.pri C:\Qt\Qt5.14.2\5.14.2\mingw73_64\mkspecs\modules\qt_lib_3dquickinput.pri C:\Qt\Qt5.14.2\5.14.2\mingw73_64\mkspecs\modules\qt_lib_3dquickinput_private.pri C:\Qt\Qt5.14.2\5.14.2\mingw73_64\mkspecs\modules\qt_lib_3dquickrender.pri C:\Qt\Qt5.14.2\5.14.2\mingw73_64\mkspecs\modules\qt_lib_3dquickrender_private.pri C:\Qt\Qt5.14.2\5.14.2\mingw73_64\mkspecs\modules\qt_lib_3dquickscene2d.pri C:\Qt\Qt5.14.2\5.14.2\mingw73_64\mkspecs\modules\qt_lib_3dquickscene2d_private.pri C:\Qt\Qt5.14.2\5.14.2\mingw73_64\mkspecs\modules\qt_lib_3drender.pri C:\Qt\Qt5.14.2\5.14.2\mingw73_64\mkspecs\modules\qt_lib_3drender_private.pri C:\Qt\Qt5.14.2\5.14.2\mingw73_64\mkspecs\modules\qt_lib_accessibility_support_private.pri C:\Qt\Qt5.14.2\5.14.2\mingw73_64\mkspecs\modules\qt_lib_axbase.pri C:\Qt\Qt5.14.2\5.14.2\mingw73_64\mkspecs\modules\qt_lib_axbase_private.pri C:\Qt\Qt5.14.2\5.14.2\mingw73_64\mkspecs\modules\qt_lib_axcontainer.pri C:\Qt\Qt5.14.2\5.14.2\mingw73_64\mkspecs\modules\qt_lib_axcontainer_private.pri C:\Qt\Qt5.14.2\5.14.2\mingw73_64\mkspecs\modules\qt_lib_axserver.pri C:\Qt\Qt5.14.2\5.14.2\mingw73_64\mkspecs\modules\qt_lib_axserver_private.pri C:\Qt\Qt5.14.2\5.14.2\mingw73_64\mkspecs\modules\qt_lib_bluetooth.pri C:\Qt\Qt5.14.2\5.14.2\mingw73_64\mkspecs\modules\qt_lib_bluetooth_private.pri C:\Qt\Qt5.14.2\5.14.2\mingw73_64\mkspecs\modules\qt_lib_bootstrap_private.pri C:\Qt\Qt5.14.2\5.14.2\mingw73_64\mkspecs\modules\qt_lib_concurrent.pri C:\Qt\Qt5.14.2\5.14.2\mingw73_64\mkspecs\modules\qt_lib_concurrent_private.pri C:\Qt\Qt5.14.2\5.14.2\mingw73_64\mkspecs\modules\qt_lib_core.pri C:\Qt\Qt5.14.2\5.14.2\mingw73_64\mkspecs\modules\qt_lib_core_private.pri C:\Qt\Qt5.14.2\5.14.2\mingw73_64\mkspecs\modules\qt_lib_dbus.pri C:\Qt\Qt5.14.2\5.14.2\mingw73_64\mkspecs\modules\qt_lib_dbus_private.pri C:\Qt\Qt5.14.2\5.14.2\mingw73_64\mkspecs\modules\qt_lib_designer.pri C:\Qt\Qt5.14.2\5.14.2\mingw73_64\mkspecs\modules\qt_lib_designer_private.pri C:\Qt\Qt5.14.2\5.14.2\mingw73_64\mkspecs\modules\qt_lib_designercomponents_private.pri C:\Qt\Qt5.14.2\5.14.2\mingw73_64\mkspecs\modules\qt_lib_devicediscovery_support_private.pri C:\Qt\Qt5.14.2\5.14.2\mingw73_64\mkspecs\modules\qt_lib_edid_support_private.pri C:\Qt\Qt5.14.2\5.14.2\mingw73_64\mkspecs\modules\qt_lib_egl_support_private.pri C:\Qt\Qt5.14.2\5.14.2\mingw73_64\mkspecs\modules\qt_lib_eventdispatcher_support_private.pri C:\Qt\Qt5.14.2\5.14.2\mingw73_64\mkspecs\modules\qt_lib_fb_support_private.pri C:\Qt\Qt5.14.2\5.14.2\mingw73_64\mkspecs\modules\qt_lib_fontdatabase_support_private.pri C:\Qt\Qt5.14.2\5.14.2\mingw73_64\mkspecs\modules\qt_lib_gamepad.pri C:\Qt\Qt5.14.2\5.14.2\mingw73_64\mkspecs\modules\qt_lib_gamepad_private.pri C:\Qt\Qt5.14.2\5.14.2\mingw73_64\mkspecs\modules\qt_lib_gui.pri C:\Qt\Qt5.14.2\5.14.2\mingw73_64\mkspecs\modules\qt_lib_gui_private.pri C:\Qt\Qt5.14.2\5.14.2\mingw73_64\mkspecs\modules\qt_lib_help.pri C:\Qt\Qt5.14.2\5.14.2\mingw73_64\mkspecs\modules\qt_lib_help_private.pri C:\Qt\Qt5.14.2\5.14.2\mingw73_64\mkspecs\modules\qt_lib_httpserver.pri C:\Qt\Qt5.14.2\5.14.2\mingw73_64\mkspecs\modules\qt_lib_httpserver_private.pri C:\Qt\Qt5.14.2\5.14.2\mingw73_64\mkspecs\modules\qt_lib_location.pri C:\Qt\Qt5.14.2\5.14.2\mingw73_64\mkspecs\modules\qt_lib_location_private.pri C:\Qt\Qt5.14.2\5.14.2\mingw73_64\mkspecs\modules\qt_lib_mqtt.pri C:\Qt\Qt5.14.2\5.14.2\mingw73_64\mkspecs\modules\qt_lib_mqtt_private.pri C:\Qt\Qt5.14.2\5.14.2\mingw73_64\mkspecs\modules\qt_lib_multimedia.pri C:\Qt\Qt5.14.2\5.14.2\mingw73_64\mkspecs\modules\qt_lib_multimedia_private.pri C:\Qt\Qt5.14.2\5.14.2\mingw73_64\mkspecs\modules\qt_lib_multimediawidgets.pri C:\Qt\Qt5.14.2\5.14.2\mingw73_64\mkspecs\modules\qt_lib_multimediawidgets_private.pri C:\Qt\Qt5.14.2\5.14.2\mingw73_64\mkspecs\modules\qt_lib_network.pri C:\Qt\Qt5.14.2\5.14.2\mingw73_64\mkspecs\modules\qt_lib_network_private.pri C:\Qt\Qt5.14.2\5.14.2\mingw73_64\mkspecs\modules\qt_lib_nfc.pri C:\Qt\Qt5.14.2\5.14.2\mingw73_64\mkspecs\modules\qt_lib_nfc_private.pri C:\Qt\Qt5.14.2\5.14.2\mingw73_64\mkspecs\modules\qt_lib_opengl.pri C:\Qt\Qt5.14.2\5.14.2\mingw73_64\mkspecs\modules\qt_lib_opengl_private.pri C:\Qt\Qt5.14.2\5.14.2\mingw73_64\mkspecs\modules\qt_lib_openglextensions.pri C:\Qt\Qt5.14.2\5.14.2\mingw73_64\mkspecs\modules\qt_lib_openglextensions_private.pri C:\Qt\Qt5.14.2\5.14.2\mingw73_64\mkspecs\modules\qt_lib_packetprotocol_private.pri C:\Qt\Qt5.14.2\5.14.2\mingw73_64\mkspecs\modules\qt_lib_platformcompositor_support_private.pri C:\Qt\Qt5.14.2\5.14.2\mingw73_64\mkspecs\modules\qt_lib_positioning.pri C:\Qt\Qt5.14.2\5.14.2\mingw73_64\mkspecs\modules\qt_lib_positioning_private.pri C:\Qt\Qt5.14.2\5.14.2\mingw73_64\mkspecs\modules\qt_lib_positioningquick.pri C:\Qt\Qt5.14.2\5.14.2\mingw73_64\mkspecs\modules\qt_lib_positioningquick_private.pri C:\Qt\Qt5.14.2\5.14.2\mingw73_64\mkspecs\modules\qt_lib_printsupport.pri C:\Qt\Qt5.14.2\5.14.2\mingw73_64\mkspecs\modules\qt_lib_printsupport_private.pri C:\Qt\Qt5.14.2\5.14.2\mingw73_64\mkspecs\modules\qt_lib_qml.pri C:\Qt\Qt5.14.2\5.14.2\mingw73_64\mkspecs\modules\qt_lib_qml_private.pri C:\Qt\Qt5.14.2\5.14.2\mingw73_64\mkspecs\modules\qt_lib_qmldebug_private.pri C:\Qt\Qt5.14.2\5.14.2\mingw73_64\mkspecs\modules\qt_lib_qmldevtools_private.pri C:\Qt\Qt5.14.2\5.14.2\mingw73_64\mkspecs\modules\qt_lib_qmlmodels.pri C:\Qt\Qt5.14.2\5.14.2\mingw73_64\mkspecs\modules\qt_lib_qmlmodels_private.pri C:\Qt\Qt5.14.2\5.14.2\mingw73_64\mkspecs\modules\qt_lib_qmltest.pri C:\Qt\Qt5.14.2\5.14.2\mingw73_64\mkspecs\modules\qt_lib_qmltest_private.pri C:\Qt\Qt5.14.2\5.14.2\mingw73_64\mkspecs\modules\qt_lib_qmlworkerscript.pri C:\Qt\Qt5.14.2\5.14.2\mingw73_64\mkspecs\modules\qt_lib_qmlworkerscript_private.pri C:\Qt\Qt5.14.2\5.14.2\mingw73_64\mkspecs\modules\qt_lib_qtmultimediaquicktools_private.pri C:\Qt\Qt5.14.2\5.14.2\mingw73_64\mkspecs\modules\qt_lib_quick.pri C:\Qt\Qt5.14.2\5.14.2\mingw73_64\mkspecs\modules\qt_lib_quick_private.pri C:\Qt\Qt5.14.2\5.14.2\mingw73_64\mkspecs\modules\qt_lib_quickcontrols2.pri C:\Qt\Qt5.14.2\5.14.2\mingw73_64\mkspecs\modules\qt_lib_quickcontrols2_private.pri C:\Qt\Qt5.14.2\5.14.2\mingw73_64\mkspecs\modules\qt_lib_quickparticles_private.pri C:\Qt\Qt5.14.2\5.14.2\mingw73_64\mkspecs\modules\qt_lib_quickshapes_private.pri C:\Qt\Qt5.14.2\5.14.2\mingw73_64\mkspecs\modules\qt_lib_quicktemplates2.pri C:\Qt\Qt5.14.2\5.14.2\mingw73_64\mkspecs\modules\qt_lib_quicktemplates2_private.pri C:\Qt\Qt5.14.2\5.14.2\mingw73_64\mkspecs\modules\qt_lib_quickwidgets.pri C:\Qt\Qt5.14.2\5.14.2\mingw73_64\mkspecs\modules\qt_lib_quickwidgets_private.pri C:\Qt\Qt5.14.2\5.14.2\mingw73_64\mkspecs\modules\qt_lib_remoteobjects.pri C:\Qt\Qt5.14.2\5.14.2\mingw73_64\mkspecs\modules\qt_lib_remoteobjects_private.pri C:\Qt\Qt5.14.2\5.14.2\mingw73_64\mkspecs\modules\qt_lib_repparser.pri C:\Qt\Qt5.14.2\5.14.2\mingw73_64\mkspecs\modules\qt_lib_repparser_private.pri C:\Qt\Qt5.14.2\5.14.2\mingw73_64\mkspecs\modules\qt_lib_scxml.pri C:\Qt\Qt5.14.2\5.14.2\mingw73_64\mkspecs\modules\qt_lib_scxml_private.pri C:\Qt\Qt5.14.2\5.14.2\mingw73_64\mkspecs\modules\qt_lib_sensors.pri C:\Qt\Qt5.14.2\5.14.2\mingw73_64\mkspecs\modules\qt_lib_sensors_private.pri C:\Qt\Qt5.14.2\5.14.2\mingw73_64\mkspecs\modules\qt_lib_serialbus.pri C:\Qt\Qt5.14.2\5.14.2\mingw73_64\mkspecs\modules\qt_lib_serialbus_private.pri C:\Qt\Qt5.14.2\5.14.2\mingw73_64\mkspecs\modules\qt_lib_serialport.pri C:\Qt\Qt5.14.2\5.14.2\mingw73_64\mkspecs\modules\qt_lib_serialport_private.pri C:\Qt\Qt5.14.2\5.14.2\mingw73_64\mkspecs\modules\qt_lib_sql.pri C:\Qt\Qt5.14.2\5.14.2\mingw73_64\mkspecs\modules\qt_lib_sql_private.pri C:\Qt\Qt5.14.2\5.14.2\mingw73_64\mkspecs\modules\qt_lib_sslserver.pri C:\Qt\Qt5.14.2\5.14.2\mingw73_64\mkspecs\modules\qt_lib_sslserver_private.pri C:\Qt\Qt5.14.2\5.14.2\mingw73_64\mkspecs\modules\qt_lib_svg.pri C:\Qt\Qt5.14.2\5.14.2\mingw73_64\mkspecs\modules\qt_lib_svg_private.pri C:\Qt\Qt5.14.2\5.14.2\mingw73_64\mkspecs\modules\qt_lib_testlib.pri C:\Qt\Qt5.14.2\5.14.2\mingw73_64\mkspecs\modules\qt_lib_testlib_private.pri C:\Qt\Qt5.14.2\5.14.2\mingw73_64\mkspecs\modules\qt_lib_texttospeech.pri C:\Qt\Qt5.14.2\5.14.2\mingw73_64\mkspecs\modules\qt_lib_texttospeech_private.pri C:\Qt\Qt5.14.2\5.14.2\mingw73_64\mkspecs\modules\qt_lib_theme_support_private.pri C:\Qt\Qt5.14.2\5.14.2\mingw73_64\mkspecs\modules\qt_lib_uiplugin.pri C:\Qt\Qt5.14.2\5.14.2\mingw73_64\mkspecs\modules\qt_lib_uitools.pri C:\Qt\Qt5.14.2\5.14.2\mingw73_64\mkspecs\modules\qt_lib_uitools_private.pri C:\Qt\Qt5.14.2\5.14.2\mingw73_64\mkspecs\modules\qt_lib_vulkan_support_private.pri C:\Qt\Qt5.14.2\5.14.2\mingw73_64\mkspecs\modules\qt_lib_webchannel.pri C:\Qt\Qt5.14.2\5.14.2\mingw73_64\mkspecs\modules\qt_lib_webchannel_private.pri C:\Qt\Qt5.14.2\5.14.2\mingw73_64\mkspecs\modules\qt_lib_websockets.pri C:\Qt\Qt5.14.2\5.14.2\mingw73_64\mkspecs\modules\qt_lib_websockets_private.pri C:\Qt\Qt5.14.2\5.14.2\mingw73_64\mkspecs\modules\qt_lib_widgets.pri C:\Qt\Qt5.14.2\5.14.2\mingw73_64\mkspecs\modules\qt_lib_widgets_private.pri C:\Qt\Qt5.14.2\5.14.2\mingw73_64\mkspecs\modules\qt_lib_windowsuiautomation_support_private.pri C:\Qt\Qt5.14.2\5.14.2\mingw73_64\mkspecs\modules\qt_lib_winextras.pri C:\Qt\Qt5.14.2\5.14.2\mingw73_64\mkspecs\modules\qt_lib_winextras_private.pri C:\Qt\Qt5.14.2\5.14.2\mingw73_64\mkspecs\modules\qt_lib_xml.pri C:\Qt\Qt5.14.2\5.14.2\mingw73_64\mkspecs\modules\qt_lib_xml_private.pri C:\Qt\Qt5.14.2\5.14.2\mingw73_64\mkspecs\modules\qt_lib_xmlpatterns.pri C:\Qt\Qt5.14.2\5.14.2\mingw73_64\mkspecs\modules\qt_lib_xmlpatterns_private.pri C:\Qt\Qt5.14.2\5.14.2\mingw73_64\mkspecs\modules\qt_lib_zlib_private.pri C:\Qt\Qt5.14.2\5.14.2\mingw73_64\mkspecs\features\qt_functions.prf C:\Qt\Qt5.14.2\5.14.2\mingw73_64\mkspecs\features\qt_config.prf C:\Qt\Qt5.14.2\5.14.2\mingw73_64\mkspecs\win32-g++\qmake.conf C:\Qt\Qt5.14.2\5.14.2\mingw73_64\mkspecs\features\spec_post.prf ..\..\.qmake.stash C:\Qt\Qt5.14.2\5.14.2\mingw73_64\mkspecs\features\exclusive_builds.prf C:\Qt\Qt5.14.2\5.14.2\mingw73_64\mkspecs\features\toolchain.prf C:\Qt\Qt5.14.2\5.14.2\mingw73_64\mkspecs\features\default_pre.prf C:\Qt\Qt5.14.2\5.14.2\mingw73_64\mkspecs\features\win32\default_pre.prf C:\Qt\Qt5.14.2\5.14.2\mingw73_64\mkspecs\features\resolve_config.prf C:\Qt\Qt5.14.2\5.14.2\mingw73_64\mkspecs\features\exclusive_builds_post.prf C:\Qt\Qt5.14.2\5.14.2\mingw73_64\mkspecs\features\default_post.prf C:\Qt\Qt5.14.2\5.14.2\mingw73_64\mkspecs\features\build_pass.prf C:\Qt\Qt5.14.2\5.14.2\mingw73_64\mkspecs\features\qml_debug.prf C:\Qt\Qt5.14.2\5.14.2\mingw73_64\mkspecs\features\precompile_header.prf C:\Qt\Qt5.14.2\5.14.2\mingw73_64\mkspecs\features\warn_on.prf C:\Qt\Qt5.14.2\5.14.2\mingw73_64\mkspecs\features\qt.prf C:\Qt\Qt5.14.2\5.14.2\mingw73_64\mkspecs\features\resources_functions.prf C:\Qt\Qt5.14.2\5.14.2\mingw73_64\mkspecs\features\resources.prf C:\Qt\Qt5.14.2\5.14.2\mingw73_64\mkspecs\features\moc.prf C:\Qt\Qt5.14.2\5.14.2\mingw73_64\mkspecs\features\win32\opengl.prf C:\Qt\Qt5.14.2\5.14.2\mingw73_64\mkspecs\features\uic.prf C:\Qt\Qt5.14.2\5.14.2\mingw73_64\mkspecs\features\qmake_use.prf C:\Qt\Qt5.14.2\5.14.2\mingw73_64\mkspecs\features\file_copies.prf C:\Qt\Qt5.14.2\5.14.2\mingw73_64\mkspecs\features\win32\windows.prf C:\Qt\Qt5.14.2\5.14.2\mingw73_64\mkspecs\features\testcase_targets.prf C:\Qt\Qt5.14.2\5.14.2\mingw73_64\mkspecs\features\exceptions.prf C:\Qt\Qt5.14.2\5.14.2\mingw73_64\mkspecs\features\yacc.prf C:\Qt\Qt5.14.2\5.14.2\mingw73_64\mkspecs\features\lex.prf Otarcik_CAN.pro C:\Qt\Qt5.14.2\5.14.2\mingw73_64\lib\Qt5Widgets.prl C:\Qt\Qt5.14.2\5.14.2\mingw73_64\lib\Qt5Gui.prl C:\Qt\Qt5.14.2\5.14.2\mingw73_64\lib\Qt5Mqtt.prl C:\Qt\Qt5.14.2\5.14.2\mingw73_64\lib\Qt5Network.prl C:\Qt\Qt5.14.2\5.14.2\mingw73_64\lib\Qt5SerialPort.prl C:\Qt\Qt5.14.2\5.14.2\mingw73_64\lib\Qt5Core.prl C:\Qt\Qt5.14.2\5.14.2\mingw73_64\lib\qtmain.prl C:\Qt\Qt5.14.2\5.14.2\mingw73_64\mkspecs\features\data\dummy.cpp Sources\MainWindow.h Sources\PCANInterface.h Sources\OtarcikCan.h Sources\Gui\GeneralStatusPage.h Sources\GeneralMessagesLogDispatcher.h Sources\defines.h Sources\Gui\ProgramSettingsPage.h Sources\KVASER\kvaDbLib.h Sources\PCAN\PCANBasic.h Sources\CANAnalyzer.h Sources\CANMessage.h Sources\Gui\CANViewerPage.h Sources\CANDatabase\CANDatabase.h Sources\CANDatabase\CANDBMessage.h Sources\CANDatabase\CANDBSignal.h Sources\CANDevice.h Sources\main.cpp Sources\MainWindow.cpp Sources\PCANInterface.cpp Sources\OtarcikCan.cpp Sources\Gui\GeneralStatusPage.cpp Sources\GeneralMessagesLogDispatcher.cpp Sources\Gui\ProgramSettingsPage.cpp Sources\CANAnalyzer.cpp Sources\CANMessage.cpp Sources\Gui\CANViewerPage.cpp Sources\CANDatabase\CANDatabase.cpp Sources\CANDatabase\CANDBMessage.cpp Sources\CANDatabase\CANDBSignal.cpp Sources\CANDevice.cpp Sources\Gui\MainWindow.ui Sources\Gui\GeneralStatusPage.ui Sources\Gui\ProgramSettingsPage.ui Sources\Gui\CANViewerPage.ui clean: compiler_clean - -$(DEL_FILE) release\main.o release\MainWindow.o release\PCANInterface.o release\OtarcikCan.o release\GeneralStatusPage.o release\GeneralMessagesLogDispatcher.o release\ProgramSettingsPage.o release\CANAnalyzer.o release\CANMessage.o release\CANViewerPage.o release\CANDatabase.o release\CANDBMessage.o release\CANDBSignal.o release\CANDevice.o release\moc_MainWindow.o release\moc_PCANInterface.o release\moc_OtarcikCan.o release\moc_GeneralStatusPage.o release\moc_ProgramSettingsPage.o release\moc_CANAnalyzer.o release\moc_CANViewerPage.o release\moc_CANDatabase.o release\moc_CANDevice.o + -$(DEL_FILE) release\main.o release\MainWindow.o release\PCANInterface.o release\OtarcikCan.o release\GeneralStatusPage.o release\GeneralMessagesLogDispatcher.o release\ProgramSettingsPage.o release\CANAnalyzer.o release\CANMessage.o release\CANViewerPage.o release\CANDatabase.o release\CANDBMessage.o release\CANDBSignal.o release\CANDevice.o release\moc_MainWindow.o release\moc_PCANInterface.o release\moc_OtarcikCan.o release\moc_GeneralStatusPage.o release\moc_ProgramSettingsPage.o release\moc_CANAnalyzer.o release\moc_CANViewerPage.o release\moc_CANDatabase.o release\moc_CANDBMessage.o release\moc_CANDevice.o distclean: clean -$(DEL_FILE) $(DESTDIR_TARGET) @@ -171,9 +173,9 @@ compiler_moc_predefs_clean: release/moc_predefs.h: C:/Qt/Qt5.14.2/5.14.2/mingw73_64/mkspecs/features/data/dummy.cpp g++ -fno-keep-inline-dllexport -O2 -Wall -Wextra -Wextra -dM -E -o release\moc_predefs.h C:\Qt\Qt5.14.2\5.14.2\mingw73_64\mkspecs\features\data\dummy.cpp -compiler_moc_header_make_all: release/moc_MainWindow.cpp release/moc_PCANInterface.cpp release/moc_OtarcikCan.cpp release/moc_GeneralStatusPage.cpp release/moc_ProgramSettingsPage.cpp release/moc_CANAnalyzer.cpp release/moc_CANViewerPage.cpp release/moc_CANDatabase.cpp release/moc_CANDevice.cpp +compiler_moc_header_make_all: release/moc_MainWindow.cpp release/moc_PCANInterface.cpp release/moc_OtarcikCan.cpp release/moc_GeneralStatusPage.cpp release/moc_ProgramSettingsPage.cpp release/moc_CANAnalyzer.cpp release/moc_CANViewerPage.cpp release/moc_CANDatabase.cpp release/moc_CANDBMessage.cpp release/moc_CANDevice.cpp compiler_moc_header_clean: - -$(DEL_FILE) release\moc_MainWindow.cpp release\moc_PCANInterface.cpp release\moc_OtarcikCan.cpp release\moc_GeneralStatusPage.cpp release\moc_ProgramSettingsPage.cpp release\moc_CANAnalyzer.cpp release\moc_CANViewerPage.cpp release\moc_CANDatabase.cpp release\moc_CANDevice.cpp + -$(DEL_FILE) release\moc_MainWindow.cpp release\moc_PCANInterface.cpp release\moc_OtarcikCan.cpp release\moc_GeneralStatusPage.cpp release\moc_ProgramSettingsPage.cpp release\moc_CANAnalyzer.cpp release\moc_CANViewerPage.cpp release\moc_CANDatabase.cpp release\moc_CANDBMessage.cpp release\moc_CANDevice.cpp release/moc_MainWindow.cpp: Sources/MainWindow.h \ C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/QMainWindow \ C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/qmainwindow.h \ @@ -735,9 +737,10 @@ release/moc_ProgramSettingsPage.cpp: Sources/Gui/ProgramSettingsPage.h \ 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 -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\ProgramSettingsPage.h -o release\moc_ProgramSettingsPage.cpp release/moc_CANAnalyzer.cpp: Sources/CANAnalyzer.h \ - Sources/defines.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/QObject \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qobject.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qobjectdefs.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qnamespace.h \ C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qglobal.h \ C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qconfig-bootstrapped.h \ C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qconfig.h \ @@ -759,10 +762,6 @@ release/moc_CANAnalyzer.cpp: Sources/CANAnalyzer.h \ C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qmutex.h \ C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qnumeric.h \ C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qversiontagging.h \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qbasictimer.h \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qnamespace.h \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qobject.h \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qobjectdefs.h \ C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qobjectdefs_impl.h \ C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qstring.h \ C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qchar.h \ @@ -791,6 +790,10 @@ release/moc_CANAnalyzer.cpp: Sources/CANAnalyzer.h \ C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qvarlengtharray.h \ C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qcontainerfwd.h \ C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qobject_impl.h \ + Sources/defines.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 \ C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/QList \ Sources/CANMessage.h \ C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/QByteArray \ @@ -974,6 +977,77 @@ release/moc_CANDatabase.cpp: Sources/CANDatabase/CANDatabase.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 -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\CANDatabase\CANDatabase.h -o release\moc_CANDatabase.cpp +release/moc_CANDBMessage.cpp: Sources/CANDatabase/CANDBMessage.h \ + Sources/CANDatabase/CANDBSignal.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/QList \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qlist.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qalgorithms.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qglobal.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qconfig-bootstrapped.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qconfig.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qtcore-config.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qsystemdetection.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qprocessordetection.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qcompilerdetection.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qtypeinfo.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qsysinfo.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qlogging.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qflags.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qatomic.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qbasicatomic.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qatomic_bootstrap.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qgenericatomic.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qatomic_cxx11.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qatomic_msvc.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qglobalstatic.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qmutex.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qnumeric.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qversiontagging.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qiterator.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qrefcount.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qarraydata.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qhashfunctions.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qstring.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qchar.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qbytearray.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qnamespace.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qstringliteral.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qstringalgorithms.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qstringview.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qstringbuilder.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qpair.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qvector.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qcontainertools_impl.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qpoint.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qbytearraylist.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qstringlist.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qregexp.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qstringmatcher.h \ + Sources/CANAnalyzer.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/QObject \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qobject.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qobjectdefs.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qobjectdefs_impl.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qcoreevent.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qscopedpointer.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qmetatype.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qvarlengtharray.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qcontainerfwd.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qobject_impl.h \ + Sources/defines.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/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 \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qdatastream.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qiodevice.h \ + Sources/PCAN/PCANBasic.h \ + 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 -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\CANDatabase\CANDBMessage.h -o release\moc_CANDBMessage.cpp + release/moc_CANDevice.cpp: Sources/CANDevice.h \ C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/QObject \ C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qobject.h \ @@ -1998,9 +2072,10 @@ release/ProgramSettingsPage.o: Sources/Gui/ProgramSettingsPage.cpp Sources/Gui/P $(CXX) -c $(CXXFLAGS) $(INCPATH) -o release\ProgramSettingsPage.o Sources\Gui\ProgramSettingsPage.cpp release/CANAnalyzer.o: Sources/CANAnalyzer.cpp Sources/CANAnalyzer.h \ - Sources/defines.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/QObject \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qobject.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qobjectdefs.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qnamespace.h \ C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qglobal.h \ C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qconfig-bootstrapped.h \ C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qconfig.h \ @@ -2022,10 +2097,6 @@ release/CANAnalyzer.o: Sources/CANAnalyzer.cpp Sources/CANAnalyzer.h \ C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qmutex.h \ C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qnumeric.h \ C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qversiontagging.h \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qbasictimer.h \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qnamespace.h \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qobject.h \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qobjectdefs.h \ C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qobjectdefs_impl.h \ C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qstring.h \ C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qchar.h \ @@ -2054,6 +2125,10 @@ release/CANAnalyzer.o: Sources/CANAnalyzer.cpp Sources/CANAnalyzer.h \ C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qvarlengtharray.h \ C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qcontainerfwd.h \ C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qobject_impl.h \ + Sources/defines.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 \ C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/QList \ Sources/CANMessage.h \ C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/QByteArray \ @@ -2062,7 +2137,6 @@ release/CANAnalyzer.o: Sources/CANAnalyzer.cpp Sources/CANAnalyzer.h \ C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qiodevice.h \ Sources/PCAN/PCANBasic.h \ Sources/PCANInterface.h \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/QObject \ Sources/GeneralMessagesLogDispatcher.h \ C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/QString \ Sources/Gui/GeneralStatusPage.h \ @@ -2449,7 +2523,28 @@ release/CANDBMessage.o: Sources/CANDatabase/CANDBMessage.cpp Sources/CANDatabase C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qbytearraylist.h \ C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qstringlist.h \ C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qregexp.h \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qstringmatcher.h + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qstringmatcher.h \ + Sources/CANAnalyzer.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/QObject \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qobject.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qobjectdefs.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qobjectdefs_impl.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qcoreevent.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qscopedpointer.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qmetatype.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qvarlengtharray.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qcontainerfwd.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qobject_impl.h \ + Sources/defines.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/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 \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qdatastream.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qiodevice.h \ + Sources/PCAN/PCANBasic.h $(CXX) -c $(CXXFLAGS) $(INCPATH) -o release\CANDBMessage.o Sources\CANDatabase\CANDBMessage.cpp release/CANDBSignal.o: Sources/CANDatabase/CANDBSignal.cpp Sources/CANDatabase/CANDBSignal.h @@ -2549,6 +2644,9 @@ release/moc_CANViewerPage.o: release/moc_CANViewerPage.cpp release/moc_CANDatabase.o: release/moc_CANDatabase.cpp $(CXX) -c $(CXXFLAGS) $(INCPATH) -o release\moc_CANDatabase.o release\moc_CANDatabase.cpp +release/moc_CANDBMessage.o: release/moc_CANDBMessage.cpp + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o release\moc_CANDBMessage.o release\moc_CANDBMessage.cpp + release/moc_CANDevice.o: release/moc_CANDevice.cpp $(CXX) -c $(CXXFLAGS) $(INCPATH) -o release\moc_CANDevice.o release\moc_CANDevice.cpp diff --git a/Otarcik_CAN/Sources/CANAnalyzer.cpp b/Otarcik_CAN/Sources/CANAnalyzer.cpp index 26d0f03..f01cf45 100644 --- a/Otarcik_CAN/Sources/CANAnalyzer.cpp +++ b/Otarcik_CAN/Sources/CANAnalyzer.cpp @@ -1,5 +1,5 @@ #include "CANAnalyzer.h" -#include "PCANInterface.h" + #include "GeneralMessagesLogDispatcher.h" #include "CANDatabase.h" #include "OtarcikCan.h" @@ -7,10 +7,9 @@ CCANAnalyzer::CCANAnalyzer(QObject *parent) : QObject(parent) { - mCANDriverIF = 0; - mCANDatabase = 0; + mCANDriverIF = new CPCANInterface; mIsCANInitialized = false; - mProgramPtr = 0; + mDevicePtr = 0; mCANReadTimer = new QTimer; mCANReadTimer->setInterval(200); @@ -20,7 +19,8 @@ CCANAnalyzer::CCANAnalyzer(QObject *parent) : QObject(parent) CCANAnalyzer::~CCANAnalyzer() { - mCANDriverIF->DeInit(0); + mCANDriverIF->DeInit(); + delete mCANDriverIF; delete mCANReadTimer; while (!mLastMessagesList.isEmpty()) { @@ -28,26 +28,22 @@ CCANAnalyzer::~CCANAnalyzer() } } -int CCANAnalyzer::Init(CPCANInterface *CANDriverInterface,CCANDatabase *CANDatabaseHandle) +int CCANAnalyzer::Init(TPCANHandle CANDeviceChannel,TPCANBaudrate CANDeviceBaudrate) { - if(CANDriverInterface == 0 || CANDatabaseHandle == 0) - { - return RET_GENERAL_ERROR; - mIsCANInitialized = false; - } - - mCANDriverIF = CANDriverInterface; - mCANDatabase = CANDatabaseHandle; CGeneralMessagesLogDispatcher::instance()->AddLogMessage("OtarcikCan modules starting..."); - if(mCANDriverIF->Init() != RET_OK) + if(mCANDriverIF->Init(CANDeviceChannel,CANDeviceBaudrate) != RET_OK) { + CGeneralMessagesLogDispatcher::instance()->AddLogMessage("Could not initialize CAN hardware",true,CGeneralMessagesLogDispatcher::GEN_MSG_TXT_ERROR_STATUS); mIsCANInitialized = false; + return RET_GENERAL_ERROR; + } + else + { + mCANReadTimer->start(); + mIsCANInitialized = true; } - - mCANReadTimer->start(); - mIsCANInitialized = true; return RET_OK; } @@ -67,6 +63,7 @@ int CCANAnalyzer::ReadCAN() // } // return stsResult; + return RET_OK; } void CCANAnalyzer::CANTimerExpired() @@ -120,5 +117,5 @@ void CCANAnalyzer::CANTimerExpired() mCANReadTimer->start(); - mProgramPtr->UpdateCANViewerDataRequest(mLastMessagesList); +// mProgramPtr->UpdateCANViewerDataRequest(mLastMessagesList); } diff --git a/Otarcik_CAN/Sources/CANAnalyzer.h b/Otarcik_CAN/Sources/CANAnalyzer.h index bd43e02..d1a2d53 100644 --- a/Otarcik_CAN/Sources/CANAnalyzer.h +++ b/Otarcik_CAN/Sources/CANAnalyzer.h @@ -6,10 +6,9 @@ #include #include #include "CANMessage.h" +#include "PCANInterface.h" -class CPCANInterface; -class CCANDatabase; -class COtarcikCan; +class CCANDevice; class CCANAnalyzer : public QObject { @@ -17,14 +16,13 @@ class CCANAnalyzer : public QObject public: explicit CCANAnalyzer(QObject *parent = 0); ~CCANAnalyzer(); - COtarcikCan *mProgramPtr; + CCANDevice *mDevicePtr; CPCANInterface *mCANDriverIF; - CCANDatabase *mCANDatabase; QTimer *mCANReadTimer; - int Init(CPCANInterface *CANDriverInterface,CCANDatabase *CANDatabaseHandle); + int Init(TPCANHandle CANDeviceChannel,TPCANBaudrate CANDeviceBaudrate); int ReadCAN(); QList mLastMessagesList; diff --git a/Otarcik_CAN/Sources/CANDatabase/CANDBMessage.cpp b/Otarcik_CAN/Sources/CANDatabase/CANDBMessage.cpp index a7e196d..d7a91ef 100644 --- a/Otarcik_CAN/Sources/CANDatabase/CANDBMessage.cpp +++ b/Otarcik_CAN/Sources/CANDatabase/CANDBMessage.cpp @@ -2,5 +2,14 @@ CCANDBMessage::CCANDBMessage() { +// QTimer *testTimer = new QTimer; + +// connect(testTimer,&QTimer::timeout,this,&CCANDBMessage::SlotTest); + + +} + +void CCANDBMessage::SlotTest() +{ } diff --git a/Otarcik_CAN/Sources/CANDatabase/CANDBMessage.h b/Otarcik_CAN/Sources/CANDatabase/CANDBMessage.h index 12cabe7..9e3e5b3 100644 --- a/Otarcik_CAN/Sources/CANDatabase/CANDBMessage.h +++ b/Otarcik_CAN/Sources/CANDatabase/CANDBMessage.h @@ -2,11 +2,17 @@ #define CANDBMESSAGE_H #include "CANDBSignal.h" #include +#include "CANAnalyzer.h" -class CCANDBMessage +class CCANDBMessage : public CCANAnalyzer { + Q_OBJECT + public: CCANDBMessage(); + +public slots: + void SlotTest(); }; #endif // CANDBMESSAGE_H diff --git a/Otarcik_CAN/Sources/CANDatabase/CANDatabase.cpp b/Otarcik_CAN/Sources/CANDatabase/CANDatabase.cpp index 7715ce7..ba8984d 100644 --- a/Otarcik_CAN/Sources/CANDatabase/CANDatabase.cpp +++ b/Otarcik_CAN/Sources/CANDatabase/CANDatabase.cpp @@ -16,8 +16,12 @@ CCANDatabase::~CCANDatabase() } -int CCANDatabase::Init() +int CCANDatabase::Init(QString DatabaseFileName) { + mDatabaseFileName = DatabaseFileName; + + LoadDatabaseFile(DatabaseFileName); + return RET_OK; } diff --git a/Otarcik_CAN/Sources/CANDatabase/CANDatabase.h b/Otarcik_CAN/Sources/CANDatabase/CANDatabase.h index 136c560..221d205 100644 --- a/Otarcik_CAN/Sources/CANDatabase/CANDatabase.h +++ b/Otarcik_CAN/Sources/CANDatabase/CANDatabase.h @@ -10,8 +10,11 @@ public: explicit CCANDatabase(QObject *parent = 0); ~CCANDatabase(); - int Init(); + int Init(QString DatabaseFileName); int LoadDatabaseFile(QString Filename); + +private: + QString mDatabaseFileName; signals: public slots: diff --git a/Otarcik_CAN/Sources/CANDevice.cpp b/Otarcik_CAN/Sources/CANDevice.cpp index fe17c9f..e256233 100644 --- a/Otarcik_CAN/Sources/CANDevice.cpp +++ b/Otarcik_CAN/Sources/CANDevice.cpp @@ -4,3 +4,16 @@ CCANDevice::CCANDevice(QObject *parent) { } + +CCANDevice::~CCANDevice() +{ + +} + +int CCANDevice::Init(QString DatabaseFileName, unsigned short CANDeviceID, unsigned short CANDeviceBaudRate) +{ + mCANDatabase.Init(DatabaseFileName); + mCANAnalyzer.Init(CANDeviceID,CANDeviceBaudRate); + + return RET_OK; +} diff --git a/Otarcik_CAN/Sources/CANDevice.h b/Otarcik_CAN/Sources/CANDevice.h index 38e9e0a..6350a83 100644 --- a/Otarcik_CAN/Sources/CANDevice.h +++ b/Otarcik_CAN/Sources/CANDevice.h @@ -1,6 +1,7 @@ #ifndef CANDEVICE_H #define CANDEVICE_H +#include "defines.h" #include #include "CANAnalyzer.h" #include "CANMessage.h" @@ -8,13 +9,23 @@ #include "CANDatabase.h" #include -class CCANDevice : public CCANDatabase, public CCANAnalyzer +class CCANDevice : public QObject { Q_OBJECT public: explicit CCANDevice(QObject *parent = 0); + ~CCANDevice(); - CCANAnalyzer mCANAnalyzer; + int Init(QString DatabaseFileName, unsigned short CANDeviceID, unsigned short CANDeviceBaudRate); + + +private: + QString mDeviceDatabaseFileName; + unsigned int mCANDeviceID; + + + CCANAnalyzer mCANAnalyzer; //The module that handles the USB puck and decodes the data + CCANDatabase mCANDatabase; //The device's database loaded from dbc file signals: diff --git a/Otarcik_CAN/Sources/PCANInterface.cpp b/Otarcik_CAN/Sources/PCANInterface.cpp index 649eacf..4f64423 100644 --- a/Otarcik_CAN/Sources/PCANInterface.cpp +++ b/Otarcik_CAN/Sources/PCANInterface.cpp @@ -22,14 +22,20 @@ CPCANInterface::CPCANInterface(QObject *parent) : QObject(parent) { + //Init only... values not used. + mInterfaceBaudrate = PCAN_BAUD_500K; + mInterfaceCANHandle = PCAN_USBBUS1; + CANInterfaceOpened = false; } -int CPCANInterface::Init() +int CPCANInterface::Init(TPCANHandle CANDeviceChannel, TPCANBaudrate CANBaudRate) { - QString LogMsg; + mInterfaceBaudrate = CANBaudRate; + mInterfaceCANHandle = CANDeviceChannel; TPCANStatus Result; - Result = CAN_Initialize(PCAN_USBBUS1, PCAN_BAUD_500K); +// Result = CAN_Initialize(PCAN_USBBUS1, PCAN_BAUD_500K); + Result = CAN_Initialize(CANDeviceChannel, CANBaudRate); CGeneralMessagesLogDispatcher::instance()->AddLogMessage(QString("Initializing PCAN USB module. Channel:%1, Baudrate:%2").arg(PCAN_USBBUS1).arg(PCAN_BAUD_500K)); if(Result != PCAN_ERROR_OK) @@ -40,18 +46,32 @@ int CPCANInterface::Init() CAN_GetErrorText(Result, 0, strMsg); qDebug("%s",strMsg); CGeneralMessagesLogDispatcher::instance()->AddLogMessage(QString("Could not initialize PCAN USB module. Error:%1").arg(strMsg),true,CGeneralMessagesLogDispatcher::GEN_MSG_TXT_ERROR_STATUS); + CANInterfaceOpened = false; return RET_GENERAL_ERROR; } else { + CANInterfaceOpened = true; CGeneralMessagesLogDispatcher::instance()->AddLogMessage("PCAN USB init SUCCESS"); } return RET_OK; } -int CPCANInterface::DeInit(unsigned short Channel) +int CPCANInterface::DeInit() { - CAN_Uninitialize(PCAN_USBBUS1); + TPCANStatus Result; + CGeneralMessagesLogDispatcher::instance()->AddLogMessage(QString("Uninitializing PCAN USB module ID %1").arg(mInterfaceCANHandle)); + Result = CAN_Uninitialize(mInterfaceCANHandle) != PCAN_ERROR_OK; + if(Result) + { + char strMsg[256]; + CAN_GetErrorText(Result, 0, strMsg); + CGeneralMessagesLogDispatcher::instance()->AddLogMessage(QString("Could not uninitialize PCAN USB module. Error:%1").arg(strMsg),true,CGeneralMessagesLogDispatcher::GEN_MSG_TXT_ERROR_STATUS); + } + else + { + CGeneralMessagesLogDispatcher::instance()->AddLogMessage("Uninitializing PCAN USB module..."); + } return RET_OK; } diff --git a/Otarcik_CAN/Sources/PCANInterface.h b/Otarcik_CAN/Sources/PCANInterface.h index 6e68a96..178f8aa 100644 --- a/Otarcik_CAN/Sources/PCANInterface.h +++ b/Otarcik_CAN/Sources/PCANInterface.h @@ -15,11 +15,16 @@ class CPCANInterface : public QObject Q_OBJECT public: explicit CPCANInterface(QObject *parent = 0); - int Init(); - int DeInit(unsigned short Channel); + int Init(TPCANHandle CANDeviceChannel, TPCANBaudrate CANBaudRate); + int DeInit(); + bool IsInterfaceOpened(){return CANInterfaceOpened;} + bool CANInterfaceOpened; QList ReadCANFullBuffer(unsigned short Channel); +private: + TPCANBaudrate mInterfaceBaudrate; + TPCANHandle mInterfaceCANHandle; signals: diff --git a/Otarcik_CAN/debug/Otarcik_CAN.exe b/Otarcik_CAN/debug/Otarcik_CAN.exe index 7e7fac9..7472ee8 100644 Binary files a/Otarcik_CAN/debug/Otarcik_CAN.exe and b/Otarcik_CAN/debug/Otarcik_CAN.exe differ diff --git a/Otarcik_CAN/debug/moc_CANDBMessage.cpp b/Otarcik_CAN/debug/moc_CANDBMessage.cpp new file mode 100644 index 0000000..8f2cd47 --- /dev/null +++ b/Otarcik_CAN/debug/moc_CANDBMessage.cpp @@ -0,0 +1,119 @@ +/**************************************************************************** +** Meta object code from reading C++ file 'CANDBMessage.h' +** +** Created by: The Qt Meta Object Compiler version 67 (Qt 5.14.2) +** +** WARNING! All changes made in this file will be lost! +*****************************************************************************/ + +#include +#include "../Sources/CANDatabase/CANDBMessage.h" +#include +#include +#if !defined(Q_MOC_OUTPUT_REVISION) +#error "The header file 'CANDBMessage.h' doesn't include ." +#elif Q_MOC_OUTPUT_REVISION != 67 +#error "This file was generated using the moc from 5.14.2. It" +#error "cannot be used with the include files from this version of Qt." +#error "(The moc has changed too much.)" +#endif + +QT_BEGIN_MOC_NAMESPACE +QT_WARNING_PUSH +QT_WARNING_DISABLE_DEPRECATED +struct qt_meta_stringdata_CCANDBMessage_t { + QByteArrayData data[3]; + char stringdata0[24]; +}; +#define QT_MOC_LITERAL(idx, ofs, len) \ + Q_STATIC_BYTE_ARRAY_DATA_HEADER_INITIALIZER_WITH_OFFSET(len, \ + qptrdiff(offsetof(qt_meta_stringdata_CCANDBMessage_t, stringdata0) + ofs \ + - idx * sizeof(QByteArrayData)) \ + ) +static const qt_meta_stringdata_CCANDBMessage_t qt_meta_stringdata_CCANDBMessage = { + { +QT_MOC_LITERAL(0, 0, 13), // "CCANDBMessage" +QT_MOC_LITERAL(1, 14, 8), // "SlotTest" +QT_MOC_LITERAL(2, 23, 0) // "" + + }, + "CCANDBMessage\0SlotTest\0" +}; +#undef QT_MOC_LITERAL + +static const uint qt_meta_data_CCANDBMessage[] = { + + // content: + 8, // revision + 0, // classname + 0, 0, // classinfo + 1, 14, // methods + 0, 0, // properties + 0, 0, // enums/sets + 0, 0, // constructors + 0, // flags + 0, // signalCount + + // slots: name, argc, parameters, tag, flags + 1, 0, 19, 2, 0x0a /* Public */, + + // slots: parameters + QMetaType::Void, + + 0 // eod +}; + +void CCANDBMessage::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) +{ + if (_c == QMetaObject::InvokeMetaMethod) { + auto *_t = static_cast(_o); + Q_UNUSED(_t) + switch (_id) { + case 0: _t->SlotTest(); break; + default: ; + } + } + Q_UNUSED(_a); +} + +QT_INIT_METAOBJECT const QMetaObject CCANDBMessage::staticMetaObject = { { + QMetaObject::SuperData::link(), + qt_meta_stringdata_CCANDBMessage.data, + qt_meta_data_CCANDBMessage, + qt_static_metacall, + nullptr, + nullptr +} }; + + +const QMetaObject *CCANDBMessage::metaObject() const +{ + return QObject::d_ptr->metaObject ? QObject::d_ptr->dynamicMetaObject() : &staticMetaObject; +} + +void *CCANDBMessage::qt_metacast(const char *_clname) +{ + if (!_clname) return nullptr; + if (!strcmp(_clname, qt_meta_stringdata_CCANDBMessage.stringdata0)) + return static_cast(this); + return CCANAnalyzer::qt_metacast(_clname); +} + +int CCANDBMessage::qt_metacall(QMetaObject::Call _c, int _id, void **_a) +{ + _id = CCANAnalyzer::qt_metacall(_c, _id, _a); + if (_id < 0) + return _id; + if (_c == QMetaObject::InvokeMetaMethod) { + if (_id < 1) + qt_static_metacall(this, _c, _id, _a); + _id -= 1; + } else if (_c == QMetaObject::RegisterMethodArgumentMetaType) { + if (_id < 1) + *reinterpret_cast(_a[0]) = -1; + _id -= 1; + } + return _id; +} +QT_WARNING_POP +QT_END_MOC_NAMESPACE diff --git a/Otarcik_CAN/debug/moc_CANDevice.cpp b/Otarcik_CAN/debug/moc_CANDevice.cpp index c796b07..6a470b2 100644 --- a/Otarcik_CAN/debug/moc_CANDevice.cpp +++ b/Otarcik_CAN/debug/moc_CANDevice.cpp @@ -64,7 +64,7 @@ void CCANDevice::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, } QT_INIT_METAOBJECT const QMetaObject CCANDevice::staticMetaObject = { { - QMetaObject::SuperData::link(), + QMetaObject::SuperData::link(), qt_meta_stringdata_CCANDevice.data, qt_meta_data_CCANDevice, qt_static_metacall, @@ -83,14 +83,12 @@ void *CCANDevice::qt_metacast(const char *_clname) if (!_clname) return nullptr; if (!strcmp(_clname, qt_meta_stringdata_CCANDevice.stringdata0)) return static_cast(this); - if (!strcmp(_clname, "CCANAnalyzer")) - return static_cast< CCANAnalyzer*>(this); - return CCANDatabase::qt_metacast(_clname); + return QObject::qt_metacast(_clname); } int CCANDevice::qt_metacall(QMetaObject::Call _c, int _id, void **_a) { - _id = CCANDatabase::qt_metacall(_c, _id, _a); + _id = QObject::qt_metacall(_c, _id, _a); return _id; } QT_WARNING_POP diff --git a/Otarcik_CAN/object_script.Otarcik_CAN.Debug b/Otarcik_CAN/object_script.Otarcik_CAN.Debug index 8bd2255..468e68f 100644 --- a/Otarcik_CAN/object_script.Otarcik_CAN.Debug +++ b/Otarcik_CAN/object_script.Otarcik_CAN.Debug @@ -20,4 +20,5 @@ debug/moc_ProgramSettingsPage.o debug/moc_CANAnalyzer.o debug/moc_CANViewerPage.o debug/moc_CANDatabase.o +debug/moc_CANDBMessage.o debug/moc_CANDevice.o diff --git a/Otarcik_CAN/object_script.Otarcik_CAN.Release b/Otarcik_CAN/object_script.Otarcik_CAN.Release index 5d50e61..d8232e5 100644 --- a/Otarcik_CAN/object_script.Otarcik_CAN.Release +++ b/Otarcik_CAN/object_script.Otarcik_CAN.Release @@ -20,4 +20,5 @@ release/moc_ProgramSettingsPage.o release/moc_CANAnalyzer.o release/moc_CANViewerPage.o release/moc_CANDatabase.o +release/moc_CANDBMessage.o release/moc_CANDevice.o