Merging

.appveyor.yml

@@ -14,17 +14,9 @@ environment:
 
 install:
   - git submodule update --init --recursive
-  - call "%ProgramFiles(x86)%\Microsoft Visual Studio 12.0\VC\vcvarsall.bat" x86
-  - set PATH=C:\Qt\Tools\QtCreator\bin;C:\Qt\5.5\msvc2013\bin;%PATH%
+  - call "%ProgramFiles(x86)%\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" x86
+  - set PATH=C:\Qt\Tools\QtCreator\bin;C:\Qt\5.8\msvc2015\bin;%PATH%
   - mkdir %LOCALAPPDATA%\QtProject && copy test\qtlogging.ini %LOCALAPPDATA%\QtProject\
-  - ps: |
-      Write-Host "Installing NSIS..." -ForegroundColor Cyan
-      $exePath = "$($env:USERPROFILE)\nsis-3.0rc1-setup.exe"
-      Write-Host "Downloading..."
-      (New-Object Net.WebClient).DownloadFile('https://storage.googleapis.com/appveyor-download-cache/nsis/nsis-3.0rc1-setup.exe', $exePath)
-      Write-Host "Installing..."
-      cmd /c start /wait $exePath /S
-      Write-Host "Installed" -ForegroundColor Green
   - ps: |
       Write-Host "Installing GStreamer..." -ForegroundColor Cyan
       $msiPath = "$($env:USERPROFILE)\gstreamer-1.0-x86-1.5.2.msi"
@@ -43,7 +35,7 @@ install:
       Write-Host "Installed" -ForegroundColor Green
 
 build_script:
-  - mkdir %SHADOW_BUILD_DIR% && cd %SHADOW_BUILD_DIR% && C:\Qt\5.5\msvc2013\bin\qmake -r CONFIG-=debug_and_release CONFIG+=%CONFIG% CONFIG+=WarningsAsErrorsOn %APPVEYOR_BUILD_FOLDER%\qgroundcontrol.pro
+  - mkdir %SHADOW_BUILD_DIR% && cd %SHADOW_BUILD_DIR% && C:\Qt\5.8\msvc2015\bin\qmake -r CONFIG-=debug_and_release CONFIG+=%CONFIG% CONFIG+=WarningsAsErrorsOn %APPVEYOR_BUILD_FOLDER%\qgroundcontrol.pro
   - cd %SHADOW_BUILD_DIR% && jom
   - if "%CONFIG%" EQU "installer" ( copy %SHADOW_BUILD_DIR%\release\QGroundControl-installer.exe %APPVEYOR_BUILD_FOLDER%\QGroundControl-installer.exe )
 # Generate the source server information to embed in the PDB

.travis.yml

@@ -27,18 +27,19 @@ matrix:
           language: android
           env: SPEC=android-g++ CONFIG=installer
           sudo: false
-        - os: osx
-          osx_image: xcode8
-          env: SPEC=macx-clang CONFIG=debug
-          sudo: required
         - os: osx
           osx_image: xcode8
           env: SPEC=macx-clang CONFIG=installer
           sudo: required
-        - os: osx
-          osx_image: xcode8
-          env: SPEC=macx-ios-clang CONFIG=release
-          sudo: false
+# OSX builds pared back to installer only since travis sucks so bad we can't afford more than one'
+#        - os: osx
+#          osx_image: xcode8
+#          env: SPEC=macx-clang CONFIG=debug
+#          sudo: required
+#        - os: osx
+#          osx_image: xcode8
+#          env: SPEC=macx-ios-clang CONFIG=release
+#          sudo: false
 
 android:
   components:
@@ -88,9 +89,9 @@ before_install:
 install:
   # linux dependencies: qt
   - if [ "${SPEC}" = "linux-g++-64" ]; then
-        wget https://s3-us-west-2.amazonaws.com/qgroundcontrol/dependencies/Qt5.5.1-linux-min.tar.bz2 &&
-        tar jxf Qt5.5.1-linux-min.tar.bz2 -C /tmp &&
-        export PATH=/tmp/Qt/5.5/gcc_64/bin:$PATH &&
+        wget https://s3-us-west-2.amazonaws.com/qgroundcontrol/dependencies/Qt5.8.0-linux-min.tar.bz2 &&
+        tar jxf Qt5.8.0-linux-min.tar.bz2 -C /tmp &&
+        export PATH=/tmp/Qt5.8-linux/5.8/gcc_64/bin:$PATH &&
         export DISPLAY=:99.0 &&
         sh -e /etc/init.d/xvfb start
         ;
@@ -98,8 +99,8 @@ install:
 
   # android dependencies: qt, gstreamer, android-ndk
   - if [ "${SPEC}" = "android-g++" ]; then
-        wget https://s3-us-west-2.amazonaws.com/qgroundcontrol/dependencies/Qt5.5.1-linux-min.tar.bz2 &&
-        tar jxf Qt5.5.1-linux-min.tar.bz2 -C /tmp &&
+        wget https://s3-us-west-2.amazonaws.com/qgroundcontrol/dependencies/Qt5.8.0-android-min.tar.bz2 &&
+        tar jxf Qt5.8.0-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 &&
         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 &&
@@ -108,35 +109,34 @@ install:
         ./android-ndk-r10e-linux-x86_64.bin > /dev/null &&
         export ANDROID_NDK_ROOT=`pwd`/android-ndk-r10e &&
         export ANDROID_SDK_ROOT=/usr/local/android-sdk &&
-        export PATH=/tmp/Qt/5.5/android_armv7/bin:`pwd`/android-ndk-r10e:$PATH
+        export PATH=/tmp/Qt5.8-android/5.8/android_armv7/bin:`pwd`/android-ndk-r10e:$PATH && echo $PATH
         ;
     fi
 
   # osx dependencies: qt, gstreamer, gstreamer-devel
   - if [ "${SPEC}" = "macx-clang" ]; then
-        wget https://s3-us-west-2.amazonaws.com/qgroundcontrol/dependencies/Qt5.5.1-mac-clang-min.tar.bz2 &&
-        tar jxf Qt5.5.1-mac-clang-min.tar.bz2 -C /tmp &&
+        wget https://s3-us-west-2.amazonaws.com/qgroundcontrol/dependencies/Qt5.8.0-mac-clang-min.tar.bz2 &&
+        tar jxf Qt5.8.0-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 &&
         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 &&
         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 &&
         sudo tar jxf osx-gstreamer.tar.bz2 -C /Library/Frameworks &&
-        export QT_DIR=Qt5.5-mac-clang/5.5/clang_64 &&
+        export QT_DIR=Qt5.8-mac-clang/5.8/clang_64 &&
         export QT_QPA_PLATFORM_PLUGIN_PATH=/tmp/$QT_DIR/plugins &&
         export QML2_IMPORT_PATH=/tmp/$QT_DIR/qml &&
-        export PATH=/tmp/$QT_DIR/bin:$PATH &&
-        tools/patch_qt_for_xcode8.sh
+        export PATH=/tmp/$QT_DIR/bin:$PATH
         ;
     fi
 
   # ios dependencies: qt, TODO: add gstreamer
   - if [ "${SPEC}" = "macx-ios-clang" ]; then
