Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

Q

qgroundcontrol
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Releases
- Model registry
- Environments
- Incidents

Snippets Groups Projects

bfae98b7

Commit bfae98b7 authored 10 years ago by Thomas Gubler

Downloads
- Plain Diff

Merge remote-tracking branch 'upstream/master' into fgfsrate

parents db2d6f72 323d162e

Branches

No related tags found

Loading

Changes 23

Hide whitespace changes

Inline Side-by-side

Showing

QGCExternalLibs.pri 3 additions, 2 deletions

QGCExternalLibs.pri
qgroundcontrol.pro 6 additions, 4 deletions

qgroundcontrol.pro
src/CmdLineOptParser.cc 59 additions, 0 deletions

src/CmdLineOptParser.cc
src/CmdLineOptParser.h 46 additions, 0 deletions

src/CmdLineOptParser.h
src/QGCCore.cc 19 additions, 5 deletions

src/QGCCore.cc
src/comm/LinkInterface.h 2 additions, 0 deletions

src/comm/LinkInterface.h
src/comm/MAVLinkProtocol.cc 21 additions, 9 deletions

src/comm/MAVLinkProtocol.cc
src/comm/MAVLinkProtocol.h 3 additions, 1 deletion

src/comm/MAVLinkProtocol.h
src/comm/QGCXPlaneLink.cc 7 additions, 3 deletions

src/comm/QGCXPlaneLink.cc
src/comm/QGCXPlaneLink.h 1 addition, 0 deletions

src/comm/QGCXPlaneLink.h
src/configuration.h 1 addition, 1 deletion

src/configuration.h
src/main.cc 39 additions, 10 deletions

src/main.cc
src/qgcunittest/UASUnitTest.cc 6 additions, 4 deletions

src/qgcunittest/UASUnitTest.cc
src/uas/QGCMAVLinkUASFactory.cc 6 additions, 12 deletions

src/uas/QGCMAVLinkUASFactory.cc
src/uas/QGCUASWorker.cc 24 additions, 0 deletions

src/uas/QGCUASWorker.cc
src/uas/QGCUASWorker.h 20 additions, 0 deletions

src/uas/QGCUASWorker.h
src/uas/UAS.cc 19 additions, 18 deletions

src/uas/UAS.cc
src/uas/UAS.h 2 additions, 1 deletion

src/uas/UAS.h
src/ui/MainWindow.cc 2 additions, 1 deletion

src/ui/MainWindow.cc
src/ui/PrimaryFlightDisplay.cc 57 additions, 3 deletions

src/ui/PrimaryFlightDisplay.cc

with 343 additions and 74 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment