Merge branch 'telemetry_ratio.fix' of https://github.com/frankiearzu/…

…edgetx into telemetry_ratio.fix
EdgeTX · Dec 19, 2023 · 471f4d4 · 471f4d4
2 parents d56d77a + 8de9104
commit 471f4d4
Show file tree

Hide file tree

Showing 915 changed files with 112,263 additions and 181,545 deletions.
diff --git a/.github/ISSUE_TEMPLATE/bug-report.yml b/.github/ISSUE_TEMPLATE/bug-report.yml
@@ -58,6 +58,8 @@ body:
       label: Version
       description: What version of EdgeTX software are you running?
       options:
+        - 2.9.2
+        - 2.9.1
         - 2.9.0
         - 2.8.5
         - 2.8.4
@@ -103,11 +105,14 @@ body:
         - Jumper T18
         - Jumper T-Lite
         - Jumper T-Pro
-        - Radiomaster Boxer
-        - Radiomaster T8
+        - Jumper T-Pro V2
+        - RadioMaster Boxer
+        - RadioMaster MT12
+        - RadioMaster Pocket
+        - RadioMaster T8
         - RadioMaster TX12 / TX12MK2
-        - Radiomaster TX16S / TX16SMK2
-        - Radiomaster Zorro
+        - RadioMaster TX16S / TX16SMK2
+        - RadioMaster Zorro
         - Other (Please specify below)
     validations:
       required: true

diff --git a/.github/workflows/actions.yml b/.github/workflows/actions.yml
@@ -3,9 +3,6 @@ name: Run tests and package firmware
 on:
   push:
     branches:
-      - '2.6'
-      - '2.7'
-      - '2.8'
       - 'main'
     tags:
       - v*
@@ -20,11 +17,9 @@ on:
       - 'companion/**'
       - '.gitpod.yml'
       - '.devcontainer/**'
+      - 'fw.json'
   pull_request:
     branches:
-      - '2.6'
-      - '2.7'
-      - '2.8'
       - 'main'
     paths-ignore:
       - '**.md'
@@ -37,6 +32,7 @@ on:
       - 'companion/**'
       - '.gitpod.yml'
       - '.devcontainer/**'
+      - 'fw.json'
   workflow_dispatch:
 
 jobs:
@@ -50,6 +46,8 @@ jobs:
           - tx16s
           - nv14
           - el18
+          - pl18
+          - pl18ev
           - t12
           - t16
           - t18
@@ -94,11 +92,11 @@ jobs:
       matrix:
         target:
           - nv14;el18
+          - pl18;pl18ev
           - t12
-          - t16
-          - t18
-          - t8;zorro;pocket;commando8
-          - tlite;tlitef4;tpro;tprov2;lr3pro
+          - t16;t18
+          - t8;zorro;pocket;mt12;commando8
+          - tlite;tpro;tprov2;lr3pro
           - t20
           - tx12;tx12mk2;boxer
           - tx16s

diff --git a/.github/workflows/linux_cpn.yml b/.github/workflows/linux_cpn.yml
@@ -3,9 +3,6 @@ name: Linux Companion
 on:
   push:
     branches:
-      - '2.6'
-      - '2.7'
-      - '2.8'
       - 'main'
     tags:
       - v*
@@ -16,9 +13,6 @@ on:
 
   pull_request:
     branches:
-      - '2.6'
-      - '2.7'
-      - '2.8'
       - 'main'
     paths:
       - '.github/workflows/linux_cpn.yml'

diff --git a/.github/workflows/macosx_cpn.yml b/.github/workflows/macosx_cpn.yml
@@ -3,9 +3,6 @@ name: MacOSX Companion
 on:
   push:
     branches:
-      - '2.6'
-      - '2.7'
-      - '2.8'
       - 'main'
     tags:
       - v*
@@ -16,9 +13,6 @@ on:
 
   pull_request:
     branches:
-      - '2.6'
-      - '2.7'
-      - '2.8'
       - 'main'
     paths:
       - '.github/workflows/macosx_cpn.yml'
@@ -30,7 +24,7 @@ on:
 env:
   # Customize the CMake build type here (Release, Debug, RelWithDebInfo, etc.)
   BUILD_TYPE: Release
-  QT_VERSION: "5.12.9"
+  QT_VERSION: "5.15.2"
 
 jobs:
   build:
@@ -71,27 +65,27 @@ jobs:
         run: python3 -m pip install --upgrade pip Pillow lz4 clang jinja2
 
       - name: Patch GitHub macOS build