-        wget https://s3-us-west-2.amazonaws.com/qgroundcontrol/dependencies/Qt5.5.1-ios-min.tar.bz2 &&
-        tar jxf Qt5.5.1-ios-min.tar.bz2 -C /tmp &&
+        wget 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++` &&
-        export PATH=/tmp/ios/bin:$PATH &&
+        export PATH=/tmp/Qt5.8-ios/5.8/ios/bin:$PATH &&
         tools/patch_qt_for_xcode8.sh
         ;
     fi
@@ -174,12 +174,14 @@ script:
   #- ccache -s
 
   # unit tests linux/osx
-  - if [[ "${SPEC}" = "linux-g++-64" && "${CONFIG}" = "debug" ]]; then
-        mkdir -p ~/.config/QtProject/ && cp ${TRAVIS_BUILD_DIR}/test/qtlogging.ini ~/.config/QtProject/ &&
-        ./debug/QGroundControl --unittest;
-    elif [[ "${SPEC}" = "macx-clang" && "${CONFIG}" = "debug" ]]; then
-        mkdir -p ~/Library/Preferences/QtProject/ && cp ${TRAVIS_BUILD_DIR}/test/qtlogging.ini ~/Library/Preferences/QtProject/ &&
-        ./debug/qgroundcontrol.app/Contents/MacOS/QGroundControl --unittest;
+  - if [ "${TRAVIS_BRANCH}" != "master" ]; then
+        if [[ "${SPEC}" = "linux-g++-64" && "${CONFIG}" = "debug" ]]; then
+            mkdir -p ~/.config/QtProject/ && cp ${TRAVIS_BUILD_DIR}/test/qtlogging.ini ~/.config/QtProject/ &&
+            ./debug/QGroundControl --unittest;
+        elif [[ "${SPEC}" = "macx-clang" && "${CONFIG}" = "debug" ]]; then
+            mkdir -p ~/Library/Preferences/QtProject/ && cp ${TRAVIS_BUILD_DIR}/test/qtlogging.ini ~/Library/Preferences/QtProject/ &&
+            ./debug/qgroundcontrol.app/Contents/MacOS/QGroundControl --unittest;
+        fi
     fi
 
 after_success:

QGCCommon.pri

@@ -38,7 +38,6 @@ linux {
         equals(ANDROID_TARGET_ARCH, x86)  {
             CONFIG += Androidx86Build
             DEFINES += __androidx86__
-            DEFINES += QGC_DISABLE_UVC
             message("Android x86 build")
         } else {
             message("Android Arm build")
@@ -47,7 +46,7 @@ linux {
         error("Unsuported Linux toolchain, only GCC 32- or 64-bit is supported")
     }
 } else : win32 {
-    win32-msvc2010 | win32-msvc2012 | win32-msvc2013 {
+    win32-msvc2010 | win32-msvc2012 | win32-msvc2013 | win32-msvc2015 {
         message("Windows build")
         CONFIG += WindowsBuild
         DEFINES += __STDC_LIMIT_MACROS
@@ -77,9 +76,11 @@ linux {
         error("Unsupported Qt version, 5.5.x or greater is required for iOS")
     }
     message("iOS build")
-    CONFIG += iOSBuild MobileBuild app_bundle
+    CONFIG  += iOSBuild MobileBuild app_bundle NoSerialBuild
+    CONFIG  -= bitcode
     DEFINES += __ios__
     DEFINES += QGC_NO_GOOGLE_MAPS
+    DEFINES += NO_SERIAL_LINK
     QMAKE_IOS_DEPLOYMENT_TARGET = 8.0
     QMAKE_IOS_TARGETED_DEVICE_FAMILY = 1,2 # Universal
     QMAKE_LFLAGS += -Wl,-no_pie
@@ -202,8 +203,13 @@ MacBuild | LinuxBuild {
 }
 
 WindowsBuild {
+    win32-msvc2015 {
+        QMAKE_CFLAGS -= -Zc:strictStrings
+        QMAKE_CXXFLAGS -= -Zc:strictStrings
+    }
     QMAKE_CFLAGS_RELEASE -= -Zc:strictStrings
     QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO -= -Zc:strictStrings
+
     QMAKE_CXXFLAGS_RELEASE -= -Zc:strictStrings
     QMAKE_CXXFLAGS_RELEASE_WITH_DEBUGINFO -= -Zc:strictStrings
     QMAKE_CXXFLAGS_WARN_ON += /W3 \
@@ -221,7 +227,7 @@ WindowsBuild {
 #
 
 ReleaseBuild {
-    DEFINES += QT_NO_DEBUG
+    DEFINES += QT_NO_DEBUG QT_MESSAGELOGCONTEXT
     CONFIG += force_debug_info  # Enable debugging symbols on release builds
     !iOSBuild {
         CONFIG += ltcg              # Turn on link time code generation
@@ -239,11 +245,3 @@ ReleaseBuild {
         QMAKE_LFLAGS_RELEASE_WITH_DEBUGINFO += /OPT:ICF
     }
 }
-
-#
-# Unit Test specific configuration goes here
-#
-
-DebugBuild {
-    DEFINES += UNITTEST_BUILD
-}

QGCExternalLibs.pri

@@ -65,103 +65,6 @@ DEPENDPATH += libs/qwt
 INCLUDEPATH += libs/qwt
 }
 
-#
-# [OPTIONAL] XBee wireless support. This is not necessary for basic serial/UART communications.
-# It's only required for speaking directly to the Xbee using their proprietary API.
-# Unsupported on Mac.
-# Installation on Windows is unnecessary, as we just link to our included .dlls directly.
-# Installing on Linux involves running `make;sudo make install` in `libs/thirdParty/libxbee`
-# Uninstalling from Linux can be done with `sudo make uninstall`.
-#
-XBEE_DEPENDENT_HEADERS += \
-    src/comm/XbeeLinkInterface.h \
-    src/comm/XbeeLink.h \
-    src/comm/HexSpinBox.h \
-    src/ui/XbeeConfigurationWindow.h \
-    src/comm/CallConv.h
-XBEE_DEPENDENT_SOURCES += \
-    src/comm/XbeeLink.cpp \
-    src/comm/HexSpinBox.cpp \
-    src/ui/XbeeConfigurationWindow.cpp
-XBEE_DEFINES = QGC_XBEE_ENABLED
-
-contains(DEFINES, DISABLE_XBEE) {
-    message("Skipping support for native XBee API (manual override from command line)")
-    DEFINES -= DISABLE_XBEE
-# Otherwise the user can still disable this feature in the user_config.pri file.
-} else:exists(user_config.pri):infile(user_config.pri, DEFINES, DISABLE_XBEE) {
-    message("Skipping support for native XBee API (manual override from user_config.pri)")
-} else:LinuxBuild {
-        linux-g++-64 {
-            message("Skipping support for XBee API (64-bit Linux builds not supported)")
-        } else:exists(/usr/include/xbee.h) {
-        message("Including support for XBee API")
-
-        HEADERS += $$XBEE_DEPENDENT_HEADERS
-        SOURCES += $$XBEE_DEPENDENT_SOURCES
-        DEFINES += $$XBEE_DEFINES
-        LIBS += -L/usr/lib -lxbee
-    } else {
-        warning("Skipping support for XBee API (missing libraries, see README)")
-    }
-} else:WindowsBuild {
-    message("Including support for XBee API")
-    HEADERS += $$XBEE_DEPENDENT_HEADERS
-    SOURCES += $$XBEE_DEPENDENT_SOURCES
-    DEFINES += $$XBEE_DEFINES
-    INCLUDEPATH += libs/thirdParty/libxbee
-        LIBS += -l$$BASEDIR/libs/thirdParty/libxbee/lib/libxbee
-} else {
-    message("Skipping support for XBee API (unsupported platform)")
-}
-
-#
-# [OPTIONAL] Opal RT-LAB Library. Provides integration with Opal-RT's RT-LAB simulator.
-#
-contains(DEFINES, DISABLE_RTLAB) {
-    message("Skipping support for RT-LAB (manual override from command line)")
-    DEFINES -= DISABLE_RTLAB
-# Otherwise the user can still disable this feature in the user_config.pri file.
-} else:exists(user_config.pri):infile(user_config.pri, DEFINES, DISABLE_RTLAB) {
-    message("Skipping support for RT-LAB (manual override from user_config.pri)")
-} else:WindowsBuild {
-    exists(src/lib/opalrt/OpalApi.h) : exists(C:/OPAL-RT/RT-LAB7.2.4/Common/bin) {
-        message("Including support for RT-LAB")
-
-        DEFINES += QGC_RTLAB_ENABLED
-
-        INCLUDEPATH +=
-            src/lib/opalrt
-            libs/lib/opal/include \
-
-        FORMS += src/ui/OpalLinkSettings.ui
-
-        HEADERS += \
-            src/comm/OpalRT.h \
-            src/comm/OpalLink.h \
-            src/comm/Parameter.h \
-            src/comm/QGCParamID.h \
-            src/comm/ParameterList.h \
-            src/ui/OpalLinkConfigurationWindow.h
-
-        SOURCES += \
-            src/comm/OpalRT.cc \
-            src/comm/OpalLink.cc \
-            src/comm/Parameter.cc \
-            src/comm/QGCParamID.cc \
-            src/comm/ParameterList.cc \
-            src/ui/OpalLinkConfigurationWindow.cc
-
-        LIBS += \
-            -LC:/OPAL-RT/RT-LAB7.2.4/Common/bin \
-            -lOpalApi
-    } else {
-        warning("Skipping support for RT-LAB (missing libraries, see README)")
-    }
-} else {
-    message("Skipping support for RT-LAB (unsupported platform)")
-}
-
 #
 # [REQUIRED] SDL dependency. Provides joystick/gamepad support.
 # The SDL is packaged with QGC for the Mac and Windows. Linux support requires installing the SDL

QGCInstaller.pri

@@ -29,7 +29,7 @@ installer {
         QMAKE_POST_LINK += && mkdir -p $${DESTDIR}/package
         QMAKE_POST_LINK += && cd $${DESTDIR} && $$dirname(QMAKE_QMAKE)/macdeployqt QGroundControl.app -appstore-compliant -verbose=2 -qmldir=$${BASEDIR}/src
         QMAKE_POST_LINK += && cd $${OUT_PWD}
-        QMAKE_POST_LINK += && hdiutil create -verbose -stretch 2g -layout SPUD -srcfolder $${DESTDIR}/QGroundControl.app -volname QGroundControl $${DESTDIR}/package/QGroundControl.dmg
+        QMAKE_POST_LINK += && hdiutil create -verbose -stretch 3g -layout SPUD -srcfolder $${DESTDIR}/QGroundControl.app -volname QGroundControl $${DESTDIR}/package/QGroundControl.dmg
     }
     WindowsBuild {
         # The pdb moving command are commented out for now since we are including the .pdb in the installer. This makes it much

QGCSetup.pri

@@ -63,7 +63,6 @@ WindowsBuild {
     ReleaseBuild: DLL_QT_DEBUGCHAR = ""
     COPY_FILE_LIST = \
         $$BASEDIR\\libs\\lib\\sdl2\\msvc\\lib\\x86\\SDL2.dll \
-        $$BASEDIR\\libs\\thirdParty\\libxbee\\lib\\libxbee.dll \
         $$BASEDIR\\deploy\\libeay32.dll
 
     for(COPY_FILE, COPY_FILE_LIST) {
@@ -85,6 +84,10 @@ WindowsBuild {
             QMAKE_POST_LINK += $$escape_expand(\\n) $$QMAKE_COPY \"C:\\Windows\\System32\\msvcp120.dll\"  \"$$DESTDIR_WIN\"
             QMAKE_POST_LINK += $$escape_expand(\\n) $$QMAKE_COPY \"C:\\Windows\\System32\\msvcr120.dll\"  \"$$DESTDIR_WIN\"
         }
+        else:win32-msvc2015 {
+            QMAKE_POST_LINK += $$escape_expand(\\n) $$QMAKE_COPY \"C:\\Windows\\System32\\msvcp140.dll\"  \"$$DESTDIR_WIN\"
+            QMAKE_POST_LINK += $$escape_expand(\\n) $$QMAKE_COPY \"C:\\Windows\\System32\\vcruntime140.dll\"  \"$$DESTDIR_WIN\"
+        }
         else {
             error("Visual studio version not supported, installation cannot be completed.")
         }
@@ -123,9 +126,9 @@ LinuxBuild {
 
         !contains(DEFINES, __rasp_pi2__) {
             QT_LIB_LIST += \
-                libicudata.so.54 \
-                libicui18n.so.54 \
-                libicuuc.so.54
+                libicudata.so.56 \
+                libicui18n.so.56 \
+                libicuuc.so.56
         }
 
         for(QT_LIB, QT_LIB_LIST) {

README.md

@@ -33,7 +33,7 @@ https://donlakeflyer.gitbooks.io/qgroundcontrol-user-guide/content/
 
 #### Native Builds
 QGroundControl builds are supported for OSX, Linux, Windows, iOS and Android. QGroundControl uses [Qt](http://www.qt.io) as its cross-platform support library and uses [QtCreator](http://doc.qt.io/qtcreator/index.html) as its default build environment.
-* OSX: OSX 10.7 or higher, 64 bit, clang compiler (IMPORTANT: XCode 8 not supported due to Qt bug. Currently only workaround is to use XCode 7.3.1)
+* OSX: OSX 10.7 or higher, 64 bit, clang compiler (IMPORTANT: XCode 8 requires a workaround described below)
 * Ubuntu: 64 bit, gcc compiler
 * Windows: Vista or higher, 32 bit, [Visual Studio 2013 compiler](http://www.visualstudio.com/downloads/download-visual-studio-vs#d-express-windows-desktop)
 * iOS: 8.0 and higher
@@ -43,7 +43,8 @@ QGroundControl builds are supported for OSX, Linux, Windows, iOS and Android. QG
 ###### Install QT
 You need to install Qt as described below instead of using pre-built packages from say, a Linux distribution because QGroundControl needs access to private Qt headers.
 * Download the [Qt installer](http://www.qt.io/download-open-source)
-    * Make sure to install Qt version **5.5.1** NOT 5.4.x, 5.6.x, 5.7.x, etc.  
+    * Make sure to install Qt version **5.5.1** NOT 5.4.x, 5.6.x, 5.7.x, etc. 
+    * If you don't install the full Qt 5.5 make sure you install Qt Location and Qt Quick Controls.
     * Ubuntu: Set the downloaded file to executable using:`chmod +x`. Install to default location for use with ./qgroundcontrol-start.sh. If you install Qt to a non-default location you will need to modify qgroundcontrol-start.sh in order to run downloaded builds.
     * Windows: Default installer not quite correct, use [this](http://download.qt.io/official_releases/qt/5.5/5.5.1/qt-opensource-windows-x86-msvc2013-5.5.1.exe) instead
 

Vagrantfile

@@ -25,7 +25,7 @@ Vagrant.configure(2) do |config|
      sudo apt-get update -y
      sudo apt-get dist-upgrade -y
      sudo apt-get install -y git build-essential
-     sudo apt-get install -y espeak libespeak-dev libudev-dev libsdl1.2-dev
+     sudo apt-get install -y espeak libespeak-dev libudev-dev libsdl2-dev
      sudo apt-get install -y doxygen
      sudo apt-get install -y gstreamer1.0* libgstreamer1.0*
 

android.pri

+include($$PWD/libs/qtandroidserialport/src/qtandroidserialport.pri)
+message("Adding Serial Java Classes")
+QT += androidextras
+ANDROID_PACKAGE_SOURCE_DIR = $$PWD/android
+OTHER_FILES += \
+    $$PWD/android/AndroidManifest.xml \
+    $$PWD/android/res/xml/device_filter.xml \
+    $$PWD/android/src/com/hoho/android/usbserial/driver/CdcAcmSerialDriver.java \
+    $$PWD/android/src/com/hoho/android/usbserial/driver/CommonUsbSerialDriver.java \
+    $$PWD/android/src/com/hoho/android/usbserial/driver/Cp2102SerialDriver.java \
+    $$PWD/android/src/com/hoho/android/usbserial/driver/FtdiSerialDriver.java \
+    $$PWD/android/src/com/hoho/android/usbserial/driver/ProlificSerialDriver.java \
+    $$PWD/android/src/com/hoho/android/usbserial/driver/UsbId.java \
+    $$PWD/android/src/com/hoho/android/usbserial/driver/UsbSerialDriver.java \
+    $$PWD/android/src/com/hoho/android/usbserial/driver/UsbSerialProber.java \
+    $$PWD/android/src/com/hoho/android/usbserial/driver/UsbSerialRuntimeException.java \
+    $$PWD/android/src/org/qgroundcontrol/qgchelper/UsbDeviceJNI.java \
+    $$PWD/android/src/org/qgroundcontrol/qgchelper/UsbIoManager.java
+
+DISTFILES += \
+    $$PWD/android/gradle/wrapper/gradle-wrapper.jar \
+    $$PWD/android/gradlew \
+    $$PWD/android/res/values/libs.xml \
+    $$PWD/android/build.gradle \
+    $$PWD/android/gradle/wrapper/gradle-wrapper.properties \
+    $$PWD/android/gradlew.bat

android/AndroidManifest.xml

@@ -48,7 +48,7 @@
             <!-- Background running -->
         </activity>
     </application>
-    <uses-sdk android:minSdkVersion="16" android:targetSdkVersion="22"/>
+    <uses-sdk android:minSdkVersion="16" android:targetSdkVersion="19"/>
 
     <!-- Needed to keep working while 'asleep' -->
     <uses-permission android:name="android.permission.WAKE_LOCK"/>

android/res/xml/device_filter.xml

 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <!-- Everything -->
+    <!-- Allow anything connected -->
     <usb-device />
-    <!-- 0x26AC / 0x11: PX4 FMU Pixhawk -->
-    <!--
-    <usb-device vendor-id="9900" product-id="17" />
-    -->
-
-    <!-- 0x0403 / 0x6001: FTDI FT232R UART -->
-    <!--
-    <usb-device vendor-id="1027" product-id="24577" />
-    -->
-
-    <!-- 0x0403 / 0x6015: FTDI FT231X -->
-    <!--
-    <usb-device vendor-id="1027" product-id="24597" />
-    -->
-
-    <!-- 0x2341 / Arduino -->
-    <!--
-    <usb-device vendor-id="9025" />
-    -->
-
-    <!-- 0x16C0 / 0x0483: Teensyduino  -->
-    <!--
-    <usb-device vendor-id="5824" product-id="1155" />
-    -->
-
-    <!-- 0x10C4 / 0xEA60: CP210x UART Bridge -->
-    <!--
-    <usb-device vendor-id="4292" product-id="60000" />
-    -->
-
-    <!-- 0x067B / 0x2303: Prolific PL2303 -->
-    <!--
-    <usb-device vendor-id="1659" product-id="8963" />
-    -->
 </resources>
 

android/src/com/hoho/android/usbserial/driver/UsbSerialProber.java

@@ -18,6 +18,10 @@
  * Project home page: http://code.google.com/p/usb-serial-for-android/
  */
 
+// IMPORTANT NOTE:
+//  This source has been modified from the original such that testIfSupported only tests for a vendor id
+//  match. If that matches it allows all product ids through. This provides for better match on unknown boards.
+
 package com.hoho.android.usbserial.driver;
 
 import android.hardware.usb.UsbDevice;
@@ -230,21 +234,7 @@ public enum UsbSerialProber {
      * @param supportedDevices map of vendor IDs to product ID(s)
      * @return {@code true} if supported
      */
-    private static boolean testIfSupported(final UsbDevice usbDevice,
-            final Map<Integer, int[]> supportedDevices) {
-        final int[] supportedProducts = supportedDevices.get(
-                Integer.valueOf(usbDevice.getVendorId()));
-        if (supportedProducts == null) {
-            return false;
-        }
-
-        final int productId = usbDevice.getProductId();
-        for (int supportedProductId : supportedProducts) {
-            if (productId == supportedProductId) {
-                return true;
-            }
-        }
-        return false;
+    private static boolean testIfSupported(final UsbDevice usbDevice, final Map<Integer, int[]> supportedDevices) {
+        return supportedDevices.containsKey(usbDevice.getVendorId());
     }
-
 }

android/src/org/qgroundcontrol/qgchelper/UsbDeviceJNI.java

@@ -68,6 +68,8 @@ public class UsbDeviceJNI extends QtActivity implements TextToSpeech.OnInitListe
     private static TextToSpeech  m_tts;
     private static PowerManager.WakeLock m_wl;
 
+    public static Context m_context;
+
     private final static UsbIoManager.Listener m_Listener =
             new UsbIoManager.Listener()
             {
@@ -90,6 +92,10 @@ public class UsbDeviceJNI extends QtActivity implements TextToSpeech.OnInitListe
     private static native void nativeDeviceException(int userDataA, String messageA);
     private static native void nativeDeviceNewData(int userDataA, byte[] dataA);
 
+    // Native C++ functions called to log output
+    public static native void qgcLogDebug(String message);
+    public static native void qgcLogWarning(String message);
+
     ////////////////////////////////////////////////////////////////////////////////////////////////
     //
     //  Constructor.  Only used once to create the initial instance for the static functions.
@@ -252,7 +258,7 @@ public class UsbDeviceJNI extends QtActivity implements TextToSpeech.OnInitListe
                 tempL = tempL + Integer.toString(deviceL.getVendorId()) + ":";
                 listL[countL] = tempL;
                 countL++;
-                //Log.i(TAG, "Found " + tempL);
+                qgcLogDebug("Found " + tempL);
             }
         }
 
@@ -273,11 +279,13 @@ public class UsbDeviceJNI extends QtActivity implements TextToSpeech.OnInitListe
     //              calls like close(), read(), and write().
     //
     /////////////////////////////////////////////////////////////////////////////////////////////////
-    public static int open(String nameA, int userDataA)
+    public static int open(Context parentContext, String nameA, int userDataA)
     {
         int idL = BAD_PORT;
 
-        Log.i(TAG, "Getting device list");
+        m_context = parentContext;
+
+        //qgcLogDebug("Getting device list");
         if (!getCurrentDevices())
             return BAD_PORT;
 
@@ -366,7 +374,7 @@ public class UsbDeviceJNI extends QtActivity implements TextToSpeech.OnInitListe
 
                 m_ioManager.remove(idL);
             }
-            Log.e(TAG, "Port open exception");
+            qgcLogWarning("Port open exception: " + exA.getMessage());
             return BAD_PORT;
         }
     }

deploy/create_linux_appimage.sh

@@ -35,7 +35,8 @@ mkdir -p ${APPDIR}
 cd ${TMPDIR}
 wget -c --quiet http://ftp.us.debian.org/debian/pool/main/u/udev/udev_175-7.2_amd64.deb
 wget -c --quiet http://ftp.us.debian.org/debian/pool/main/e/espeak/espeak_1.46.02-2_amd64.deb
-wget -c --quiet http://ftp.us.debian.org/debian/pool/main/libs/libsdl1.2/libsdl1.2debian_1.2.15-5_amd64.deb
+wget -c --quiet http://ftp.us.debian.org/debian/pool/main/libs/libsdl2/libsdl2-2.0-0_2.0.2%2bdfsg1-6_amd64.deb
+
 
 cd ${APPDIR}
 find ../ -name *.deb -exec dpkg -x {} . \;

deploy/qgroundcontrol_installer.nsi

@@ -41,6 +41,8 @@ Var StartMenuFolder
 
 InstallDir $PROGRAMFILES\qgroundcontrol
 
+SetCompressor /SOLID /FINAL lzma
+
 !define MUI_HEADERIMAGE
 !define MUI_HEADERIMAGE_BITMAP "installheader.bmp";
 

ios/iOS-Info.plist

@@ -2,85 +2,87 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
-    <key>CFBundleDisplayName</key>
-    <string>QGroundControl</string>
-    <key>CFBundleExecutable</key>
-    <string>$(EXECUTABLE_NAME)</string>
-    <key>NSHumanReadableCopyright</key>
-    <string>Open Source Flight Systems GmbH - Internal Build</string>
-    <key>CFBundleIconFile</key>
-    <string></string>
-    <key>CFBundleIdentifier</key>
-    <string>org.QGroundControl.qgc</string>
-    <key>CFBundleName</key>
-    <string>$(PRODUCT_NAME)</string>
-    <key>CFBundlePackageType</key>
-    <string>APPL</string>
-    <key>CFBundleShortVersionString</key>
-    <string>0.0.0</string>
-    <key>CFBundleSignature</key>
-    <string>????</string>
-    <key>CFBundleVersion</key>
-    <string>1</string>
-    <key>LSRequiresIPhoneOS</key>
-    <true/>
-    <key>UILaunchStoryboardName</key>
-    <string>QGCLaunchScreen</string>
-    <key>UIRequiresFullScreen</key>
-    <true/>
-    <key>CFBundleInfoDictionaryVersion</key>
-    <string>6.0</string>
-    <key>ForAppStore</key>
-    <string>No</string>
-    <key>NSLocationUsageDescription</key>
-    <string>Ground Station Location</string>
-    <key>NSLocationWhenInUseUsageDescription</key>
-    <string>Ground Station Location</string>
-    <key>UISupportedInterfaceOrientations</key>
-    <array>
-        <string>UIInterfaceOrientationLandscapeLeft</string>
-        <string>UIInterfaceOrientationLandscapeRight</string>
-    </array>
-    <key>CFBundleIcons</key>
-    <dict>
-        <key>CFBundlePrimaryIcon</key>
-        <dict>
-            <key>CFBundleIconFiles</key>
-            <array>
-                <string>AppIcon29x29.png</string>
-                <string>AppIcon29x29@2x.png</string>
-                <string>AppIcon40x40@2x.png</string>
-                <string>AppIcon57x57.png</string>
-                <string>AppIcon57x57@2x.png</string>
-                <string>AppIcon60x60@2x.png</string>
-            </array>
-        </dict>
-    </dict>
-    <key>CFBundleIcons~ipad</key>
-    <dict>
-        <key>CFBundlePrimaryIcon</key>
-        <dict>
-            <key>CFBundleIconFiles</key>
-            <array>
-                <string>AppIcon29x29.png</string>
-                <string>AppIcon29x29@2x.png</string>
-                <string>AppIcon40x40@2x.png</string>
-                <string>AppIcon57x57.png</string>
-                <string>AppIcon57x57@2x.png</string>
-                <string>AppIcon60x60@2x.png</string>
-                <string>AppIcon29x29~ipad.png</string>
-                <string>AppIcon29x29@2x~ipad.png</string>
-                <string>AppIcon40x40~ipad.png</string>
-                <string>AppIcon40x40@2x~ipad.png</string>
-                <string>AppIcon50x50~ipad.png</string>
-                <string>AppIcon50x50@2x~ipad.png</string>
-                <string>AppIcon72x72~ipad.png</string>
-                <string>AppIcon72x72@2x~ipad.png</string>
-                <string>AppIcon76x76~ipad.png</string>
-                <string>AppIcon76x76@2x~ipad.png</string>
-                <string>AppIcon83.5x83.5@2x~ipad.png</string>
-            </array>
-        </dict>
-    </dict>
+	<key>NSCameraUsageDescription</key>
+	<string>QGC uses UVC devices for video streaming.</string>
+	<key>CFBundleDisplayName</key>
+	<string>QGroundControl</string>
+	<key>CFBundleExecutable</key>
+	<string>$(EXECUTABLE_NAME)</string>
+	<key>NSHumanReadableCopyright</key>
+	<string>Open Source Flight Systems GmbH - Internal Build</string>
+	<key>CFBundleIconFile</key>
+	<string></string>
+	<key>CFBundleIdentifier</key>
+	<string>org.QGroundControl.qgc</string>
+	<key>CFBundleName</key>
+	<string>$(PRODUCT_NAME)</string>
+	<key>CFBundlePackageType</key>
+	<string>APPL</string>
+	<key>CFBundleShortVersionString</key>
+	<string>0.0.0</string>
+	<key>CFBundleSignature</key>
+	<string>????</string>
+	<key>CFBundleVersion</key>
+	<string>1</string>
+	<key>LSRequiresIPhoneOS</key>
+	<true/>
+	<key>UILaunchStoryboardName</key>
+	<string>QGCLaunchScreen</string>
+	<key>UIRequiresFullScreen</key>
+	<true/>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>ForAppStore</key>
+	<string>No</string>
+	<key>NSLocationUsageDescription</key>
+	<string>Ground Station Location</string>
+	<key>NSLocationWhenInUseUsageDescription</key>
+	<string>Ground Station Location</string>
+	<key>UISupportedInterfaceOrientations</key>
+	<array>
+		<string>UIInterfaceOrientationLandscapeLeft</string>
+		<string>UIInterfaceOrientationLandscapeRight</string>
+	</array>
+	<key>CFBundleIcons</key>
+	<dict>
+		<key>CFBundlePrimaryIcon</key>
+		<dict>
+			<key>CFBundleIconFiles</key>
+			<array>
+				<string>AppIcon29x29.png</string>
+				<string>AppIcon29x29@2x.png</string>
+				<string>AppIcon40x40@2x.png</string>
+				<string>AppIcon57x57.png</string>
+				<string>AppIcon57x57@2x.png</string>
+				<string>AppIcon60x60@2x.png</string>
+			</array>
+		</dict>
+	</dict>
+	<key>CFBundleIcons~ipad</key>
+	<dict>
+		<key>CFBundlePrimaryIcon</key>
+		<dict>
+			<key>CFBundleIconFiles</key>
+			<array>
+				<string>AppIcon29x29.png</string>
+				<string>AppIcon29x29@2x.png</string>
+				<string>AppIcon40x40@2x.png</string>
+				<string>AppIcon57x57.png</string>
+				<string>AppIcon57x57@2x.png</string>
+				<string>AppIcon60x60@2x.png</string>
+				<string>AppIcon29x29~ipad.png</string>
+				<string>AppIcon29x29@2x~ipad.png</string>
+				<string>AppIcon40x40~ipad.png</string>
+				<string>AppIcon40x40@2x~ipad.png</string>
+				<string>AppIcon50x50~ipad.png</string>
+				<string>AppIcon50x50@2x~ipad.png</string>
+				<string>AppIcon72x72~ipad.png</string>
+				<string>AppIcon72x72@2x~ipad.png</string>
+				<string>AppIcon76x76~ipad.png</string>
+				<string>AppIcon76x76@2x~ipad.png</string>
+				<string>AppIcon83.5x83.5@2x~ipad.png</string>
+			</array>
+		</dict>
+	</dict>
 </dict>
 </plist>

libs/lib/Frameworks/SDL2.framework/Versions/A/Resources/Info.plist

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>BuildMachineOSBuild</key>
+	<string>15C50</string>
+	<key>CFBundleDevelopmentRegion</key>
+	<string>English</string>
+	<key>CFBundleExecutable</key>
+	<string>SDL2</string>
+	<key>CFBundleGetInfoString</key>
+	<string>http://www.libsdl.org</string>
+	<key>CFBundleIdentifier</key>
+	<string>org.libsdl.SDL2</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundleName</key>
+	<string>Simple DirectMedia Layer</string>
+	<key>CFBundlePackageType</key>
+	<string>FMWK</string>
+	<key>CFBundleShortVersionString</key>
+	<string>2.0.4</string>
+	<key>CFBundleSignature</key>
+	<string>SDLX</string>
+	<key>CFBundleSupportedPlatforms</key>
+	<array>
+		<string>MacOSX</string>
+	</array>
+	<key>CFBundleVersion</key>
+	<string>2.0.4</string>
+	<key>DTCompiler</key>
+	<string>com.apple.compilers.llvm.clang.1_0</string>
+	<key>DTPlatformBuild</key>
+	<string>7C68</string>
+	<key>DTPlatformVersion</key>
+	<string>GM</string>
+	<key>DTSDKBuild</key>
+	<string>15C43</string>
+	<key>DTSDKName</key>
+	<string>macosx10.11</string>
+	<key>DTXcode</key>
+	<string>0720</string>
+	<key>DTXcodeBuild</key>
+	<string>7C68</string>
+</dict>
+</plist>

libs/lib/Frameworks/SDL2.framework/Versions/A/_CodeSignature/CodeResources

-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>files</key>
-	<dict>
-		<key>Resources/Info.plist</key>
-		<data>
-		p+Cz4Y64VH6pZL+sceQcjAJniME=
-		</data>
-	</dict>
-	<key>files2</key>
-	<dict>
-		<key>Headers/SDL.h</key>
-		<data>
-		7nrs8rqLHJbbjdCsBibxA6rEHdE=
-		</data>
-		<key>Headers/SDL_assert.h</key>
-		<data>
-		WAfvaSHAUBsbTpD1OW6bLIO3TDo=
-		</data>
-		<key>Headers/SDL_atomic.h</key>
-		<data>
-		6ZfydfmWn0sHmKXyYj1gCJC9EdQ=
-		</data>
-		<key>Headers/SDL_audio.h</key>
-		<data>
-		QlFi0vrVOdDgVyOeeux8WYNfJtY=
-		</data>
-		<key>Headers/SDL_bits.h</key>
-		<data>
-		bBKWsjJQnPdjedRePFr25fPkhrM=
-		</data>
-		<key>Headers/SDL_blendmode.h</key>
-		<data>
-		Qbv4ZV4rYaGKgwLfmRqpUXcfrzo=
-		</data>
-		<key>Headers/SDL_clipboard.h</key>
-		<data>
-		E2B/Gj1/db5PjecKc2tjGLGnnEU=
-		</data>
-		<key>Headers/SDL_config.h</key>
-		<data>
-		SICWRZVShJxQcjoldrByc8tKyiE=
-		</data>
-		<key>Headers/SDL_config_macosx.h</key>
-		<data>
-		AXT1YfhBssV2mdMI7radyWtrnV4=
-		</data>
-		<key>Headers/SDL_copying.h</key>
-		<data>
-		ksKqAB2l2GpnBa96oo8FhwfrjZs=
-		</data>
-		<key>Headers/SDL_cpuinfo.h</key>
-		<data>
-		L1bug7VmDQNJDS/a2qhveSB41wg=
-		</data>
-		<key>Headers/SDL_endian.h</key>
-		<data>
-		yIPSROTHpa65o98kvhVPa5vJd20=
-		</data>
-		<key>Headers/SDL_error.h</key>
-		<data>
-		EKMXAYytkozTsnGEetwJSWxDdXs=
-		</data>
-		<key>Headers/SDL_events.h</key>
-		<data>
-		ADO6YH92cpZr0xch44chc5jDoBk=
-		</data>
-		<key>Headers/SDL_filesystem.h</key>
-		<data>
-		z0ipNXSs0G+cMSE5xJ/1OLb0iww=
-		</data>
-		<key>Headers/SDL_gamecontroller.h</key>
-		<data>
-		+fEy8fr9o1eNqVcgZxdAGSB+fdg=
-		</data>
-		<key>Headers/SDL_gesture.h</key>
-		<data>
-		gL8Pe0KmmUmvy06MPiwcXLy1RPc=
-		</data>
-		<key>Headers/SDL_haptic.h</key>
-		<data>
-		mZKe1lBgPwES+wjXj+NqIqG4D7g=
-		</data>
-		<key>Headers/SDL_hints.h</key>
-		<data>
-		8ccADZ7c1T6VURxXmnucUptCjFE=
-		</data>
-		<key>Headers/SDL_joystick.h</key>
-		<data>
-		GQ1apgzllUcFXq08Wp6GXfaItxk=
-		</data>
-		<key>Headers/SDL_keyboard.h</key>
-		<data>
-		wqXTQaRIpfh2YsZOyej8AymHDh4=
-		</data>
-		<key>Headers/SDL_keycode.h</key>
-		<data>
-		6bL7lbeGExj/h8aqaSdhpq23rJY=
-		</data>
-		<key>Headers/SDL_loadso.h</key>
-		<data>
-		NpMytx6UwU3pTsWYm9KbfrSeyBM=
-		</data>
-		<key>Headers/SDL_log.h</key>
-		<data>
-		rghDDMt7l/53fcvzIf2ueASgru0=
-		</data>
-		<key>Headers/SDL_main.h</key>
-		<data>
-		S4r/E0n7XChUx09exG9MmT+wVC4=
-		</data>
-		<key>Headers/SDL_messagebox.h</key>
-		<data>
-		AofMdqXibVh1eLBrQBaSJtT2TBA=
-		</data>
-		<key>Headers/SDL_mouse.h</key>
-		<data>
-		I0gCdZwctoT8UsPkCyQcev84wic=
-		</data>
-		<key>Headers/SDL_mutex.h</key>
-		<data>
-		V9Eo8zGubHioHOR/zDh7vxX7Ot0=
-		</data>
-		<key>Headers/SDL_name.h</key>
-		<data>
-		mEOy6xwQy0aKcghbHD2Gk8AiE2Y=
-		</data>
-		<key>Headers/SDL_opengl.h</key>
-		<data>
-		uLy76O02VpeHP49lGqfyOJZVN98=
-		</data>
-		<key>Headers/SDL_opengl_glext.h</key>
-		<data>
-		nqPX1ObCVYyVzW3VbD3C/1vaTRE=
-		</data>
-		<key>Headers/SDL_opengles.h</key>
-		<data>
-		Qe8Wo6WE/eFYjQpZNSkjrEdPH3k=
-		</data>
-		<key>Headers/SDL_opengles2.h</key>
-		<data>
-		j2409OmIX5ZzPeAohEUZ9fTY0dA=
-		</data>
-		<key>Headers/SDL_opengles2_gl2.h</key>
-		<data>
-		g4y04zPFy1H/qujSNGRd0vB7ClQ=
-		</data>
-		<key>Headers/SDL_opengles2_gl2ext.h</key>
-		<data>
-		bTlnL+42kbi+n/gH//X2p0pqeuM=
-		</data>
-		<key>Headers/SDL_opengles2_gl2platform.h</key>
-		<data>
-		ByFMXJFtjcRglS/e0+DujyjC3dM=
-		</data>
-		<key>Headers/SDL_opengles2_khrplatform.h</key>
-		<data>
-		NLpJq9uBqjOpWhXISOQHPnTp/XQ=
-		</data>
-		<key>Headers/SDL_pixels.h</key>
-		<data>
-		SYKqjrlfx4WBrF/7RJJcebj022I=
-		</data>
-		<key>Headers/SDL_platform.h</key>
-		<data>
-		yEP4Wx6FLQvho00DCxY4qMLDnV0=
-		</data>
-		<key>Headers/SDL_power.h</key>
-		<data>
-		Hht8UlX2Q+ZZYP4+TOUjRtFj+Ww=
-		</data>
-		<key>Headers/SDL_quit.h</key>
-		<data>
-		4gv2IjG2mCPLKUXLEgxBp+zQLuM=
-		</data>
-		<key>Headers/SDL_rect.h</key>
-		<data>
-		ArluDPEgeo4k7O85ALBoryFpGyk=
-		</data>
-		<key>Headers/SDL_render.h</key>
-		<data>
-		geL0fIDmDRM/s1nP1HdMh7Bn+KY=
-		</data>
-		<key>Headers/SDL_revision.h</key>
-		<data>
-		U25Cfa7DqslNn/mqxEnMfgLnA9I=
-		</data>
-		<key>Headers/SDL_rwops.h</key>
-		<data>
-		NLcf6LWtFIqQT/OcVl+KUtvGVIY=
-		</data>
-		<key>Headers/SDL_scancode.h</key>
-		<data>
-		cFbtc//t5wQjDoEFox2sb72ixzM=
-		</data>
-		<key>Headers/SDL_shape.h</key>
-		<data>
-		uI7SsJKg+9VUi3Ol3HSjbrfJiuw=
-		</data>
-		<key>Headers/SDL_stdinc.h</key>
-		<data>
-		EqWdk11X5VFG5/gIaFSC2tThVN0=
-		</data>
-		<key>Headers/SDL_surface.h</key>
-		<data>
-		WoUDHhIvivPiGkT/PjIt7/Wag0k=
-		</data>
-		<key>Headers/SDL_system.h</key>
-		<data>
-		mTKo4PBIinn03uXfN1DJ/He9e9k=
-		</data>
-		<key>Headers/SDL_syswm.h</key>
-		<data>
-		ZpNuqGdez02XRnDbUCnPQlvrpQg=
-		</data>
-		<key>Headers/SDL_thread.h</key>
-		<data>
-		7j7DqnFpoS63qhuVR2Q0gSa/4ds=
-		</data>
-		<key>Headers/SDL_timer.h</key>
-		<data>
-		wTTvR/s4oORZCAHQrwGvEitdftg=
-		</data>
-		<key>Headers/SDL_touch.h</key>
-		<data>
-		iTKBLV0gnsn1y4RjFyKjss42FAw=
-		</data>
-		<key>Headers/SDL_types.h</key>
-		<data>
-		sxzg0bkqO1atJAHHIFE6TMMWt+w=
-		</data>
-		<key>Headers/SDL_version.h</key>
-		<data>
-		H5m85H3BgpanqxVVrr8x27umKn0=
-		</data>
-		<key>Headers/SDL_video.h</key>
-		<data>
-		vdRhnMIZssjdCJ72fNj04OTX3u0=
-		</data>
-		<key>Headers/begin_code.h</key>
-		<data>
-		WnMoGL8utnke7xWxpDeTFp+/QIA=
-		</data>
-		<key>Headers/close_code.h</key>
-		<data>
-		nnSi+1tlfaAkwmjGng6tRmzXcnw=
-		</data>
-		<key>Resources/Info.plist</key>
-		<data>
-		p+Cz4Y64VH6pZL+sceQcjAJniME=
-		</data>
-	</dict>
-	<key>rules</key>
-	<dict>
-		<key>^Resources/</key>
-		<true/>
-		<key>^Resources/.*\.lproj/</key>
-		<dict>
-			<key>optional</key>
-			<true/>
-			<key>weight</key>
-			<real>1000</real>
-		</dict>
-		<key>^Resources/.*\.lproj/locversion.plist$</key>
-		<dict>
-			<key>omit</key>
-			<true/>
-			<key>weight</key>
-			<real>1100</real>
-		</dict>
-		<key>^version.plist$</key>
-		<true/>
-	</dict>
-	<key>rules2</key>
-	<dict>
-		<key>.*\.dSYM($|/)</key>
-		<dict>
-			<key>weight</key>
-			<real>11</real>
-		</dict>
-		<key>^(.*/)?\.DS_Store$</key>
-		<dict>
-			<key>omit</key>
-			<true/>
-			<key>weight</key>
-			<real>2000</real>
-		</dict>
-		<key>^(Frameworks|SharedFrameworks|PlugIns|Plug-ins|XPCServices|Helpers|MacOS|Library/(Automator|Spotlight|LoginItems))/</key>
-		<dict>
-			<key>nested</key>
-			<true/>
-			<key>weight</key>
-			<real>10</real>
-		</dict>
-		<key>^.*</key>
-		<true/>
-		<key>^Info\.plist$</key>
-		<dict>
-			<key>omit</key>
-			<true/>
-			<key>weight</key>
-			<real>20</real>
-		</dict>
-		<key>^PkgInfo$</key>
-		<dict>
-			<key>omit</key>
-			<true/>
-			<key>weight</key>
-			<real>20</real>
-		</dict>
-		<key>^Resources/</key>
-		<dict>
-			<key>weight</key>
-			<real>20</real>
-		</dict>
-		<key>^Resources/.*\.lproj/</key>
-		<dict>
-			<key>optional</key>
-			<true/>
-			<key>weight</key>
-			<real>1000</real>
-		</dict>
-		<key>^Resources/.*\.lproj/locversion.plist$</key>
-		<dict>
-			<key>omit</key>
-			<true/>
-			<key>weight</key>
-			<real>1100</real>
-		</dict>
-		<key>^[^/]+$</key>
-		<dict>
-			<key>nested</key>
-			<true/>
-			<key>weight</key>
-			<real>10</real>
-		</dict>
-		<key>^embedded\.provisionprofile$</key>
-		<dict>
-			<key>weight</key>
-			<real>20</real>
-		</dict>
-		<key>^version\.plist$</key>
-		<dict>
-			<key>weight</key>
-			<real>20</real>
-		</dict>
-	</dict>
-</dict>
-</plist>

v1.0 @ 13a47809

-Subproject commit e93ac62981a338a7c823364e7c4ff1077e3f8fc1
+Subproject commit 13a478092fc9c2faa90c553c362e799ba3bad4e8

v2.0 @ b5aaac46

-Subproject commit 36f37bde1df2dd36661fbcbd6ed5aaf0424c8269
+Subproject commit b5aaac46c4819bab0f80d4d071ae9a8fec439676

libs/qtandroidserialport/src/qserialport_android.cpp

@@ -46,10 +46,10 @@
 #include <QtAndroidExtras/QtAndroidExtras>
 #include <QtAndroidExtras/QAndroidJniObject>
 
-#include <android/log.h>
-
 #include "qserialport_android_p.h"
 
+QGC_LOGGING_CATEGORY(AndroidSerialPortLog, "AndroidSerialPortLog")
+
 QT_BEGIN_NAMESPACE
 
 #define BAD_PORT 0
@@ -91,6 +91,30 @@ static void jniDeviceException(JNIEnv *envA, jobject thizA, jint userDataA, jstr
     }
 }
 
+static void jniLogDebug(JNIEnv *envA, jobject thizA, jstring messageA)
+{
+    Q_UNUSED(thizA);
+
+    const char *stringL = envA->GetStringUTFChars(messageA, NULL);
+    QString logMessage = QString::fromUtf8(stringL);
+    envA->ReleaseStringUTFChars(messageA, stringL);
+    if (envA->ExceptionCheck())
+        envA->ExceptionClear();
+    qCDebug(AndroidSerialPortLog) << logMessage;
+}
+
+static void jniLogWarning(JNIEnv *envA, jobject thizA, jstring messageA)
+{
+    Q_UNUSED(thizA);
+
+    const char *stringL = envA->GetStringUTFChars(messageA, NULL);
+    QString logMessage = QString::fromUtf8(stringL);
+    envA->ReleaseStringUTFChars(messageA, stringL);
+    if (envA->ExceptionCheck())
+        envA->ExceptionClear();
+    qWarning() << logMessage;
+}
+
 void cleanJavaException()
 {
     QAndroidJniEnvironment env;
@@ -116,13 +140,15 @@ QSerialPortPrivate::QSerialPortPrivate(QSerialPort *q)
 
 void QSerialPortPrivate::setNativeMethods(void)
 {
-    __android_log_print(ANDROID_LOG_INFO, kJTag, "Registering Native Functions");
+    qCDebug(AndroidSerialPortLog) << "Registering Native Functions";
 
     //  REGISTER THE C++ FUNCTION WITH JNI
     JNINativeMethod javaMethods[] {
-        {"nativeDeviceHasDisconnected", "(I)V",                   reinterpret_cast<void *>(jniDeviceHasDisconnected)},
-        {"nativeDeviceNewData",         "(I[B)V",                 reinterpret_cast<void *>(jniDeviceNewData)},
-        {"nativeDeviceException",       "(ILjava/lang/String;)V", reinterpret_cast<void *>(jniDeviceException)}
+        {"nativeDeviceHasDisconnected", "(I)V",                     reinterpret_cast<void *>(jniDeviceHasDisconnected)},
+        {"nativeDeviceNewData",         "(I[B)V",                   reinterpret_cast<void *>(jniDeviceNewData)},
+        {"nativeDeviceException",       "(ILjava/lang/String;)V",   reinterpret_cast<void *>(jniDeviceException)},
+        {"qgcLogDebug",                 "(Ljava/lang/String;)V",    reinterpret_cast<void *>(jniLogDebug)},
+        {"qgcLogWarning",               "(Ljava/lang/String;)V",    reinterpret_cast<void *>(jniLogWarning)}
     };
 
     QAndroidJniEnvironment jniEnv;
@@ -133,36 +159,36 @@ void QSerialPortPrivate::setNativeMethods(void)
 
     jclass objectClass = jniEnv->FindClass(kJniClassName);
     if(!objectClass) {
-        __android_log_print(ANDROID_LOG_ERROR, kJTag, "Couldn't find class: %s", kJniClassName);
+        qWarning() << "Couldn't find class:" << kJniClassName;
         return;
     }
 
     jint val = jniEnv->RegisterNatives(objectClass, javaMethods, sizeof(javaMethods) / sizeof(javaMethods[0]));
 
-    __android_log_print(ANDROID_LOG_INFO, kJTag, "Native Functions Registered");
+    if (val < 0) {
+        qWarning() << "Error registering methods: " << val;
+    } else {
+        qCDebug(AndroidSerialPortLog) << "Native Functions Registered";
+    }
 
     if (jniEnv->ExceptionCheck()) {
         jniEnv->ExceptionDescribe();
         jniEnv->ExceptionClear();
     }
-
-    if (val < 0) {
-        __android_log_print(ANDROID_LOG_ERROR, kJTag, "Error registering methods");
-    }
 }
 
 bool QSerialPortPrivate::open(QIODevice::OpenMode mode)
 {
     rwMode = mode;
-    __android_log_print(ANDROID_LOG_INFO, kJTag, "Opening %s", systemLocation.toLatin1().data());
+    qCDebug(AndroidSerialPortLog) << "Opening" << systemLocation.toLatin1().data();
 
-    __android_log_print(ANDROID_LOG_INFO, kJTag, "Calling Java Open");
     QAndroidJniObject jnameL = QAndroidJniObject::fromString(systemLocation);
     cleanJavaException();
     deviceId = QAndroidJniObject::callStaticMethod<jint>(
         kJniClassName,
         "open",
-        "(Ljava/lang/String;I)I",
+        "(Landroid/content/Context;Ljava/lang/String;I)I",
+        QtAndroid::androidActivity().object(),
         jnameL.object<jstring>(),
         (jint)this);
     cleanJavaException();
@@ -171,20 +197,11 @@ bool QSerialPortPrivate::open(QIODevice::OpenMode mode)
 
     if (deviceId == BAD_PORT)
     {
-        __android_log_print(ANDROID_LOG_ERROR, kJTag, "Error opening %s", systemLocation.toLatin1().data());
+        qWarning() << "Error opening %s" << systemLocation.toLatin1().data();
         q_ptr->setError(QSerialPort::DeviceNotFoundError);
         return false;
     }
 
-    __android_log_print(ANDROID_LOG_INFO, kJTag, "Calling Java getDeviceHandle");
-    cleanJavaException();
-    descriptor = QAndroidJniObject::callStaticMethod<jint>(
-        kJniClassName,
-        "getDeviceHandle",
-        "(I)I",
-        deviceId);
-    cleanJavaException();
-
     if (rwMode == QIODevice::WriteOnly)
         stopReadThread();
 
@@ -196,7 +213,7 @@ void QSerialPortPrivate::close()
     if (deviceId == BAD_PORT)
         return;
 
-    __android_log_print(ANDROID_LOG_INFO, kJTag, "Closing %s", systemLocation.toLatin1().data());
+    qCDebug(AndroidSerialPortLog) << "Closing" << systemLocation.toLatin1().data();
     cleanJavaException();
     jboolean resultL = QAndroidJniObject::callStaticMethod<jboolean>(
         kJniClassName,

libs/qtandroidserialport/src/qserialport_android_p.h

@@ -49,6 +49,9 @@
 #include <QtCore/qstringlist.h>
 #include <QtCore/qthread.h>
 
+#include "QGCLoggingCategory.h"
+
+Q_DECLARE_LOGGING_CATEGORY(AndroidSerialPortLog)
 
 QT_BEGIN_NAMESPACE
 

libs/qwt/qwt_plot_canvas.cpp

@@ -937,7 +937,14 @@ void QwtPlotCanvas::drawBorder( QPainter *painter )
     else
     {
 #if QT_VERSION >= 0x040500
+#if !defined(_MSC_VER)
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
+#endif
         QStyleOptionFrameV3 opt;
+#if !defined(_MSC_VER)
+#pragma GCC diagnostic pop
+#endif
         opt.init(this);
 
         int frameShape  = frameStyle() & QFrame::Shape_Mask;

libs/thirdParty/libxbee/README

-Welcome to libxbee!
-
-I have proveded sample code in the ./sample directory. Hopefully this will help
-get you up and running with libxbee. If you would like samples showing a different
-aspect of libxbee, then please do not hesitate to file an 'issue' on the project
-site, and I will get to it ASAP:
-  http://code.google.com/p/libxbee/issues/list
-
-
-Documentation is avaliable via the man page system once you have installed the
-library, or as HTML in the 'doc' directory.
-  $ man libxbee
-
-
-Please note that this project is still in development, so should not be used for
-any purpose other than learning/playing/testing etc... Basically don't use it to
-make money, and then hold me responsible if it breaks!
-
-Feel free to contact me directly with any queries:
-  attie@attie.co.uk
-
-
-For those of you that are planning to use this on an embedded board, I have
-included a small makefile (umakefile) that has only the information needed to
-compile the library. I suggest you use this instead!
-
-=== Installation ===
-To install simply type:
-  $ make install
-
-For more information, or if you can't install it, please see the wiki:
-  http://code.google.com/p/libxbee/wiki/install_libxbee
-
-
-=== Usage ===
-If you are compiling the object file directly into your executable instead
-of making use of the shared library, you must include the following link
-flags:
-  -lpthread -lrt

libs/thirdParty/libxbee/doc/man/man3/libxbee.3.html

-<HTML><HEAD><TITLE>Manpage of LIBXBEE</TITLE>
-</HEAD><BODY>
-<H1>LIBXBEE</H1>
-Section: Linux Programmer's Manual (3)<BR>Updated: 2009-11-01<BR><A HREF="#index">Index</A>
-<A HREF="../index.html">Return to Main Contents</A><HR>
-
-<A NAME="lbAB">&nbsp;</A>
-<H2>NAME</H2>
-
-libxbee
-<A NAME="lbAC">&nbsp;</A>
-<H2>DESCRIPTION</H2>
-
-libxbee is a C library to aid the use of Series 1 Digi XBee radios running in API mode (AP=2).
-<P>
-I have tried to keep flexibility to a maximum.
-By allowing connections to individual nodes to be created you don't have to address each packet,
-or filter through incomming packets to get at the one you are after. This is all taken care of
-for you by
-<B>libxbee!</B>
-
-<P>
-libxbee is still in development, so if you find any bugs or have any enhancement requests, please
-feel free to submit an issue on the project page:
-
-<PRE>
-<A HREF="http://code.google.com/p/libxbee/">http://code.google.com/p/libxbee/</A>
-</PRE>
-
-
-or contact me (Attie) directly:
-
-<PRE>
-<A HREF="mailto:attie@attie.co.uk">attie@attie.co.uk</A>
-</PRE>
-
-
-<A NAME="lbAD">&nbsp;</A>
-<H2>MAN PAGES</H2>
-
-Documentation is avaliable via the following man pages, or by example in the 'sample' folder in the SVN repository
-
-<P>
-<B><A HREF="../man3/xbee_pkt.3.html">xbee_pkt</A></B>(3) - libxbee's packet structure
-
-<B><A HREF="../man3/xbee_con.3.html">xbee_con</A></B>(3) - libxbee's connection structure
-
-<P>
-<B><A HREF="../man3/xbee_setup.3.html">xbee_setup</A></B>(3) - function to setup libxbee (and its variants)
-
-<B><A HREF="../man3/xbee_end.3.html">xbee_end</A></B>(3) - function to end the libxbee session and close any open handles
-
-<P>
-<B><A HREF="../man3/xbee_logit.3.html">xbee_logit</A></B>(3) - function that allows the user to add to the xbee log output
-
-<P>
-<B><A HREF="../man3/xbee_newcon.3.html">xbee_newcon</A></B>(3) - function to create a new connection
-
-<B><A HREF="../man3/xbee_flushcon.3.html">xbee_flushcon</A></B>(3) - function to flush packets from a connection
-
-<B><A HREF="../man3/xbee_endcon.3.html">xbee_endcon</A></B>(3) - function to end a connection
-
-<P>
-<B><A HREF="../man3/xbee_senddata.3.html">xbee_senddata</A></B>(3) - function to send data to a remote XBee (and its variants)
-
-<B><A HREF="../man3/xbee_getpacket.3.html">xbee_getpacket</A></B>(3) - function to get a packet from a connection (and its variants)
-
-<P>
-<B><A HREF="../man3/xbee_hasdigital.3.html">xbee_hasdigital</A></B>(3) - function to check if digital sample is in the packet
-
-<B><A HREF="../man3/xbee_getdigital.3.html">xbee_getdigital</A></B>(3) - function to get digital sample from the packet
-
-<P>
-<B><A HREF="../man3/xbee_hasanalog.3.html">xbee_hasanalog</A></B>(3) - function to check if analog sample is in the packet
-
-<B><A HREF="../man3/xbee_getanalog.3.html">xbee_getanalog</A></B>(3) - function to get the analog sample from the packet
-
-
-
-<A NAME="lbAE">&nbsp;</A>
-<H2>SEE ALSO</H2>
-
-<B><A HREF="../man3/xbee_pkt.3.html">xbee_pkt</A></B>(3),
-
-<B><A HREF="../man3/xbee_con.3.html">xbee_con</A></B>(3),
-
-<B><A HREF="../man3/xbee_setup.3.html">xbee_setup</A></B>(3),
-
-<B><A HREF="../man3/xbee_end.3.html">xbee_end</A></B>(3),
-
-<B><A HREF="../man3/xbee_logit.3.html">xbee_logit</A></B>(3),
-
-<B><A HREF="../man3/xbee_newcon.3.html">xbee_newcon</A></B>(3),
-
-<B><A HREF="../man3/xbee_flushcon.3.html">xbee_flushcon</A></B>(3),
-
-<B><A HREF="../man3/xbee_endcon.3.html">xbee_endcon</A></B>(3),
-
-<B><A HREF="../man3/xbee_senddata.3.html">xbee_senddata</A></B>(3),
-
-<B><A HREF="../man3/xbee_getpacket.3.html">xbee_getpacket</A></B>(3),
-
-<B><A HREF="../man3/xbee_hasdigital.3.html">xbee_hasdigital</A></B>(3),
-
-<B><A HREF="../man3/xbee_getdigital.3.html">xbee_getdigital</A></B>(3),
-
-<B><A HREF="../man3/xbee_hasanalog.3.html">xbee_hasanalog</A></B>(3),
-
-<B><A HREF="../man3/xbee_getanalog.3.html">xbee_getanalog</A></B>(3)
-
-<P>
-
-<HR>
-<A NAME="index">&nbsp;</A><H2>Index</H2>
-<DL>
-<DT><A HREF="#lbAB">NAME</A><DD>
-<DT><A HREF="#lbAC">DESCRIPTION</A><DD>
-<DT><A HREF="#lbAD">MAN PAGES</A><DD>
-<DT><A HREF="#lbAE">SEE ALSO</A><DD>
-</DL>
-<HR>
-This document was created by
-<A HREF="http://localhost/cgi-bin/man/man2html">man2html</A>,
-using the manual pages.<BR>
-Time: 00:08:23 GMT, March 30, 2011
-</BODY>
-</HTML>

libs/thirdParty/libxbee/doc/man/man3/xbee_con.3.html

-<HTML><HEAD><TITLE>Manpage of LIBXBEE</TITLE>
-</HEAD><BODY>
-<H1>LIBXBEE</H1>
-Section: Linux Programmer's Manual (3)<BR>Updated: 2009-11-01<BR><A HREF="#index">Index</A>
-<A HREF="../index.html">Return to Main Contents</A><HR>
-
-<A NAME="lbAB">&nbsp;</A>
-<H2>NAME</H2>
-
-libxbee
-<P>
-This page has not been written yet...
-<P>
-
-<HR>
-<A NAME="index">&nbsp;</A><H2>Index</H2>
-<DL>
-<DT><A HREF="#lbAB">NAME</A><DD>
-</DL>
-<HR>
-This document was created by
-<A HREF="http://localhost/cgi-bin/man/man2html">man2html</A>,
-using the manual pages.<BR>
-Time: 00:08:23 GMT, March 30, 2011
-</BODY>
-</HTML>

libs/thirdParty/libxbee/doc/man/man3/xbee_endcon.3.html

-<HTML><HEAD><TITLE>Invalid Manpage</TITLE></HEAD>
-<BODY>
-<H1>Invalid Manpage</H1>
-The requested file ./man/man3/xbee_endcon.3 is not a valid (unformatted) man page.</BODY></HTML>

libs/thirdParty/libxbee/doc/man/man3/xbee_flushcon.3.html

-<HTML><HEAD><TITLE>Invalid Manpage</TITLE></HEAD>
-<BODY>
-<H1>Invalid Manpage</H1>
-The requested file ./man/man3/xbee_flushcon.3 is not a valid (unformatted) man page.</BODY></HTML>

libs/thirdParty/libxbee/doc/man/man3/xbee_hasanalog.3.html

-<HTML><HEAD><TITLE>Invalid Manpage</TITLE></HEAD>
-<BODY>
-<H1>Invalid Manpage</H1>
-The requested file ./man/man3/xbee_hasanalog.3 is not a valid (unformatted) man page.</BODY></HTML>