about to add fact system to wima

.appveyor.yml

 version: '{branch}-{build}'
 
+image: Visual Studio 2017
+
 build:
   verbosity: minimal
 
 environment:
   matrix:
-#  - BUILD: 'Debug'
-#    CONFIG: debug
-#    SHADOW_BUILD_DIR: C:\projects\qgroundcontrol\build_windows_debug
   - BUILD: 'Release'
     CONFIG: installer
     SHADOW_BUILD_DIR: C:\projects\qgroundcontrol\build_windows_install
+    QT_JOM_DIR: C:\Qt-QGC-5.12.6\Tools\QtCreator\bin
+    QT_QMAKE_DIR: C:\Qt-QGC-5.12.6\5.12.6\msvc2017_64\bin
 
 install:
   - git submodule update --init --recursive
-  - call "%ProgramFiles(x86)%\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" x86
-  - set PATH=C:\Qt\Tools\QtCreator\bin;C:\Qt\5.11\msvc2015\bin;%PATH%
+  - call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvars64.bat"
   - mkdir %LOCALAPPDATA%\QtProject && copy test\qtlogging.ini %LOCALAPPDATA%\QtProject\
+  - ps: |
+      Write-Host "Installing Qt..." -ForegroundColor Cyan
+      $qt7zPath = "$($env:USERPROFILE)\Qt-QGC-5.12.6.7z"
+      Write-Host "Downloading..."
+      (New-Object Net.WebClient).DownloadFile('https://qgroundcontrol.s3-us-west-2.amazonaws.com/dependencies/Qt-QGC-5.12.6.7z', $qt7zPath)
+      Write-Host "Unzipping..."
+      cmd /c start /wait 7z x $qt7zPath -oC:\
+      Write-Host "Installed" -ForegroundColor Green
   - ps: |
       Write-Host "Installing GStreamer..." -ForegroundColor Cyan
-      $msiPath = "$($env:USERPROFILE)\gstreamer-1.0-x86-1.5.2.msi"
+      $msiPath = "$($env:USERPROFILE)\gstreamer-1.0-x86_64-1.14.4.msi"
       Write-Host "Downloading..."
-      (New-Object Net.WebClient).DownloadFile('https://s3-us-west-2.amazonaws.com/qgroundcontrol/dependencies/gstreamer-1.0-x86-1.5.2.msi', $msiPath)
+      (New-Object Net.WebClient).DownloadFile('https://s3-us-west-2.amazonaws.com/qgroundcontrol/dependencies/gstreamer-1.0-x86_64-1.14.4.msi', $msiPath)
       Write-Host "Installing..."
       cmd /c start /wait msiexec /package $msiPath /passive ADDLOCAL=ALL
       Write-Host "Installed" -ForegroundColor Green
   - ps: |
       Write-Host "Installing GStreamer dev..." -ForegroundColor Cyan
-      $msiPath = "$($env:USERPROFILE)\gstreamer-1.0-devel-x86-1.5.2.msi"
+      $msiPath = "$($env:USERPROFILE)\gstreamer-1.0-devel-x86_64-1.14.4.msi"
       Write-Host "Downloading..."
-      (New-Object Net.WebClient).DownloadFile('https://s3-us-west-2.amazonaws.com/qgroundcontrol/dependencies/gstreamer-1.0-devel-x86-1.5.2.msi', $msiPath)
+      (New-Object Net.WebClient).DownloadFile('https://s3-us-west-2.amazonaws.com/qgroundcontrol/dependencies/gstreamer-1.0-devel-x86_64-1.14.4.msi', $msiPath)
       Write-Host "Installing..."
       cmd /c start /wait msiexec /package $msiPath /passive ADDLOCAL=ALL
       Write-Host "Installed" -ForegroundColor Green
 
 build_script:
-  - mkdir %SHADOW_BUILD_DIR% && cd %SHADOW_BUILD_DIR% && C:\Qt\5.11\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 )
+  - mkdir %SHADOW_BUILD_DIR% && cd %SHADOW_BUILD_DIR% && %QT_QMAKE_DIR%\qmake -r CONFIG+=%CONFIG% %APPVEYOR_BUILD_FOLDER%\qgroundcontrol.pro
+  - cd %SHADOW_BUILD_DIR% && %QT_JOM_DIR%\jom
+  - if "%CONFIG%" EQU "installer" ( copy %SHADOW_BUILD_DIR%\staging\QGroundControl-installer.exe %APPVEYOR_BUILD_FOLDER%\QGroundControl-installer.exe )
 # Generate the source server information to embed in the PDB
