From 38d8f89f2f2b27fb25e0b4b9a34b45b76f6dc6f2 Mon Sep 17 00:00:00 2001 From: daniel-Jones Date: Mon, 13 Feb 2017 16:06:14 +1030 Subject: added fade ability to Arduino sketch, using psuedo threading. Rework of serial communication also started, the Qt interface is currently under development to support fading. --- qt/build/degub/.qmake.stash | 12 +++++ qt/build/degub/Makefile | 80 ++++++++++++++++++++++++++++--- qt/build/degub/RGBController | Bin 1314264 -> 1312000 bytes qt/build/degub/controllerwindow.o | Bin 1029400 -> 651816 bytes qt/build/degub/main.o | Bin 872920 -> 499560 bytes qt/build/degub/moc_controllerwindow.cpp | 4 +- qt/build/degub/moc_controllerwindow.o | Bin 971792 -> 561368 bytes qt/build/degub/presets.txt | 1 + qt/build/degub/presets_backup.txt | 11 +++++ qt/build/degub/serial_communication.o | Bin 533368 -> 293944 bytes qt/build/degub/ui_controllerwindow.h | 82 ++++++++++++++++---------------- 11 files changed, 140 insertions(+), 50 deletions(-) create mode 100644 qt/build/degub/.qmake.stash mode change 100755 => 100644 qt/build/degub/moc_controllerwindow.cpp create mode 100644 qt/build/degub/presets_backup.txt mode change 100755 => 100644 qt/build/degub/ui_controllerwindow.h (limited to 'qt/build/degub') diff --git a/qt/build/degub/.qmake.stash b/qt/build/degub/.qmake.stash new file mode 100644 index 0000000..f31b11e --- /dev/null +++ b/qt/build/degub/.qmake.stash @@ -0,0 +1,12 @@ +QMAKE_DEFAULT_INCDIRS = \ + /usr/include/c++/6.1.1 \ + /usr/include/c++/6.1.1/x86_64-pc-linux-gnu \ + /usr/include/c++/6.1.1/backward \ + /usr/lib/gcc/x86_64-pc-linux-gnu/6.1.1/include \ + /usr/local/include \ + /usr/lib/gcc/x86_64-pc-linux-gnu/6.1.1/include-fixed \ + /usr/include +QMAKE_DEFAULT_LIBDIRS = \ + /usr/lib/gcc/x86_64-pc-linux-gnu/6.1.1 \ + /usr/lib \ + /lib diff --git a/qt/build/degub/Makefile b/qt/build/degub/Makefile index b5ca973..e0c8f89 100755 --- a/qt/build/degub/Makefile +++ b/qt/build/degub/Makefile @@ -1,6 +1,6 @@ ############################################################################# # Makefile for building: RGBController -# Generated by qmake (3.0) (Qt 5.6.0) +# Generated by qmake (3.0) (Qt 5.7.0) # Project: ../../RGBController/RGBController.pro # Template: app # Command: /usr/lib/qt/bin/qmake -spec linux-g++ CONFIG+=debug CONFIG+=qml_debug -o Makefile ../../RGBController/RGBController.pro @@ -14,7 +14,7 @@ CC = gcc CXX = g++ DEFINES = -DQT_QML_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_SERIALPORT_LIB -DQT_NETWORK_LIB -DQT_CORE_LIB CFLAGS = -pipe -g -Wall -W -D_REENTRANT -fPIC $(DEFINES) -CXXFLAGS = -pipe -g -std=gnu++0x -Wall -W -D_REENTRANT -fPIC $(DEFINES) +CXXFLAGS = -pipe -g -Wall -W -D_REENTRANT -fPIC $(DEFINES) INCPATH = -I../../RGBController -I. -isystem /usr/include/qt -isystem /usr/include/qt/QtWidgets -isystem /usr/include/qt/QtGui -isystem /usr/include/qt/QtSerialPort -isystem /usr/include/qt/QtNetwork -isystem /usr/include/qt/QtCore -I. -I. -I/usr/lib/qt/mkspecs/linux-g++ QMAKE = /usr/lib/qt/bin/qmake DEL_FILE = rm -f @@ -89,6 +89,7 @@ DIST = /usr/lib/qt/mkspecs/features/spec_pre.prf \ /usr/lib/qt/mkspecs/modules/qt_KItemModels.pri \ /usr/lib/qt/mkspecs/modules/qt_KItemViews.pri \ /usr/lib/qt/mkspecs/modules/qt_KJobWidgets.pri \ + /usr/lib/qt/mkspecs/modules/qt_KNewStuff.pri \ /usr/lib/qt/mkspecs/modules/qt_KNotifications.pri \ /usr/lib/qt/mkspecs/modules/qt_KNotifyConfig.pri \ /usr/lib/qt/mkspecs/modules/qt_KNTLM.pri \ @@ -104,12 +105,16 @@ DIST = /usr/lib/qt/mkspecs/features/spec_pre.prf \ /usr/lib/qt/mkspecs/modules/qt_KXmlGui.pri \ /usr/lib/qt/mkspecs/modules/qt_lib_3dcore.pri \ /usr/lib/qt/mkspecs/modules/qt_lib_3dcore_private.pri \ + /usr/lib/qt/mkspecs/modules/qt_lib_3dextras.pri \ + /usr/lib/qt/mkspecs/modules/qt_lib_3dextras_private.pri \ /usr/lib/qt/mkspecs/modules/qt_lib_3dinput.pri \ /usr/lib/qt/mkspecs/modules/qt_lib_3dinput_private.pri \ /usr/lib/qt/mkspecs/modules/qt_lib_3dlogic.pri \ /usr/lib/qt/mkspecs/modules/qt_lib_3dlogic_private.pri \ /usr/lib/qt/mkspecs/modules/qt_lib_3dquick.pri \ /usr/lib/qt/mkspecs/modules/qt_lib_3dquick_private.pri \ + /usr/lib/qt/mkspecs/modules/qt_lib_3dquickextras.pri \ + /usr/lib/qt/mkspecs/modules/qt_lib_3dquickextras_private.pri \ /usr/lib/qt/mkspecs/modules/qt_lib_3dquickinput.pri \ /usr/lib/qt/mkspecs/modules/qt_lib_3dquickinput_private.pri \ /usr/lib/qt/mkspecs/modules/qt_lib_3dquickrender.pri \ @@ -119,17 +124,22 @@ DIST = /usr/lib/qt/mkspecs/features/spec_pre.prf \ /usr/lib/qt/mkspecs/modules/qt_lib_bluetooth.pri \ /usr/lib/qt/mkspecs/modules/qt_lib_bluetooth_private.pri \ /usr/lib/qt/mkspecs/modules/qt_lib_bootstrap_private.pri \ + /usr/lib/qt/mkspecs/modules/qt_lib_charts.pri \ + /usr/lib/qt/mkspecs/modules/qt_lib_charts_private.pri \ /usr/lib/qt/mkspecs/modules/qt_lib_clucene_private.pri \ /usr/lib/qt/mkspecs/modules/qt_lib_concurrent.pri \ /usr/lib/qt/mkspecs/modules/qt_lib_concurrent_private.pri \ /usr/lib/qt/mkspecs/modules/qt_lib_core.pri \ /usr/lib/qt/mkspecs/modules/qt_lib_core_private.pri \ + /usr/lib/qt/mkspecs/modules/qt_lib_datavisualization.pri \ + /usr/lib/qt/mkspecs/modules/qt_lib_datavisualization_private.pri \ /usr/lib/qt/mkspecs/modules/qt_lib_dbus.pri \ /usr/lib/qt/mkspecs/modules/qt_lib_dbus_private.pri \ /usr/lib/qt/mkspecs/modules/qt_lib_designer.pri \ /usr/lib/qt/mkspecs/modules/qt_lib_designer_private.pri \ /usr/lib/qt/mkspecs/modules/qt_lib_designercomponents_private.pri \ /usr/lib/qt/mkspecs/modules/qt_lib_eglfs_device_lib_private.pri \ + /usr/lib/qt/mkspecs/modules/qt_lib_eglfs_kms_support_private.pri \ /usr/lib/qt/mkspecs/modules/qt_lib_enginio.pri \ /usr/lib/qt/mkspecs/modules/qt_lib_enginio_private.pri \ /usr/lib/qt/mkspecs/modules/qt_lib_gui.pri \ @@ -150,6 +160,7 @@ DIST = /usr/lib/qt/mkspecs/features/spec_pre.prf \ /usr/lib/qt/mkspecs/modules/qt_lib_opengl_private.pri \ /usr/lib/qt/mkspecs/modules/qt_lib_openglextensions.pri \ /usr/lib/qt/mkspecs/modules/qt_lib_openglextensions_private.pri \ + /usr/lib/qt/mkspecs/modules/qt_lib_packetprotocol_private.pri \ /usr/lib/qt/mkspecs/modules/qt_lib_platformsupport_private.pri \ /usr/lib/qt/mkspecs/modules/qt_lib_positioning.pri \ /usr/lib/qt/mkspecs/modules/qt_lib_positioning_private.pri \ @@ -157,13 +168,17 @@ DIST = /usr/lib/qt/mkspecs/features/spec_pre.prf \ /usr/lib/qt/mkspecs/modules/qt_lib_printsupport_private.pri \ /usr/lib/qt/mkspecs/modules/qt_lib_qml.pri \ /usr/lib/qt/mkspecs/modules/qt_lib_qml_private.pri \ + /usr/lib/qt/mkspecs/modules/qt_lib_qmldebug_private.pri \ /usr/lib/qt/mkspecs/modules/qt_lib_qmldevtools_private.pri \ /usr/lib/qt/mkspecs/modules/qt_lib_qmltest.pri \ /usr/lib/qt/mkspecs/modules/qt_lib_qmltest_private.pri \ /usr/lib/qt/mkspecs/modules/qt_lib_qtmultimediaquicktools_private.pri \ /usr/lib/qt/mkspecs/modules/qt_lib_quick.pri \ /usr/lib/qt/mkspecs/modules/qt_lib_quick_private.pri \ + /usr/lib/qt/mkspecs/modules/qt_lib_quickcontrols2.pri \ + /usr/lib/qt/mkspecs/modules/qt_lib_quickcontrols2_private.pri \ /usr/lib/qt/mkspecs/modules/qt_lib_quickparticles_private.pri \ + /usr/lib/qt/mkspecs/modules/qt_lib_quicktemplates2_private.pri \ /usr/lib/qt/mkspecs/modules/qt_lib_quickwidgets.pri \ /usr/lib/qt/mkspecs/modules/qt_lib_quickwidgets_private.pri \ /usr/lib/qt/mkspecs/modules/qt_lib_script.pri \ @@ -185,6 +200,8 @@ DIST = /usr/lib/qt/mkspecs/features/spec_pre.prf \ /usr/lib/qt/mkspecs/modules/qt_lib_uitools_private.pri \ /usr/lib/qt/mkspecs/modules/qt_lib_waylandclient.pri \ /usr/lib/qt/mkspecs/modules/qt_lib_waylandclient_private.pri \ + /usr/lib/qt/mkspecs/modules/qt_lib_waylandcompositor.pri \ + /usr/lib/qt/mkspecs/modules/qt_lib_waylandcompositor_private.pri \ /usr/lib/qt/mkspecs/modules/qt_lib_webchannel.pri \ /usr/lib/qt/mkspecs/modules/qt_lib_webchannel_private.pri \ /usr/lib/qt/mkspecs/modules/qt_lib_webengine.pri \ @@ -218,6 +235,7 @@ DIST = /usr/lib/qt/mkspecs/features/spec_pre.prf \ /usr/lib/qt/mkspecs/features/qt_config.prf \ /usr/lib/qt/mkspecs/linux-g++/qmake.conf \ /usr/lib/qt/mkspecs/features/spec_post.prf \ + ../../RGBController/.qmake.stash \ /usr/lib/qt/mkspecs/features/exclusive_builds.prf \ /usr/lib/qt/mkspecs/features/default_pre.prf \ /usr/lib/qt/mkspecs/features/resolve_config.prf \ @@ -230,6 +248,7 @@ DIST = /usr/lib/qt/mkspecs/features/spec_pre.prf \ /usr/lib/qt/mkspecs/features/unix/opengl.prf \ /usr/lib/qt/mkspecs/features/uic.prf \ /usr/lib/qt/mkspecs/features/unix/thread.prf \ + /usr/lib/qt/mkspecs/features/file_copies.prf \ /usr/lib/qt/mkspecs/features/testcase_targets.prf \ /usr/lib/qt/mkspecs/features/exceptions.prf \ /usr/lib/qt/mkspecs/features/yacc.prf \ @@ -283,6 +302,7 @@ Makefile: ../../RGBController/RGBController.pro /usr/lib/qt/mkspecs/linux-g++/qm /usr/lib/qt/mkspecs/modules/qt_KItemModels.pri \ /usr/lib/qt/mkspecs/modules/qt_KItemViews.pri \ /usr/lib/qt/mkspecs/modules/qt_KJobWidgets.pri \ + /usr/lib/qt/mkspecs/modules/qt_KNewStuff.pri \ /usr/lib/qt/mkspecs/modules/qt_KNotifications.pri \ /usr/lib/qt/mkspecs/modules/qt_KNotifyConfig.pri \ /usr/lib/qt/mkspecs/modules/qt_KNTLM.pri \ @@ -298,12 +318,16 @@ Makefile: ../../RGBController/RGBController.pro /usr/lib/qt/mkspecs/linux-g++/qm /usr/lib/qt/mkspecs/modules/qt_KXmlGui.pri \ /usr/lib/qt/mkspecs/modules/qt_lib_3dcore.pri \ /usr/lib/qt/mkspecs/modules/qt_lib_3dcore_private.pri \ + /usr/lib/qt/mkspecs/modules/qt_lib_3dextras.pri \ + /usr/lib/qt/mkspecs/modules/qt_lib_3dextras_private.pri \ /usr/lib/qt/mkspecs/modules/qt_lib_3dinput.pri \ /usr/lib/qt/mkspecs/modules/qt_lib_3dinput_private.pri \ /usr/lib/qt/mkspecs/modules/qt_lib_3dlogic.pri \ /usr/lib/qt/mkspecs/modules/qt_lib_3dlogic_private.pri \ /usr/lib/qt/mkspecs/modules/qt_lib_3dquick.pri \ /usr/lib/qt/mkspecs/modules/qt_lib_3dquick_private.pri \ + /usr/lib/qt/mkspecs/modules/qt_lib_3dquickextras.pri \ + /usr/lib/qt/mkspecs/modules/qt_lib_3dquickextras_private.pri \ /usr/lib/qt/mkspecs/modules/qt_lib_3dquickinput.pri \ /usr/lib/qt/mkspecs/modules/qt_lib_3dquickinput_private.pri \ /usr/lib/qt/mkspecs/modules/qt_lib_3dquickrender.pri \ @@ -313,17 +337,22 @@ Makefile: ../../RGBController/RGBController.pro /usr/lib/qt/mkspecs/linux-g++/qm /usr/lib/qt/mkspecs/modules/qt_lib_bluetooth.pri \ /usr/lib/qt/mkspecs/modules/qt_lib_bluetooth_private.pri \ /usr/lib/qt/mkspecs/modules/qt_lib_bootstrap_private.pri \ + /usr/lib/qt/mkspecs/modules/qt_lib_charts.pri \ + /usr/lib/qt/mkspecs/modules/qt_lib_charts_private.pri \ /usr/lib/qt/mkspecs/modules/qt_lib_clucene_private.pri \ /usr/lib/qt/mkspecs/modules/qt_lib_concurrent.pri \ /usr/lib/qt/mkspecs/modules/qt_lib_concurrent_private.pri \ /usr/lib/qt/mkspecs/modules/qt_lib_core.pri \ /usr/lib/qt/mkspecs/modules/qt_lib_core_private.pri \ + /usr/lib/qt/mkspecs/modules/qt_lib_datavisualization.pri \ + /usr/lib/qt/mkspecs/modules/qt_lib_datavisualization_private.pri \ /usr/lib/qt/mkspecs/modules/qt_lib_dbus.pri \ /usr/lib/qt/mkspecs/modules/qt_lib_dbus_private.pri \ /usr/lib/qt/mkspecs/modules/qt_lib_designer.pri \ /usr/lib/qt/mkspecs/modules/qt_lib_designer_private.pri \ /usr/lib/qt/mkspecs/modules/qt_lib_designercomponents_private.pri \ /usr/lib/qt/mkspecs/modules/qt_lib_eglfs_device_lib_private.pri \ + /usr/lib/qt/mkspecs/modules/qt_lib_eglfs_kms_support_private.pri \ /usr/lib/qt/mkspecs/modules/qt_lib_enginio.pri \ /usr/lib/qt/mkspecs/modules/qt_lib_enginio_private.pri \ /usr/lib/qt/mkspecs/modules/qt_lib_gui.pri \ @@ -344,6 +373,7 @@ Makefile: ../../RGBController/RGBController.pro /usr/lib/qt/mkspecs/linux-g++/qm /usr/lib/qt/mkspecs/modules/qt_lib_opengl_private.pri \ /usr/lib/qt/mkspecs/modules/qt_lib_openglextensions.pri \ /usr/lib/qt/mkspecs/modules/qt_lib_openglextensions_private.pri \ + /usr/lib/qt/mkspecs/modules/qt_lib_packetprotocol_private.pri \ /usr/lib/qt/mkspecs/modules/qt_lib_platformsupport_private.pri \ /usr/lib/qt/mkspecs/modules/qt_lib_positioning.pri \ /usr/lib/qt/mkspecs/modules/qt_lib_positioning_private.pri \ @@ -351,13 +381,17 @@ Makefile: ../../RGBController/RGBController.pro /usr/lib/qt/mkspecs/linux-g++/qm /usr/lib/qt/mkspecs/modules/qt_lib_printsupport_private.pri \ /usr/lib/qt/mkspecs/modules/qt_lib_qml.pri \ /usr/lib/qt/mkspecs/modules/qt_lib_qml_private.pri \ + /usr/lib/qt/mkspecs/modules/qt_lib_qmldebug_private.pri \ /usr/lib/qt/mkspecs/modules/qt_lib_qmldevtools_private.pri \ /usr/lib/qt/mkspecs/modules/qt_lib_qmltest.pri \ /usr/lib/qt/mkspecs/modules/qt_lib_qmltest_private.pri \ /usr/lib/qt/mkspecs/modules/qt_lib_qtmultimediaquicktools_private.pri \ /usr/lib/qt/mkspecs/modules/qt_lib_quick.pri \ /usr/lib/qt/mkspecs/modules/qt_lib_quick_private.pri \ + /usr/lib/qt/mkspecs/modules/qt_lib_quickcontrols2.pri \ + /usr/lib/qt/mkspecs/modules/qt_lib_quickcontrols2_private.pri \ /usr/lib/qt/mkspecs/modules/qt_lib_quickparticles_private.pri \ + /usr/lib/qt/mkspecs/modules/qt_lib_quicktemplates2_private.pri \ /usr/lib/qt/mkspecs/modules/qt_lib_quickwidgets.pri \ /usr/lib/qt/mkspecs/modules/qt_lib_quickwidgets_private.pri \ /usr/lib/qt/mkspecs/modules/qt_lib_script.pri \ @@ -379,6 +413,8 @@ Makefile: ../../RGBController/RGBController.pro /usr/lib/qt/mkspecs/linux-g++/qm /usr/lib/qt/mkspecs/modules/qt_lib_uitools_private.pri \ /usr/lib/qt/mkspecs/modules/qt_lib_waylandclient.pri \ /usr/lib/qt/mkspecs/modules/qt_lib_waylandclient_private.pri \ + /usr/lib/qt/mkspecs/modules/qt_lib_waylandcompositor.pri \ + /usr/lib/qt/mkspecs/modules/qt_lib_waylandcompositor_private.pri \ /usr/lib/qt/mkspecs/modules/qt_lib_webchannel.pri \ /usr/lib/qt/mkspecs/modules/qt_lib_webchannel_private.pri \ /usr/lib/qt/mkspecs/modules/qt_lib_webengine.pri \ @@ -412,6 +448,7 @@ Makefile: ../../RGBController/RGBController.pro /usr/lib/qt/mkspecs/linux-g++/qm /usr/lib/qt/mkspecs/features/qt_config.prf \ /usr/lib/qt/mkspecs/linux-g++/qmake.conf \ /usr/lib/qt/mkspecs/features/spec_post.prf \ + .qmake.stash \ /usr/lib/qt/mkspecs/features/exclusive_builds.prf \ /usr/lib/qt/mkspecs/features/default_pre.prf \ /usr/lib/qt/mkspecs/features/resolve_config.prf \ @@ -424,6 +461,7 @@ Makefile: ../../RGBController/RGBController.pro /usr/lib/qt/mkspecs/linux-g++/qm /usr/lib/qt/mkspecs/features/unix/opengl.prf \ /usr/lib/qt/mkspecs/features/uic.prf \ /usr/lib/qt/mkspecs/features/unix/thread.prf \ + /usr/lib/qt/mkspecs/features/file_copies.prf \ /usr/lib/qt/mkspecs/features/testcase_targets.prf \ /usr/lib/qt/mkspecs/features/exceptions.prf \ /usr/lib/qt/mkspecs/features/yacc.prf \ @@ -469,6 +507,7 @@ Makefile: ../../RGBController/RGBController.pro /usr/lib/qt/mkspecs/linux-g++/qm /usr/lib/qt/mkspecs/modules/qt_KItemModels.pri: /usr/lib/qt/mkspecs/modules/qt_KItemViews.pri: /usr/lib/qt/mkspecs/modules/qt_KJobWidgets.pri: +/usr/lib/qt/mkspecs/modules/qt_KNewStuff.pri: /usr/lib/qt/mkspecs/modules/qt_KNotifications.pri: /usr/lib/qt/mkspecs/modules/qt_KNotifyConfig.pri: /usr/lib/qt/mkspecs/modules/qt_KNTLM.pri: @@ -484,12 +523,16 @@ Makefile: ../../RGBController/RGBController.pro /usr/lib/qt/mkspecs/linux-g++/qm /usr/lib/qt/mkspecs/modules/qt_KXmlGui.pri: /usr/lib/qt/mkspecs/modules/qt_lib_3dcore.pri: /usr/lib/qt/mkspecs/modules/qt_lib_3dcore_private.pri: +/usr/lib/qt/mkspecs/modules/qt_lib_3dextras.pri: +/usr/lib/qt/mkspecs/modules/qt_lib_3dextras_private.pri: /usr/lib/qt/mkspecs/modules/qt_lib_3dinput.pri: /usr/lib/qt/mkspecs/modules/qt_lib_3dinput_private.pri: /usr/lib/qt/mkspecs/modules/qt_lib_3dlogic.pri: /usr/lib/qt/mkspecs/modules/qt_lib_3dlogic_private.pri: /usr/lib/qt/mkspecs/modules/qt_lib_3dquick.pri: /usr/lib/qt/mkspecs/modules/qt_lib_3dquick_private.pri: +/usr/lib/qt/mkspecs/modules/qt_lib_3dquickextras.pri: +/usr/lib/qt/mkspecs/modules/qt_lib_3dquickextras_private.pri: /usr/lib/qt/mkspecs/modules/qt_lib_3dquickinput.pri: /usr/lib/qt/mkspecs/modules/qt_lib_3dquickinput_private.pri: /usr/lib/qt/mkspecs/modules/qt_lib_3dquickrender.pri: @@ -499,17 +542,22 @@ Makefile: ../../RGBController/RGBController.pro /usr/lib/qt/mkspecs/linux-g++/qm /usr/lib/qt/mkspecs/modules/qt_lib_bluetooth.pri: /usr/lib/qt/mkspecs/modules/qt_lib_bluetooth_private.pri: /usr/lib/qt/mkspecs/modules/qt_lib_bootstrap_private.pri: +/usr/lib/qt/mkspecs/modules/qt_lib_charts.pri: +/usr/lib/qt/mkspecs/modules/qt_lib_charts_private.pri: /usr/lib/qt/mkspecs/modules/qt_lib_clucene_private.pri: /usr/lib/qt/mkspecs/modules/qt_lib_concurrent.pri: /usr/lib/qt/mkspecs/modules/qt_lib_concurrent_private.pri: /usr/lib/qt/mkspecs/modules/qt_lib_core.pri: /usr/lib/qt/mkspecs/modules/qt_lib_core_private.pri: +/usr/lib/qt/mkspecs/modules/qt_lib_datavisualization.pri: +/usr/lib/qt/mkspecs/modules/qt_lib_datavisualization_private.pri: /usr/lib/qt/mkspecs/modules/qt_lib_dbus.pri: /usr/lib/qt/mkspecs/modules/qt_lib_dbus_private.pri: /usr/lib/qt/mkspecs/modules/qt_lib_designer.pri: /usr/lib/qt/mkspecs/modules/qt_lib_designer_private.pri: /usr/lib/qt/mkspecs/modules/qt_lib_designercomponents_private.pri: /usr/lib/qt/mkspecs/modules/qt_lib_eglfs_device_lib_private.pri: +/usr/lib/qt/mkspecs/modules/qt_lib_eglfs_kms_support_private.pri: /usr/lib/qt/mkspecs/modules/qt_lib_enginio.pri: /usr/lib/qt/mkspecs/modules/qt_lib_enginio_private.pri: /usr/lib/qt/mkspecs/modules/qt_lib_gui.pri: @@ -530,6 +578,7 @@ Makefile: ../../RGBController/RGBController.pro /usr/lib/qt/mkspecs/linux-g++/qm /usr/lib/qt/mkspecs/modules/qt_lib_opengl_private.pri: /usr/lib/qt/mkspecs/modules/qt_lib_openglextensions.pri: /usr/lib/qt/mkspecs/modules/qt_lib_openglextensions_private.pri: +/usr/lib/qt/mkspecs/modules/qt_lib_packetprotocol_private.pri: /usr/lib/qt/mkspecs/modules/qt_lib_platformsupport_private.pri: /usr/lib/qt/mkspecs/modules/qt_lib_positioning.pri: /usr/lib/qt/mkspecs/modules/qt_lib_positioning_private.pri: @@ -537,13 +586,17 @@ Makefile: ../../RGBController/RGBController.pro /usr/lib/qt/mkspecs/linux-g++/qm /usr/lib/qt/mkspecs/modules/qt_lib_printsupport_private.pri: /usr/lib/qt/mkspecs/modules/qt_lib_qml.pri: /usr/lib/qt/mkspecs/modules/qt_lib_qml_private.pri: +/usr/lib/qt/mkspecs/modules/qt_lib_qmldebug_private.pri: /usr/lib/qt/mkspecs/modules/qt_lib_qmldevtools_private.pri: /usr/lib/qt/mkspecs/modules/qt_lib_qmltest.pri: /usr/lib/qt/mkspecs/modules/qt_lib_qmltest_private.pri: /usr/lib/qt/mkspecs/modules/qt_lib_qtmultimediaquicktools_private.pri: /usr/lib/qt/mkspecs/modules/qt_lib_quick.pri: /usr/lib/qt/mkspecs/modules/qt_lib_quick_private.pri: +/usr/lib/qt/mkspecs/modules/qt_lib_quickcontrols2.pri: +/usr/lib/qt/mkspecs/modules/qt_lib_quickcontrols2_private.pri: /usr/lib/qt/mkspecs/modules/qt_lib_quickparticles_private.pri: +/usr/lib/qt/mkspecs/modules/qt_lib_quicktemplates2_private.pri: /usr/lib/qt/mkspecs/modules/qt_lib_quickwidgets.pri: /usr/lib/qt/mkspecs/modules/qt_lib_quickwidgets_private.pri: /usr/lib/qt/mkspecs/modules/qt_lib_script.pri: @@ -565,6 +618,8 @@ Makefile: ../../RGBController/RGBController.pro /usr/lib/qt/mkspecs/linux-g++/qm /usr/lib/qt/mkspecs/modules/qt_lib_uitools_private.pri: /usr/lib/qt/mkspecs/modules/qt_lib_waylandclient.pri: /usr/lib/qt/mkspecs/modules/qt_lib_waylandclient_private.pri: +/usr/lib/qt/mkspecs/modules/qt_lib_waylandcompositor.pri: +/usr/lib/qt/mkspecs/modules/qt_lib_waylandcompositor_private.pri: /usr/lib/qt/mkspecs/modules/qt_lib_webchannel.pri: /usr/lib/qt/mkspecs/modules/qt_lib_webchannel_private.pri: /usr/lib/qt/mkspecs/modules/qt_lib_webengine.pri: @@ -598,6 +653,7 @@ Makefile: ../../RGBController/RGBController.pro /usr/lib/qt/mkspecs/linux-g++/qm /usr/lib/qt/mkspecs/features/qt_config.prf: /usr/lib/qt/mkspecs/linux-g++/qmake.conf: /usr/lib/qt/mkspecs/features/spec_post.prf: +.qmake.stash: /usr/lib/qt/mkspecs/features/exclusive_builds.prf: /usr/lib/qt/mkspecs/features/default_pre.prf: /usr/lib/qt/mkspecs/features/resolve_config.prf: @@ -610,6 +666,7 @@ Makefile: ../../RGBController/RGBController.pro /usr/lib/qt/mkspecs/linux-g++/qm /usr/lib/qt/mkspecs/features/unix/opengl.prf: /usr/lib/qt/mkspecs/features/uic.prf: /usr/lib/qt/mkspecs/features/unix/thread.prf: +/usr/lib/qt/mkspecs/features/file_copies.prf: /usr/lib/qt/mkspecs/features/testcase_targets.prf: /usr/lib/qt/mkspecs/features/exceptions.prf: /usr/lib/qt/mkspecs/features/yacc.prf: @@ -646,6 +703,7 @@ clean: compiler_clean distclean: clean -$(DEL_FILE) $(TARGET) + -$(DEL_FILE) .qmake.stash -$(DEL_FILE) Makefile @@ -657,21 +715,26 @@ mocables: compiler_moc_header_make_all compiler_moc_source_make_all check: first +benchmark: first + compiler_rcc_make_all: compiler_rcc_clean: compiler_moc_header_make_all: moc_controllerwindow.cpp compiler_moc_header_clean: -$(DEL_FILE) moc_controllerwindow.cpp moc_controllerwindow.cpp: ../../RGBController/serial_communication.h \ - ../../RGBController/controllerwindow.h - /usr/lib/qt/bin/moc $(DEFINES) -I/usr/lib/qt/mkspecs/linux-g++ -I'/home/daniel_j/documents/school/2016 research project/RGBController/qt/RGBController' -I/usr/include/qt -I/usr/include/qt/QtWidgets -I/usr/include/qt/QtGui -I/usr/include/qt/QtSerialPort -I/usr/include/qt/QtNetwork -I/usr/include/qt/QtCore -I. -I/usr/include/c++/5.3.0 -I/usr/include/c++/5.3.0/x86_64-unknown-linux-gnu -I/usr/include/c++/5.3.0/backward -I/usr/lib/gcc/x86_64-unknown-linux-gnu/5.3.0/include -I/usr/local/include -I/usr/lib/gcc/x86_64-unknown-linux-gnu/5.3.0/include-fixed -I/usr/include ../../RGBController/controllerwindow.h -o moc_controllerwindow.cpp + ui_controllerwindow.h \ + ../../RGBController/controllerwindow.h \ + /usr/lib/qt/bin/moc + /usr/lib/qt/bin/moc $(DEFINES) -I/usr/lib/qt/mkspecs/linux-g++ -I'/home/daniel_j/documents/school/2016 research project/RGBController/qt/RGBController' -I/usr/include/qt -I/usr/include/qt/QtWidgets -I/usr/include/qt/QtGui -I/usr/include/qt/QtSerialPort -I/usr/include/qt/QtNetwork -I/usr/include/qt/QtCore -I. -I/usr/include/c++/6.1.1 -I/usr/include/c++/6.1.1/x86_64-pc-linux-gnu -I/usr/include/c++/6.1.1/backward -I/usr/lib/gcc/x86_64-pc-linux-gnu/6.1.1/include -I/usr/local/include -I/usr/lib/gcc/x86_64-pc-linux-gnu/6.1.1/include-fixed -I/usr/include ../../RGBController/controllerwindow.h -o moc_controllerwindow.cpp compiler_moc_source_make_all: compiler_moc_source_clean: compiler_uic_make_all: ui_controllerwindow.h compiler_uic_clean: -$(DEL_FILE) ui_controllerwindow.h -ui_controllerwindow.h: ../../RGBController/controllerwindow.ui +ui_controllerwindow.h: ../../RGBController/controllerwindow.ui \ + /usr/lib/qt/bin/uic /usr/lib/qt/bin/uic ../../RGBController/controllerwindow.ui -o ui_controllerwindow.h compiler_yacc_decl_make_all: @@ -685,7 +748,8 @@ compiler_clean: compiler_moc_header_clean compiler_uic_clean ####### Compile main.o: ../../RGBController/main.cpp ../../RGBController/controllerwindow.h \ - ../../RGBController/serial_communication.h + ../../RGBController/serial_communication.h \ + ui_controllerwindow.h $(CXX) -c $(CXXFLAGS) $(INCPATH) -o main.o ../../RGBController/main.cpp controllerwindow.o: ../../RGBController/controllerwindow.cpp ../../RGBController/controllerwindow.h \ @@ -693,7 +757,9 @@ controllerwindow.o: ../../RGBController/controllerwindow.cpp ../../RGBController ui_controllerwindow.h $(CXX) -c $(CXXFLAGS) $(INCPATH) -o controllerwindow.o ../../RGBController/controllerwindow.cpp -serial_communication.o: ../../RGBController/serial_communication.cpp ../../RGBController/serial_communication.h +serial_communication.o: ../../RGBController/serial_communication.cpp ../../RGBController/serial_communication.h \ + ../../RGBController/controllerwindow.h \ + ui_controllerwindow.h $(CXX) -c $(CXXFLAGS) $(INCPATH) -o serial_communication.o ../../RGBController/serial_communication.cpp moc_controllerwindow.o: moc_controllerwindow.cpp diff --git a/qt/build/degub/RGBController b/qt/build/degub/RGBController index 41cc589..91ab134 100755 Binary files a/qt/build/degub/RGBController and b/qt/build/degub/RGBController differ diff --git a/qt/build/degub/controllerwindow.o b/qt/build/degub/controllerwindow.o index b9424c6..d5ce046 100644 Binary files a/qt/build/degub/controllerwindow.o and b/qt/build/degub/controllerwindow.o differ diff --git a/qt/build/degub/main.o b/qt/build/degub/main.o index bb17f39..f70fffe 100644 Binary files a/qt/build/degub/main.o and b/qt/build/degub/main.o differ diff --git a/qt/build/degub/moc_controllerwindow.cpp b/qt/build/degub/moc_controllerwindow.cpp old mode 100755 new mode 100644 index 07e69be..0beaf14 --- a/qt/build/degub/moc_controllerwindow.cpp +++ b/qt/build/degub/moc_controllerwindow.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** Meta object code from reading C++ file 'controllerwindow.h' ** -** Created by: The Qt Meta Object Compiler version 67 (Qt 5.6.0) +** Created by: The Qt Meta Object Compiler version 67 (Qt 5.7.0) ** ** WARNING! All changes made in this file will be lost! *****************************************************************************/ @@ -12,7 +12,7 @@ #if !defined(Q_MOC_OUTPUT_REVISION) #error "The header file 'controllerwindow.h' doesn't include ." #elif Q_MOC_OUTPUT_REVISION != 67 -#error "This file was generated using the moc from 5.6.0. It" +#error "This file was generated using the moc from 5.7.0. It" #error "cannot be used with the include files from this version of Qt." #error "(The moc has changed too much.)" #endif diff --git a/qt/build/degub/moc_controllerwindow.o b/qt/build/degub/moc_controllerwindow.o index d19a41d..5d835ad 100644 Binary files a/qt/build/degub/moc_controllerwindow.o and b/qt/build/degub/moc_controllerwindow.o differ diff --git a/qt/build/degub/presets.txt b/qt/build/degub/presets.txt index 2b9422e..1162758 100644 --- a/qt/build/degub/presets.txt +++ b/qt/build/degub/presets.txt @@ -3,3 +3,4 @@ purple=255,0,255 light purple=255,55,255 yellow=255,83,0 light blue=0,255,255 +pink=255,0,91 diff --git a/qt/build/degub/presets_backup.txt b/qt/build/degub/presets_backup.txt new file mode 100644 index 0000000..7bc9af4 --- /dev/null +++ b/qt/build/degub/presets_backup.txt @@ -0,0 +1,11 @@ +Only add things to this file if you know what you are doing. +Don't be dumb. + +The program only cares for lines here if they contain the equals symbol. +Everything else is ignored - if you add an equals symbol to this file, you will most likely crash it. + +white=255,255,255 +purple=255,0,255 +light purple=255,55,255 +yellow=255,83,0 +light blue=0,255,255 diff --git a/qt/build/degub/serial_communication.o b/qt/build/degub/serial_communication.o index dd01faa..3fb7cb2 100644 Binary files a/qt/build/degub/serial_communication.o and b/qt/build/degub/serial_communication.o differ diff --git a/qt/build/degub/ui_controllerwindow.h b/qt/build/degub/ui_controllerwindow.h old mode 100755 new mode 100644 index 03ce981..2dbb079 --- a/qt/build/degub/ui_controllerwindow.h +++ b/qt/build/degub/ui_controllerwindow.h @@ -1,7 +1,7 @@ /******************************************************************************** ** Form generated from reading UI file 'controllerwindow.ui' ** -** Created by: Qt User Interface Compiler version 5.6.0 +** Created by: Qt User Interface Compiler version 5.7.0 ** ** WARNING! All changes made in this file will be lost when recompiling UI file! ********************************************************************************/ @@ -39,29 +39,29 @@ public: QPushButton *connect_button; QPushButton *disconnect_button; QLabel *rgb_label; - QPushButton *red_button; QSlider *r_slider; + QPushButton *red_button; QSlider *g_slider; - QSlider *b_slider; QPushButton *green_button; + QSlider *b_slider; QPushButton *blue_button; - QLabel *presets_label; QPushButton *off_button; - QLabel *info_log_label; - QPushButton *set_preset_button; + QLabel *presets_label; QComboBox *presets_dropdown; - QTextEdit *info_log_textarea; + QPushButton *set_preset_button; + QPushButton *reload_preset_button; QLineEdit *preset_name_textbox; QPushButton *preset_save_button; QPushButton *preset_delete_button; - QPushButton *reload_preset_button; + QLabel *info_log_label; + QTextEdit *info_log_textarea; void setupUi(QMainWindow *controllerWindow) { if (controllerWindow->objectName().isEmpty()) controllerWindow->setObjectName(QStringLiteral("controllerWindow")); controllerWindow->setWindowModality(Qt::WindowModal); - controllerWindow->resize(235, 428); + controllerWindow->resize(235, 447); centralWidget = new QWidget(controllerWindow); centralWidget->setObjectName(QStringLiteral("centralWidget")); formLayout = new QFormLayout(centralWidget); @@ -109,11 +109,6 @@ public: formLayout->setWidget(4, QFormLayout::LabelRole, rgb_label); - red_button = new QPushButton(centralWidget); - red_button->setObjectName(QStringLiteral("red_button")); - - formLayout->setWidget(5, QFormLayout::FieldRole, red_button); - r_slider = new QSlider(centralWidget); r_slider->setObjectName(QStringLiteral("r_slider")); r_slider->setMinimumSize(QSize(120, 0)); @@ -123,6 +118,11 @@ public: formLayout->setWidget(5, QFormLayout::LabelRole, r_slider); + red_button = new QPushButton(centralWidget); + red_button->setObjectName(QStringLiteral("red_button")); + + formLayout->setWidget(5, QFormLayout::FieldRole, red_button); + g_slider = new QSlider(centralWidget); g_slider->setObjectName(QStringLiteral("g_slider")); g_slider->setMinimumSize(QSize(120, 0)); @@ -132,6 +132,11 @@ public: formLayout->setWidget(6, QFormLayout::LabelRole, g_slider); + green_button = new QPushButton(centralWidget); + green_button->setObjectName(QStringLiteral("green_button")); + + formLayout->setWidget(6, QFormLayout::FieldRole, green_button); + b_slider = new QSlider(centralWidget); b_slider->setObjectName(QStringLiteral("b_slider")); b_slider->setMinimumSize(QSize(120, 0)); @@ -141,35 +146,20 @@ public: formLayout->setWidget(7, QFormLayout::LabelRole, b_slider); - green_button = new QPushButton(centralWidget); - green_button->setObjectName(QStringLiteral("green_button")); - - formLayout->setWidget(6, QFormLayout::FieldRole, green_button); - blue_button = new QPushButton(centralWidget); blue_button->setObjectName(QStringLiteral("blue_button")); formLayout->setWidget(7, QFormLayout::FieldRole, blue_button); - presets_label = new QLabel(centralWidget); - presets_label->setObjectName(QStringLiteral("presets_label")); - - formLayout->setWidget(9, QFormLayout::LabelRole, presets_label); - off_button = new QPushButton(centralWidget); off_button->setObjectName(QStringLiteral("off_button")); formLayout->setWidget(8, QFormLayout::FieldRole, off_button); - info_log_label = new QLabel(centralWidget); - info_log_label->setObjectName(QStringLiteral("info_log_label")); - - formLayout->setWidget(14, QFormLayout::LabelRole, info_log_label); - - set_preset_button = new QPushButton(centralWidget); - set_preset_button->setObjectName(QStringLiteral("set_preset_button")); + presets_label = new QLabel(centralWidget); + presets_label->setObjectName(QStringLiteral("presets_label")); - formLayout->setWidget(10, QFormLayout::FieldRole, set_preset_button); + formLayout->setWidget(9, QFormLayout::LabelRole, presets_label); presets_dropdown = new QComboBox(centralWidget); presets_dropdown->setObjectName(QStringLiteral("presets_dropdown")); @@ -177,10 +167,15 @@ public: formLayout->setWidget(10, QFormLayout::LabelRole, presets_dropdown); - info_log_textarea = new QTextEdit(centralWidget); - info_log_textarea->setObjectName(QStringLiteral("info_log_textarea")); + set_preset_button = new QPushButton(centralWidget); + set_preset_button->setObjectName(QStringLiteral("set_preset_button")); - formLayout->setWidget(15, QFormLayout::SpanningRole, info_log_textarea); + formLayout->setWidget(10, QFormLayout::FieldRole, set_preset_button); + + reload_preset_button = new QPushButton(centralWidget); + reload_preset_button->setObjectName(QStringLiteral("reload_preset_button")); + + formLayout->setWidget(11, QFormLayout::LabelRole, reload_preset_button); preset_name_textbox = new QLineEdit(centralWidget); preset_name_textbox->setObjectName(QStringLiteral("preset_name_textbox")); @@ -197,10 +192,15 @@ public: formLayout->setWidget(13, QFormLayout::FieldRole, preset_delete_button); - reload_preset_button = new QPushButton(centralWidget); - reload_preset_button->setObjectName(QStringLiteral("reload_preset_button")); + info_log_label = new QLabel(centralWidget); + info_log_label->setObjectName(QStringLiteral("info_log_label")); - formLayout->setWidget(11, QFormLayout::LabelRole, reload_preset_button); + formLayout->setWidget(14, QFormLayout::LabelRole, info_log_label); + + info_log_textarea = new QTextEdit(centralWidget); + info_log_textarea->setObjectName(QStringLiteral("info_log_textarea")); + + formLayout->setWidget(15, QFormLayout::SpanningRole, info_log_textarea); controllerWindow->setCentralWidget(centralWidget); @@ -222,13 +222,13 @@ public: red_button->setText(QApplication::translate("controllerWindow", "Red", 0)); green_button->setText(QApplication::translate("controllerWindow", "Green", 0)); blue_button->setText(QApplication::translate("controllerWindow", "Blue", 0)); - presets_label->setText(QApplication::translate("controllerWindow", "Presets", 0)); off_button->setText(QApplication::translate("controllerWindow", "Off", 0)); - info_log_label->setText(QApplication::translate("controllerWindow", "Information log", 0)); + presets_label->setText(QApplication::translate("controllerWindow", "Presets", 0)); set_preset_button->setText(QApplication::translate("controllerWindow", "Set", 0)); + reload_preset_button->setText(QApplication::translate("controllerWindow", "Reload", 0)); preset_save_button->setText(QApplication::translate("controllerWindow", "Save", 0)); preset_delete_button->setText(QApplication::translate("controllerWindow", "Delete", 0)); - reload_preset_button->setText(QApplication::translate("controllerWindow", "Reload", 0)); + info_log_label->setText(QApplication::translate("controllerWindow", "Information log", 0)); } // retranslateUi }; -- cgit v1.2.3