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
e99ffb3d
Commit
e99ffb3d
authored
Dec 10, 2010
by
lm
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed compile warnings
parent
58c5b220
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
7 additions
and
7 deletions
+7
-7
qgroundcontrol.pri
qgroundcontrol.pri
+3
-3
MAVLinkSimulationLink.cc
src/comm/MAVLinkSimulationLink.cc
+2
-2
PxQuadMAV.cc
src/uas/PxQuadMAV.cc
+1
-1
QOSGWidget.h
src/ui/map3D/QOSGWidget.h
+1
-1
No files found.
qgroundcontrol.pri
View file @
e99ffb3d
...
...
@@ -77,11 +77,11 @@ macx {
ICON = $$BASEDIR/images/icons/macx.icns
# Copy audio files if needed
QMAKE_POST_LINK += && cp -rf $$BASEDIR/audio $$TARGETDIR/qgroundcontrol.app/Contents/MacOs
/.
QMAKE_POST_LINK += && cp -rf $$BASEDIR/audio $$TARGETDIR/qgroundcontrol.app/Contents/MacOs
# Copy google earth starter file
QMAKE_POST_LINK += && cp -f $$BASEDIR/images/earth.html $$TARGETDIR/qgroundcontrol.app/Contents/MacOs
/.
QMAKE_POST_LINK += && cp -f $$BASEDIR/images/earth.html $$TARGETDIR/qgroundcontrol.app/Contents/MacOs
# Copy model files
#QMAKE_POST_LINK += && cp -f $$BASEDIR/models/*.dae $$TARGETDIR/qgroundcontrol.app/Contents/MacOs
/.
#QMAKE_POST_LINK += && cp -f $$BASEDIR/models/*.dae $$TARGETDIR/qgroundcontrol.app/Contents/MacOs
exists(/Library/Frameworks/osg.framework):exists(/Library/Frameworks/OpenThreads.framework) {
# No check for GLUT.framework since it's a MAC default
...
...
src/comm/MAVLinkSimulationLink.cc
View file @
e99ffb3d
...
...
@@ -564,8 +564,8 @@ void MAVLinkSimulationLink::mainloop()
// uint8_t posZControl = 0;
// uint8_t posYawControl = 1;
uint8_t
gpsLock
=
2
;
uint8_t
visLock
=
3
;
//
uint8_t gpsLock = 2;
//
uint8_t visLock = 3;
//uint8_t posLock = qMax(gpsLock, visLock);
#ifdef MAVLINK_ENABLED_PIXHAWK
...
...
src/uas/PxQuadMAV.cc
View file @
e99ffb3d
...
...
@@ -41,7 +41,7 @@ void PxQuadMAV::receiveMessage(LinkInterface* link, mavlink_message_t message)
{
// Let UAS handle the default message set
UAS
::
receiveMessage
(
link
,
message
);
mavlink_message_t
*
msg
=
&
message
;
//
mavlink_message_t* msg = &message;
//qDebug() << "PX RECEIVED" << msg->sysid << msg->compid << msg->msgid;
...
...
src/ui/map3D/QOSGWidget.h
View file @
e99ffb3d
...
...
@@ -158,7 +158,7 @@ public:
_timer
.
start
(
1000
.
0
f
/
fps
);
}
virtual
void
paintEvent
(
QPaintEvent
*
event
)
{
frame
();
}
virtual
void
paintEvent
(
QPaintEvent
*
event
)
{
Q_UNUSED
(
event
);
frame
();
}
void
keyPressEvent
(
QKeyEvent
*
event
)
{
...
...
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