-  - '"C:\Program Files (x86)\Windows Kits\8.1\Debuggers\x64\srcsrv\srctool.exe" -r -u "%SHADOW_BUILD_DIR%\release\qgroundcontrol.pdb" | grep qgroundcontrol | grep -v moc_ | grep -v libs\\mavlink | grep -v build_windows_install | python %APPVEYOR_BUILD_FOLDER%\deploy\genPDBsrcsrv.py > %SHADOW_BUILD_DIR%\release\qgroundcontrol.pdb.srcsrv'
+# Temporarily disabled while we try to figure out where this is located on appveyor image
+#  - '"C:\Program Files (x86)\Windows Kits\10\Debuggers\x64\srcsrv\srctool.exe" -r -u "%SHADOW_BUILD_DIR%\qgc-app\qgroundcontrol.pdb" | grep qgroundcontrol | grep -v moc_ | grep -v libs\\mavlink | grep -v build_windows_install | python %APPVEYOR_BUILD_FOLDER%\deploy\genPDBsrcsrv.py > %SHADOW_BUILD_DIR%\qgc-app\qgroundcontrol.pdb.srcsrv'
 # write the source server info
-  - '"C:\Program Files (x86)\Windows Kits\8.1\Debuggers\x64\srcsrv\pdbstr.exe" -w -i:%SHADOW_BUILD_DIR%\release\qgroundcontrol.pdb.srcsrv -p:%SHADOW_BUILD_DIR%\release\qgroundcontrol.pdb -s:srcsrv'
+#  - '"C:\Program Files (x86)\Windows Kits\10\Debuggers\x64\srcsrv\pdbstr.exe" -w -i:%SHADOW_BUILD_DIR%\qgc-app\qgroundcontrol.pdb.srcsrv -p:%SHADOW_BUILD_DIR%\qgc-app\qgroundcontrol.pdb -s:srcsrv'
 # build the symbol / PE store
-  - 'cd %APPVEYOR_BUILD_FOLDER% && "C:\Program Files (x86)\Windows Kits\8.1\Debuggers\x64\symstore.exe" add /compress /s symbols /f %SHADOW_BUILD_DIR%\release\qgroundcontrol.pdb /t qgroundcontrol'
-  - 'cd %APPVEYOR_BUILD_FOLDER% && "C:\Program Files (x86)\Windows Kits\8.1\Debuggers\x64\symstore.exe" add /compress /s symbols /f %SHADOW_BUILD_DIR%\release\qgroundcontrol.exe /t qgroundcontrol'
-  - ps: 'cd $env:appveyor_build_folder; .\deploy\lowercaseify_symbolstore.ps1'
+#  - 'cd %APPVEYOR_BUILD_FOLDER% && "C:\Program Files (x86)\Windows Kits\10\Debuggers\x64\symstore.exe" add /compress /s symbols /f %SHADOW_BUILD_DIR%\qgc-app\qgroundcontrol.pdb /t qgroundcontrol'
+#  - 'cd %APPVEYOR_BUILD_FOLDER% && "C:\Program Files (x86)\Windows Kits\10\Debuggers\x64\symstore.exe" add /compress /s symbols /f %SHADOW_BUILD_DIR%\qgc-app\qgroundcontrol.exe /t qgroundcontrol'
+#  - ps: 'cd $env:appveyor_build_folder; .\deploy\lowercaseify_symbolstore.ps1'
 
 test_script:
   - if "%CONFIG%" EQU "debug" ( %SHADOW_BUILD_DIR%\debug\qgroundcontrol --unittest )
 
-for:
--
-  branches:
-    only:
-      - master
-  artifacts:
+artifacts:
   - path: QGroundControl-installer.exe
     name: qgcinstaller
--
-  branches:
-    only:
-      - Stable_V3.5
-  artifacts:
-    - path: QGroundControl-installer.exe
-      name: qgcinstaller
-    - path: symbols\**\*.*_
-      name: symbols
+  - path: build_windows_install\staging\qgroundcontrol.pdb
+    name: pdb
 
 deploy:
 # deploy continuous builds to s3
@@ -101,19 +98,19 @@ deploy:
 #      appveyor_repo_tag: false
 
 # deploy release symbols to s3
-  - provider: S3
-    access_key_id:
-      secure: IGAojLMqokL+76DbdulmWDA3MTsxEBBi3ReVVSqTy9c=
-    secret_access_key:
-      secure: RiYqaR+3T2PMNz2j5ur8LCA6H/Zfd4jTX33CZE5iBxm+zaz4QLs25p0B7prpaoNN
-    bucket: qgroundcontrol
-    region: us-west-2
-    set_public: true
-    folder: releasesyms
-    artifact: symbols
-    on:
-      CONFIG: installer
-      appveyor_repo_tag: true
+#  - provider: S3
+#    access_key_id:
+#      secure: IGAojLMqokL+76DbdulmWDA3MTsxEBBi3ReVVSqTy9c=
+#    secret_access_key:
+#      secure: RiYqaR+3T2PMNz2j5ur8LCA6H/Zfd4jTX33CZE5iBxm+zaz4QLs25p0B7prpaoNN
+#    bucket: qgroundcontrol
+#    region: us-west-2
+#    set_public: true
+#    folder: releasesyms
+#    artifact: symbols
+#    on:
+#      CONFIG: installer
+#      appveyor_repo_tag: true
 
 # deploy tagged releases to Github releases
   - provider: GitHub
@@ -155,3 +152,18 @@ deploy:
     on:
       CONFIG: installer
       appveyor_repo_tag: true
