diff --git a/groundStation/Makefile b/groundStation/Makefile index e4eafdd3edd0bcb78eefebe37ebe26cccae45a9b..620bbcefd1a2f32773a283dfad29e9b3e2fd308a 100644 --- a/groundStation/Makefile +++ b/groundStation/Makefile @@ -82,7 +82,7 @@ vrpn/build: cd src/vrpn/build && cmake .. && make GroundStation: - cd gui/MicroCART && qmake + cd gui/MicroCART && qmake-qt5 cd gui/MicroCART && make ln -s gui/MicroCART/MicroCART GroundStation diff --git a/groundStation/gui/MicroCART/.qmake.stash b/groundStation/gui/MicroCART/.qmake.stash new file mode 100644 index 0000000000000000000000000000000000000000..6ea5b2126ee311f11a3da7fd84e4ec97bd9b1ab6 --- /dev/null +++ b/groundStation/gui/MicroCART/.qmake.stash @@ -0,0 +1,22 @@ +QMAKE_CXX.INCDIRS = \ + /usr/include/c++/4.8.5 \ + /usr/include/c++/4.8.5/x86_64-redhat-linux \ + /usr/include/c++/4.8.5/backward \ + /usr/lib/gcc/x86_64-redhat-linux/4.8.5/include \ + /usr/local/include \ + /usr/include +QMAKE_CXX.LIBDIRS = \ + /usr/lib/gcc/x86_64-redhat-linux/4.8.5 \ + /usr/lib64 \ + /lib64 \ + /usr/lib \ + /lib +QMAKE_CXX.QT_COMPILER_STDCXX = 199711L +QMAKE_CXX.QMAKE_GCC_MAJOR_VERSION = 4 +QMAKE_CXX.QMAKE_GCC_MINOR_VERSION = 8 +QMAKE_CXX.QMAKE_GCC_PATCH_VERSION = 5 +QMAKE_CXX.COMPILER_MACROS = \ + QT_COMPILER_STDCXX \ + QMAKE_GCC_MAJOR_VERSION \ + QMAKE_GCC_MINOR_VERSION \ + QMAKE_GCC_PATCH_VERSION diff --git a/quad/src/commands/commands.h b/quad/src/commands/commands.h index 194bbaedcb7ac1661035e721da865fc038db8a34..41dcb96f31a2003163108455e0250a1bf371121e 100644 --- a/quad/src/commands/commands.h +++ b/quad/src/commands/commands.h @@ -51,9 +51,10 @@ enum MessageTypeID{ RESPOUTPUT_ID, // 14 - Responding with node output GETNODES_ID, // 15 - Getting node IDs from current comp_graph RESPNODES_ID, // 16 - Responding with node IDs from current comp_graph - ADDNODE_ID, // 17 - Add a node of specified type_id - RESPADDNODE_ID, // 18 - Responding with the block_id of the newly added node - MAX_TYPE_ID // 19 - Just used to keep track of the size. Must remain at the end + ADDNODE_ID, // 17 - Add a node of specified type_id + RESPADDNODE_ID, // 18 - Responding with the block_id of the newly added node + MAX_TYPE_ID, // 19 - Just used to keep track of the size. Must remain at the end + SEND_RT_ID // 20 - Real Time sensor data sent to groundstation }; struct modular_structs;