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

fb7d8413

Commit fb7d8413 authored 11 years ago by Lorenz Meier

Downloads
- Plain Diff

Merge branch 'new_state_machine_modes' of https://github.com/DrTon/qgroundcontrol into config

parents c5bed07a 8541598f

Loading

Changes 5

Hide whitespace changes

Inline Side-by-side

Showing

src/uas/UAS.cc 69 additions, 99 deletions

src/uas/UAS.cc
src/uas/UAS.h 3 additions, 6 deletions

src/uas/UAS.h
src/uas/UASInterface.h 1 addition, 1 deletion

src/uas/UASInterface.h
src/ui/uas/UASControlWidget.cc 114 additions, 88 deletions

src/ui/uas/UASControlWidget.cc
src/ui/uas/UASControlWidget.h 22 additions, 6 deletions

src/ui/uas/UASControlWidget.h

with 209 additions and 200 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