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

354c6259

Commit 354c6259 authored 9 years ago by Gus Grubba

Downloads
- Plain Diff

Merge pull request #2195 from dogmaphobic/flowImage

PX4FLOW Sensor Support. @LorenzMeier Can you please try this and see if the image comes across fine?

parents 139167b1 27a4837c

Loading

Changes 17

Hide whitespace changes

Inline Side-by-side

Showing

QGCApplication.pro 2 additions, 2 deletions

QGCApplication.pro
qgroundcontrol.qrc 75 additions, 70 deletions

qgroundcontrol.qrc
src/QGCQmlWidgetHolder.cpp 14 additions, 8 deletions

src/QGCQmlWidgetHolder.cpp
src/QGCQmlWidgetHolder.h 13 additions, 10 deletions

src/QGCQmlWidgetHolder.h
src/QGCToolbox.cc 4 additions, 0 deletions

src/QGCToolbox.cc
src/QGCToolbox.h 31 additions, 28 deletions

src/QGCToolbox.h
src/QmlControls/QGCImageProvider.cc 97 additions, 0 deletions

src/QmlControls/QGCImageProvider.cc
src/QmlControls/QGCImageProvider.h 22 additions, 13 deletions

src/QmlControls/QGCImageProvider.h
src/QmlControls/SubMenuButton.qml 1 addition, 0 deletions

src/QmlControls/SubMenuButton.qml
src/Vehicle/MultiVehicleManager.cc 33 additions, 30 deletions

src/Vehicle/MultiVehicleManager.cc
src/Vehicle/MultiVehicleManager.h 31 additions, 30 deletions

src/Vehicle/MultiVehicleManager.h
src/Vehicle/Vehicle.cc 81 additions, 66 deletions

src/Vehicle/Vehicle.cc
src/Vehicle/Vehicle.h 64 additions, 57 deletions

src/Vehicle/Vehicle.h
src/VehicleSetup/PX4FlowSensor.qml 64 additions, 0 deletions

src/VehicleSetup/PX4FlowSensor.qml
src/VehicleSetup/SetupView.qml 15 additions, 0 deletions

src/VehicleSetup/SetupView.qml
src/comm/MockLink.cc 30 additions, 30 deletions

src/comm/MockLink.cc
src/ui/MainWindow.cc 20 additions, 3 deletions

src/ui/MainWindow.cc

with 597 additions and 347 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