+
+# deploy pdb for tagged releases to s3 latest folder
+  - provider: S3
+    access_key_id:
+        secure: IGAojLMqokL+76DbdulmWDA3MTsxEBBi3ReVVSqTy9c=
+    secret_access_key:
+        secure: RiYqaR+3T2PMNz2j5ur8LCA6H/Zfd4jTX33CZE5iBxm+zaz4QLs25p0B7prpaoNN
+    bucket: qgroundcontrol
+    region: us-west-2
+    set_public: true
+    folder: latest
+    artifact: pdb
+    on:
+       CONFIG: installer
+       appveyor_repo_tag: true

.github/ISSUE_TEMPLATE/feature_request.md

+---
+name: Feature request
+about: Tell us about your new idea
+
+---
+
+Tell us a bit about the feature:
+- What problem does it solve?
+- What does it do?
+- What flight stacks must it work with? (All, PX4, ArduPilot)
+- Relevant vehicle types? (All, multirotor, fixed-wing, VTOL, submarine, etc.)
+- Are there other systems that have this feature?
+- What communication/integration standards does the feature rely on (e.g. MAVLink commands etc.)
+
+Any additional context you can provide will make the feature easier to evaluate (e.g. mockups, detailed specification, etc.)

.gitignore

@@ -5,7 +5,6 @@ libs/lib/Frameworks/GStreamer.framework
 CMakeFiles
 tags
 build*/
-Info.plist
 obj
 .DS_Store
 *.log
@@ -28,7 +27,6 @@ doc/html
 doc/doxy.log
 deploy/mac
 deploy/linux
-deploy/qgroundcontrol*
 controller_log*
 user_config.pri
 *.app
@@ -57,6 +55,7 @@ libs/thirdParty/libxbee/lib/
 GeneratedFiles/
 gstreamer-1.0-android*
 src/Airmap/Airmap_api_key.h
+localization/qgroundcontrol/
 
 *.autosave
 .settings/
@@ -68,8 +67,6 @@ ios/iOSForAppStore-Info.plist
 moc_*
 ui_*
 *.o
-*.a
-*.so*
 *.moc
 *.prl
 

.gitmodules

@@ -4,9 +4,6 @@
 [submodule "libs/mavlink/include/mavlink/v2.0"]
 	path = libs/mavlink/include/mavlink/v2.0
 	url = https://github.com/mavlink/c_library_v2.git
-[submodule "libs/WGS84toCartesian"]
-	path = libs/WGS84toCartesian
-	url = https://github.com/chrberger/WGS84toCartesian.git
 [submodule "libs/polylabel"]
 	path = libs/polylabel
 	url = https://github.com/mapbox/polylabel.git
@@ -25,3 +22,9 @@
 [submodule "libs/or-tools"]
 	path = libs/or-tools
 	url = https://github.com/google/or-tools.git
+[submodule "libs/OpenSSL/android_openssl"]
+	path = libs/OpenSSL/android_openssl
+	url = https://github.com/Auterion/android_openssl
+[submodule "libs/qmlglsink/gst-plugins-good"]
+	path = libs/qmlglsink/gst-plugins-good
+	url = https://github.com/mavlink/gst-plugins-good.git

.gitmodules.orig

+[submodule "src/GPS/Drivers"]
+	path = src/GPS/Drivers
+	url = https://github.com/PX4/GpsDrivers.git
+[submodule "libs/mavlink/include/mavlink/v2.0"]
+	path = libs/mavlink/include/mavlink/v2.0
+	url = https://github.com/mavlink/c_library_v2.git
+<<<<<<< HEAD
+[submodule "libs/WGS84toCartesian"]
+	path = libs/WGS84toCartesian
+	url = https://github.com/chrberger/WGS84toCartesian.git
+[submodule "libs/polylabel"]
+	path = libs/polylabel
+	url = https://github.com/mapbox/polylabel.git
+[submodule ".libs/or-tools/dependencies/Cbc/source"]
+	path = .libs/or-tools/dependencies/Cbc/source
+	url = https://github.com/Mizux/Cbc.git
+[submodule ".libs/or-tools/dependencies/Cgl/source"]
+	path = .libs/or-tools/dependencies/Cgl/source
+	url = https://github.com/Mizux/Cgl.git
+[submodule ".libs/or-tools/dependencies/Clp/source"]
+	path = .libs/or-tools/dependencies/Clp/source
+	url = https://github.com/Mizux/Clp.git
+[submodule ".libs/or-tools/dependencies/Osi/source"]
+	path = .libs/or-tools/dependencies/Osi/source
+	url = https://github.com/Mizux/Osi.git
+[submodule "libs/or-tools"]
+	path = libs/or-tools
+	url = https://github.com/google/or-tools.git
+=======
+[submodule "libs/OpenSSL/android_openssl"]
+	path = libs/OpenSSL/android_openssl
+	url = https://github.com/Auterion/android_openssl
+[submodule "libs/qmlglsink/gst-plugins-good"]
+	path = libs/qmlglsink/gst-plugins-good
+	url = https://github.com/mavlink/gst-plugins-good.git
+>>>>>>> upstream_merge

.vagrantconfig.yml

 configs: