Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
M
MicroCART
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Deploy
Releases
Model registry
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Distributed Autonomous Networked Control Lab
MicroCART
Commits
eba3a607
Commit
eba3a607
authored
5 years ago
by
ucart
Browse files
Options
Downloads
Patches
Plain Diff
fixing build issues
parent
a577ce1f
No related branches found
No related tags found
1 merge request
!43
Resolve "Transition current hardware platform to Vivado"
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
groundStation/Makefile
+1
-1
1 addition, 1 deletion
groundStation/Makefile
groundStation/gui/MicroCART/.qmake.stash
+22
-0
22 additions, 0 deletions
groundStation/gui/MicroCART/.qmake.stash
quad/src/commands/commands.h
+4
-3
4 additions, 3 deletions
quad/src/commands/commands.h
with
27 additions
and
4 deletions
groundStation/Makefile
+
1
−
1
View file @
eba3a607
...
...
@@ -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
...
...
This diff is collapsed.
Click to expand it.
groundStation/gui/MicroCART/.qmake.stash
0 → 100644
+
22
−
0
View file @
eba3a607
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
This diff is collapsed.
Click to expand it.
quad/src/commands/commands.h
+
4
−
3
View file @
eba3a607
...
...
@@ -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
;
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment