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

d39079b9

Commit d39079b9 authored 14 years ago by hengli

Downloads
- Plain Diff

Merge branch 'dev' of pixhawk.ethz.ch:qgroundcontrol into dev

parents 17cb2805 efc0e3c6

Loading

Changes 15

Hide whitespace changes

Inline Side-by-side

Showing

.gitignore 1 addition, 0 deletions

.gitignore
qgroundcontrol.pri 35 additions, 46 deletions

qgroundcontrol.pri
src/Waypoint.cc 1 addition, 2 deletions

src/Waypoint.cc
src/comm/MAVLinkProtocol.cc 1 addition, 1 deletion

src/comm/MAVLinkProtocol.cc
src/uas/UAS.cc 37 additions, 0 deletions

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

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

src/uas/UASInterface.h
src/uas/UASWaypointManager.cc 2 additions, 1 deletion

src/uas/UASWaypointManager.cc
src/ui/UASControl.ui 27 additions, 10 deletions

src/ui/UASControl.ui
src/ui/WaypointList.cc 0 additions, 2 deletions

src/ui/WaypointList.cc
src/ui/WaypointView.cc 11 additions, 8 deletions

src/ui/WaypointView.cc
src/ui/map3D/QGCGoogleEarthView.cc 12 additions, 3 deletions

src/ui/map3D/QGCGoogleEarthView.cc
src/ui/map3D/QGCGoogleEarthView.h 3 additions, 2 deletions

src/ui/map3D/QGCGoogleEarthView.h
src/ui/uas/UASControlWidget.cc 2 additions, 0 deletions

src/ui/uas/UASControlWidget.cc
src/ui/uas/UASView.cc 20 additions, 0 deletions

src/ui/uas/UASView.cc

with 156 additions and 75 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