diff options
| author | daniel-Jones <daniel@danieljon.es> | 2017-04-07 09:17:10 +0930 |
|---|---|---|
| committer | daniel-Jones <daniel@danieljon.es> | 2017-04-07 09:17:10 +0930 |
| commit | 9ff573e9fe4c40ffb342ce2b215042c39b518aeb (patch) | |
| tree | e4168caacbb934b072da417275ea578d26229db6 /qt/RGBController/Makefile | |
| parent | 1189c8c2671b2463dbca7842a81adfe00c35549c (diff) | |
| download | RGB-Controller-9ff573e9fe4c40ffb342ce2b215042c39b518aeb.tar.gz RGB-Controller-9ff573e9fe4c40ffb342ce2b215042c39b518aeb.zip | |
Merged source into one .cpp and .h. Added serial communication from the Arduino to the host computer. Added ping/pong system to maintain a connection, once 3 failed tries have occured, the connection is force closed, this restores the ui to a desired state. A ping is sent every 60 seconds and a response is required within one second. Some debug UI additions and code is still present, to be removed.
Diffstat (limited to 'qt/RGBController/Makefile')
| -rw-r--r-- | qt/RGBController/Makefile | 30 |
1 files changed, 12 insertions, 18 deletions
diff --git a/qt/RGBController/Makefile b/qt/RGBController/Makefile index efaa9b4..415befe 100644 --- a/qt/RGBController/Makefile +++ b/qt/RGBController/Makefile @@ -49,11 +49,9 @@ OBJECTS_DIR = ./ ####### Files SOURCES = main.cpp \ - controllerwindow.cpp \ - serial_communication.cpp moc_controllerwindow.cpp + controllerwindow.cpp moc_controllerwindow.cpp OBJECTS = main.o \ controllerwindow.o \ - serial_communication.o \ moc_controllerwindow.o DIST = /usr/lib/qt/mkspecs/features/spec_pre.prf \ /usr/lib/qt/mkspecs/common/unix.conf \ @@ -166,6 +164,8 @@ DIST = /usr/lib/qt/mkspecs/features/spec_pre.prf \ /usr/lib/qt/mkspecs/modules/qt_lib_multimediawidgets_private.pri \ /usr/lib/qt/mkspecs/modules/qt_lib_network.pri \ /usr/lib/qt/mkspecs/modules/qt_lib_network_private.pri \ + /usr/lib/qt/mkspecs/modules/qt_lib_networkauth.pri \ + /usr/lib/qt/mkspecs/modules/qt_lib_networkauth_private.pri \ /usr/lib/qt/mkspecs/modules/qt_lib_nfc.pri \ /usr/lib/qt/mkspecs/modules/qt_lib_nfc_private.pri \ /usr/lib/qt/mkspecs/modules/qt_lib_opengl.pri \ @@ -276,10 +276,8 @@ DIST = /usr/lib/qt/mkspecs/features/spec_pre.prf \ /usr/lib/qt/mkspecs/features/exceptions.prf \ /usr/lib/qt/mkspecs/features/yacc.prf \ /usr/lib/qt/mkspecs/features/lex.prf \ - RGBController.pro controllerwindow.h \ - serial_communication.h main.cpp \ - controllerwindow.cpp \ - serial_communication.cpp + RGBController.pro controllerwindow.h main.cpp \ + controllerwindow.cpp QMAKE_TARGET = RGBController DESTDIR = TARGET = RGBController @@ -402,6 +400,8 @@ Makefile: RGBController.pro /usr/lib/qt/mkspecs/linux-g++/qmake.conf /usr/lib/qt /usr/lib/qt/mkspecs/modules/qt_lib_multimediawidgets_private.pri \ /usr/lib/qt/mkspecs/modules/qt_lib_network.pri \ /usr/lib/qt/mkspecs/modules/qt_lib_network_private.pri \ + /usr/lib/qt/mkspecs/modules/qt_lib_networkauth.pri \ + /usr/lib/qt/mkspecs/modules/qt_lib_networkauth_private.pri \ /usr/lib/qt/mkspecs/modules/qt_lib_nfc.pri \ /usr/lib/qt/mkspecs/modules/qt_lib_nfc_private.pri \ /usr/lib/qt/mkspecs/modules/qt_lib_opengl.pri \ @@ -630,6 +630,8 @@ Makefile: RGBController.pro /usr/lib/qt/mkspecs/linux-g++/qmake.conf /usr/lib/qt /usr/lib/qt/mkspecs/modules/qt_lib_multimediawidgets_private.pri: /usr/lib/qt/mkspecs/modules/qt_lib_network.pri: /usr/lib/qt/mkspecs/modules/qt_lib_network_private.pri: +/usr/lib/qt/mkspecs/modules/qt_lib_networkauth.pri: +/usr/lib/qt/mkspecs/modules/qt_lib_networkauth_private.pri: /usr/lib/qt/mkspecs/modules/qt_lib_nfc.pri: /usr/lib/qt/mkspecs/modules/qt_lib_nfc_private.pri: /usr/lib/qt/mkspecs/modules/qt_lib_opengl.pri: @@ -761,8 +763,8 @@ distdir: FORCE @test -d $(DISTDIR) || mkdir -p $(DISTDIR) $(COPY_FILE) --parents $(DIST) $(DISTDIR)/ $(COPY_FILE) --parents /usr/lib/qt/mkspecs/features/data/dummy.cpp $(DISTDIR)/ - $(COPY_FILE) --parents controllerwindow.h serial_communication.h $(DISTDIR)/ - $(COPY_FILE) --parents main.cpp controllerwindow.cpp serial_communication.cpp $(DISTDIR)/ + $(COPY_FILE) --parents controllerwindow.h $(DISTDIR)/ + $(COPY_FILE) --parents main.cpp controllerwindow.cpp $(DISTDIR)/ $(COPY_FILE) --parents controllerwindow.ui $(DISTDIR)/ @@ -798,8 +800,7 @@ moc_predefs.h: /usr/lib/qt/mkspecs/features/data/dummy.cpp compiler_moc_header_make_all: moc_controllerwindow.cpp compiler_moc_header_clean: -$(DEL_FILE) moc_controllerwindow.cpp -moc_controllerwindow.cpp: serial_communication.h \ - ui_controllerwindow.h \ +moc_controllerwindow.cpp: ui_controllerwindow.h \ controllerwindow.h \ moc_predefs.h \ /usr/bin/moc @@ -825,20 +826,13 @@ compiler_clean: compiler_moc_predefs_clean compiler_moc_header_clean compiler_ui ####### Compile main.o: main.cpp controllerwindow.h \ - serial_communication.h \ ui_controllerwindow.h $(CXX) -c $(CXXFLAGS) $(INCPATH) -o main.o main.cpp controllerwindow.o: controllerwindow.cpp controllerwindow.h \ - serial_communication.h \ ui_controllerwindow.h $(CXX) -c $(CXXFLAGS) $(INCPATH) -o controllerwindow.o controllerwindow.cpp -serial_communication.o: serial_communication.cpp serial_communication.h \ - controllerwindow.h \ - ui_controllerwindow.h - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o serial_communication.o serial_communication.cpp - moc_controllerwindow.o: moc_controllerwindow.cpp $(CXX) -c $(CXXFLAGS) $(INCPATH) -o moc_controllerwindow.o moc_controllerwindow.cpp |