-        run: brew install pkg-config
+        run:  brew install pkg-config
 
       - name: Install libusb
-        run:   wget https://github.com/libusb/libusb/releases/download/v1.0.20/libusb-1.0.20.tar.bz2 &&
-          export MACOSX_DEPLOYMENT_TARGET=10.9 &&
-          tar xfv libusb-1.0.20.tar.bz2 &&
-          cd libusb-1.0.20 &&
-          ./configure &&
-          make install &&
-          cd ..
+        run:  brew install libusb
 
       - name: Install dfu-util
-        run:   wget https://downloads.sourceforge.net/project/dfu-util/dfu-util-0.9.tar.gz &&
-          tar xfv dfu-util-0.9.tar.gz &&
-          cd dfu-util-0.9 &&
-          ./configure &&
-          make install
+        run:  brew install dfu-util
+
+      - name: Select XCode version
+        uses: maxim-lobanov/setup-xcode@v1
+        with:
+          xcode-version: '13.2.1'
 
       - name: Install SDL2
         run:  brew install SDL2
 
+      - name: Select XCode version
+        uses: maxim-lobanov/setup-xcode@v1
+        with:
+          xcode-version: '11.7'
+
       - name: Build
         working-directory: ${{github.workspace}}
         shell: bash

diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
@@ -1,9 +1,6 @@
 ---
 name: Build and deploy nightly release
 on:
-  push:
-    branches:
-    - 'nightly_filenames'
   schedule:
     - cron: '0 2 * * *' # run at 2 AM UTC
 
@@ -19,11 +16,12 @@ jobs:
       matrix:
         target:
           - nv14;el18
+          - pl18;pl18ev
           - t12
           - t16
           - t18
-          - t8;zorro;pocket;commando8
-          - tlite;tlitef4;tpro;tprov2;lr3pro
+          - t8;zorro;pocket;mt12;commando8
+          - tlite;tpro;tprov2;lr3pro
           - t20
           - tx12;tx12mk2;boxer
           - tx16s

diff --git a/.github/workflows/win-cpn-32.yml b/.github/workflows/win-cpn-32.yml
@@ -17,9 +17,9 @@ env:
   # Customize the CMake build type here (Release, Debug, RelWithDebInfo, etc.)
   BUILD_TYPE: Release
   CMAKE_GENERATOR: "MSYS Makefiles"
-  QT_VERSION: "5.12.9"
-  MINGW_VERSION: "win32_mingw73"
-  MINGW_PATH: "mingw73_32"
+  QT_VERSION: "5.15.2"
+  MINGW_VERSION: "win32_mingw81"
+  MINGW_PATH: "mingw81_32"
 
 jobs:
   build:
@@ -56,7 +56,9 @@ jobs:
                                 mingw-w64-i686-libraqm \
                                 mingw-w64-i686-SDL2 \
                                 mingw-w64-i686-clang \
-                                mingw-w64-i686-nsis
+                                mingw-w64-i686-nsis \
+                                mingw-w64-i686-dfu-util \
+                                mingw-w64-i686-openssl
           python -m pip install clang jinja2
 
       - name: Install Qt
@@ -66,7 +68,6 @@ jobs:
           cache-key-prefix: 'install-qt-action-win32'
           version: ${{ env.QT_VERSION }}
           arch: ${{ env.MINGW_VERSION }}
-          tools: 'tools_openssl_x86'
 
       - name: Check out the repo
         uses: actions/checkout@v3
@@ -79,7 +80,6 @@ jobs:
         run: |
           mkdir output && \
           CMAKE_PREFIX_PATH=$RUNNER_WORKSPACE/Qt/$QT_VERSION/$MINGW_PATH \
-          QT_TOOLS_OPENSSL_ROOT_PATH=$RUNNER_WORKSPACE/Qt/Tools/OpenSSL/Win_x86 \
           tools/build-companion.sh "$(pwd)" "$(pwd)/output/"
       - name: Compose release filename
         # https://stackoverflow.com/questions/58033366/how-to-get-current-branch-within-github-actions

diff --git a/.github/workflows/win_cpn-64.yml b/.github/workflows/win_cpn-64.yml
@@ -3,9 +3,6 @@ name: Windows Companion 64-bit
 on:
   push:
     branches:
-      - '2.6'
-      - '2.7'
-      - '2.8'
       - 'main'
     tags:
       - v*
@@ -16,9 +13,6 @@ on:
 
   pull_request:
     branches:
-      - '2.6'
-      - '2.7'
-      - '2.8'
       - 'main'
     paths:
       - '.github/workflows/win_cpn-64.yml'
@@ -31,9 +25,9 @@ env:
   # Customize the CMake build type here (Release, Debug, RelWithDebInfo, etc.)
   BUILD_TYPE: Release
   CMAKE_GENERATOR: "MSYS Makefiles"
-  QT_VERSION: "5.12.9"
-  MINGW_VERSION: "win64_mingw73"
-  MINGW_PATH: "mingw73_64"
+  QT_VERSION: "5.15.2"
+  MINGW_VERSION: "win64_mingw81"
+  MINGW_PATH: "mingw81_64"
 
 jobs:
   build:
@@ -70,7 +64,9 @@ jobs:
                                 mingw-w64-x86_64-libraqm \
                                 mingw-w64-x86_64-SDL2 \
                                 mingw-w64-x86_64-clang \
-                                mingw-w64-x86_64-nsis
+                                mingw-w64-x86_64-nsis \
+                                mingw-w64-x86_64-dfu-util \
+                                mingw-w64-x86_64-openssl
           python -m pip install clang jinja2
 
       - name: Install Qt
@@ -80,7 +76,6 @@ jobs:
           cache-key-prefix: 'install-qt-action-win64'
           version: ${{ env.QT_VERSION }}
           arch: ${{ env.MINGW_VERSION }}
-          tools: 'tools_openssl_x64'
 
       - name: Check out the repo
         uses: actions/checkout@v3
@@ -93,7 +88,6 @@ jobs:
         run: |
           mkdir output && \
           CMAKE_PREFIX_PATH=$RUNNER_WORKSPACE/Qt/$QT_VERSION/$MINGW_PATH \
-          QT_TOOLS_OPENSSL_ROOT_PATH=$RUNNER_WORKSPACE/Qt/Tools/OpenSSL/Win_x64 \
           tools/build-companion.sh "$(pwd)" "$(pwd)/output/"
 
       - name: Compose release filename

diff --git a/.gitmodules b/.gitmodules
@@ -1,9 +1,6 @@
 [submodule "radio/src/thirdparty/AccessDenied"]
 	path = radio/src/thirdparty/AccessDenied
 	url = https://github.com/raphaelcoeffic/AccessDenied.git
-[submodule "companion/src/thirdparty/yaml-cpp"]
-	path = companion/src/thirdparty/yaml-cpp
-	url = https://github.com/jbeder/yaml-cpp.git
 [submodule "radio/src/thirdparty/FreeRTOS"]
 	path = radio/src/thirdparty/FreeRTOS
 	url = https://github.com/FreeRTOS/FreeRTOS-Kernel.git

diff --git a/.gitpod.yml b/.gitpod.yml
@@ -1,8 +1,4 @@
-image: ghcr.io/edgetx/edgetx-dev
-
-vscode:
-  extensions:
-    - ms-vscode.cpptools
+image: ghcr.io/edgetx/gitpod-workspace:latest
 
 tasks:
   - name: Prep build folder

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -47,7 +47,7 @@ if(EdgeTX_SUPERBUILD)
 
   # Add explicit targets for triggering cmake in the external projects
   set_property(DIRECTORY PROPERTY EP_STEP_TARGETS configure clean)
-  
+
   # Native targets
   ExternalProject_Add(native
     SOURCE_DIR ${CMAKE_SOURCE_DIR}
@@ -136,7 +136,7 @@ if(NATIVE_BUILD)
   include(NativeTargets)
 else()
   # Prevent CMake warnings
-  set(IGNORE "${SDL2_LIBRARY_PATH}")
+  set(IGNORE "${SDL2_LIBRARY_PATH}" "${LIBSSL1_ROOT_DIR}" "${OPENSSL_ROOT_DIR}")
 endif()
 
 add_subdirectory(${RADIO_SRC_DIR})
-Original file line number
+Diff line change
@@ Expand Up / @@ -3,9 +3,6 @@ name: Linux Companion @@
     on:
       push:
         branches:
-          - '2.6'
-          - '2.7'
-          - '2.8'
           - 'main'
         tags:
           - v*
@@ Expand All / @@ -16,9 +13,6 @@ on: @@
       pull_request:
         branches:
-          - '2.6'
-          - '2.7'
-          - '2.8'
           - 'main'
         paths:
           - '.github/workflows/linux_cpn.yml'
@@ Expand Down @@