Update FirmwareUpgradeController.cc

.github/ISSUE_TEMPLATE/bug_report.md

@@ -1,7 +1,9 @@
 ---
 name: Bug report
 about: Create a report to help us improve
-labels: 
+title: ''
+labels: 'Report: Bug'
+assignees: ''
 
 ---
 

.github/ISSUE_TEMPLATE/feature_request.md

@@ -1,6 +1,9 @@
 ---
 name: Feature request
 about: Tell us about your new idea
+title: ''
+labels: Feature Request
+assignees: ''
 
 ---
 

.github/ISSUE_TEMPLATE/question.md

@@ -0,0 +1,13 @@
+---
+name: Question
+about: Ask a question related to QGC source
+title: ''
+labels: Question
+assignees: ''
+
+---
+
+Please only ask questions related to source code.
+- For questions about how to use or build QGC see: http://qgroundcontrol.com/#resources
+- If your question still isn't answered, please check the forums: https://discuss.px4.io/c/qgroundcontrol/15.
+- If it is about Qt or any QGC dependencies, please refer to them instead.

.github/actions/checkout/action.yml

@@ -0,0 +1,11 @@
+name: Checkout Repository
+description: Checks out the QGC repo with all the correct settings
+runs:
+  using: "composite"
+  steps:
+      - name: Checkout repo
+        uses: actions/checkout@v4
+        with:
+          submodules: recursive
+          fetch-tags: true
+          fetch-depth: 0

.github/actions/gstreamer/action.yml

@@ -0,0 +1,91 @@
+name: Build GStreamer
+description: Builds GStreamer using Meson
+inputs:
+  gst_version:
+    description: Version of GStreamer to Build
+    required: true
+    default: 1.22.11
+  build_type:
+    description: Build Type "release" or "debug"
+    required: true
+    default: release
+  working_directory:
+    description: Where to clone GStreamer source
+    required: true
+    default: ${{ runner.temp }}
+  install_directory:
+    description: Where to install GStreamer Build
+    required: true
+    default: ${{ runner.temp }}/gst
+runs:
+  using: "composite"
+  steps:
+    - name: Clone GStreamer
+      working-directory: ${{ inputs.working_directory }}
+      run: git clone --depth 1 --branch ${{ inputs.gst_version }} https://github.com/GStreamer/gstreamer.git
+      shell: bash
+
+    - name: Configure GStreamer
+      working-directory: ${{ inputs.working_directory }}/gstreamer
+      run: meson setup
+        --prefix=${{ inputs.install_directory }}
+        --buildtype=${{ inputs.build_type }}
+        --default-library=static
+        --wrap-mode=forcefallback
+        --strip
+        -Dauto_features=disabled
+        -Dgst-full-libraries=gstreamer,base,controller,net,app,audio,fft,pbutils,riff,rtp,rtsp,tag,video,gl,codecparsers,photography
+        -Dgpl=enabled
+        -Dlibav=enabled
+        -Dorc=enabled
+        -Dbase=enabled
+        -Dgst-plugins-base:gl=enabled
+        -Dgst-plugins-base:gl_platform=glx
+        -Dgst-plugins-base:gl_winsys=x11
+        -Dgst-plugins-base:x11=enabled
+        -Dgst-plugins-base:playback=enabled
+        -Dgst-plugins-base:tcp=enabled
+        -Dgood=enabled
+        -Dgst-plugins-good:qt6=enabled
+        -Dgst-plugins-good:qt-x11=enabled
+        -Dgst-plugins-good:qt-method=auto
+        -Dgst-plugins-good:isomp4=enabled
+        -Dgst-plugins-good:matroska=enabled
+        -Dgst-plugins-good:rtp=enabled
+        -Dgst-plugins-good:rtpmanager=enabled
+        -Dgst-plugins-good:rtsp=enabled
+        -Dgst-plugins-good:udp=enabled
+        -Dbad=enabled
+        -Dgst-plugins-bad:gl=enabled
+        -Dgst-plugins-bad:mpegtsdemux=enabled
+        -Dgst-plugins-bad:rtp=enabled
+        -Dgst-plugins-bad:videoparsers=enabled
+        -Dgst-plugins-bad:sdp=enabled
+        -Dgst-plugins-bad:x11=enabled
+        -Dugly=enabled
+        -Dgst-plugins-ugly:x264=enabled
+        builddir
+        # -Dqt6=enabled
+        # -Dgst-full-target-type=static_library
+        # -Dgst-plugins-base:gl_platform=glx,egl
+        # -Dgst-plugins-base:gl_winsys=x11,egl,wayland
+        # -Dgst-plugins-good:qt-wayland=enabled
+        # -Dgst-plugins-good:qt-egl=enabled
+        # -Dgst-plugins-bad:xshm=enabled
+        # -Dgst-plugins-bad:wayland=enabled
+      shell: bash
+
+    - name: Compile GStreamer
+      working-directory: ${{ inputs.working_directory }}/gstreamer
+      run: meson compile -C builddir
+      shell: bash
+
+    - name: Install GStreamer
+      working-directory: ${{ inputs.working_directory }}/gstreamer
+      run: meson install -C builddir
+      shell: bash
+
+    - name: Setup Environment
+      working-directory: ${{ runner.temp }}/gstreamer
+      run: echo "PKG_CONFIG_PATH=${{ runner.temp }}/gst/lib/x86_64-linux-gnu/pkgconfig:${{ env.PKG_CONFIG_PATH }}" >> "$GITHUB_ENV"
+      shell: bash

.github/actions/qt/action.yml

@@ -0,0 +1,23 @@
+name: Build jurplel/install-qt-action
+description: Build jurplel/install-qt-action
+runs:
+  using: "composite"
+  steps:
+    - uses: actions/checkout@v4
+      with:
+        repository: jurplel/install-qt-action
+        ref: master
+        path: install-qt-action
+
+    - uses: actions/setup-node@v4
+      with:
+        node-version: 22
+        cache: npm
+        cache-dependency-path: install-qt-action/action/
+
+    - name: Build jurplel/install-qt-action
+      run: |
+        cd install-qt-action/action/
+        npm ci || npm install
+        npm run build
+      shell: bash

.github/actions/upload/action.yml

@@ -0,0 +1,42 @@
+name: Upload Release
+description: Uploads a built release file
+inputs:
+  artifact_name:
+    description: artifact name
+    required: true
+  aws_key_id:
+    description: aws key id
+    required: true
+  aws_secret_access_key:
+    description: aws secret access key
+    required: true
+  source:
+    description: source location
+    required: false
+    default: package
+runs:
+  using: "composite"
+  steps:
+    - name: Save artifact
+      uses: actions/upload-artifact@v4
+      with:
+        name: ${{ inputs.artifact_name }}
+        path: ${{ runner.temp }}/shadow_build_dir/${{ inputs.source }}/${{ inputs.artifact_name }}
+
+    - name: Upload build to S3 Bucket
+      if: github.event_name == 'push'
+      working-directory: ${{ runner.temp }}/shadow_build_dir/${{ inputs.source }}
+      run: |
+        aws configure set aws_access_key_id ${{ inputs.aws_key_id }}
+        aws configure set aws_secret_access_key ${{ inputs.aws_secret_access_key }}
+        aws s3 cp ${{ inputs.artifact_name }} s3://qgroundcontrol/builds/${{ github.ref_name }}/${{ inputs.artifact_name }} --region us-west-2 --acl public-read
+      shell: bash
+
+    - name: Upload tagged stable build to S3 latest Bucket
+      if: github.event_name == 'push' && github.ref_type == 'tag'
+      working-directory: ${{ runner.temp }}/shadow_build_dir/${{ inputs.source }}
+      run: |
+        aws configure set aws_access_key_id ${{ inputs.aws_key_id }}
+        aws configure set aws_secret_access_key ${{ inputs.aws_secret_access_key }}
+        aws s3 cp ${{ inputs.artifact_name }} s3://qgroundcontrol/latest/${{ inputs.artifact_name }} --region us-west-2 --acl public-read
+      shell: bash

.github/pull_request_template.md

@@ -0,0 +1,23 @@
+<!--- Title -->
+
+Description
+-----------
+<!--- Describe your changes in detail. -->
+
+Test Steps
+-----------
+<!-- Describe the steps to reproduce. -->
+
+Checklist:
+----------
+<!--- Go over all the following points, and put an `x` in all the boxes that apply. -->
+- [ ] [Review Contribution Guidelines](https://github.com/mavlink/qgroundcontrol/blob/master/.github/CONTRIBUTING.md).
+- [ ] [Review Code of Conduct](https://github.com/mavlink/qgroundcontrol/blob/master/.github/CODE_OF_CONDUCT.md).
+- [ ] I have tested my changes.
+
+Related Issue
+-----------
+<!-- If any, please provide issue ID. -->
+
+
+By submitting this pull request, I confirm that you can use, modify, copy, and redistribute this contribution, under the terms of your choice.

.github/workflows/android-macos.yml

@@ -0,0 +1,130 @@
+name: Android-MacOS
+
+on:
+  workflow_dispatch:
+
+jobs:
+  build:
+    runs-on: macos-13
+
+    strategy:
+      matrix:
+        BuildType: [Debug, Release]
+
+    defaults:
+      run:
+        shell: bash
+
+    env:
+      ARTIFACT: QGroundControl.apk
+      QT_VERSION: 6.6.3
+      QT_ANDROID_KEYSTORE_PATH: ${{ github.workspace }}/deploy/android/android_release.keystore
+      QT_ANDROID_KEYSTORE_ALIAS: QGCAndroidKeyStore
+      QT_ANDROID_KEYSTORE_STORE_PASS: ${{ secrets.ANDROID_KEYSTORE_PASSWORD }}
+      QT_ANDROID_KEYSTORE_KEY_PASS: ${{ secrets.ANDROID_KEYSTORE_PASSWORD }}
+      QT_ANDROID_ABIS: "armeabi-v7a;arm64-v8a"
+
+    steps:
+      - name: Checkout repo
+        uses: actions/checkout@v4
+        with:
+          submodules: recursive
+          fetch-tags: true
+          fetch-depth: 0
+
+      - name: Setup Java Environment
+        uses: actions/setup-java@v4
+        with:
+          distribution: temurin
+          java-version: 17
+
+      - name: Install Qt6 for MacOS
+        uses: jurplel/install-qt-action@v4
+        with:
+          version: ${{ env.QT_VERSION }}
+          aqtversion: ==3.1.*
+          host: mac
+          target: desktop
+          dir: ${{ runner.temp }}
+          modules: qtcharts qtlocation qtpositioning qtspeech qt5compat qtmultimedia qtserialport qtimageformats qtshadertools qtconnectivity qtquick3d qtsensors
+          cache: ${{ github.ref == 'refs/heads/master' && github.event_name != 'pull_request' }}
+
+      - name: Install Qt6 for Android (armv7)
+        uses: jurplel/install-qt-action@v4
+        if: contains( env.QT_ANDROID_ABIS, 'armeabi-v7a')
+        with:
+          version: ${{ env.QT_VERSION }}
+          aqtversion: ==3.1.*
+          host: mac
+          target: android
+          arch: android_armv7
+          dir: ${{ runner.temp }}
+          modules: qtcharts qtlocation qtpositioning qtspeech qt5compat qtmultimedia qtserialport qtimageformats qtshadertools qtconnectivity qtquick3d qtsensors
+          cache: ${{ github.ref == 'refs/heads/master' && github.event_name != 'pull_request' }}
+
+      - name: Install Qt6 for Android (arm64_v8a)
+        uses: jurplel/install-qt-action@v4
+        if: contains( env.QT_ANDROID_ABIS, 'arm64-v8a')
+        with:
+          version: ${{ env.QT_VERSION }}
+          aqtversion: ==3.1.*
+          host: mac
+          target: android
+          arch: android_arm64_v8a
+          dir: ${{ runner.temp }}
+          modules: qtcharts qtlocation qtpositioning qtspeech qt5compat qtmultimedia qtserialport qtimageformats qtshadertools qtconnectivity qtquick3d qtsensors
+          cache: ${{ github.ref == 'refs/heads/master' && github.event_name != 'pull_request' }}
+
+      - name: Install Qt6 for Android (x86)
+        uses: jurplel/install-qt-action@v4
+        if: contains( env.QT_ANDROID_ABIS, 'x86')
+        with:
+          version: ${{ env.QT_VERSION }}
+          aqtversion: ==3.1.*
+          host: mac
+          target: android
+          arch: android_x86
+          dir: ${{ runner.temp }}
+          modules: qtcharts qtlocation qtpositioning qtspeech qt5compat qtmultimedia qtserialport qtimageformats qtshadertools qtconnectivity qtquick3d qtsensors
+          cache: ${{ github.ref == 'refs/heads/master' && github.event_name != 'pull_request' }}
+
+      - name: Install Qt6 for Android (x86_64)
+        uses: jurplel/install-qt-action@v4
+        if: contains( env.QT_ANDROID_ABIS, 'x86_64')
+        with:
+          version: ${{ env.QT_VERSION }}
+          aqtversion: ==3.1.*
+          host: mac
+          target: android
+          arch: android_x86_64
+          dir: ${{ runner.temp }}
+          modules: qtcharts qtlocation qtpositioning qtspeech qt5compat qtmultimedia qtserialport qtimageformats qtshadertools qtconnectivity qtquick3d qtsensors
+          cache: ${{ github.ref == 'refs/heads/master' && github.event_name != 'pull_request' }}
+
+      - name: Install Dependencies
+        run: |
+          brew update
+          brew install ninja cmake
+
+      - run: mkdir ${{ runner.temp }}/shadow_build_dir
+
+      - name: Configure
+        working-directory: ${{ runner.temp }}/shadow_build_dir
+        run: ${{ env.QT_ROOT_DIR }}/bin/qt-cmake -S ${{ github.workspace }} -B . -G Ninja
+              -DCMAKE_BUILD_TYPE=${{ matrix.BuildType }}
+              -DQT_ANDROID_ABIS="${{ env.QT_ANDROID_ABIS }}"
+              -DQT_ANDROID_BUILD_ALL_ABIS=OFF
+              -DQT_HOST_PATH="${{ env.QT_ROOT_DIR }}/../msvc2019_64"
+              -DQT_ANDROID_SIGN_APK=${{ github.ref == 'refs/heads/master' && github.event_name != 'pull_request' && 'ON' || 'OFF' }}
+              -DQT_DEBUG_FIND_PACKAGE=ON
+              -DQGC_STABLE_BUILD=${{ github.ref_type == 'tag' || contains(github.ref, 'Stable') && 'ON' || 'OFF' }}
+
+      - name: Build
+        working-directory: ${{ runner.temp }}/shadow_build_dir
+        run: cmake --build . --target all --config ${{ matrix.BuildType }}
+
+      - name: Save APK
+        uses: actions/upload-artifact@v4
+        with:
+          name: ${{ env.ARTIFACT }}
+          path: ${{ runner.temp }}/shadow_build_dir/android-build/*.apk