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

* 'master' of https://github.com/mavlink/qgroundcontrol: (37 commits)
  Update ISSUE_TEMPLATE.md
  Update ISSUE_TEMPLATE.md
  Create ISSUE_TEMPLATE.md
  Revert "Remove FileManager unit test"
  Revert "Temp removal of Onboard File"
  FileManager: fix upload complete
  QGCUASFileView.cc: fix upload complete
  Flight display: Fixed TypeErrors on startup without gstream installed
  Fix timeout logic
  10 sec timeout on vehicle
  Stack callsign below altitude
  Flight display: Create property variable
  Flight display: Remove video record button when gstreamer is not installed
  Add missing lib
  Flight display: Add callsign to transponders
  Add missing lib
  Better display of vehicle indicators for multi-vehicle
  Add support for ADSB vehicle display
  travis-ci fix indentation
  travis-ci fix google play deploy and quiet wget
  ...

.travis.yml

@@ -72,7 +72,7 @@ before_install:
 
   # install ccache for osx/ios
   - if [ "${TRAVIS_OS_NAME}" = "osx" ]; then
-        wget https://s3.amazonaws.com/px4-travis/toolchain/macos/ccache &&
+        wget --quiet https://s3.amazonaws.com/px4-travis/toolchain/macos/ccache &&
         chmod +x ccache && sudo mv ccache /usr/local/bin;
     fi
 
@@ -89,7 +89,7 @@ before_install:
 install:
   # linux dependencies: qt
   - if [ "${SPEC}" = "linux-g++-64" ]; then
-        wget https://s3-us-west-2.amazonaws.com/qgroundcontrol/dependencies/Qt5.7.1-linux-min.tar.bz2 &&
+        wget --quiet https://s3-us-west-2.amazonaws.com/qgroundcontrol/dependencies/Qt5.7.1-linux-min.tar.bz2 &&
         tar jxf Qt5.7.1-linux-min.tar.bz2 -C /tmp &&
         export PATH=/tmp/Qt5.7-linux/5.7/gcc_64/bin:$PATH &&
         export DISPLAY=:99.0 &&
@@ -99,12 +99,12 @@ install:
 
   # android dependencies: qt, gstreamer, android-ndk
   - if [ "${SPEC}" = "android-g++" ]; then
-        wget https://s3-us-west-2.amazonaws.com/qgroundcontrol/dependencies/Qt5.7.1-android-min.tar.bz2 &&
+        wget --quiet https://s3-us-west-2.amazonaws.com/qgroundcontrol/dependencies/Qt5.7.1-android-min.tar.bz2 &&
         tar jxf Qt5.7.1-android-min.tar.bz2 -C /tmp &&
-        wget https://s3-us-west-2.amazonaws.com/qgroundcontrol/dependencies/gstreamer-1.0-android-armv7-1.5.2.tar.bz2 &&
+        wget --quiet https://s3-us-west-2.amazonaws.com/qgroundcontrol/dependencies/gstreamer-1.0-android-armv7-1.5.2.tar.bz2 &&
         mkdir -p ${TRAVIS_BUILD_DIR}/gstreamer-1.0-android-armv7-1.5.2 &&
         tar jxf gstreamer-1.0-android-armv7-1.5.2.tar.bz2 -C ${TRAVIS_BUILD_DIR}/gstreamer-1.0-android-armv7-1.5.2 &&
-        wget http://dl.google.com/android/ndk/android-ndk-r10e-linux-x86_64.bin &&
+        wget --quiet http://dl.google.com/android/ndk/android-ndk-r10e-linux-x86_64.bin &&
         chmod +x android-ndk-r10e-linux-x86_64.bin &&
         ./android-ndk-r10e-linux-x86_64.bin > /dev/null &&
         export ANDROID_NDK_ROOT=`pwd`/android-ndk-r10e &&
@@ -115,13 +115,13 @@ install:
 
   # osx dependencies: qt, gstreamer, gstreamer-devel
   - if [ "${SPEC}" = "macx-clang" ]; then
-        wget https://s3-us-west-2.amazonaws.com/qgroundcontrol/dependencies/Qt5.7.1-mac-clang-min.tar.bz2 &&
+        wget --quiet https://s3-us-west-2.amazonaws.com/qgroundcontrol/dependencies/Qt5.7.1-mac-clang-min.tar.bz2 &&
         tar jxf Qt5.7.1-mac-clang-min.tar.bz2 -C /tmp &&
-        wget https://s3-us-west-2.amazonaws.com/qgroundcontrol/dependencies/gstreamer-1.0-1.5.2-x86_64.pkg &&
+        wget --quiet https://s3-us-west-2.amazonaws.com/qgroundcontrol/dependencies/gstreamer-1.0-1.5.2-x86_64.pkg &&
         sudo installer -verboseR -pkg gstreamer-1.0-1.5.2-x86_64.pkg -target / &&
-        wget https://s3-us-west-2.amazonaws.com/qgroundcontrol/dependencies/gstreamer-1.0-devel-1.5.2-x86_64.pkg &&
+        wget --quiet https://s3-us-west-2.amazonaws.com/qgroundcontrol/dependencies/gstreamer-1.0-devel-1.5.2-x86_64.pkg &&
         sudo installer -verboseR -pkg gstreamer-1.0-devel-1.5.2-x86_64.pkg -target / &&
-        wget https://s3-us-west-2.amazonaws.com/qgroundcontrol/dependencies/osx-gstreamer.tar.bz2 &&
+        wget --quiet https://s3-us-west-2.amazonaws.com/qgroundcontrol/dependencies/osx-gstreamer.tar.bz2 &&
         sudo tar jxf osx-gstreamer.tar.bz2 -C /Library/Frameworks &&
         export QT_DIR=Qt5.7-mac-clang/5.7/clang_64 &&
         export QT_QPA_PLATFORM_PLUGIN_PATH=/tmp/$QT_DIR/plugins &&
@@ -132,7 +132,7 @@ install:
 
   # ios dependencies: qt, TODO: add gstreamer
   - if [ "${SPEC}" = "macx-ios-clang" ]; then
-        wget https://s3-us-west-2.amazonaws.com/qgroundcontrol/dependencies/Qt5.8.0-ios-min.tar.bz2 &&
+        wget --quiet https://s3-us-west-2.amazonaws.com/qgroundcontrol/dependencies/Qt5.8.0-ios-min.tar.bz2 &&
         tar jxf Qt5.8.0-ios-min.tar.bz2 -C /tmp &&
         export IOS_CCACHE_CC=`/usr/bin/xcrun -sdk iphoneos -find clang` &&
         export IOS_CCACHE_CXX=`/usr/bin/xcrun -sdk iphoneos -find clang++` &&
@@ -145,8 +145,8 @@ before_script:
   - cd ${TRAVIS_BUILD_DIR}
 
   # grab latest PX4 parameter and airframe metadata
-  - wget http://px4-travis.s3.amazonaws.com/Firmware/master/parameters.xml -O src/FirmwarePlugin/PX4/PX4ParameterFactMetaData.xml
-  - wget http://px4-travis.s3.amazonaws.com/Firmware/master/airframes.xml -O src/AutoPilotPlugins/PX4/AirframeFactMetaData.xml
+  - wget --quiet http://px4-travis.s3.amazonaws.com/Firmware/master/parameters.xml -O src/FirmwarePlugin/PX4/PX4ParameterFactMetaData.xml
+  - wget --quiet http://px4-travis.s3.amazonaws.com/Firmware/master/airframes.xml -O src/AutoPilotPlugins/PX4/AirframeFactMetaData.xml
 
   # switch android config from installer to release if the android storepass isn't available
   - if [[ "${SPEC}" = "android-g++" && "${CONFIG}" = "installer" && -z ${ANDROID_STOREPASS} ]]; then
@@ -156,7 +156,7 @@ before_script:
   # insert QGC version in AndroidManifest.xml
   - if [ "${SPEC}" = "android-g++" ]; then
         git remote set-branches origin 'master' &&
-        git fetch origin master &&
+        git fetch --tags origin master &&
         ./tools/update_android_version.sh;
     fi
 
@@ -183,12 +183,15 @@ after_success:
   - cd ${TRAVIS_BUILD_DIR}
 
   # master development builds to beta track
-  # tagged releases first to beta track then manually move to production
   - GOOGLE_PLAY_PKG=org.mavlink.qgroundcontrolbeta
   - if [ "${TRAVIS_TAG}" ]; then
         GOOGLE_PLAY_PKG=org.mavlink.qgroundcontrol;
+    elif [ "${TRAVIS_BRANCH}" = "master" ]; then
+        GOOGLE_PLAY_PKG=org.mavlink.qgroundcontrolbeta;
+    else
+        GOOGLE_PLAY_PKG=none;
     fi
