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

576b8cc2

Commit 576b8cc2 authored 14 years ago by lm

Downloads
- Plain Diff

Merge branch 'master' of git@pixhawk.ethz.ch:qgroundcontrol

parents 1c6b362e 55ae8c09

Loading

Changes 11

Hide whitespace changes

Inline Side-by-side

Showing

src/comm/MAVLinkProtocol.cc 4 additions, 1 deletion

src/comm/MAVLinkProtocol.cc
src/uas/UAS.cc 18 additions, 8 deletions

src/uas/UAS.cc
src/uas/UASWaypointManager.cc 75 additions, 13 deletions

src/uas/UASWaypointManager.cc
src/uas/UASWaypointManager.h 38 additions, 4 deletions

src/uas/UASWaypointManager.h
src/ui/HSIDisplay.cc 12 additions, 4 deletions

src/ui/HSIDisplay.cc
src/ui/HSIDisplay.h 3 additions, 1 deletion

src/ui/HSIDisplay.h
src/ui/WaypointList.cc 28 additions, 66 deletions

src/ui/WaypointList.cc
src/ui/WaypointList.h 7 additions, 11 deletions

src/ui/WaypointList.h
src/ui/WaypointView.cc 33 additions, 12 deletions

src/ui/WaypointView.cc
src/ui/WaypointView.h 7 additions, 7 deletions

src/ui/WaypointView.h
src/ui/WaypointView.ui 59 additions, 5 deletions

src/ui/WaypointView.ui

with 284 additions and 132 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