Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Q
qgroundcontrol
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Valentin Platzgummer
qgroundcontrol
Commits
80404c9c
Commit
80404c9c
authored
Feb 10, 2011
by
lm
Browse files
Options
Browse Files
Download
Plain Diff
Merged
parents
16092c24
6679ac37
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
22 additions
and
21 deletions
+22
-21
qgroundcontrol.pri
qgroundcontrol.pri
+8
-8
MAVLinkSimulationLink.cc
src/comm/MAVLinkSimulationLink.cc
+11
-11
UAS.cc
src/uas/UAS.cc
+3
-2
No files found.
qgroundcontrol.pri
View file @
80404c9c
...
...
@@ -48,14 +48,14 @@ DEFINES += _TTY_NOWARN_
macx {
COMPILER_VERSION = $$system(gcc -v)
message(Using compiler $$COMPILER_VERSION)
#
message(Using compiler $$COMPILER_VERSION)
HARDWARE_PLATFORM = $$system(uname -a)
contains(
HARDWARE_PLATFORM, 9.6.0 ) || contains( HARDWARE_PLATFORM, 9.7.0 ) || contains( HARDWARE_PLATFORM, 9.8.0 ) || contains( HARDWARE_PLATFORM, 9.9.0
) {
contains(
$$HARDWARE_PLATFORM, "9.6.0" ) || contains( $$HARDWARE_PLATFORM, "9.7.0" ) || contains( $$HARDWARE_PLATFORM, "9.8.0" ) || contains( $$HARDWARE_PLATFORM, "9.9.0"
) {
# x86 Mac OS X Leopard 10.5 and earlier
CONFIG += x86 cocoa phonon
CONFIG -= x86_64
message(Building for Mac OS X 32bit/Leopard 10.5 and earlier)
CONFIG += x86
x86_64
cocoa phonon
#
CONFIG -= x86_64
#
message(Building for Mac OS X 32bit/Leopard 10.5 and earlier)
# Enable function-profiling with the OS X saturn tool
debug {
...
...
@@ -65,9 +65,9 @@ macx {
}
} else {
# x64 Mac OS X Snow Leopard 10.6 and later
CONFIG += x86_64 cocoa
CONFIG -= x86
phonon
message(Building for Mac OS X 64bit/Snow Leopard 10.6 and later)
CONFIG += x86_64
x86
cocoa
#CONFIG -= x86 #
phonon
#
message(Building for Mac OS X 64bit/Snow Leopard 10.6 and later)
debug {
#QMAKE_CXXFLAGS += -finstrument-functions
#LIBS += -lSaturn
...
...
src/comm/MAVLinkSimulationLink.cc
View file @
80404c9c
...
...
@@ -610,18 +610,18 @@ void MAVLinkSimulationLink::mainloop()
// Send controller states
#ifdef MAVLINK_ENABLED_PIXHAWK
uint8_t
attControl
=
1
;
uint8_t
posXYControl
=
1
;
uint8_t
posZControl
=
0
;
uint8_t
posYawControl
=
1
;
uint8_t
gpsLock
=
2
;
uint8_t
visLock
=
3
;
uint8_t
posLock
=
qMax
(
gpsLock
,
visLock
)
;
uint8_t
ahrsHealth
=
240
;
#ifdef MAVLINK_ENABLED_PIXHAWK
uint8_t
attControl
=
1
;
uint8_t
posXYControl
=
1
;
uint8_t
posZControl
=
0
;
uint8_t
posYawControl
=
1
;
uint8_t
gpsLock
=
2
;
uint8_t
visLock
=
3
;
uint8_t
ahrsHealth
=
200
;
uint8_t
posLock
=
qMax
(
gpsLock
,
visLock
)
;
messageSize
=
mavlink_msg_control_status_pack
(
systemId
,
componentId
,
&
msg
,
posLock
,
visLock
,
gpsLock
,
ahrsHealth
,
attControl
,
posXYControl
,
posZControl
,
posYawControl
);
#endif
#endif
bufferlength
=
mavlink_msg_to_send_buffer
(
buffer
,
&
msg
);
memcpy
(
stream
+
streampointer
,
buffer
,
bufferlength
);
...
...
src/uas/UAS.cc
View file @
80404c9c
...
...
@@ -250,11 +250,12 @@ void UAS::receiveMessage(LinkInterface* link, mavlink_message_t message)
getStatusForCode
((
int
)
state
.
status
,
uasState
,
stateDescription
);
emit
statusChanged
(
this
,
uasState
,
stateDescription
);
emit
statusChanged
(
this
->
status
);
emit
loadChanged
(
this
,
state
.
load
/
10.0
f
);
emit
valueChanged
(
uasId
,
"Load"
,
"%"
,
((
float
)
state
.
load
)
/
1000.0
f
,
MG
::
TIME
::
getGroundTimeNow
());
stateAudio
=
" changed status to "
+
uasState
;
}
emit
loadChanged
(
this
,
state
.
load
/
10.0
f
);
emit
valueChanged
(
uasId
,
"Load"
,
"%"
,
((
float
)
state
.
load
)
/
1000.0
f
,
getUnixTime
());
if
(
this
->
mode
!=
static_cast
<
unsigned
int
>
(
state
.
mode
))
{
modechanged
=
true
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment