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

93a465fc

Commit 93a465fc authored 12 years ago by Lorenz Meier

Downloads
- Plain Diff

Merge branch 'master' of github.com:mavlink/qgroundcontrol into sensor_hil

parents 8df3fa95 3935c549

Branches

No related tags found

Loading

Changes 13

Hide whitespace changes

Inline Side-by-side

Showing

qgroundcontrol.pro 5 additions, 0 deletions

qgroundcontrol.pro
src/comm/MAVLinkProtocol.cc 5 additions, 2 deletions

src/comm/MAVLinkProtocol.cc
src/comm/QGCFlightGearLink.cc 43 additions, 37 deletions

src/comm/QGCFlightGearLink.cc
src/comm/QGCJSBSimLink.cc 422 additions, 0 deletions

src/comm/QGCJSBSimLink.cc
src/comm/QGCJSBSimLink.h 153 additions, 0 deletions

src/comm/QGCJSBSimLink.h
src/uas/UAS.cc 27 additions, 0 deletions

src/uas/UAS.cc
src/uas/UAS.h 2 additions, 0 deletions

src/uas/UAS.h
src/ui/HUD.cc 10 additions, 8 deletions

src/ui/HUD.cc
src/ui/QGCHilConfiguration.cc 15 additions, 1 deletion

src/ui/QGCHilConfiguration.cc
src/ui/QGCHilConfiguration.ui 6 additions, 1 deletion

src/ui/QGCHilConfiguration.ui
src/ui/QGCHilJSBSimConfiguration.cc 49 additions, 0 deletions

src/ui/QGCHilJSBSimConfiguration.cc
src/ui/QGCHilJSBSimConfiguration.h 33 additions, 0 deletions

src/ui/QGCHilJSBSimConfiguration.h
src/ui/QGCHilJSBSimConfiguration.ui 99 additions, 0 deletions

src/ui/QGCHilJSBSimConfiguration.ui

with 869 additions and 49 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