-  - if [[ "${SPEC}" = "android-g++" && "${TRAVIS_PULL_REQUEST}" = "false" && "${TRAVIS_BRANCH}" = "master" ]]; then
+  - if [[ "${SPEC}" = "android-g++" && "${TRAVIS_PULL_REQUEST}" = "false" && "${GOOGLE_PLAY_PKG}" != "none" ]]; then
         pip install --user google-api-python-client PyOpenSSL &&
         openssl aes-256-cbc -K $encrypted_25db6eb7c3fd_key -iv $encrypted_25db6eb7c3fd_iv -in android/Google_Play_Android_Developer-4432a3c4f5d1.json.enc -out android/Google_Play_Android_Developer-4432a3c4f5d1.json -d &&
         ./tools/google_play_upload.py production ${GOOGLE_PLAY_PKG} ${SHADOW_BUILD_DIR}/release/package/QGroundControl.apk;

ISSUE_TEMPLATE.md

+Note: GitHub Issues are for bugs or feature requests only. Do not enter Issues for questions regarding usage or problems building QGC yourself. 
+Use the appropriate support channel instead: http://qgroundcontrol.com/#resources.
+
+Delete all of this text when create a real bug Issue.

QGCInstaller.pri

@@ -35,7 +35,7 @@ installer {
         QMAKE_POST_LINK += && hdiutil create -verbose -stretch 4g -layout SPUD -srcfolder $${DESTDIR}/$${TARGET}.app -volname $${TARGET} $${DESTDIR}/package/$${TARGET}.dmg
     }
     WindowsBuild {
-        QMAKE_POST_LINK += $$escape_expand(\\n) cd $$BASEDIR_WIN && $$quote("\"C:\\Program Files \(x86\)\\NSIS\\makensis.exe\"" /DAPPNAME="\"$${QGC_APP_NAME}\"" /DEXENAME="\"$${TARGET}\"" /DORGNAME="\"$${QGC_ORG_NAME}\"" /DDESTDIR=$${DESTDIR} /NOCD "\"/XOutFile $${DESTDIR_WIN}\\$${TARGET}-installer.exe\"" "$$BASEDIR_WIN\\deploy\\qgroundcontrol_installer.nsi")
+        QMAKE_POST_LINK += $$escape_expand(\\n) cd $$BASEDIR_WIN && $$quote("\"C:\\Program Files \(x86\)\\NSIS\\makensis.exe\"" /DINSTALLER_ICON="\"$${QGC_INSTALLER_ICON}\"" /DHEADER_BITMAP="\"$${QGC_INSTALLER_HEADER_BITMAP}\"" /DAPPNAME="\"$${QGC_APP_NAME}\"" /DEXENAME="\"$${TARGET}\"" /DORGNAME="\"$${QGC_ORG_NAME}\"" /DDESTDIR=$${DESTDIR} /NOCD "\"/XOutFile $${DESTDIR_WIN}\\$${TARGET}-installer.exe\"" "$$BASEDIR_WIN\\deploy\\qgroundcontrol_installer.nsi")
         OTHER_FILES += deploy/qgroundcontrol_installer.nsi
     }
     LinuxBuild {

QGCSetup.pri

@@ -114,6 +114,8 @@ LinuxBuild {
         libQt5PrintSupport.so.5 \
         libQt5Qml.so.5 \
         libQt5Quick.so.5 \
+        libQt5QuickControls2.so.5 \
+        libQt5QuickTemplates2.so.5 \
         libQt5QuickWidgets.so.5 \
         libQt5SerialPort.so.5 \
         libQt5Sql.so.5 \

deploy/qgroundcontrol_installer.nsi

@@ -44,9 +44,9 @@ InstallDir "$PROGRAMFILES\${APPNAME}"
 SetCompressor /SOLID /FINAL lzma
 
 !define MUI_HEADERIMAGE
-!define MUI_HEADERIMAGE_BITMAP "installheader.bmp";
-!define MUI_ICON "WindowsQGC.ico";
-!define MUI_UNICON "WindowsQGC.ico";
+!define MUI_HEADERIMAGE_BITMAP "${HEADER_BITMAP}";
+!define MUI_ICON "${INSTALLER_ICON}";
+!define MUI_UNICON "${INSTALLER_ICON}";
 
 !insertmacro MUI_PAGE_STARTMENU Application $StartMenuFolder
 !insertmacro MUI_PAGE_DIRECTORY

ios/iOSForAppStore-Info-Source.plist

@@ -85,6 +85,8 @@
 	<string>Ground Station Location</string>
 	<key>UILaunchStoryboardName</key>
 	<string>QGCLaunchScreen</string>
+    <key>NSBluetoothPeripheralUsageDescription</key>
+    <string>QGroundControl would like to use bluetooth.</string>    
 	<key>UIRequiresFullScreen</key>
 	<true/>
 	<key>UISupportedInterfaceOrientations</key>

qgcresources.qrc

@@ -113,6 +113,7 @@
         <file alias="scale_end.png">src/FlightMap/Images/scale_end.png</file>
         <file alias="scaleLight.png">src/FlightMap/Images/scaleLight.png</file>
         <file alias="scale_endLight.png">src/FlightMap/Images/scale_endLight.png</file>
+        <file alias="adsbVehicle.svg">src/FlightMap/Images/adsbVehicle.svg</file>
         <file alias="vehicleArrowOutline.svg">src/FlightMap/Images/vehicleArrowOutline.svg</file>
         <file alias="vehicleArrowOpaque.svg">src/FlightMap/Images/vehicleArrowOpaque.svg</file>
         <file alias="ZoomPlus.svg">src/FlightMap/Images/ZoomPlus.svg</file>

qgroundcontrol.pro

@@ -55,6 +55,8 @@ iOSBuild {
         count(APP_ERROR, 1) {
             error("Error building .plist file. 'ForAppStore' builds are only possible through the official build system.")
         }
+        QT               += qml-private
+        CONFIG           += qtquickcompiler
         QMAKE_INFO_PLIST  = $${BASEDIR}/ios/iOSForAppStore-Info.plist
         OTHER_FILES      += $${BASEDIR}/ios/iOSForAppStore-Info.plist
     } else {
@@ -82,6 +84,10 @@ QGC_ORG_DOMAIN      = "org.qgroundcontrol"
 QGC_APP_DESCRIPTION = "Open source ground control app provided by QGroundControl dev team"
 QGC_APP_COPYRIGHT   = "Copyright (C) 2017 QGroundControl Development Team. All rights reserved."
 
+WindowsBuild {
+    QGC_INSTALLER_ICON          = "WindowsQGC.ico"
+    QGC_INSTALLER_HEADER_BITMAP = "installheader.bmp"
+}
 
 # Load additional config flags from user_config.pri
 exists(user_config.pri):infile(user_config.pri, CONFIG) {
@@ -830,6 +836,7 @@ HEADERS+= \
     src/FirmwarePlugin/CameraMetaData.h \
     src/FirmwarePlugin/FirmwarePlugin.h \
     src/FirmwarePlugin/FirmwarePluginManager.h \
+    src/Vehicle/ADSBVehicle.h \
     src/Vehicle/MultiVehicleManager.h \
     src/Vehicle/GPSRTKFactGroup.h \
     src/Vehicle/Vehicle.h \
@@ -855,6 +862,7 @@ SOURCES += \
     src/FirmwarePlugin/CameraMetaData.cc \
     src/FirmwarePlugin/FirmwarePlugin.cc \
     src/FirmwarePlugin/FirmwarePluginManager.cc \
+    src/Vehicle/ADSBVehicle.cc \
     src/Vehicle/MultiVehicleManager.cc \
     src/Vehicle/GPSRTKFactGroup.cc \
     src/Vehicle/Vehicle.cc \

src/FirmwarePlugin/APM/ArduCopterFirmwarePlugin.h

@@ -73,7 +73,7 @@ public:
     QString missionFlightMode                   (void) const override { return QString("Auto"); }
     QString rtlFlightMode                       (void) const override { return QString("RTL"); }
     QString landFlightMode                      (void) const override { return QString("Land"); }
-    QString takeControlFlightMode               (void) const override { return QString("Stablize"); }
+    QString takeControlFlightMode               (void) const override { return QString("Loiter"); }
     bool    vehicleYawsToNextWaypointInMission  (const Vehicle* vehicle) const final;
     QString autoDisarmParameter                 (Vehicle* vehicle) final { Q_UNUSED(vehicle); return QStringLiteral("DISARM_DELAY"); }
     void    startMission                        (Vehicle* vehicle) override;

src/FlightDisplay/FlightDisplayView.qml

@@ -43,6 +43,7 @@ QGCView {
     property var    _geoFenceController:    _planMasterController.geoFenceController
     property var    _rallyPointController:  _planMasterController.rallyPointController
     property var    _activeVehicle:         QGroundControl.multiVehicleManager.activeVehicle
+    property var    _videoReceiver:         QGroundControl.videoManager.videoReceiver
     property bool   _mainIsMap:             QGroundControl.videoManager.hasVideo ? QGroundControl.loadBoolGlobalSetting(_mainIsMapKey,  true) : true
     property bool   _isPipVisible:          QGroundControl.videoManager.hasVideo ? QGroundControl.loadBoolGlobalSetting(_PIPVisibleKey, true) : false
     property real   _savedZoomLevel:        0
@@ -331,7 +332,7 @@ QGCView {
 
             QGCRadioButton {
                 exclusiveGroup: multiVehicleSelectorGroup
-                text:           qsTr("Multi-Vehicle (WIP)")
+                text:           qsTr("Multi-Vehicle")
                 color:          mapPal.text
             }
         }
@@ -339,7 +340,7 @@ QGCView {
         FlightDisplayViewWidgets {
             id:                 flightDisplayViewWidgets
             z:                  _panel.z + 4
-            height:             ScreenTools.availableHeight
+            height:             ScreenTools.availableHeight - (singleMultiSelector.visible ? singleMultiSelector.height + _margins : 0)
             anchors.left:       parent.left
             anchors.right:      altitudeSlider.visible ? altitudeSlider.left : parent.right
             anchors.bottom:     parent.bottom
@@ -370,14 +371,14 @@ QGCView {
             anchors.right:      _flightVideo.right
             height:             ScreenTools.defaultFontPixelHeight * 2
             width:              height
-            visible:            QGroundControl.videoManager.videoReceiver.videoRunning && QGroundControl.settingsManager.videoSettings.showRecControl.rawValue
+            visible:            _videoReceiver && _videoReceiver.videoRunning && QGroundControl.settingsManager.videoSettings.showRecControl.rawValue
             opacity:            0.75
 
             Rectangle {
                 anchors.top:        parent.top
                 anchors.bottom:     parent.bottom
                 width:              height
-                radius:             QGroundControl.videoManager && QGroundControl.videoManager.videoReceiver && QGroundControl.videoManager.videoReceiver.recording ? 0 : height
+                radius:             QGroundControl.videoManager && _videoReceiver && _videoReceiver.recording ? 0 : height
                 color:              "red"
             }
 
@@ -394,21 +395,21 @@ QGCView {
 
             MouseArea {
                 anchors.fill:   parent
-                onClicked:      QGroundControl.videoManager.videoReceiver && QGroundControl.videoManager.videoReceiver.recording ? QGroundControl.videoManager.videoReceiver.stopRecording() : QGroundControl.videoManager.videoReceiver.startRecording()
+                onClicked:      _videoReceiver && _videoReceiver.recording ? _videoReceiver.stopRecording() : _videoReceiver.startRecording()
             }
         }
 
         MultiVehicleList {
-            anchors.margins:    _margins
-            anchors.top:        singleMultiSelector.bottom
-            anchors.right:      parent.right
-            anchors.bottom:     parent.bottom
-            width:              ScreenTools.defaultFontPixelWidth * 30
-            visible:            !singleVehicleView.checked
-            z:                  _panel.z + 4
+            anchors.margins:            _margins
+            anchors.top:                singleMultiSelector.bottom
+            anchors.right:              parent.right
+            anchors.bottom:             parent.bottom
+            width:                      ScreenTools.defaultFontPixelWidth * 30
+            visible:                    !singleVehicleView.checked
+            z:                          _panel.z + 4
+            guidedActionsController:    _guidedController
         }
 
-
         //-- Virtual Joystick
         Loader {
             id:                         virtualJoystickMultiTouch

src/FlightDisplay/FlightDisplayViewMap.qml

@@ -184,12 +184,28 @@ FlightMap {
         delegate: VehicleMapItem {
             vehicle:        object
             coordinate:     object.coordinate
-            isSatellite:    flightMap.isSatelliteMap
+            map:            flightMap
             size:           _mainIsMap ? ScreenTools.defaultFontPixelHeight * 3 : ScreenTools.defaultFontPixelHeight
             z:              QGroundControl.zOrderVehicles
         }
     }
 
+    // Add ADSB vehicles to the map
+    MapItemView {
+        model: _activeVehicle ? _activeVehicle.adsbVehicles : 0
+
+        property var _activeVehicle: QGroundControl.multiVehicleManager.activeVehicle
+
+        delegate: VehicleMapItem {
+            coordinate:     object.coordinate
+            altitude:       object.altitude
+            callsign:       object.callsign
+            heading:        object.heading
+            map:            flightMap
+            z:              QGroundControl.zOrderVehicles
+        }
+    }
+
     // Add the mission item visuals to the map
     Repeater {
         model: _mainIsMap ? _missionController.visualItems : 0

src/FlightDisplay/FlightDisplayViewVideo.qml

@@ -25,11 +25,13 @@ Item {
     id: root
     property double _ar:            QGroundControl.settingsManager.videoSettings.aspectRatio.rawValue
     property bool   _showGrid:      QGroundControl.settingsManager.videoSettings.gridLines.rawValue > 0
+    property var    _videoReceiver: QGroundControl.videoManager.videoReceiver
+
     Rectangle {
         id:             noVideo
         anchors.fill:   parent
         color:          Qt.rgba(0,0,0,0.75)
-        visible:        !QGroundControl.videoManager.videoReceiver.videoRunning
+        visible:        !(_videoReceiver && _videoReceiver.videoRunning)
         QGCLabel {
             text:               qsTr("WAITING FOR VIDEO")
             font.family:        ScreenTools.demiboldFontFamily
@@ -41,20 +43,20 @@ Item {
     Rectangle {
         anchors.fill:   parent
         color:          "black"
-        visible:        QGroundControl.videoManager.videoReceiver.videoRunning
+        visible:        _videoReceiver && _videoReceiver.videoRunning
         QGCVideoBackground {
             id:             videoContent
             height:         parent.height
             width:          _ar != 0.0 ? height * _ar : parent.width
             anchors.centerIn: parent
-            receiver:       QGroundControl.videoManager.videoReceiver
-            display:        QGroundControl.videoManager.videoReceiver.videoSurface
-            visible:        QGroundControl.videoManager.videoReceiver.videoRunning
+            receiver:       _videoReceiver
+            display:        _videoReceiver && _videoReceiver.videoSurface
+            visible:        _videoReceiver && _videoReceiver.videoRunning
             Connections {
-                target:         QGroundControl.videoManager.videoReceiver
+                target:         _videoReceiver
                 onImageFileChanged: {
                     videoContent.grabToImage(function(result) {
-                        if (!result.saveToFile(QGroundControl.videoManager.videoReceiver.imageFile)) {
+                        if (!result.saveToFile(_videoReceiver.imageFile)) {
                             console.error('Error capturing video frame');
                         }
                     });

src/FlightDisplay/GuidedActionsController.qml

@@ -64,6 +64,7 @@ Item {
     readonly property string orbitMessage:              qsTr("Orbit the vehicle around the current location.")
     readonly property string landAbortMessage:          qsTr("Abort the landing sequence.")
     readonly property string pauseMessage:              qsTr("Pause the vehicle at it's current position.")
+    readonly property string mvPauseMessage:            qsTr("Pause all vehicles at their current position.")
 
     readonly property int actionRTL:                1
     readonly property int actionLand:               2
@@ -81,6 +82,8 @@ Item {
     readonly property int actionResumeMission:      14
     readonly property int actionResumeMissionReady: 15
     readonly property int actionPause:              16
+    readonly property int actionMVPause:            17
+    readonly property int actionMVStartMission:     18
 
     property bool showEmergenyStop:     !_hideEmergenyStop && _activeVehicle && _vehicleArmed && _vehicleFlying
     property bool showArm:              _activeVehicle && !_vehicleArmed
@@ -90,7 +93,7 @@ Item {
     property bool showLand:             _activeVehicle && _activeVehicle.guidedModeSupported && _vehicleArmed && !_activeVehicle.fixedWing && !_vehicleInLandMode
     property bool showStartMission:     _activeVehicle && _missionAvailable && !_missionActive && !_vehicleFlying
     property bool showContinueMission:  _activeVehicle && _missionAvailable && !_missionActive && _vehicleFlying && (_currentMissionIndex < missionController.visualItems.count - 1)
-    property bool showResumeMission:    _activeVehicle && !_vehicleFlying && _missionAvailable && _resumeMissionIndex > 0 && (_resumeMissionIndex < missionController.visualItems.count - 2)
+    property bool showResumeMission:    _activeVehicle && !_vehicleArmed && _vehicleWasFlying && _missionAvailable && _resumeMissionIndex > 0 && (_resumeMissionIndex < missionController.visualItems.count - 2)
     property bool showPause:            _activeVehicle && _vehicleArmed && _activeVehicle.pauseVehicleSupported && _vehicleFlying && !_vehiclePaused
     property bool showChangeAlt:        (_activeVehicle && _vehicleFlying) && _activeVehicle.guidedModeSupported && _vehicleArmed && !_missionActive
     property bool showOrbit:            !_hideOrbit && _activeVehicle && _vehicleFlying && _activeVehicle.orbitModeSupported && _vehicleArmed && !_missionActive
@@ -114,6 +117,7 @@ Item {
     property int    _resumeMissionIndex:    missionController.resumeMissionIndex
     property bool   _hideEmergenyStop:      !QGroundControl.corePlugin.options.guidedBarShowEmergencyStop
     property bool   _hideOrbit:             !QGroundControl.corePlugin.options.guidedBarShowOrbit
+    property bool   _vehicleWasFlying:      false
 
     // This is a temporary hack to debug a problem with RTL and Pause being disabled at the wrong time
 
@@ -128,7 +132,6 @@ Item {
     Component.onCompleted: _outputState()
     on_ActiveVehicleChanged: _outputState()
     on_VehicleArmedChanged: _outputState()
-    on_VehicleFlyingChanged: _outputState()
     on_VehicleInRTLModeChanged: _outputState()
     on_VehiclePausedChanged: _outputState()
     on__FlightModeChanged: _outputState()
@@ -137,6 +140,15 @@ Item {
 
     // End of hack
 
+    on_VehicleFlyingChanged: {
+        _outputState()
+        if (!_vehicleFlying) {
+            // We use _vehicleWasFLying to help trigger Resume Mission only if the vehicle actually flew and came back down.
+            // Otherwise it may trigger during the Start Mission sequence due to signal ordering or armed and resume mission index.
+            _vehicleWasFlying = true
+        }
+    }
+
     property var    _actionData
 
     on_CurrentMissionIndexChanged: console.log("_currentMissionIndex", _currentMissionIndex)
@@ -186,6 +198,11 @@ Item {
             confirmDialog.message = startMissionMessage
             confirmDialog.hideTrigger = Qt.binding(function() { return !showStartMission })
             break;
+        case actionMVStartMission:
+            confirmDialog.title = startMissionTitle
+            confirmDialog.message = startMissionMessage
+            confirmDialog.hideTrigger = true
+            break;
         case actionContinueMission:
             confirmDialog.title = continueMissionTitle
             confirmDialog.message = continueMissionMessage
@@ -242,6 +259,11 @@ Item {
             confirmDialog.message = pauseMessage
             confirmDialog.hideTrigger = Qt.binding(function() { return !showPause })
             break;
+        case actionMVPause:
+            confirmDialog.title = pauseTitle
+            confirmDialog.message = mvPauseMessage
+            confirmDialog.hideTrigger = true
+            break;
         default:
             console.warn("Unknown actionCode", actionCode)
             return
@@ -265,12 +287,20 @@ Item {
             missionController.resumeMission(missionController.resumeMissionIndex)
             break
         case actionResumeMissionReady:
+            _vehicleWasFlying = false
             _activeVehicle.startMission()
             break
         case actionStartMission:
         case actionContinueMission:
             _activeVehicle.startMission()
             break
+        case actionMVStartMission:
+            var rgVehicle = QGroundControl.multiVehicleManager.vehicles
+            for (var i=0; i<rgVehicle.count; i++) {
+                var vehicle = rgVehicle.get(i)
+                vehicle.startMission()
+            }
+            break
         case actionArm:
             _activeVehicle.armed = true
             break
@@ -298,6 +328,13 @@ Item {
         case actionPause:
             _activeVehicle.pauseVehicle()
             break
+        case actionMVPause:
+            var rgVehicle = QGroundControl.multiVehicleManager.vehicles
+            for (var i=0; i<rgVehicle.count; i++) {
+                var vehicle = rgVehicle.get(i)
+                vehicle.pauseVehicle()
+            }
+            break
         default:
             console.warn(qsTr("Internal error: unknown actionCode"), actionCode)
             break

src/FlightDisplay/MultiVehicleList.qml

@@ -18,118 +18,163 @@ import QGroundControl.Palette       1.0
 import QGroundControl.Vehicle       1.0
 import QGroundControl.FlightMap     1.0
 
-QGCListView {
-    id:             missionItemEditorListView
-    spacing:        ScreenTools.defaultFontPixelHeight / 2
-    orientation:    ListView.Vertical
-    model:          QGroundControl.multiVehicleManager.vehicles
-    cacheBuffer:    _cacheBuffer < 0 ? 0 : _cacheBuffer
-    clip:           true
-
-    property real _margin:          ScreenTools.defaultFontPixelWidth / 2
-    property real _cacheBuffer:     height * 2
-    property real _widgetHeight:    ScreenTools.defaultFontPixelHeight * 3
-
-    delegate: Rectangle {
-        width:      parent.width
-        height:     innerColumn.y + innerColumn.height + _margin
-        color:      qgcPal.missionItemEditor
-        opacity:    0.8
-        radius:     _margin
-
-        property var    _vehicle:   object
-        property color  _textColor: "black"
-
-        QGCPalette { id: qgcPal }
-
-        Row {
-            id:                 widgetLayout
-            anchors.margins:    _margin
-            anchors.top:        parent.top
-            anchors.right:      parent.right
-            spacing:            ScreenTools.defaultFontPixelWidth / 2
-            layoutDirection:    Qt.RightToLeft
-
-            QGCCompassWidget {
-                size:       _widgetHeight
-                vehicle:    _vehicle
-            }
-
-            QGCAttitudeWidget {
-                size:       _widgetHeight
-                vehicle:    _vehicle
-            }
-        }
+Item {
+    property var guidedActionsController
 
-        RowLayout {
-            anchors.top:    widgetLayout.top
-            anchors.bottom: widgetLayout.bottom
-            anchors.left:   parent.left
-            anchors.right:  widgetLayout.left
-            spacing:        ScreenTools.defaultFontPixelWidth / 2
+    property real   _margin:        ScreenTools.defaultFontPixelWidth / 2
+    property real   _widgetHeight:  ScreenTools.defaultFontPixelHeight * 3
+    property color  _textColor:     "black"
+    property real   _rectOpacity:   0.8
 
-            QGCLabel {
-                Layout.alignment:   Qt.AlignTop
-                text:               _vehicle.id
-                color:              _textColor
-            }
+    QGCPalette { id: qgcPal }
 
-            FlightModeMenu {
-                font.pointSize: ScreenTools.largeFontPointSize
-                color:          _textColor
-                activeVehicle:  _vehicle
-            }
-        }
+    NoMouseThroughRectangle {
+        id:             mvCommands
+        anchors.left:   parent.left
+        anchors.right:  parent.right
+        height:         mvCommandsColumn.height + (_margin *2)
+        color:          qgcPal.missionItemEditor
+        opacity:        _rectOpacity
+        radius:         _margin
 
         Column {
-            id:                 innerColumn
+            id:                 mvCommandsColumn
             anchors.margins:    _margin
+            anchors.top:        parent.top
             anchors.left:       parent.left
             anchors.right:      parent.right
-            anchors.top:        widgetLayout.bottom
             spacing:            _margin
 
-            Rectangle {
+            QGCLabel {
                 anchors.left:   parent.left
                 anchors.right:  parent.right
-                height:         5
-                color:          "green"
+                text:           qsTr("The following commands will be applied to all vehicles")
+                color:          _textColor
+                wrapMode:       Text.WordWrap
+                font.pointSize: ScreenTools.smallFontPointSize
             }
 
             Row {
-                spacing: ScreenTools.defaultFontPixelWidth
+                spacing:            _margin
 
                 QGCButton {
-                    text:       "Arm"
-                    visible:    !_vehicle.armed
-                    onClicked:  _vehicle.armed = true
+                    text:       "Pause"
+                    onClicked:  guidedActionsController.confirmAction(guidedActionsController.actionMVPause)
                 }
 
                 QGCButton {
-                    text:       "Start"
-                    visible:    _vehicle.armed && _vehicle.flightMode != _vehicle.missionFlightMode
-                    onClicked:  _vehicle.flightMode = _vehicle.missionFlightMode
+                    text:       "Start Mision"
+                    onClicked:  guidedActionsController.confirmAction(guidedActionsController.actionMVStartMission)
                 }
-
-                QGCButton {
-                    text:       "Stop"
-                    visible:    _vehicle.armed && _vehicle.pauseVehicleSupported
-                    onClicked:  _vehicle.pauseVehicle()
-                }
-
-                QGCButton {
-                    text:       "RTL"
-                    visible:    _vehicle.armed && _vehicle.flightMode != _vehicle.rtlFlightMode
-                    onClicked:  _vehicle.flightMode = _vehicle.rtlFlightMode
-                }
-
-                QGCButton {
-                    text:       "Take control"
-                    visible:    _vehicle.armed && _vehicle.flightMode != _vehicle.takeControlFlightMode
-                    onClicked:  _vehicle.flightMode = _vehicle.takeControlFlightMode
-                }
-
             }
         }
     }
-} // QGCListView
+
+    QGCListView {
+        id:                 missionItemEditorListView
+        anchors.left:       parent.left
+        anchors.right:      parent.right
+        anchors.topMargin:  _margin
+        anchors.top:        mvCommands.bottom
+        anchors.bottom:     parent.bottom
+        spacing:            ScreenTools.defaultFontPixelHeight / 2
+        orientation:        ListView.Vertical
+        model:              QGroundControl.multiVehicleManager.vehicles
+        cacheBuffer:        _cacheBuffer < 0 ? 0 : _cacheBuffer
+        clip:               true
+
+        property real _cacheBuffer:     height * 2
+
+        delegate: Rectangle {
+            width:      parent.width
+            height:     innerColumn.y + innerColumn.height + _margin
+            color:      qgcPal.missionItemEditor
+            opacity:    _rectOpacity
+            radius:     _margin
+
+            property var    _vehicle:   object
+
+            ColumnLayout {
+                id:                 innerColumn
+                anchors.margins:    _margin
+                anchors.top:        parent.top
+                anchors.left:       parent.left
+                anchors.right:      parent.left
+                spacing:            _margin
+
+                RowLayout {
+                    anchors.left:   parent.left
+                    anchors.right:  parent.left
+
+                    QGCLabel {
+                        Layout.alignment:   Qt.AlignTop
+                        text:               _vehicle.id
+                        color:              _textColor
+                    }
+
+                    ColumnLayout {
+                        Layout.alignment:   Qt.AlignCenter
+                        spacing:            _margin
+
+                        FlightModeMenu {
+                            anchors.horizontalCenter:   parent.horizontalCenter
+                            font.pointSize:             ScreenTools.largeFontPointSize
+                            color:                      _textColor
+                            activeVehicle:              _vehicle
+                        }
+
+                        QGCLabel {
+                            anchors.horizontalCenter:   parent.horizontalCenter
+                            text:                       _vehicle.armed ? qsTr("Armed") : qsTr("Disarmed")
+                            color:                      _textColor
+                        }
+                    }
+
+                    QGCCompassWidget {
+                        size:       _widgetHeight
+                        vehicle:    _vehicle
+                    }
+
+                    QGCAttitudeWidget {
+                        size:       _widgetHeight
+                        vehicle:    _vehicle
+                    }
+                } // RowLayout
+
+                Row {
+                    spacing: ScreenTools.defaultFontPixelWidth
+
+                    QGCButton {
+                        text:       "Arm"
+                        visible:    !_vehicle.armed
+                        onClicked:  _vehicle.armed = true
+                    }
+
+                    QGCButton {
+                        text:       "Start Mission"
+                        visible:    _vehicle.armed && _vehicle.flightMode != _vehicle.missionFlightMode
+                        onClicked:  _vehicle.startMission()
+                    }
+
+                    QGCButton {
+                        text:       "Pause"
+                        visible:    _vehicle.armed && _vehicle.pauseVehicleSupported
+                        onClicked:  _vehicle.pauseVehicle()
+                    }
+
+                    QGCButton {
+                        text:       "RTL"
+                        visible:    _vehicle.armed && _vehicle.flightMode != _vehicle.rtlFlightMode
+                        onClicked:  _vehicle.flightMode = _vehicle.rtlFlightMode
+                    }
+
+                    QGCButton {
+                        text:       "Take control"
+                        visible:    _vehicle.armed && _vehicle.flightMode != _vehicle.takeControlFlightMode
+                        onClicked:  _vehicle.flightMode = _vehicle.takeControlFlightMode
+                    }
+                } // Row
+            } // ColumnLayout
+        } // delegate - Rectangle
+    } // QGCListView
+} // Item

src/FlightMap/Images/adsbVehicle.svg

+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Generator: Adobe Illustrator 21.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   id="Layer_1"
+   x="0px"
+   y="0px"
+   viewBox="0 0 72 72"
+   style="enable-background:new 0 0 72 72;"
+   xml:space="preserve"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="adsbVehicle.svg"><metadata
+     id="metadata23"><rdf:RDF><cc:Work
+         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><defs
+     id="defs21" /><sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="664"
+     inkscape:window-height="480"
+     id="namedview19"
+     showgrid="false"
+     inkscape:zoom="3.2777778"
+     inkscape:cx="36"
+     inkscape:cy="36"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="g7" /><style
+     type="text/css"
+     id="style3">
+	.st0{fill:#C72B27;}
+	.st1{fill:#7F0036;}
+	.st2{fill:#EE3424;}
+</style><g
+     id="g5"><g
+       id="g7"><polygon
+         class="st0"
+         points="35.5,2.118 35.5,53.691 1.118,70.882   "
+         id="polygon9"
+         style="fill:#24d3ee;fill-opacity:1" /><path
+         class="st1"
+         d="M35,4.236v49.146L2.236,69.764L35,4.236 M36,0L0,72l36-18V0L36,0z"
+         id="path11" /></g><g
+       id="g13"><polygon
+         class="st2"
+         points="36.5,53.691 36.5,2.118 70.882,70.882   "
+         id="polygon15"
+         style="fill:#24d3ee;fill-opacity:1" /><path
+         class="st1"
+         d="M37,4.236l32.764,65.528L37,53.382V4.236 M36,0v54l36,18L36,0L36,0z"
+         id="path17" /></g></g></svg>
\ No newline at end of file

src/FlightMap/MapItems/VehicleMapItem.qml

@@ -7,38 +7,81 @@
  *
  ****************************************************************************/
 
-
-/// @file
-///     @author Don Gagne <don@thegagnes.com>
-
 import QtQuick          2.3
 import QtLocation       5.3
 import QtPositioning    5.3
 
+import QGroundControl               1.0
 import QGroundControl.ScreenTools   1.0
 import QGroundControl.Vehicle       1.0
+import QGroundControl.Controls      1.0
 
 /// Marker for displaying a vehicle location on the map
 MapQuickItem {
-    property var    vehicle                ///< Vehicle object
-    property bool   isSatellite:    false  ///< true: satellite map is showing
-    property real   size:           ScreenTools.defaultFontPixelHeight * 5
-
-    anchorPoint.x:  vehicleIcon.width  / 2
-    anchorPoint.y:  vehicleIcon.height / 2
-    visible:        vehicle && vehicle.coordinate.isValid
-
-    sourceItem: Image {
-        id:                 vehicleIcon
-        source:             isSatellite ? vehicle.vehicleImageOpaque : vehicle.vehicleImageOutline
-        mipmap:             true
-        width:              size
-        sourceSize.width:   size
-        fillMode:           Image.PreserveAspectFit
-        transform: Rotation {
-            origin.x:       vehicleIcon.width  / 2
-            origin.y:       vehicleIcon.height / 2
-            angle:          vehicle ? vehicle.heading.value : 0
+    property var    vehicle                                                         /// Vehicle object, undefined for ADSB vehicle
+    property var    map
+    property double altitude:       Number.NaN                                      ///< NAN to not show
+    property string callsign:       ""                                              ///< Vehicle callsign
+    property double heading:        vehicle ? vehicle.heading.value : Number.NaN    ///< Vehicle heading, NAN for none
+    property real   size:           _adsbVehicle ? _adsbSize : _uavSize             /// Size for icon
+
+    anchorPoint.x:  vehicleItem.width  / 2
+    anchorPoint.y:  vehicleItem.height / 2
+    visible:        coordinate.isValid
+
+    property bool   _adsbVehicle:   vehicle ? false : true
+    property real   _uavSize:       ScreenTools.defaultFontPixelHeight * 5
+    property real   _adsbSize:      ScreenTools.defaultFontPixelHeight * 1.5
+    property var    _map:           map
+    property bool   _multiVehicle:  QGroundControl.multiVehicleManager.vehicles.count > 1
+
+    sourceItem: Item {
+        id:         vehicleItem
+        width:      vehicleIcon.width
+        height:     vehicleIcon.height
+        opacity:    vehicle ? (vehicle.active ? 1.0 : 0.5) : 1.0
+
+        Image {
+            id:                 vehicleIcon
+            source:             _adsbVehicle ? "/qmlimages/adsbVehicle.svg" : vehicle.vehicleImageOpaque
+            mipmap:             true
+            width:              size
+            sourceSize.width:   size
+            fillMode:           Image.PreserveAspectFit
+
+            transform: Rotation {
+                origin.x:       vehicleIcon.width  / 2
+                origin.y:       vehicleIcon.height / 2
+                angle:          isNaN(heading) ? 0 : heading
+            }
+        }
+
+        QGCMapLabel {
+            id:                         vehicleLabel
+            anchors.top:                parent.bottom
+            anchors.horizontalCenter:   parent.horizontalCenter
+            map:                        _map
+            text:                       vehicleLabelText
+            font.pointSize:             ScreenTools.smallFontPointSize
+            visible:                    _adsbVehicle ? !isNaN(altitude) : _multiVehicle
+
+            property string vehicleLabelText: visible ?
+                                                  (_adsbVehicle ?
+                                                       QGroundControl.metersToAppSettingsDistanceUnits(altitude).toFixed(0) + " " + QGroundControl.appSettingsDistanceUnitsString :
+                                                       (_multiVehicle ? qsTr("Vehicle %1").arg(vehicle.id) : "")) :
+                                                  ""
+
+        }
+
+        QGCMapLabel {
+            anchors.top:                vehicleLabel.bottom
+            anchors.horizontalCenter:   parent.horizontalCenter
+            map:                        _map
+            text:                       vehicleLabelText
+            font.pointSize:             ScreenTools.smallFontPointSize
+            visible:                    _adsbVehicle ? !isNaN(altitude) : _multiVehicle
+
+            property string vehicleLabelText: visible && _adsbVehicle ? callsign : ""
         }
     }
 }

src/MissionManager/GeoFenceController.cc

@@ -84,6 +84,8 @@ void GeoFenceController::_signalAll(void)
     emit polygonEnabledChanged(polygonEnabled());
     emit polygonSupportedChanged(polygonSupported());
     emit dirtyChanged(dirty());
+    emit paramsChanged(params());
+    emit paramLabelsChanged(paramLabels());
 }
 
 void GeoFenceController::managerVehicleChanged(Vehicle* managerVehicle)

src/MissionManager/MissionController.cc

@@ -158,7 +158,10 @@ void MissionController::_newMissionItemsAvailableFromVehicle(bool removeAllReque
                 qWarning() << "First item is not settings item";
                 return;
             }
-            settingsItem->setCoordinate(newMissionItems[0]->coordinate());
+            MissionItem* fakeHomeItem = newMissionItems[0];
+            if (fakeHomeItem->coordinate().latitude() != 0 || fakeHomeItem->coordinate().longitude() != 0) {
+                settingsItem->setCoordinate(fakeHomeItem->coordinate());
+            }
             i = 1;
         }
 

src/MissionManager/Survey.SettingsGroup.json

@@ -64,7 +64,7 @@
     "min":              0,
     "max":              85,
     "units":            "%",
-    "defaultValue":     10
+    "defaultValue":     70
 },
 {
     "name":             "SideOverlap",
@@ -74,7 +74,7 @@
     "min":              0,
     "max":              85,
     "units":            "%",
-    "defaultValue":     10
+    "defaultValue":     70
 },
 {
     "name":             "CameraSensorWidth",

src/PlanView/PlanView.qml

@@ -366,7 +366,7 @@ QGCView {
                     VehicleMapItem {
                     vehicle:        object
                     coordinate:     object.coordinate
-                    isSatellite:    editorMap.isSatelliteMap
+                    map:            editorMap
                     size:           ScreenTools.defaultFontPixelHeight * 3
                     z:              QGroundControl.zOrderMapItems - 1
                 }

src/QmlControls/FactSliderPanel.qml

@@ -111,25 +111,25 @@ Column {
                         onValueChanged: {
                             if (_loadComplete) {
                                 fact.value = value
-                                    }
-                                }
+                            }
+                        }
 
-                                activeFocusOnPress:         true
+                        activeFocusOnPress:         true
 
-                                MultiPointTouchArea {
-                                    anchors.fill: parent
+                        MultiPointTouchArea {
+                            anchors.fill: parent
 
-                                    minimumTouchPoints: 1
-                                    maximumTouchPoints: 1
-                                    mouseEnabled:       false
-                                }
+                            minimumTouchPoints: 1
+                            maximumTouchPoints: 1
+                            mouseEnabled:       false
+                        }
 
-                                // Block wheel events
-                                MouseArea {
-                                    anchors.fill: parent
-                                    acceptedButtons: Qt.NoButton
-                                    onWheel: {
-                                        wheel.accepted = true
+                        // Block wheel events
+                        MouseArea {
+                            anchors.fill: parent
+                            acceptedButtons: Qt.NoButton
+                            onWheel: {
+                                wheel.accepted = true
                             }
                         }
                     } // Slider

src/Vehicle/ADSBVehicle.cc

+/****************************************************************************
+ *
+ *   (c) 2009-2016 QGROUNDCONTROL PROJECT <http://www.qgroundcontrol.org>
+ *
+ * QGroundControl is licensed according to the terms in the file
+ * COPYING.md in the root of the source code directory.
+ *
+ ****************************************************************************/
+
+#include "ADSBVehicle.h"
+
+#include <QDebug>
+#include <QtMath>
+
+ADSBVehicle::ADSBVehicle(mavlink_adsb_vehicle_t& adsbVehicle, QObject* parent)
+    : QObject       (parent)
+    , _icaoAddress  (adsbVehicle.ICAO_address)
+    , _callsign     (adsbVehicle.callsign)
+    , _altitude     (NAN)
+    , _heading      (NAN)
+{
+    if (!(adsbVehicle.flags | ADSB_FLAGS_VALID_COORDS)) {
+        qWarning() << "At least coords must be valid";
+        return;
+    }
+
+    update(adsbVehicle);
+}
+
+void ADSBVehicle::update(mavlink_adsb_vehicle_t& adsbVehicle)
+{
+    if (_icaoAddress != adsbVehicle.ICAO_address) {
+        qWarning() << "ICAO address mismatch expected:actual" << _icaoAddress << adsbVehicle.ICAO_address;
+        return;
+    }
+
+    if (!(adsbVehicle.flags | ADSB_FLAGS_VALID_COORDS)) {
+        return;
+    }
+
+    QString currCallsign(adsbVehicle.callsign);
+
+    if (currCallsign != _callsign) {
+        _callsign = currCallsign;
+        emit callsignChanged(_callsign);
+    }
+
+    QGeoCoordinate newCoordinate(adsbVehicle.lat / 1e7, adsbVehicle.lon / 1e7);
+    if (newCoordinate != _coordinate) {
+        _coordinate = newCoordinate;
+        emit coordinateChanged(_coordinate);
+    }
+
+    double newAltitude = NAN;
+    if (adsbVehicle.flags | ADSB_FLAGS_VALID_ALTITUDE) {
+        newAltitude = (double)adsbVehicle.altitude / 1e3;
+    }
+    if (!(qIsNaN(newAltitude) && qIsNaN(_altitude)) && !qFuzzyCompare(newAltitude, _altitude)) {
+        _altitude = newAltitude;
+        emit altitudeChanged(_altitude);
+    }
+
+    double newHeading = NAN;
+    if (adsbVehicle.flags | ADSB_FLAGS_VALID_HEADING) {
+        newHeading = (double)adsbVehicle.heading / 100.0;
+    }
+    if (!(qIsNaN(newHeading) && qIsNaN(_heading)) && !qFuzzyCompare(newHeading, _heading)) {
+        _heading = newHeading;
+        emit headingChanged(_heading);
+    }
+}

src/Vehicle/ADSBVehicle.h

+/****************************************************************************
+ *
+ *   (c) 2009-2016 QGROUNDCONTROL PROJECT <http://www.qgroundcontrol.org>
+ *
+ * QGroundControl is licensed according to the terms in the file
+ * COPYING.md in the root of the source code directory.
+ *
+ ****************************************************************************/
+
+#pragma once
+
+#include <QObject>
+#include <QGeoCoordinate>
+
+#include "QGCMAVLink.h"
+
+class ADSBVehicle : public QObject
+{
+    Q_OBJECT
+
+public:
+    ADSBVehicle(mavlink_adsb_vehicle_t& adsbVehicle, QObject* parent = NULL);
+
+    Q_PROPERTY(int              icaoAddress READ icaoAddress    CONSTANT)
+    Q_PROPERTY(QString          callsign    READ callsign       NOTIFY callsignChanged)
+    Q_PROPERTY(QGeoCoordinate   coordinate  READ coordinate     NOTIFY coordinateChanged)
+    Q_PROPERTY(double           altitude    READ altitude       NOTIFY altitudeChanged)     // NaN for not available
+    Q_PROPERTY(double           heading     READ heading        NOTIFY headingChanged)      // NaN for not available
+
+    int             icaoAddress (void) const { return _icaoAddress; }
+    QString         callsign    (void) const { return _callsign; }
+    QGeoCoordinate  coordinate  (void) const { return _coordinate; }
+    double          altitude    (void) const { return _altitude; }
+    double          heading     (void) const { return _heading; }
+
+    /// Update the vehicle with new information
+    void update(mavlink_adsb_vehicle_t& adsbVehicle);
+
+signals:
+    void coordinateChanged(QGeoCoordinate coordinate);
+    void callsignChanged(QString callsign);
+    void altitudeChanged(double altitude);
+    void headingChanged(double heading);
+
+private:
+    uint32_t        _icaoAddress;
+    QString         _callsign;
+    QGeoCoordinate  _coordinate;
+    double          _altitude;
+    double          _heading;
+};

src/Vehicle/Vehicle.h

@@ -38,6 +38,7 @@ class ParameterManager;
 class JoystickManager;
 class UASMessage;
 class SettingsManager;
+class ADSBVehicle;
 
 Q_DECLARE_LOGGING_CATEGORY(VehicleLog)
 
@@ -311,6 +312,7 @@ public:
     Q_PROPERTY(int                  telemetryRNoise         READ telemetryRNoise                                        NOTIFY telemetryRNoiseChanged)
     Q_PROPERTY(QVariantList         toolBarIndicators       READ toolBarIndicators                                      CONSTANT)
     Q_PROPERTY(QVariantList         cameraList              READ cameraList                                             CONSTANT)
+    Q_PROPERTY(QmlObjectListModel*  adsbVehicles            READ adsbVehicles                                           CONSTANT)
 
     /// true: Vehicle is flying, false: Vehicle is on ground
     Q_PROPERTY(bool flying READ flying NOTIFY flyingChanged)
@@ -527,6 +529,7 @@ public:
 
     QmlObjectListModel* trajectoryPoints(void) { return &_mapTrajectoryList; }
     QmlObjectListModel* cameraTriggerPoints(void) { return &_cameraTriggerPoints; }
+    QmlObjectListModel* adsbVehicles(void) { return &_adsbVehicles; }
 
     int  flowImageIndex() { return _flowImageIndex; }
 
@@ -836,6 +839,7 @@ private:
     void _handleScaledPressure3(mavlink_message_t& message);
     void _handleCameraFeedback(const mavlink_message_t& message);
     void _handleCameraImageCaptured(const mavlink_message_t& message);
+    void _handleADSBVehicle(const mavlink_message_t& message);
     void _missionManagerError(int errorCode, const QString& errorMsg);
     void _geoFenceManagerError(int errorCode, const QString& errorMsg);
     void _rallyPointManagerError(int errorCode, const QString& errorMsg);
@@ -866,6 +870,7 @@ private:
     AutoPilotPlugin*    _autopilotPlugin;
     MAVLinkProtocol*    _mavlink;
     bool                _soloFirmware;
+    QGCToolbox*         _toolbox;
     SettingsManager*    _settingsManager;
 
     QList<LinkInterface*> _links;
@@ -974,6 +979,9 @@ private:
 
     QmlObjectListModel  _cameraTriggerPoints;
 
+    QmlObjectListModel              _adsbVehicles;
+    QMap<uint32_t, ADSBVehicle*>    _adsbICAOMap;
+
     // Toolbox references
     FirmwarePluginManager*      _firmwarePluginManager;
     JoystickManager*            _joystickManager;

src/api/QGCCorePlugin.cc

@@ -175,6 +175,13 @@ bool QGCCorePlugin::adjustSettingMetaData(FactMetaData& metaData)
 #else
         metaData.setRawDefaultValue(true);
         return true;
+#endif
+#if defined(__ios__)
+    } else if (metaData.name() == AppSettings::savePathName) {
+        QString appName = qgcApp()->applicationName();
+        QDir rootDir = QDir(QStandardPaths::writableLocation(QStandardPaths::DocumentsLocation));
+        metaData.setRawDefaultValue(rootDir.filePath(appName));
+        return false;
 #endif
     }
     return true; // Show setting in ui
@@ -225,3 +232,12 @@ QQmlApplicationEngine* QGCCorePlugin::createRootWindow(QObject *parent)
     pEngine->load(QUrl(QStringLiteral("qrc:/qml/MainWindowNative.qml")));
     return pEngine;
 }
+
+bool QGCCorePlugin::mavlinkMessage(Vehicle* vehicle, LinkInterface* link, mavlink_message_t message)
+{
+    Q_UNUSED(vehicle);
+    Q_UNUSED(link);
+    Q_UNUSED(message);
+
+    return true;
+}

src/api/QGCCorePlugin.h

@@ -11,6 +11,7 @@
 
 #include "QGCToolbox.h"
 #include "QGCPalette.h"
+#include "QGCMAVLink.h"
 
 #include <QObject>
 #include <QVariantList>
@@ -28,6 +29,8 @@ class QGCCorePlugin_p;
 class FactMetaData;
 class QGeoPositionInfoSource;
 class QQmlApplicationEngine;
+class Vehicle;
+class LinkInterface;
 
 class QGCCorePlugin : public QGCTool
 {
@@ -90,6 +93,10 @@ public:
     /// Allows the plugin to override the creation of the root (native) window.
     virtual QQmlApplicationEngine* createRootWindow(QObject* parent);
 
+    /// Allows the plugin to see all mavlink traffic to a vehicle
+    /// @return true: Allow vehicle to continue processing, false: Vehicle should not process message
+    virtual bool mavlinkMessage(Vehicle* vehicle, LinkInterface* link, mavlink_message_t message);
+
     bool showTouchAreas(void) const { return _showTouchAreas; }
     bool showAdvancedUI(void) const { return _showAdvancedUI; }
     void setShowTouchAreas(bool show);

src/comm/MockLink.cc

@@ -33,11 +33,13 @@ QGC_LOGGING_CATEGORY(MockLinkVerboseLog, "MockLinkVerboseLog")
 ///
 ///     @author Don Gagne <don@thegagnes.com>
 
-float           MockLink::_vehicleLatitude =        47.633033f;
-float           MockLink::_vehicleLongitude =       -122.08794f;
-float           MockLink::_vehicleAltitude =        3.5f;
-int             MockLink::_nextVehicleSystemId =    128;
-const char*     MockLink::_failParam =              "COM_FLTMODE6";
+// Vehicle position is set close to default Gazebo vehicle location. This allows for multi-vehicle
+// testing of a gazebo vehicle and a mocklink vehicle
+double      MockLink::_defaultVehicleLatitude =     47.397f;
+double      MockLink::_defaultVehicleLongitude =    8.5455f;
+double      MockLink::_defaultVehicleAltitude =     488.056f;
+int         MockLink::_nextVehicleSystemId =        128;
+const char* MockLink::_failParam =                  "COM_FLTMODE6";
 
 const char* MockConfiguration::_firmwareTypeKey =   "FirmwareType";
 const char* MockConfiguration::_vehicleTypeKey =    "VehicleType";
@@ -45,29 +47,32 @@ const char* MockConfiguration::_sendStatusTextKey = "SendStatusText";
 const char* MockConfiguration::_failureModeKey =    "FailureMode";
 
 MockLink::MockLink(SharedLinkConfigurationPointer& config)
-    : LinkInterface(config)
-    , _missionItemHandler(this, qgcApp()->toolbox()->mavlinkProtocol())
-    , _name("MockLink")
-    , _connected(false)
-    , _mavlinkChannel(0)
-    , _vehicleSystemId(_nextVehicleSystemId++)
-    , _vehicleComponentId(MAV_COMP_ID_AUTOPILOT1)
-    , _inNSH(false)
-    , _mavlinkStarted(true)
-    , _mavBaseMode(MAV_MODE_FLAG_MANUAL_INPUT_ENABLED | MAV_MODE_FLAG_CUSTOM_MODE_ENABLED)
-    , _mavState(MAV_STATE_STANDBY)
-    , _firmwareType(MAV_AUTOPILOT_PX4)
-    , _vehicleType(MAV_TYPE_QUADROTOR)
-    , _fileServer(NULL)
-    , _sendStatusText(false)
-    , _apmSendHomePositionOnEmptyList(false)
-    , _failureMode(MockConfiguration::FailNone)
-    , _sendHomePositionDelayCount(10)   // No home position for 4 seconds
-    , _sendGPSPositionDelayCount(100)   // No gps lock for 5 seconds
+    : LinkInterface                         (config)
+    , _missionItemHandler                   (this, qgcApp()->toolbox()->mavlinkProtocol())
+    , _name                                 ("MockLink")
+    , _connected                            (false)
+    , _mavlinkChannel                       (0)
+    , _vehicleSystemId                      (_nextVehicleSystemId++)
+    , _vehicleComponentId                   (MAV_COMP_ID_AUTOPILOT1)
+    , _inNSH                                (false)
+    , _mavlinkStarted                       (true)
+    , _mavBaseMode                          (MAV_MODE_FLAG_MANUAL_INPUT_ENABLED | MAV_MODE_FLAG_CUSTOM_MODE_ENABLED)
+    , _mavState                             (MAV_STATE_STANDBY)
+    , _firmwareType                         (MAV_AUTOPILOT_PX4)
+    , _vehicleType                          (MAV_TYPE_QUADROTOR)
+    , _vehicleLatitude                      (_defaultVehicleLatitude + ((_vehicleSystemId - 128) * 0.0001))     // Slight offset for each vehicle
+    , _vehicleLongitude                     (_defaultVehicleLongitude + ((_vehicleSystemId - 128) * 0.0001))
+    , _vehicleAltitude                      (_defaultVehicleAltitude)
+    , _fileServer                           (NULL)
+    , _sendStatusText                       (false)
+    , _apmSendHomePositionOnEmptyList       (false)
+    , _failureMode                          (MockConfiguration::FailNone)
+    , _sendHomePositionDelayCount           (10)    // No home position for 4 seconds
+    , _sendGPSPositionDelayCount            (100)   // No gps lock for 5 seconds
     , _currentParamRequestListComponentIndex(-1)
-    , _currentParamRequestListParamIndex(-1)
-    , _logDownloadCurrentOffset(0)
-    , _logDownloadBytesRemaining(0)
+    , _currentParamRequestListParamIndex    (-1)
+    , _logDownloadCurrentOffset             (0)
+    , _logDownloadBytesRemaining            (0)
 {
     MockConfiguration* mockConfig = qobject_cast<MockConfiguration*>(_config.data());
     _firmwareType = mockConfig->firmwareType();
@@ -156,6 +161,7 @@ void MockLink::_run1HzTasks(void)
 {
     if (_mavlinkStarted && _connected) {
         _sendVibration();
+        _sendADSBVehicles();
         if (!qgcApp()->runningUnitTests()) {
             // Sending RC Channels during unit test breaks RC tests which does it's own RC simulation
             _sendRCChannels();
@@ -1263,3 +1269,26 @@ void MockLink::_logDownloadWorker(void)
         }
     }
 }
+
+void MockLink::_sendADSBVehicles(void)
+{
+    mavlink_message_t responseMsg;
+    mavlink_msg_adsb_vehicle_pack_chan(_vehicleSystemId,
+                                       _vehicleComponentId,
+                                       _mavlinkChannel,
+                                       &responseMsg,
+                                       12345,                           // ICAO address
+                                       (_vehicleLatitude + 0.001) * 1e7,
+                                       (_vehicleLongitude + 0.001) * 1e7,
+                                       ADSB_ALTITUDE_TYPE_GEOMETRIC,
+                                       100 * 1000,                      // Altitude in millimeters
+                                       10 * 100,                        // Heading in centidegress
+                                       0, 0,                            // Horizontal/Vertical velocity
+                                       "N1234500",                      // Callsign
+                                       ADSB_EMITTER_TYPE_ROTOCRAFT,
+                                       1,                               // Seconds since last communication
+                                       ADSB_FLAGS_VALID_COORDS | ADSB_FLAGS_VALID_ALTITUDE | ADSB_FLAGS_VALID_HEADING | ADSB_FLAGS_VALID_CALLSIGN | ADSB_FLAGS_SIMULATED,
+                                       0);                              // Squawk code
+
+    respondWithMavlinkMessage(responseMsg);
+}

src/comm/MockLink.h

@@ -192,6 +192,7 @@ private:
     void _sendRCChannels(void);
     void _paramRequestListWorker(void);
     void _logDownloadWorker(void);
+    void _sendADSBVehicles(void);
 
     static MockLink* _startMockLink(MockConfiguration* mockConfig);
 
@@ -216,6 +217,9 @@ private:
 
     MAV_AUTOPILOT       _firmwareType;
     MAV_TYPE            _vehicleType;
+    double              _vehicleLatitude;
+    double              _vehicleLongitude;
+    double              _vehicleAltitude;
 
     MockLinkFileServer* _fileServer;
 
@@ -236,9 +240,9 @@ private:
     uint32_t    _logDownloadCurrentOffset;  ///< Current offset we are sending from
     uint32_t    _logDownloadBytesRemaining; ///< Number of bytes still to send, 0 = send inactive
 
-    static float        _vehicleLatitude;
-    static float        _vehicleLongitude;
-    static float        _vehicleAltitude;
+    static double       _defaultVehicleLatitude;
+    static double       _defaultVehicleLongitude;
+    static double       _defaultVehicleAltitude;
     static int          _nextVehicleSystemId;
     static const char*  _failParam;
 };

src/qgcunittest/UnitTestList.cc

@@ -52,6 +52,7 @@ UT_REGISTER_TEST(MissionControllerTest)
 UT_REGISTER_TEST(MissionManagerTest)
 UT_REGISTER_TEST(RadioConfigTest)
 UT_REGISTER_TEST(TCPLinkTest)
+UT_REGISTER_TEST(FileManagerTest)
 UT_REGISTER_TEST(ParameterManagerTest)
 UT_REGISTER_TEST(MissionCommandTreeTest)
 UT_REGISTER_TEST(LogDownloadTest)
@@ -69,8 +70,5 @@ UT_REGISTER_TEST(QGCMapPolygonTest)
 // FIXME: Temporarily disabled until this can be stabilized
 //UT_REGISTER_TEST(MainWindowTest)
 
-// Onboard file support has been removed until it can be make to work correctly
-//UT_REGISTER_TEST(FileManagerTest)
-
 // Needs to be update for latest updates
 //UT_REGISTER_TEST(MavlinkLogTest)

src/uas/FileManager.cc

@@ -239,6 +239,7 @@ void FileManager::_writeAckResponse(Request* writeAck)
 {
     if(_writeOffset + _writeSize >= _writeFileSize){
         _closeUploadSession(true /* success */);
+        return;
     }
 
     if (writeAck->hdr.session != _activeSession) {

src/ui/MainWindow.cc

@@ -296,7 +296,7 @@ QString MainWindow::_getWindowGeometryKey()
 #ifndef __mobile__
 MAVLinkDecoder* MainWindow::_mavLinkDecoderInstance(void)
 {
-    if (_mavlinkDecoder) {
+    if (!_mavlinkDecoder) {
         _mavlinkDecoder = new MAVLinkDecoder(qgcApp()->toolbox()->mavlinkProtocol());
         connect(_mavlinkDecoder, &MAVLinkDecoder::valueChanged, this, &MainWindow::valueChanged);
     }
@@ -313,10 +313,6 @@ void MainWindow::_buildCommonWidgets(void)
 
     // Populate widget menu
     for (int i = 0, end = ARRAY_SIZE(rgDockWidgetNames); i < end; i++) {
-        if (i == ONBOARD_FILES) {
-            // Temporarily removed until twe can fix all the problems with it
-            continue;
-        }
 
         const char* pDockWidgetName = rgDockWidgetNames[i];
 
@@ -333,11 +329,6 @@ void MainWindow::_buildCommonWidgets(void)
 /// Shows or hides the specified dock widget, creating if necessary
 void MainWindow::_showDockWidget(const QString& name, bool show)
 {
-    if (name == rgDockWidgetNames[ONBOARD_FILES]) {
-        // Temporarily disabled due to bugs
-        return;
-    }
-
     // Create the inner widget if we need to
     if (!_mapName2DockWidget.contains(name)) {
         if(!_createInnerDockWidget(name)) {

src/ui/QGCUASFileView.cc

@@ -198,7 +198,7 @@ void QGCUASFileView::_commandComplete(void)
         _currentCommand = commandNone;
         _setAllButtonsEnabled(true);
         statusText = "Download complete";
-    } else if (_currentCommand == commandDownload) {
+    } else if (_currentCommand == commandUpload) {
         _currentCommand = commandNone;
         _setAllButtonsEnabled(true);
         statusText = "Upload complete";