.appveyor.yml

@@ -20,118 +20,118 @@ environment:
     #                          -DBUILD_SERVER=OFF \
     #                          -DCMAKE_PREFIX_PATH=C:\\Qt\\5.15.2\\msvc2019_64;C:\\Libraries\\boost_1_73_0"
     #   CMAKE_GENERATOR: Ninja
-    # - TARGET: ubuntu2204prod
-    #   APPVEYOR_BUILD_WORKER_CLOUD: nasrock Docker
-    #   APPVEYOR_BUILD_WORKER_IMAGE: Linux
-    #   CC:  "gcc-11"
-    #   CXX: "g++-11"
-    #   CMAKE_CUSTOM_OPTIONS: "-DCMAKE_BUILD_TYPE=Release \
-    #                          -DARCH_OPT=nehalem \
-    #                          -DDEBUG_OUTPUT=ON \
-    #                          -DENABLE_EXTERNAL_LIBRARIES=AUTO \
-    #                          -DBUILD_SERVER=OFF"
+    - TARGET: ubuntu2204prod
+      APPVEYOR_BUILD_WORKER_CLOUD: nasrock Docker
+      APPVEYOR_BUILD_WORKER_IMAGE: Linux
+      CC:  "gcc-11"
+      CXX: "g++-11"
+      CMAKE_CUSTOM_OPTIONS: "-DCMAKE_BUILD_TYPE=Release \
+                             -DARCH_OPT=nehalem \
+                             -DDEBUG_OUTPUT=ON \
+                             -DENABLE_EXTERNAL_LIBRARIES=AUTO \
+                             -DBUILD_SERVER=OFF"
     - TARGET: ubuntu2204docker
       APPVEYOR_BUILD_WORKER_CLOUD: nasrock
       APPVEYOR_BUILD_WORKER_IMAGE: Linux
       APPVEYOR_CONSOLE_DISABLE_PTY: true
 
 for:
-#   # - matrix:
-#   #     only:
-#   #       - TARGET: 'vs2019gui'
-#   #   cache:
-#   #     - C:\ProgramData\chocolatey\bin
-#   #     - C:\ProgramData\chocolatey\lib
-#   #   build_script:
-#   #     - call "%ProgramFiles(x86)%\Microsoft Visual Studio\2019\Community\VC\Auxiliary\Build\vcvars64.bat"
-#   #     # Install GNU patch as applying patches with git fails in BladeRF tree
-#   #     - choco install patch
-#   #     - git submodule update --init --recursive
-#   #     - mkdir build && cd build
-#   #     - cmake .. -G "%CMAKE_GENERATOR%" %CMAKE_CUSTOM_OPTIONS%
-#   #     - cmake --build . --config Release --target package
-#   #   artifacts: # push installer executable
-#   #     path: build\*.exe
-#   #     name: installer
-#   #   deploy:
-#   #     release: sdrangel-v$(appveyor_build_version)
-#   #     description: 'SDRangel Windows'
-#   #     provider: GitHub
-#   #     auth_token:
-#   #       secure: kyU5TaXRoily6q/QLRLqal2xCFGWEdnb8AJIu7FknsUQyj1wjRGmqC2My+Wfszod
-#   #     artifact: installer, portable
-#   #     draft: false
-#   #     prerelease: false
-#   #     tag: $(APPVEYOR_REPO_TAG_NAME) # will not work until tag is pushed
-#   #     on:
-#   #       APPVEYOR_REPO_TAG: true   # deploy on tag push only
-#   #       branch: master            # release from master branch only
-#   - matrix:
-#       only:
-#         - TARGET: ubuntu2204prod
-#     clone_folder: /home/appveyor/projects
-#     cache:
-#       - $HOME/external/
-#     install:
-#       - sh: sudo apt-get update
-#       - sh: echo 'debconf debconf/frontend select Noninteractive' | sudo debconf-set-selections
-#       # not sdrplay with soapysdr; libairspyhf-dev is too old (no lna)
-#       - sh: |
-#           sudo apt-get -y install build-essential cmake git xxd \
-#             devscripts fakeroot debhelper libfftw3-dev qtbase5-dev libopengl-dev libqt5opengl5-dev \
-#             qttools5-dev qttools5-dev-tools qtmultimedia5-dev libqt5multimedia5-plugins libqt5websockets5-dev \
-#             libqt5quick5 qtwebengine5-dev qtbase5-private-dev \
-#             qml-module-qtlocation qml-module-qtpositioning qml-module-qtquick-window2 qml-module-qtquick-dialogs \
-#             qml-module-qtquick-controls qml-module-qtquick-controls2 qml-module-qtquick-layouts qml-module-qtgraphicaleffects \
-#             libqt5serialport5-dev qtdeclarative5-dev qtpositioning5-dev qtlocation5-dev \
-#             libqt5charts5-dev libqt5texttospeech5-dev libqt5gamepad5-dev libqt5svg5-dev libfaad-dev libflac-dev zlib1g-dev \
-#             libusb-1.0-0-dev libhidapi-dev libboost-all-dev libasound2-dev libopencv-dev libopencv-imgcodecs-dev \
-#             libxml2-dev bison flex ffmpeg  libpostproc-dev libavcodec-dev libavformat-dev \
-#             libopus-dev libcodec2-dev libairspy-dev libhackrf-dev \
-#             libbladerf-dev libsoapysdr-dev libiio-dev libuhd-dev libhamlib-dev \
-#             python3-mako python3-cheetah python3-numpy \
-#             autoconf automake libtool ninja-build libclang1-11
-#       - sh: if [[ ! "${CMAKE_CUSTOM_OPTIONS}" =~ "ENABLE_EXTERNAL_LIBRARIES" ]]; then bash cmake/ci/build_cm256cc.sh; fi
-#       - sh: if [[ ! "${CMAKE_CUSTOM_OPTIONS}" =~ "ENABLE_EXTERNAL_LIBRARIES" ]]; then bash cmake/ci/build_mbelib.sh; fi
-#       - sh: if [[ ! "${CMAKE_CUSTOM_OPTIONS}" =~ "ENABLE_EXTERNAL_LIBRARIES" ]]; then bash cmake/ci/build_serialdv.sh; fi
-#       - sh: if [[ ! "${CMAKE_CUSTOM_OPTIONS}" =~ "ENABLE_EXTERNAL_LIBRARIES" ]]; then bash cmake/ci/build_dsdcc.sh; fi
-#       - sh: if [[ ! "${CMAKE_CUSTOM_OPTIONS}" =~ "ENABLE_EXTERNAL_LIBRARIES" ]]; then bash cmake/ci/build_perseus-sdr.sh; fi
-#       - sh: if [[ ! "${CMAKE_CUSTOM_OPTIONS}" =~ "ENABLE_EXTERNAL_LIBRARIES" ]]; then bash cmake/ci/build_xtrx-sdr.sh; fi
-#       - sh: if [[ ! "${CMAKE_CUSTOM_OPTIONS}" =~ "ENABLE_EXTERNAL_LIBRARIES" ]]; then bash cmake/ci/build_airspyhf.sh; fi
-#       - sh: if [[ ! "${CMAKE_CUSTOM_OPTIONS}" =~ "ENABLE_EXTERNAL_LIBRARIES" ]]; then bash cmake/ci/build_rtlsdr.sh; fi
-#       - sh: if [[ ! "${CMAKE_CUSTOM_OPTIONS}" =~ "ENABLE_EXTERNAL_LIBRARIES" ]]; then bash cmake/ci/build_limesuite.sh; fi
-#       - sh: if [[ ! "${CMAKE_CUSTOM_OPTIONS}" =~ "ENABLE_EXTERNAL_LIBRARIES" ]]; then bash cmake/ci/build_ggmorse.sh; fi
-#       - sh: bash cmake/ci/build_sdrplay.sh
-#     before_build:
-#       - sh: bash -c export
-#       - sh: bash -c pwd
-#     build_script:
-#       - sh: ./cmake/ci/build_sdrangel.sh
-#     test_script:
-#       # debian build path
-#       - sh: ./obj-x86_64-linux-gnu/sdrangelbench
-#     after_build:
-#       - sh: mkdir sdrangel-${APPVEYOR_BUILD_VERSION}
-#       - sh: cp ../*.deb ../*.build ../*.buildinfo ../*.changes sdrangel-${APPVEYOR_BUILD_VERSION}
-#       - sh: tar -czf sdrangel-${APPVEYOR_BUILD_VERSION}.tar.gz sdrangel-${APPVEYOR_BUILD_VERSION}
-#     artifacts:
-#       - path: sdrangel-${APPVEYOR_BUILD_VERSION}.tar.gz
-#         name: package2204
-#     # deploy:
-#     #   release: sdrangel-v$(appveyor_build_version)
-#     #   description: 'SDRangel Ubuntu 22.04'
-#     #   provider: GitHub
-#     #   auth_token:
-#     #     secure: kyU5TaXRoily6q/QLRLqal2xCFGWEdnb8AJIu7FknsUQyj1wjRGmqC2My+Wfszod
-#     #   artifact: archive
-#     #   draft: false
-#     #   prerelease: false
-#     #   on:
-#     #     APPVEYOR_REPO_TAG: true        # deploy on tag push only
-#     #     branch: master                 # release from master branch only
-#     deploy:
-#       provider: Environment
-#       name: f4exb
+  # - matrix:
+  #     only:
+  #       - TARGET: 'vs2019gui'
+  #   cache:
+  #     - C:\ProgramData\chocolatey\bin
+  #     - C:\ProgramData\chocolatey\lib
+  #   build_script:
+  #     - call "%ProgramFiles(x86)%\Microsoft Visual Studio\2019\Community\VC\Auxiliary\Build\vcvars64.bat"
+  #     # Install GNU patch as applying patches with git fails in BladeRF tree
+  #     - choco install patch
+  #     - git submodule update --init --recursive
+  #     - mkdir build && cd build
+  #     - cmake .. -G "%CMAKE_GENERATOR%" %CMAKE_CUSTOM_OPTIONS%
+  #     - cmake --build . --config Release --target package
+  #   artifacts: # push installer executable
+  #     path: build\*.exe
+  #     name: installer
+  #   deploy:
+  #     release: sdrangel-v$(appveyor_build_version)
+  #     description: 'SDRangel Windows'
+  #     provider: GitHub
+  #     auth_token:
+  #       secure: kyU5TaXRoily6q/QLRLqal2xCFGWEdnb8AJIu7FknsUQyj1wjRGmqC2My+Wfszod
+  #     artifact: installer, portable
+  #     draft: false
+  #     prerelease: false
+  #     tag: $(APPVEYOR_REPO_TAG_NAME) # will not work until tag is pushed
+  #     on:
+  #       APPVEYOR_REPO_TAG: true   # deploy on tag push only
+  #       branch: master            # release from master branch only
+  - matrix:
+      only:
+        - TARGET: ubuntu2204prod
+    clone_folder: /home/appveyor/projects
+    cache:
+      - $HOME/external/
+    install:
+      - sh: sudo apt-get update
+      - sh: echo 'debconf debconf/frontend select Noninteractive' | sudo debconf-set-selections
+      # not sdrplay with soapysdr; libairspyhf-dev is too old (no lna)
+      - sh: |
+          sudo apt-get -y install build-essential cmake git xxd \
+            devscripts fakeroot debhelper libfftw3-dev qtbase5-dev libopengl-dev libqt5opengl5-dev \
+            qttools5-dev qttools5-dev-tools qtmultimedia5-dev libqt5multimedia5-plugins libqt5websockets5-dev \
+            libqt5quick5 qtwebengine5-dev qtbase5-private-dev \
+            qml-module-qtlocation qml-module-qtpositioning qml-module-qtquick-window2 qml-module-qtquick-dialogs \
+            qml-module-qtquick-controls qml-module-qtquick-controls2 qml-module-qtquick-layouts qml-module-qtgraphicaleffects \
+            libqt5serialport5-dev qtdeclarative5-dev qtpositioning5-dev qtlocation5-dev \
+            libqt5charts5-dev libqt5texttospeech5-dev libqt5gamepad5-dev libqt5svg5-dev libfaad-dev zlib1g-dev \
+            libusb-1.0-0-dev libhidapi-dev libboost-all-dev libasound2-dev libopencv-dev libopencv-imgcodecs-dev \
+            libxml2-dev bison flex ffmpeg  libpostproc-dev libavcodec-dev libavformat-dev \
+            libopus-dev libcodec2-dev libairspy-dev libhackrf-dev \
+            libbladerf-dev libsoapysdr-dev libiio-dev libuhd-dev libhamlib-dev \
+            python3-mako python3-cheetah python3-numpy \
+            autoconf automake libtool ninja-build libclang1-11
+      - sh: if [[ ! "${CMAKE_CUSTOM_OPTIONS}" =~ "ENABLE_EXTERNAL_LIBRARIES" ]]; then bash cmake/ci/build_cm256cc.sh; fi
+      - sh: if [[ ! "${CMAKE_CUSTOM_OPTIONS}" =~ "ENABLE_EXTERNAL_LIBRARIES" ]]; then bash cmake/ci/build_mbelib.sh; fi
+      - sh: if [[ ! "${CMAKE_CUSTOM_OPTIONS}" =~ "ENABLE_EXTERNAL_LIBRARIES" ]]; then bash cmake/ci/build_serialdv.sh; fi
+      - sh: if [[ ! "${CMAKE_CUSTOM_OPTIONS}" =~ "ENABLE_EXTERNAL_LIBRARIES" ]]; then bash cmake/ci/build_dsdcc.sh; fi
+      - sh: if [[ ! "${CMAKE_CUSTOM_OPTIONS}" =~ "ENABLE_EXTERNAL_LIBRARIES" ]]; then bash cmake/ci/build_perseus-sdr.sh; fi
+      - sh: if [[ ! "${CMAKE_CUSTOM_OPTIONS}" =~ "ENABLE_EXTERNAL_LIBRARIES" ]]; then bash cmake/ci/build_xtrx-sdr.sh; fi
+      - sh: if [[ ! "${CMAKE_CUSTOM_OPTIONS}" =~ "ENABLE_EXTERNAL_LIBRARIES" ]]; then bash cmake/ci/build_airspyhf.sh; fi
+      - sh: if [[ ! "${CMAKE_CUSTOM_OPTIONS}" =~ "ENABLE_EXTERNAL_LIBRARIES" ]]; then bash cmake/ci/build_rtlsdr.sh; fi
+      - sh: if [[ ! "${CMAKE_CUSTOM_OPTIONS}" =~ "ENABLE_EXTERNAL_LIBRARIES" ]]; then bash cmake/ci/build_limesuite.sh; fi
+      - sh: if [[ ! "${CMAKE_CUSTOM_OPTIONS}" =~ "ENABLE_EXTERNAL_LIBRARIES" ]]; then bash cmake/ci/build_ggmorse.sh; fi
+      - sh: bash cmake/ci/build_sdrplay.sh
+    before_build:
+      - sh: bash -c export
+      - sh: bash -c pwd
+    build_script:
+      - sh: ./cmake/ci/build_sdrangel.sh
+    test_script:
+      # debian build path
+      - sh: ./obj-x86_64-linux-gnu/sdrangelbench
+    after_build:
+      - sh: mkdir sdrangel-${APPVEYOR_BUILD_VERSION}
+      - sh: cp ../*.deb ../*.build ../*.buildinfo ../*.changes sdrangel-${APPVEYOR_BUILD_VERSION}
+      - sh: tar -czf sdrangel-${APPVEYOR_BUILD_VERSION}.tar.gz sdrangel-${APPVEYOR_BUILD_VERSION}
+    artifacts:
+      - path: sdrangel-${APPVEYOR_BUILD_VERSION}.tar.gz
+        name: package2204
+    # deploy:
+    #   release: sdrangel-v$(appveyor_build_version)
+    #   description: 'SDRangel Ubuntu 22.04'
+    #   provider: GitHub
+    #   auth_token:
+    #     secure: kyU5TaXRoily6q/QLRLqal2xCFGWEdnb8AJIu7FknsUQyj1wjRGmqC2My+Wfszod
+    #   artifact: archive
+    #   draft: false
+    #   prerelease: false
+    #   on:
+    #     APPVEYOR_REPO_TAG: true        # deploy on tag push only
+    #     branch: master                 # release from master branch only
+    deploy:
+      provider: Environment
+      name: f4exb
   - matrix:
       only:
         - TARGET: ubuntu2204docker

.github/workflows/linux.yml

@@ -1,62 +0,0 @@
-name: SDRangel Linux release build
-
-on:
-  push:
-    branches:
-      - linux_github_release
-    tags:
-      - 'v*'
-
-jobs:
-  build_deb:
-    strategy:
-      fail-fast: false
-      matrix:
-       os: [ubuntu-22.04, ubuntu-24.04]
-    runs-on: ${{ matrix.os }}
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          submodules: true
-          fetch-depth: 0
-      - name: Install dependencies
-        run: |
-          sudo apt-get update
-          sudo apt-get -y install build-essential cmake git xxd \
-            devscripts fakeroot debhelper libfftw3-dev qtbase5-dev libopengl-dev libqt5opengl5-dev \
-            qttools5-dev qttools5-dev-tools qtmultimedia5-dev libqt5multimedia5-plugins libqt5websockets5-dev \
-            libqt5quick5 qtwebengine5-dev qtbase5-private-dev \
-            qml-module-qtlocation qml-module-qtpositioning qml-module-qtquick-window2 qml-module-qtquick-dialogs \
-            qml-module-qtquick-controls qml-module-qtquick-controls2 qml-module-qtquick-layouts qml-module-qtgraphicaleffects \
-            libqt5serialport5-dev qtdeclarative5-dev qtpositioning5-dev qtlocation5-dev \
-            libqt5charts5-dev libqt5texttospeech5-dev libqt5gamepad5-dev libqt5svg5-dev libfaad-dev libflac-dev zlib1g-dev \
-            libusb-1.0-0-dev libhidapi-dev libboost-all-dev libasound2-dev libopencv-dev libopencv-imgcodecs-dev \
-            libxml2-dev bison flex ffmpeg  libpostproc-dev libavcodec-dev libavformat-dev \
-            libopus-dev libcodec2-dev libairspy-dev libhackrf-dev \
-            libbladerf-dev libsoapysdr-dev libiio-dev libuhd-dev libhamlib-dev \
-            python3-mako python3-cheetah python3-numpy \
-            autoconf automake libtool ninja-build
-          bash cmake/ci/build_sdrplay.sh
-      - name: Build SDRangel
-        run: |
-          debuild -i -us -uc -b
-      - name: Get version
-        id: get_version
-        run: |
-            if [[ "${{github.ref_name}}" == "linux_github_release" ]]; then
-                echo "version=$(echo ${{github.sha}} | cut -c1-7)" >> $GITHUB_OUTPUT
-            else
-                echo "version=$(echo ${{github.ref_name}} | cut -c2-)" >> $GITHUB_OUTPUT
-            fi
-      - name: Rename
-        run: mv ../sdrangel_*_amd64.deb sdrangel_${{ steps.get_version.outputs.version }}_${{ matrix.os }}_amd64.deb
-      - name: Upload artifact
-        uses: actions/upload-artifact@v4
-        with:
-          name: sdrangel_${{ steps.get_version.outputs.version }}_${{ matrix.os }}_amd64.deb
-          path: sdrangel_${{ steps.get_version.outputs.version }}_${{ matrix.os }}_amd64.deb
-      - name: Upload release
-        if: startsWith(github.ref, 'refs/tags/')
-        uses: softprops/action-gh-release@v2
-        with:
-          files: sdrangel_${{ steps.get_version.outputs.version }}_${{ matrix.os }}_amd64.deb

.github/workflows/mac.yml

@@ -1,161 +0,0 @@
-name: SDRangel Mac release build
-
-on:
-  push:
-    branches:
-      - mac_ci
-    tags:
-      - 'v*'
-
-jobs:
-  build_mac_x64:
-    runs-on: macos-13
-    env:
-      MACOSX_DEPLOYMENT_TARGET: 12.0
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          submodules: true
-          fetch-depth: 0
-      - name: Update brew
-        run: brew update
-      - name: Install brew packages
-        run: brew install nasm subversion
-      - name: Install SDRplay API
-        run: |
-            wget https://www.sdrplay.com/software/SDRplayAPI-macos-installer-universal-3.15.0.pkg
-            sudo installer -pkg SDRplayAPI-macos-installer-universal-3.15.0.pkg -target /
-      - name: Install python
-        run: |
-            wget  https://www.python.org/ftp/python/3.12.7/python-3.12.7-macos11.pkg
-            sudo installer -pkg python-3.12.7-macos11.pkg -target /
-      - name: Install python packages for UHD
-        run: |
-            /usr/local/bin/python3.12 -m pip install numpy mako requests Cheetah3 setuptools
-      - name: Install Qt
-        uses: jurplel/install-qt-action@v4
-        with:
-          version: '6.9.1'
-          host: 'mac'
-          arch: 'clang_64'
-          modules: 'qtcharts qtscxml qt5compat qtlocation qtmultimedia qtpositioning qtserialport qtspeech qtwebsockets qtwebengine qtshadertools qtwebchannel'
-      - name: Configure SDRangel
-        run: |
-          mkdir build && cd build
-          cmake .. -DCMAKE_VERBOSE_MAKEFILE=ON -DENABLE_QT6=ON -DCMAKE_BUILD_TYPE=Release -DARCH_OPT=nehalem -DDEBUG_OUTPUT=ON -DENABLE_USRP=ON -DENABLE_MIRISDR=OFF -DBUILD_SERVER=OFF -DENABLE_EXTERNAL_LIBRARIES=ON -DBUNDLE=ON -DPKG_CONFIG_USE_CMAKE_PREFIX_PATH=TRUE -DPYTHON_EXECUTABLE=/usr/local/bin/python3.12
-      - name: Build SDRangel on Mac
-        run: |
-          cd build
-          make -j4
-      - name: Create dmg
-        run: |
-          cd build
-          RETRIES=5
-          COUNT=1
-          set +e
-          while [ $COUNT -lt $RETRIES ]; do
-            make package
-            if [ $? -eq 0 ]; then
-              RETRIES=0
-              break
-            fi
-            let COUNT=$COUNT+1
-          done
-        shell: bash
-        continue-on-error: true
-      - name: Get version
-        id: get_version
-        run: |
-            if [[ "${{github.ref_name}}" == "mac_ci" ]]; then
-                echo "version=$(echo ${{github.sha}} | cut -c1-7)" >> $GITHUB_OUTPUT
-            else
-                echo "version=$(echo ${{github.ref_name}} | cut -c2-)" >> $GITHUB_OUTPUT
-            fi
-      - name: Get filename
-        id: get_filename
-        run: echo "filename=$(grep CPACK_PACKAGE_FILE_NAME build/CMakeCache.txt | cut -d "=" -f2)" >> $GITHUB_OUTPUT
-      - name: Upload artifact
-        uses: actions/upload-artifact@v4
-        with:
-          name: sdrangel-${{ steps.get_version.outputs.version }}-macx64.dmg
-          path: ${{ github.workspace }}/build/${{ steps.get_filename.outputs.filename }}.dmg
-      - name: Upload release
-        if: startsWith(github.ref, 'refs/tags/')
-        uses: softprops/action-gh-release@v2
-        with:
-          files: ${{ github.workspace }}/build/${{ steps.get_filename.outputs.filename }}.dmg
-
-  build_mac_arm64:
-    runs-on: macos-14
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          submodules: true
-          fetch-depth: 0
-      - name: Update brew
-        run: brew update
-      - name: Install brew packages
-        run: brew install nasm subversion
-      - name: Install SDRplay API
-        run: |
-            wget https://www.sdrplay.com/software/SDRplayAPI-macos-installer-universal-3.15.0.pkg
-            sudo installer -pkg SDRplayAPI-macos-installer-universal-3.15.0.pkg -target /
-      - name: Install python
-        run: |
-            wget  https://www.python.org/ftp/python/3.12.7/python-3.12.7-macos11.pkg
-            sudo installer -pkg python-3.12.7-macos11.pkg -target /
-      - name: Install python packages for UHD
-        run: |
-            /usr/local/bin/python3.12 -m pip install numpy mako requests Cheetah3 setuptools
-      - name: Install Qt
-        uses: jurplel/install-qt-action@v4
-        with:
-          version: '6.9.1'
-          host: 'mac'
-          arch: 'clang_64'
-          modules: 'qtcharts qtscxml qt5compat qtlocation qtmultimedia qtpositioning qtserialport qtspeech qtwebsockets qtwebengine qtshadertools qtwebchannel'
-      - name: Configure SDRangel
-        run: |
-          mkdir build && cd build
-          cmake .. -DCMAKE_VERBOSE_MAKEFILE=ON -DENABLE_QT6=ON -DCMAKE_BUILD_TYPE=Release -DDEBUG_OUTPUT=ON -DENABLE_USRP=ON -DENABLE_MIRISDR=OFF -DBUILD_SERVER=OFF -DENABLE_EXTERNAL_LIBRARIES=ON -DBUNDLE=ON -DPKG_CONFIG_USE_CMAKE_PREFIX_PATH=TRUE -DPYTHON_EXECUTABLE=/usr/local/bin/python3.12
-      - name: Build SDRangel on Mac
-        run: |
-          cd build
-          make -j3
-      - name: Create dmg
-        run: |
-          cd build
-          RETRIES=5
-          COUNT=1
-          set +e
-          while [ $COUNT -lt $RETRIES ]; do
-            make package
-            if [ $? -eq 0 ]; then
-              RETRIES=0
-              break
-            fi
-            let COUNT=$COUNT+1
-          done
-        shell: bash
-        continue-on-error: true
-      - name: Get version
-        id: get_version
-        run: |
-            if [[ "${{github.ref_name}}" == "mac_ci" ]]; then
-                echo "version=$(echo ${{github.sha}} | cut -c1-7)" >> $GITHUB_OUTPUT
-            else
-                echo "version=$(echo ${{github.ref_name}} | cut -c2-)" >> $GITHUB_OUTPUT
-            fi
-      - name: Get filename
-        id: get_filename
-        run: echo "filename=$(grep CPACK_PACKAGE_FILE_NAME build/CMakeCache.txt | cut -d "=" -f2)" >> $GITHUB_OUTPUT
-      - name: Upload artifact
-        uses: actions/upload-artifact@v4
-        with:
-          name: sdrangel-${{ steps.get_version.outputs.version }}-macarm64.dmg
-          path: ${{ github.workspace }}/build/${{ steps.get_filename.outputs.filename }}.dmg
-      - name: Upload release
-        if: startsWith(github.ref, 'refs/tags/')
-        uses: softprops/action-gh-release@v2
-        with:
-          files: ${{ github.workspace }}/build/${{ steps.get_filename.outputs.filename }}.dmg

.github/workflows/sdrangel.yml

@@ -24,7 +24,7 @@ jobs:
             WIN_ARCH: "x64",
             os: windows-latest,
             QT_INST_DIR: "C:/",
-            QTDIR: "C:/Qt/6.7.3/msvc2019_64",
+            QTDIR: "C:/Qt/5.15.2/msvc2019_64",
             QT_ARCH: win64_msvc2019_64,
             boost_dl: "${{ github.workspace }}\\downloads\\boost",
             lib_dir: "C:\\Libraries",
@@ -41,9 +41,6 @@ jobs:
           echo github.event_name: ${{ github.event_name }}
           echo github.ref: ${{ github.ref }}
           echo github.workspace: ${{ github.workspace }}
-      - uses: actions/setup-python@v5
-        with:
-          python-version: '3.12'
       - name: Install basic dependencies on Windows
         if: startsWith(matrix.config.os, 'windows')
         run: |
@@ -72,20 +69,19 @@ jobs:
           rm -rf boost_*/* download.tar.bz2 download.tar
         shell: bash
       - name: Install Qt
-        uses: jurplel/install-qt-action@v4
+        uses: jurplel/install-qt-action@v3
         with:
-          version: '6.7.3'
           dir: ${{matrix.config.QT_INST_DIR}}
           arch: ${{matrix.config.QT_ARCH}}
           setup-python: false
-          modules: 'qtcharts qtscxml qt5compat qtlocation qtmultimedia qtpositioning qtserialport qtspeech qtwebsockets qtwebengine qtshadertools qtwebchannel'
+          modules: 'qtcharts qtwebengine'
       - name: build sdrangel on Windows
         if: startsWith(matrix.config.os, 'windows')
         run: |
-          cmd "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvars64.bat"
+          cmd "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvars64.bat"
           choco install patch
           mkdir build && cd build
-          cmake .. -G "${{ matrix.config.generators }}" -DCMAKE_BUILD_TYPE=Release -DENABLE_QT6=ON -DARCH_OPT=SSE4_2 -DDEBUG_OUTPUT=ON -DENABLE_MIRISDR=OFF -DBUILD_SERVER=OFF -DCMAKE_PREFIX_PATH="C:\Qt\6.7.3\msvc2019_64;C:\Libraries\boost_1_73_0"
+          cmake .. -G "${{ matrix.config.generators }}" -DCMAKE_BUILD_TYPE=Release -DARCH_OPT=SSE4_2 -DDEBUG_OUTPUT=ON -DENABLE_MIRISDR=OFF -DBUILD_SERVER=OFF -DCMAKE_PREFIX_PATH="C:\Qt\5.15.2\msvc2019_64;C:\Libraries\boost_1_73_0"
           cmake --build . --config Release --target package
       - name: Check disk space
         run: Get-PSDrive
@@ -93,13 +89,18 @@ jobs:
         id: get_version
         run: echo "version=$(grep sdrangel_VERSION build/CMakeCache.txt | cut -d "=" -f2)" >> $env:GITHUB_OUTPUT
       - name: Upload artifact
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v3
         with:
           name: sdrangel-${{ steps.get_version.outputs.version }}-win64.exe
           path: ${{ github.workspace }}/build/sdrangel-${{ steps.get_version.outputs.version }}-win64.exe
+      - name: Upload release
+        if: startsWith(github.ref, 'refs/tags/')
+        uses: softprops/action-gh-release@v0.1.13
+        with:
+          files: ${{ github.workspace }}/build/sdrangel-${{ steps.get_version.outputs.version }}-win64.exe
 
   build_mac:
-    runs-on: macos-14
+    runs-on: macos-13
     steps:
       - uses: actions/checkout@v4
         with:
@@ -124,7 +125,10 @@ jobs:
       - name: Configure SDRangel
         run: |
           mkdir build && cd build
-          cmake .. -DCMAKE_VERBOSE_MAKEFILE=ON -DENABLE_QT6=ON -DCMAKE_BUILD_TYPE=Release -DDEBUG_OUTPUT=ON -DENABLE_CHANNELRX_DEMODDATV=OFF -DENABLE_CHANNELTX_MODDATV=OFF -DENABLE_MIRISDR=OFF -DBUILD_SERVER=OFF -DENABLE_EXTERNAL_LIBRARIES=AUTO -DBUNDLE=ON -DPKG_CONFIG_USE_CMAKE_PREFIX_PATH=TRUE -DCMAKE_PREFIX_PATH="/usr/local/opt/ffmpeg@5/"
+          cmake .. -DCMAKE_VERBOSE_MAKEFILE=ON -DENABLE_QT6=ON -DCMAKE_BUILD_TYPE=Release -DARCH_OPT=nehalem -DDEBUG_OUTPUT=ON -DENABLE_CHANNELRX_DEMODDATV=OFF -DENABLE_CHANNELTX_MODDATV=OFF -DENABLE_MIRISDR=OFF -DBUILD_SERVER=OFF -DENABLE_EXTERNAL_LIBRARIES=AUTO -DBUNDLE=ON -DPKG_CONFIG_USE_CMAKE_PREFIX_PATH=TRUE -DCMAKE_PREFIX_PATH="/usr/local/opt/ffmpeg@5/"
+      - name: Get filename
+        id: get_filename
+        run: echo "filename=$(grep CPACK_PACKAGE_FILE_NAME build/CMakeCache.txt | cut -d "=" -f2)" >> $GITHUB_OUTPUT
       - name: Build SDRangel on Mac
         run: |
           cd build

.github/workflows/snap.yml

@@ -1,44 +0,0 @@
-# See: https://github.com/snapcore/action-build
-name: SDRangel snap release build
-
-on:
-  push:
-    branches:
-      - snap
-    tags:
-      - 'v*'
-
-jobs:
-  build_snap:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          submodules: true
-          fetch-depth: 0
-      - name: Get version
-        id: get_version
-        run: |
-            if [[ "${{github.ref_name}}" == "snap" ]]; then
-                echo "version=${{github.sha}}" >> $GITHUB_OUTPUT
-            else
-                echo "version=$(echo ${{github.ref_name}} | cut -c2-)" >> $GITHUB_OUTPUT
-            fi
-      - uses: snapcore/action-build@v1
-        id: build
-      - name: Upload artifact
-        uses: actions/upload-artifact@v4
-        with:
-          name: sdrangel-${{ steps.get_version.outputs.version }}-amd64.snap
-          path: ${{ steps.build.outputs.snap }}
-      - name: Upload release
-        if: startsWith(github.ref, 'refs/tags/')
-        uses: softprops/action-gh-release@v2
-        with:
-          files: ${{ steps.build.outputs.snap }}
-      - uses: snapcore/action-publish@v1
-        env:
-          SNAPCRAFT_STORE_CREDENTIALS: ${{ secrets.SNAP_STORE_LOGIN }}
-        with:
-          snap: ${{ steps.build.outputs.snap }}
-          release: stable

.github/workflows/windows.yml

@@ -1,119 +0,0 @@
-name: SDRangel Windows release build and signing
-
-on:
-  push:
-    branches:
-      - master
-    tags:
-      - 'v*'
-
-jobs:
-  build:
-    name: ${{ matrix.config.name }}
-    runs-on: ${{ matrix.config.os }}
-    strategy:
-      fail-fast: false
-      matrix:
-        config:
-        - {
-            name: "Windows-x64",
-            WIN_ARCH: "x64",
-            os: windows-latest,
-            QT_INST_DIR: "C:/",
-            QTDIR: "C:/Qt/6.7.3/msvc2019_64",
-            QT_ARCH: win64_msvc2019_64,
-            boost_dl: "${{ github.workspace }}\\downloads\\boost",
-            lib_dir: "C:\\Libraries",
-            generators: Ninja
-          }
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          submodules: true
-          fetch-depth: 0
-      - name: Print env
-        run: |
-          echo github.event.action: ${{ github.event.action }}
-          echo github.event_name: ${{ github.event_name }}
-          echo github.ref: ${{ github.ref }}
-          echo github.workspace: ${{ github.workspace }}
-      - uses: actions/setup-python@v5
-        with:
-          python-version: '3.12'
-      - name: Install basic dependencies on Windows
-        if: startsWith(matrix.config.os, 'windows')
-        run: |
-          choco install ninja cmake
-          ninja --version
-          cmake --version
-      - name: Install MSVC on Windows
-        if: startsWith(matrix.config.os, 'windows')
-        uses: ilammy/msvc-dev-cmd@v1
-        with:
-          arch: x64
-      - name: Install Boost
-        env:
-          BOOST_ROOT: ${{ matrix.config.boost_dl }}
-          BOOST_DEST: ${{ matrix.config.lib_dir }}
-          BOOST_URL: https://archives.boost.io/release/1.73.0/source/boost_1_73_0.tar.bz2
-        run: |
-          mkdir -p $BOOST_ROOT
-          mkdir -p $BOOST_DEST
-          curl --progress-bar --location --output $BOOST_ROOT/download.tar.bz2 $BOOST_URL
-          7z -o$BOOST_ROOT x $BOOST_ROOT/download.tar.bz2 -y -bd
-          7z -o$BOOST_ROOT x $BOOST_ROOT/download.tar -y -bd
-          cd $BOOST_ROOT && cp -r boost_* $BOOST_DEST
-          ls -l $BOOST_DEST
-          ls -l "C:\\"
-          rm -rf boost_*/* download.tar.bz2 download.tar
-        shell: bash
-      - name: Install Qt
-        uses: jurplel/install-qt-action@v4
-        with:
-          version: '6.7.3'
-          dir: ${{matrix.config.QT_INST_DIR}}
-          arch: ${{matrix.config.QT_ARCH}}
-          setup-python: 'false'
-          modules: 'qtcharts qtscxml qt5compat qtlocation qtmultimedia qtpositioning qtserialport qtspeech qtwebsockets qtwebengine qtshadertools qtwebchannel'
-      - name: build sdrangel on Windows
-        if: startsWith(matrix.config.os, 'windows')
-        run: |
-          cmd "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvars64.bat"
-          choco install patch
-          mkdir build && cd build
-          cmake .. -G "${{ matrix.config.generators }}" -DCMAKE_BUILD_TYPE=Release -DENABLE_QT6=ON -DARCH_OPT=SSE4_2 -DDEBUG_OUTPUT=ON -DENABLE_MIRISDR=OFF -DBUILD_SERVER=OFF -DCMAKE_PREFIX_PATH="C:\Qt\6.7.3\msvc2019_64;C:\Libraries\boost_1_73_0"
-          cmake --build . --config Release --target package
-      - name: Check disk space
-        run: Get-PSDrive
-      - name: Get version
-        id: get_version
-        run: echo "version=$(grep sdrangel_VERSION build/CMakeCache.txt | cut -d "=" -f2)" >> $env:GITHUB_OUTPUT
-      - name: Upload unsigned artifact
-        id: upload-unsigned-artifact
-        uses: actions/upload-artifact@v4
-        with:
-          name: sdrangel-${{ steps.get_version.outputs.version }}-win64.exe
-          path: ${{ github.workspace }}/build/sdrangel-${{ steps.get_version.outputs.version }}-win64.exe
-      - name: Sign Code
-        id: sign_code
-        uses: signpath/github-action-submit-signing-request@v1
-        with:
-          api-token: '${{ secrets.SIGNPATH_API_TOKEN }}'
-          organization-id: '553b8f53-adf0-4fe5-be3d-283504a21a51'
-          project-slug: 'sdrangel'
-          signing-policy-slug: 'release-signing'
-          github-artifact-id: '${{ steps.upload-unsigned-artifact.outputs.artifact-id }}'
-          wait-for-completion: true
-          output-artifact-directory: 'build\signed'
-          wait-for-completion-timeout-in-seconds: 3600
-      - name: Upload signed artifact
-        id: upload-signed-artifact
-        uses: actions/upload-artifact@v4
-        with:
-          name: sdrangel-${{ steps.get_version.outputs.version }}-win64-signed.exe
-          path: ${{ github.workspace }}/build/signed/sdrangel-${{ steps.get_version.outputs.version }}-win64.exe
-      - name: Upload release
-        if: startsWith(github.ref, 'refs/tags/')
-        uses: softprops/action-gh-release@v2
-        with:
-          files: ${{ github.workspace }}/build/signed/sdrangel-${{ steps.get_version.outputs.version }}-win64.exe

.gitignore

@@ -14,9 +14,7 @@ LOCAL/*
 .vscode/
 .settings/
 *.cs
-*.orig
 *.pro.user
-*.rej
 .idea/*
 rescuesdriq/rescuesdriq
 debian/sdrangel/*
@@ -28,7 +26,6 @@ obj-x86_64-linux-gnu/*
 **/venv*/
 *.pyc
 .DS_Store
-.sonarlint
 
 ### Go ###
 # Binaries for programs and plugins

CHANGELOG

@@ -1,147 +1,3 @@
-sdrangel (7.22.8-1) unstable; urgency=medium
-
-    * See Github release
-
-   -- Edouard Griffiths, F4EXB  <f4exb06@gmail.com>  Wed, 02 Jul 2025 17:00:39 +0200
-
-sdrangel (7.22.7-1) unstable; urgency=medium
-
-    * See Github release
-
-   -- Edouard Griffiths, F4EXB  <f4exb06@gmail.com>  Sun, 04 May 2025 17:58:14 +0200
-
-sdrangel (7.22.6-1) unstable; urgency=medium
-
-    * See Github release
-
-   -- Edouard Griffiths, F4EXB  <f4exb06@gmail.com>  Sun, 02 Feb 2025 18:08:11 +0100
-
-sdrangel (7.22.5-1) unstable; urgency=medium
-
-    * Windows: upload signed releases rather than unsigned releases to Github releases page. PR #2347
-    * Windows: fixed signed releases. PR #2344
-    * FT8 Demod: limit upper bandwidth to 5.8 kHz. Fixes #2339
-    * Stop device while changing channel set. Fixes #2332. PR #2342
-    * ADSB: Update URL of OpenSkyNetwork Aircraft database. PR #2341
-    * Don't stop source if being deleted. For #2315. PR #2340
-    * Send DSPSignalNotification in audio mods for #2336. PR #2340
-    * Radiosonde: limit precision of floating point numbers sent to SondeHub. PR #2338
-    * Windows signed releases: use relative path. Increase timeout to 30 minutes. PR #2335
-    * ADSB: Include adsbdemodsettings.h PR #2334
-    * Use release signing certificate for Windows installer. PR #2331
-    * Fix memory leak and race condition relating to DSP*Engines. Part of #2159 PR #2330
-    * FreeDV: Fix memory allocation/free issues. Part of #2315. PR #2330
-    * Wav Files: Add support for meta-data. PR #2328
-    * DemodAnalyzer: Ensure sample rate is set in worker. Fixes #2309. PR #2328
-    ^ SDRplayv3: Mac: link with libsdrplay_api.so.3 rather than libsdrplay_api.so.3.15. PR #2327
-    * ADS-B: Fix memory use after delete. For #1734 and part of #2315 PR #2326
-    * Fixed Appveyor Docker image build
-    * Fix output-artifact-directory and unzip file. PR #2323
-
-   -- Edouard Griffiths, F4EXB  <f4exb06@gmail.com>  Thu, 05 Dec 2024 01:07:27 +0100
-
-sdrangel (7.22.4-1) unstable; urgency=medium
-
-    * Use macos-12 for Mac x86 build. PR #2321
-    * Workaround for "hdiutil: create failed - Resource busy"
-    * Pager: Add alpha and numeric columns. Implements #2319. PR #2320
-    * Added qtwebchannel dependecy to fix missing 3d Map and Sky Map from Windows release. PR #2316
-    * Removed .deb package build from Appveyor
-
-   -- Edouard Griffiths, F4EXB  <f4exb06@gmail.com>  Mom, 11 Nov 2024 08:42:03 +0100
-
-sdrangel (7.22.3-1) unstable; urgency=medium
-
-    * Add deb dependencies for pipewire. PR #2314
-    * Added compilation options for WebAssembly. PR #2313
-    * ADS-B: Use settings keys. PR #2310
-    * AIS Demod: Remove spacing around messages. PR #2310
-    * Freuqency Scanner: Add multiplex mode. PR #2310
-    * Build snap, MAC, Windows and Ubuntu .deb with Github actions. Various PRs
-    * Server: Use Sink/MIMO signals rather than Source. Part of #2294. PR #2304
-    * Updated some Python scripts to Python3. PR #2298
-    * RemoteTCPSink: Does use IQ only setting for RTL0. PR #2301
-    * Server: wait for set sample source/sink/MIMO to complete before loading the device settings. Fixes #2294
-    * Fix spectrum peak measurement for SSB spectra. Fixes #2282. PR #2299
-    * Upgrade C++ standard to c++17
-    * Fixes for Android . PR #2288
-    * Add qtshadertools. PR #2287
-    * Add more Qt modules and set ENABLE_QT6=ON. PR #2287
-    * Update Qt optional packages for 6.8 , PR #2287
-    * Use Qt 6.8 for Windows build. PR #2287
-
-   -- Edouard Griffiths, F4EXB  <f4exb06@gmail.com>  Sat, 09 Nov 2024 17:30:44 +0100
-
-sdrangel (7.22.2-1) unstable; urgency=medium
-
-    * ChirpChat: increased preamble symbols limit from 20 to 32. Fixes #2284
-    * RTLSDR: Apply driver settings in RTLSDRThread Add sync read for WebAssembly. PR #2281
-    * SSB demod: fixed GUI and returned to previous threading model. Fixes #2273
-    * HeatMap: Catch memory allocation failures... For #2083 PR #2277
-    * Add default-qt6-windows cmake config. PR #2276
-    * Add pager notifications. Add option to ignore duplicates. Support plotting pager messages on the map. PR #2276
-    * Don't load defaults if loading a preset. PR #2274
-    * DeviceGUI::closeEvent - Don't automatically delete the GUI,.. PR #2274
-    * MainWindow: Add FSMs to avoid blocking on the GUI thread... PR #2274
-    * Fix replay buffer when FixReal is qint16. PR #2270
-    * snap: Try to get version number from latest tag. PR #2270
-    * Add libflac to snap. Set ARCH_OPT to nehalem. PR #2270
-    * Fix flac on Mac. PR #2270
-    * RemoteTCP: Update docs. PR #2270
-    * Map: Fix Kiwi list. Add SDRangel wss support. PR #2270
-    * RemoteTCPSink: Report server init errors via GUI. Send protocol to public list. PR #2270
-    * RemoteTCPInput: Add wss protocol support. PR #2270
-    * Fix DeviceAPI::deserialize. Fixes #2266. PR #2267
-
-   -- Edouard Griffiths, F4EXB  <f4exb06@gmail.com>  Sun, 20 Oct 2024 08:26:38 +0200
-
-sdrangel (7.22.1-1) unstable; urgency=medium
-
-    * wdsprx: Fix path to help file.
-    * Removed SyncMessenger from DSPDeviceSourceEngine. Part of #2159
-    * Fixed threading model for DSPDeviceSourceEngine. Part of #2159
-    * Removed SyncMessenger from DSPDeviceMIMOEngine. Part of #2159
-    * RTLSDR: make sure start and stop are effective once only. PArt of #2159
-    * Fixed threading model for DSPDeviceMIMOEngine plus other fixes. Part of #2159
-    * Removed SyncMessenger from DSPDeviceSinkEngine. Part of #2159
-    * SSBMod, AMMod, NFMMod: revised thread processing
-    * Fixed threading model for DSPDeviceSinkEngine plus other fixes. Part of #2159
-    * DeviceSet and DeviceUISet: use delete channel API instead of destroy method...
-    * BladeRF2Output: removed applySettings from stop method
-    * All device plugins: make sure start and stop are effective once only. PArt of #2159
-    * Removed the destroy method from ChannelGUI interface
-    * DeviceGUI: removed destroy method. Part of #2159
-    * Fix SopaySDR library search when system cmake package present. PR #2245
-    * Append prefix to plugin name when running on Android. PR #2245
-    * Fix compilation with newer ffmpeg libavutil. PR #2245
-    * Fix compilation for Android with Qt6. PR #2245
-    * Bump Cmake minimal version to 3.17
-    * Use new find_package(CUDA Toolkit). PR #2250
-    * Update CMakeLists.txt to allow static libraries to be built, as well as shared... PR #2252
-    * Allow plugins to be compiled as static libs, part 2. PR #2254
-    * Use opencv4 with VS2022. PR #2257
-    * Frequency Scanner: initialize pointer to FrequencyScanner. Fixes #2262
-    * Update channel list upon Morse Decoder and Demod Analyzer GUI creation. Fixes #2263
-
-   -- Edouard Griffiths, F4EXB  <f4exb06@gmail.com>  Sun, 06 Oct 2024 08:39:11 +0200
-
-sdrangel (7.22.0-1) unstable; urgency=medium
-
-    * New Rx channel based on WDSP. Issue #2156
-    * Added cubehelix based color maps. Issue #2191
-    * Fix API host address in About dialog and debug message. PR #2218
-    * Some cleanup. PR #2212
-    * Added shift to channel marker to take RIT into account. Part of #2156
-    * Added S-meter units to scale engine. Part of #2156
-    * Some typos fixes. PR #2206
-    * Map enhancements and fixes. PR #2187
-    * APT Demod: Check filename suffix is specified. PR #2190
-    * Don't change filenames on Android, PR #2190
-    * Frequency Scanner: Fix rounding error. PR #2186
-    * Update sdrangel-windows-libraries link to include latest VC redistributable. PR #2185
-
-   -- Edouard Griffiths, F4EXB  <f4exb06@gmail.com>  Tue, 13 Aug 2024 17:01:01 +0200
-
 sdrangel (7.21.4-1) unstable; urgency=medium
 
     * Code fixes. PR #2184

CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.17.0)
+cmake_minimum_required(VERSION 3.13.0)
 
 set(CMAKE_MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>DLL")
 
@@ -11,7 +11,7 @@ endif()
 list(APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/Modules)
 
 # disable only when needed
-set(CMAKE_CXX_STANDARD 17)
+set(CMAKE_CXX_STANDARD 14)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 set(CMAKE_CXX_EXTENSIONS OFF)
 
@@ -19,8 +19,8 @@ set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
 
 # configure version
 set(sdrangel_VERSION_MAJOR "7")
-set(sdrangel_VERSION_MINOR "22")
-set(sdrangel_VERSION_PATCH "8")
+set(sdrangel_VERSION_MINOR "21")
+set(sdrangel_VERSION_PATCH "4")
 set(sdrangel_VERSION_SUFFIX "")
 
 # SDRAngel cmake options
@@ -30,7 +30,6 @@ option(SANITIZE_MEMORY "Activate detection of leaked memory (LeakSanitizer)" OFF
 option(RX_SAMPLE_24BIT "Internal 24 bit Rx DSP" ON)
 option(BUILD_SERVER "Build Server" ON)
 option(BUILD_GUI "Build GUI" ON)
-option(BUILD_BENCH "Build benchmark" ON)
 option(HIDE_CONSOLE "Hide console when running GUI on Windows" ON)
 option(BUNDLE "Enable distribution bundle" OFF)
 set(ARCH_OPT "native" CACHE STRING "Specify instruction set to use. Will be passed directly as `-march` or `/arch:` argument on supported compilers. \
@@ -38,10 +37,8 @@ set(ARCH_OPT "native" CACHE STRING "Specify instruction set to use. Will be pass
 option(ENABLE_QT6 "Build with Qt6 rather than Qt5" OFF)
 option(ENABLE_PROFILER "Enable runtime profiler" OFF)
 set(VKFFT_BACKEND 1 CACHE STRING "vkFFT Backend: 0 - Vulkan, 1 - CUDA")
-option(BUILD_SHARED_LIBS "Build using shared libraries" ON)
 
 # Sampling devices enablers
-option(ENABLE_AARONIARTSA "Enable AaroniaRTSA support" ON)
 option(ENABLE_AIRSPY "Enable AirSpy support" ON)
 option(ENABLE_AIRSPYHF "Enable AirSpyHF support" ON)
 option(ENABLE_BLADERF "Enable bladeRF support" ON)
@@ -49,7 +46,6 @@ option(ENABLE_FUNCUBE "Enable FUNcube support" ON)
 option(ENABLE_HACKRF "Enable HackRF support" ON)
 option(ENABLE_IIO "Enable liniio support like PlutoSDR" ON)
 option(ENABLE_LIMESUITE "Enable limesuite support" ON)
-option(ENABLE_METIS "Enable Metis support" ON)
 option(ENABLE_MIRISDR "Enable LibMiri for old SDRPlay" ON)
 option(ENABLE_PERSEUS "Enable perseus support" ON)
 option(ENABLE_RTLSDR "Enable rtl-sdr support" ON)
@@ -100,7 +96,6 @@ option(ENABLE_CHANNELRX_HEATMAP "Enable channelrx heatmap plugin" ON)
 option(ENABLE_CHANNELRX_FREQSCANNER "Enable channelrx freqscanner plugin" ON)
 option(ENABLE_CHANNELRX_ENDOFTRAIN "Enable channelrx end-of-train plugin" ON)
 option(ENABLE_CHANNELRX_CHANNELPOWER "Enable channelrx channel power plugin" ON)
-option(ENABLE_CHANNELRX_WDSPRX "Enable channelrx WDSP receiver plugin" ON)
 
 # Channel Tx enablers
 option(ENABLE_CHANNELTX "Enable channeltx plugins" ON)
@@ -186,7 +181,7 @@ if(GIT_FOUND AND EXISTS "${CMAKE_SOURCE_DIR}/.git/")
 endif()
 
 find_program(CCACHE "ccache")
-if(CCACHE AND NOT EMSCRIPTEN)
+if(CCACHE)
     message(STATUS "Using ccache ${CCACHE}")
     set(CMAKE_C_COMPILER_LAUNCHER ${CCACHE})
     set(CMAKE_CXX_COMPILER_LAUNCHER ${CCACHE})
@@ -194,7 +189,7 @@ if(CCACHE AND NOT EMSCRIPTEN)
         set(CMAKE_OBJCXX_COMPILER_LAUNCHER ${CCACHE})
     endif()
     set(ENV{CCACHE_SLOPPINESS} pch_defines,time_macros)
-endif()
+endif(CCACHE)
 
 set(sdrangel_VERSION "${sdrangel_VERSION_MAJOR}.${sdrangel_VERSION_MINOR}.${sdrangel_VERSION_PATCH}${sdrangel_VERSION_SUFFIX}" CACHE INTERNAL "")
 message(STATUS "${APPLICATION_NAME} Version: ${sdrangel_VERSION}")
@@ -273,15 +268,6 @@ else()
 endif()
 set(INSTALL_PLUGINS_DIR "${INSTALL_LIB_DIR}/plugins")
 set(INSTALL_PLUGINSSRV_DIR "${INSTALL_LIB_DIR}/pluginssrv")
-
-if(ANDROID)
-  set(PLUGINS_PREFIX    "sdrangel_plugins_")
-  set(PLUGINSSRV_PREFIX "sdrangel_pluginssrv_")
-  set(ANDROID_PACKAGE_SOURCE_DIR ${PROJECT_SOURCE_DIR}/android/qt6 CACHE INTERNAL "")
-else()
-  set(PLUGINS_PREFIX    "")
-  set(PLUGINSSRV_PREFIX "")
-endif()
 set(EXTERNAL_BUILD_LIBRARIES "${CMAKE_BINARY_DIR}/external")
 
 # custom libraries
@@ -348,7 +334,7 @@ elseif (WIN32)
   set(LIBUSB_LIBRARIES "${EXTERNAL_LIBRARY_FOLDER}/libusb/MS64/dll/libusb-1.0.lib" CACHE INTERNAL "")
   set(LIBUSB_DLL_DIR "${EXTERNAL_LIBRARY_FOLDER}/libusb/MS64/dll" CACHE INTERNAL "")
 
-  if(VS2022 OR VS2019)
+if(VS2019)
     set(OpenCV_DIR "${EXTERNAL_LIBRARY_FOLDER}/opencv4" CACHE INTERNAL "")
   else()
     set(OpenCV_DIR "${EXTERNAL_LIBRARY_FOLDER}/opencv" CACHE INTERNAL "")
@@ -429,7 +415,7 @@ elseif (WIN32)
 elseif(ANDROID)
   set(EXTERNAL_LIBRARY_FOLDER "${CMAKE_SOURCE_DIR}/external/android")
 
-  set(Boost_INCLUDE_DIR "${EXTERNAL_LIBRARY_FOLDER}/ndk_26b_boost_1.83.0/include" CACHE INTERNAL "")
+  set(Boost_INCLUDE_DIR "${EXTERNAL_LIBRARY_FOLDER}/ndk_21_boost_1.72.0/include" CACHE INTERNAL "")
 
   set(FFTW3F_FOUND ON CACHE INTERNAL "")
   set(FFTW3F_INCLUDE_DIRS "${EXTERNAL_LIBRARY_FOLDER}/${ANDROID_ABI}/fftw-3/include" CACHE INTERNAL "")
@@ -486,14 +472,6 @@ elseif(ANDROID)
   set(SWSCALE_INCLUDE_DIRS "${EXTERNAL_LIBRARY_FOLDER}/${ANDROID_ABI}/ffmpeg/include" CACHE INTERNAL "")
   set(SWSCALE_LIBRARIES "${EXTERNAL_LIBRARY_FOLDER}/${ANDROID_ABI}/ffmpeg/lib/libswscale.so" CACHE INTERNAL "")
 
-  set(GGMORSE_FOUND ON CACHE INTERNAL "")
-  set(GGMORSE_INCLUDE_DIR "${EXTERNAL_LIBRARY_FOLDER}/${ANDROID_ABI}/ggmorse/include/" CACHE INTERNAL "")
-  set(GGMORSE_LIBRARIES "${EXTERNAL_LIBRARY_FOLDER}/${ANDROID_ABI}/ggmorse/lib/static/libggmorse.a" CACHE INTERNAL "")
-
-  set(FLAC_FOUND ON CACHE INTERNAL "")
-  set(FLAC_INCLUDE_DIR "${EXTERNAL_LIBRARY_FOLDER}/${ANDROID_ABI}/flac/include/" CACHE INTERNAL "")
-  set(FLAC_LIBRARIES "${EXTERNAL_LIBRARY_FOLDER}/${ANDROID_ABI}/flac/lib/libFLAC.so" CACHE INTERNAL "")
-
   set(LIBUSB_FOUND ON CACHE INTERNAL "")
   set(LIBUSB_INCLUDE_DIR "${EXTERNAL_LIBRARY_FOLDER}/${ANDROID_ABI}/libusb/include/" CACHE INTERNAL "")
   set(LIBUSB_LIBRARIES "${EXTERNAL_LIBRARY_FOLDER}/${ANDROID_ABI}/libusb/lib/libusb1.0.so" CACHE INTERNAL "")
@@ -516,6 +494,11 @@ elseif(ANDROID)
 
   if (ENABLE_QT6)
     set(ANDROID_EXTRA_LIBS
+      ${Qt6_DIR}/../../../android_arm64_v8a/lib/libQt6Charts_arm64-v8a.so
+      ${Qt6_DIR}/../../../android_arm64_v8a/lib/libQt6Concurrent_arm64-v8a.so
+      ${Qt6_DIR}/../../../android_arm64_v8a/lib/libQt6MultimediaWidgets_arm64-v8a.so
+      ${Qt6_DIR}/../../../android_arm64_v8a/lib/libQt6SerialPort_arm64-v8a.so
+      ${Qt6_DIR}/../../../android_arm64_v8a/lib/libQt6TextToSpeech_arm64-v8a.so
       ${EXTERNAL_LIBRARY_FOLDER}/android_openssl/latest/arm64/libssl_1_1.so
       ${EXTERNAL_LIBRARY_FOLDER}/android_openssl/latest/arm64/libcrypto_1_1.so
       ${EXTERNAL_LIBRARY_FOLDER}/${ANDROID_ABI}/ffmpeg/lib/libavcodec.so
@@ -530,7 +513,6 @@ elseif(ANDROID)
       ${EXTERNAL_LIBRARY_FOLDER}/${ANDROID_ABI}/dsdcc/lib/libdsdcc.so
       ${EXTERNAL_LIBRARY_FOLDER}/${ANDROID_ABI}/libusb/lib/libunrooted_android.so
       ${EXTERNAL_LIBRARY_FOLDER}/${ANDROID_ABI}/libusb/lib/libusb1.0.so
-      ${EXTERNAL_LIBRARY_FOLDER}/${ANDROID_ABI}/flac/lib/libFLAC.so
       CACHE INTERNAL ""
     )
   else()
@@ -581,7 +563,6 @@ elseif(ANDROID)
         ${EXTERNAL_LIBRARY_FOLDER}/arm64-v8a/dsdcc/lib/libdsdcc.so
         ${EXTERNAL_LIBRARY_FOLDER}/arm64-v8a/libusb/lib/libunrooted_android.so
         ${EXTERNAL_LIBRARY_FOLDER}/arm64-v8a/libusb/lib/libusb1.0.so
-        ${EXTERNAL_LIBRARY_FOLDER}/arm64-v8a/flac/lib/libFLAC.so
         ${EXTERNAL_LIBRARY_FOLDER}/armeabi-v7a/ffmpeg/lib/libavcodec.so
         ${EXTERNAL_LIBRARY_FOLDER}/armeabi-v7a/ffmpeg/lib/libavdevice.so
         ${EXTERNAL_LIBRARY_FOLDER}/armeabi-v7a/ffmpeg/lib/libavfilter.so
@@ -594,11 +575,9 @@ elseif(ANDROID)
         ${EXTERNAL_LIBRARY_FOLDER}/armeabi-v7a/dsdcc/lib/libdsdcc.so
         ${EXTERNAL_LIBRARY_FOLDER}/armeabi-v7a/libusb/lib/libunrooted_android.so
         ${EXTERNAL_LIBRARY_FOLDER}/armeabi-v7a/libusb/lib/libusb1.0.so
-        ${EXTERNAL_LIBRARY_FOLDER}/armeabi-v7a/flac/lib/libFLAC.so
       CACHE INTERNAL ""
     )
   endif()
-  add_compile_definitions(ANDROID)
 endif()
 
 # When building a bundle on MacOS, we want to keep build paths in the library
@@ -657,7 +636,8 @@ if(ENABLE_QT6)
                      MultimediaWidgets
                      Positioning
                      Charts
-                     SerialPort)
+                     SerialPort
+                     Core5Compat)
 else()
     find_package(Qt5 5.15
                    REQUIRED COMPONENTS
@@ -678,15 +658,13 @@ if (BUILD_GUI)
         if (ENABLE_QT6)
             find_package(Qt6
                            REQUIRED COMPONENTS
-                            Location
                             OpenGL
                             OpenGLWidgets
                             Quick
                             QuickWidgets
                             TextToSpeech
                             Svg
-                            SvgWidgets
-                            StateMachine)
+                            SvgWidgets)
         else()
             find_package(Qt5
                            REQUIRED COMPONENTS
@@ -711,7 +689,6 @@ if (BUILD_GUI)
                             QuickWidgets
                             Svg
                             SvgWidgets
-                            StateMachine
                            OPTIONAL_COMPONENTS
                             WebEngineQuick
                             WebEngineCore
@@ -736,27 +713,8 @@ if (BUILD_GUI)
     endif()
 endif()
 
-# List of static plugins to link with - This is appended to by each pluging CMakeLists.txt
-set_property(GLOBAL PROPERTY STATIC_PLUGINS_PROPERTY "")
-
-if(Qt${QT_DEFAULT_MAJOR_VERSION}Positioning_FOUND)
-    add_compile_definitions(QT_POSITIONING_FOUND)
-endif()
-if(Qt${QT_DEFAULT_MAJOR_VERSION}Location_FOUND)
-    add_compile_definitions(QT_LOCATION_FOUND)
-endif()
-if(Qt${QT_DEFAULT_MAJOR_VERSION}Charts_FOUND)
-    add_compile_definitions(QT_CHARTS_FOUND)
-endif()
-if(Qt${QT_DEFAULT_MAJOR_VERSION}TextToSpeech_FOUND)
-    add_compile_definitions(QT_TEXTTOSPEECH_FOUND)
-endif()
-if(BUILD_SHARED_LIBS)
-    add_compile_definitions(BUILD_SHARED_LIBS)
-endif()
-
 # other requirements
-if(NOT ANDROID AND NOT EMSCRIPTEN)
+if(NOT ANDROID)
   find_package(PkgConfig REQUIRED)
 endif()
 
@@ -901,15 +859,13 @@ if (FFTW3F_FOUND)
     set(FT8_SUPPORT ON CACHE INTERNAL "")
 endif()
 
-if (FFTW3F_FOUND)
+if (FFTW3F_FOUND AND LINUX)
     add_subdirectory(wdsp)
     add_definitions(-DHAS_WDSP)
     set(WDSP_SUPPORT ON CACHE INTERNAL "")
 endif()
 
-if (BUILD_BENCH)
 add_subdirectory(sdrbench)
-endif()
 
 if (BUILD_GUI)
     add_subdirectory(sdrgui)
@@ -980,7 +936,6 @@ else()
 endif()
 
 ############ build sdrangel benchmark ################
-if (BUILD_BENCH)
 set(sdrangelbench_SOURCES
   appbench/main.cpp
 )
@@ -994,7 +949,6 @@ target_link_libraries(sdrangelbench
   sdrbench
   logging
 )
-endif()
 
 ############ build sdrangel gui ################
 if (BUILD_GUI)
@@ -1088,9 +1042,7 @@ if (BUILD_SERVER)
 endif()
 
 ############ install ##################
-if (BUILD_BENCH)
 install(TARGETS sdrangelbench DESTINATION ${INSTALL_BIN_DIR})
-endif()
 if (BUILD_GUI)
       install(TARGETS ${CMAKE_PROJECT_NAME} DESTINATION ${INSTALL_BIN_DIR})
 endif()

CMakePresets.json

@@ -80,15 +80,6 @@
       "cacheVariables": {
         "ENABLE_QT6": "ON"
       }
-    },
-    {
-      "name": "default-qt6-windows",
-      "inherits": "default-windows",
-      "binaryDir": "${sourceDir}/build-qt6",
-      "cacheVariables": {
-        "ENABLE_QT6": "ON",
-        "CMAKE_PREFIX_PATH": "C:/Qt/6.7.3/msvc2022_64;C:/Applications/boost_1_81_0"
-      }
     }
   ],
   "buildPresets": [
@@ -103,10 +94,6 @@
     {
       "name": "default-qt6",
       "configurePreset": "default-qt6"
-    },
-    {
-      "name": "default-qt6-windows",
-      "configurePreset": "default-qt6-windows"
     }
   ]
 }

app/main.cpp

@@ -22,6 +22,7 @@
 ///////////////////////////////////////////////////////////////////////////////////
 
 #include <QApplication>
+#include <QTextCodec>
 #include <QProxyStyle>
 #include <QStyleFactory>
 #include <QFontDatabase>
@@ -47,6 +48,10 @@
 
 static int runQtApplication(int argc, char* argv[], qtwebapp::LoggerWithFile *logger)
 {
+/*
+	QTextCodec::setCodecForTr(QTextCodec::codecForName("UTF-8"));
+	QTextCodec::setCodecForCStrings(QTextCodec::codecForName("UTF-8"));
+*/
 	QCoreApplication::setOrganizationName(COMPANY);
 	QCoreApplication::setApplicationName(APPLICATION_NAME);
     QCoreApplication::setApplicationVersion(SDRANGEL_VERSION);
@@ -143,7 +148,7 @@ static int runQtApplication(int argc, char* argv[], qtwebapp::LoggerWithFile *lo
 #endif
 
 #ifdef ANDROID
-    // Default sized sliders can be hard to move using touch GUIs, so increase size
+    // Default sized sliders can be hard to move using touch GUIs, so increase szie
     // FIXME: How can we do a double border around the handle, as Fusion style seems to use?
     // Dialog borders are hard to see as is (perhaps as Android doesn't have a title bar), so use same color as for MDI
     qApp->setStyleSheet("QSlider {min-height: 20px; } "
@@ -184,13 +189,11 @@ static int runQtApplication(int argc, char* argv[], qtwebapp::LoggerWithFile *lo
     {
         // Disable log on console, so we can more easily see device list
         logger->setConsoleMinMessageLevel(QtFatalMsg);
-        // Don't pass logger to MainWindow, otherwise it can re-enable log output
+        // Don't pass logger to MainWindow, otherwise it can reenable log output
         logger = nullptr;
     }
 
-    MainWindow w(logger, parser);
-
-    w.show();
+	MainWindow w(logger, parser);
 
     if (parser.getListDevices())
     {
@@ -199,6 +202,12 @@ static int runQtApplication(int argc, char* argv[], qtwebapp::LoggerWithFile *lo
         return EXIT_SUCCESS;
     }
 
+    if (parser.getRemoteTCPSink()) {
+        RemoteTCPSinkStarter::start(parser);
+    }
+
+	w.show();
+
 	return a.exec();
 }
 
@@ -208,7 +217,7 @@ int main(int argc, char* argv[])
     // Request OpenGL 3.3 context, needed for glspectrum and 3D Map feature
     // Note that Mac only supports CoreProfile, so any deprecated OpenGL 2 features
     // will not work. Because of this, we have two versions of the shaders:
-    // OpenGL 2 versions for compatibility with older drivers and OpenGL 3.3
+    // OpenGL 2 versions for compatiblity with older drivers and OpenGL 3.3
     // versions for newer drivers
 #if (QT_VERSION < QT_VERSION_CHECK(6, 0, 0))
     QGLFormat fmt;

appsrv/main.cpp

@@ -100,7 +100,7 @@ static int runQtApplication(int argc, char* argv[], qtwebapp::LoggerWithFile *lo
     {
         // Disable log on console, so we can more easily see device list
         logger->setConsoleMinMessageLevel(QtFatalMsg);
-        // Don't pass logger to MainServer, otherwise it can re-enable log output
+        // Don't pass logger to MainServer, otherwise it can reenable log output
         logger = nullptr;
     }
 

cmake/Modules/CompilerOptions.cmake

@@ -19,11 +19,7 @@ if(WIN32)
 endif()
 
 if(NOT MSVC)
-  add_compile_options(-Wall -Wextra -Wvla -ffast-math -fno-finite-math-only -ftree-vectorize)
-  add_compile_options($<$<COMPILE_LANGUAGE:CXX>:-Woverloaded-virtual>)
-  if (CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
-    add_compile_options(-Wno-inconsistent-missing-override)
-  endif()
+  add_compile_options(-Wall -Wextra -Wvla -Woverloaded-virtual -Wno-inconsistent-missing-override -ffast-math -fno-finite-math-only -ftree-vectorize)
 else()
   # Disable some warnings, so more useful warnings aren't hidden in the noise
   # 4996 'fopen': This function or variable may be unsafe. Consider using fopen_s instead.

cmake/Modules/FindFLAC.cmake

@@ -1,31 +0,0 @@
-IF(NOT FLAC_FOUND)
-    INCLUDE(FindPkgConfig)
-    PKG_CHECK_MODULES(PC_FLAC flac)
-
-    FIND_PATH(
-        FLAC_INCLUDE_DIR
-        NAMES FLAC/stream_encoder.h
-        HINTS ${PC_FLAC_INCLUDE_DIRS}
-        PATHS /usr/local/include
-              /usr/include
-    )
-
-    FIND_LIBRARY(
-        FLAC_LIBRARY
-        NAMES FLAC
-              libFLAC
-        HINTS ${FLAC_DIR}/lib
-              ${PC_FLAC_LIBRARY_DIRS}
-        PATHS /usr/local/lib
-              /usr/lib
-              /usr/lib64
-    )
-
-    message(STATUS "FLAC LIBRARY " ${FLAC_LIBRARY})
-    message(STATUS "FLAC INCLUDE DIR " ${FLAC_INCLUDE_DIR})
-
-    INCLUDE(FindPackageHandleStandardArgs)
-    FIND_PACKAGE_HANDLE_STANDARD_ARGS(FLAC DEFAULT_MSG FLAC_LIBRARY FLAC_INCLUDE_DIR)
-    MARK_AS_ADVANCED(FLAC_LIBRARY FLAC_INCLUDE_DIR)
-
-ENDIF(NOT FLAC_FOUND)

cmake/cpack/CMakeLists.txt

@@ -36,7 +36,7 @@ if(APPLE AND BUNDLE AND BUILD_GUI)
   set(CPACK_BUNDLE_ICON "${CMAKE_SOURCE_DIR}/cmake/cpack/sdrangel_icon.icns")
   set(CPACK_BUNDLE_PLIST "${CMAKE_BINARY_DIR}/Info.plist")
   set(CPACK_PACKAGE_ICON "${CMAKE_SOURCE_DIR}/cmake/cpack/sdrangel_icon.icns")
-  set(CPACK_PACKAGE_FILE_NAME "${CMAKE_PROJECT_NAME}-${CPACK_PACKAGE_VERSION}_mac-${CPACK_MACOS_PACKAGE_ARCHITECTURE}_${CMAKE_SYSTEM_PROCESSOR}" CACHE INTERNAL "")
+  set(CPACK_PACKAGE_FILE_NAME "${CMAKE_PROJECT_NAME}-${CPACK_PACKAGE_VERSION}_${CPACK_MACOS_PACKAGE_ARCHITECTURE}_${CMAKE_SYSTEM_PROCESSOR}" CACHE INTERNAL "")
   set(CPACK_PRE_BUILD_SCRIPTS "${PROJECT_BINARY_DIR}/deploy_mac.cmake")
 
   # copy SoapySDR Modules
@@ -175,7 +175,7 @@ elseif(WIN32 OR MINGW)
       COMMAND ${CMAKE_COMMAND} -E copy_if_different "${fftw3f_dll}" "${SDRANGEL_BINARY_BIN_DIR}/"
     )
   endforeach(fftw3f_dll)
-
+  
   file(GLOB LIBUSB_DLLS "${LIBUSB_DLL_DIR}/*${CMAKE_SHARED_LIBRARY_SUFFIX}")
   foreach(libusb_dll ${LIBUSB_DLLS})
     get_filename_component(libusb_dll_name "${libusb_dll}"  NAME)

cmake/cpack/deploy_mac.cmake.in

@@ -1,15 +1,14 @@
 # This CPACK_PRE_BUILD_SCRIPTS script is used to copy all required Qt and other 3rd party libraries (SDR drivers and codecs) in to the .app bundle
 # It is run in a staging area (${CPACK_TEMPORARY_INSTALL_DIRECTORY}/SDRangel.app) after all targets have been installed (E.g. sdrangel exe and plugins)
 # The copying of frameworks and libraries is mostly done by 'macdeployqt', however, in order for 'macdeployqt' to copy libraries built by external/CMakeLists.txt,
-# we first need to add RPATHs into the libraries giving the locations of any libraries they might depend on.
+# we first need to add RPATHs into the libraries giving the locations of any libraries they might depend on. 
 # These paths are in the variable MACOS_EXTERNAL_LIBS_FIXUP set in externals/CMakeLists.txt
 # Is there an easier way to this?
 
 # Copy executable that will be run when icon in /Applications is clicked
 message ("Copying default executable to SDRangel.app/Contents/MacOS/SDRangel")
 execute_process (COMMAND mkdir ${CPACK_TEMPORARY_INSTALL_DIRECTORY}/SDRangel.app/Contents/MacOS/)
-execute_process (COMMAND pwd)
-execute_process (COMMAND cp sdrangel ${CPACK_TEMPORARY_INSTALL_DIRECTORY}/SDRangel.app/Contents/MacOS/SDRangel)
+execute_process (COMMAND cp /opt/build/sdrangel/build/sdrangel ${CPACK_TEMPORARY_INSTALL_DIRECTORY}/SDRangel.app/Contents/MacOS/SDRangel)
 
 
 # Add RPATHS to libraries so macdeployqt can find out and copy all dependencies

debian/changelog

@@ -1,147 +1,3 @@
-sdrangel (7.22.8-1) unstable; urgency=medium
-
-    * See Github release
-
-   -- Edouard Griffiths, F4EXB  <f4exb06@gmail.com>  Wed, 02 Jul 2025 17:00:39 +0200
-
-sdrangel (7.22.7-1) unstable; urgency=medium
-
-    * See Github release
-
-   -- Edouard Griffiths, F4EXB  <f4exb06@gmail.com>  Sun, 04 May 2025 17:58:14 +0200
-
-sdrangel (7.22.6-1) unstable; urgency=medium
-
-    * See Github release
-
-   -- Edouard Griffiths, F4EXB  <f4exb06@gmail.com>  Sun, 02 Feb 2025 18:08:11 +0100
-
-sdrangel (7.22.5-1) unstable; urgency=medium
-
-    * Windows: upload signed releases rather than unsigned releases to Github releases page. PR #2347
-    * Windows: fixed signed releases. PR #2344
-    * FT8 Demod: limit upper bandwidth to 5.8 kHz. Fixes #2339
-    * Stop device while changing channel set. Fixes #2332. PR #2342
-    * ADSB: Update URL of OpenSkyNetwork Aircraft database. PR #2341
-    * Don't stop source if being deleted. For #2315. PR #2340
-    * Send DSPSignalNotification in audio mods for #2336. PR #2340
-    * Radiosonde: limit precision of floating point numbers sent to SondeHub. PR #2338
-    * Windows signed releases: use relative path. Increase timeout to 30 minutes. PR #2335
-    * ADSB: Include adsbdemodsettings.h PR #2334
-    * Use release signing certificate for Windows installer. PR #2331
-    * Fix memory leak and race condition relating to DSP*Engines. Part of #2159 PR #2330
-    * FreeDV: Fix memory allocation/free issues. Part of #2315. PR #2330
-    * Wav Files: Add support for meta-data. PR #2328
-    * DemodAnalyzer: Ensure sample rate is set in worker. Fixes #2309. PR #2328
-    ^ SDRplayv3: Mac: link with libsdrplay_api.so.3 rather than libsdrplay_api.so.3.15. PR #2327
-    * ADS-B: Fix memory use after delete. For #1734 and part of #2315 PR #2326
-    * Fixed Appveyor Docker image build
-    * Fix output-artifact-directory and unzip file. PR #2323
-
-   -- Edouard Griffiths, F4EXB  <f4exb06@gmail.com>  Thu, 05 Dec 2024 01:07:27 +0100
-
-sdrangel (7.22.4-1) unstable; urgency=medium
-
-    * Use macos-12 for Mac x86 build. PR #2321
-    * Workaround for "hdiutil: create failed - Resource busy"
-    * Pager: Add alpha and numeric columns. Implements #2319. PR #2320
-    * Added qtwebchannel dependecy to fix missing 3d Map and Sky Map from Windows release. PR #2316
-    * Removed .deb package build from Appveyor
-
-   -- Edouard Griffiths, F4EXB  <f4exb06@gmail.com>  Mom, 11 Nov 2024 08:42:03 +0100
-
-sdrangel (7.22.3-1) unstable; urgency=medium
-
-    * Add deb dependencies for pipewire. PR #2314
-    * Added compilation options for WebAssembly. PR #2313
-    * ADS-B: Use settings keys. PR #2310
-    * AIS Demod: Remove spacing around messages. PR #2310
-    * Freuqency Scanner: Add multiplex mode. PR #2310
-    * Build snap, MAC, Windows and Ubuntu .deb with Github actions. Various PRs
-    * Server: Use Sink/MIMO signals rather than Source. Part of #2294. PR #2304
-    * Updated some Python scripts to Python3. PR #2298
-    * RemoteTCPSink: Does use IQ only setting for RTL0. PR #2301
-    * Server: wait for set sample source/sink/MIMO to complete before loading the device settings. Fixes #2294
-    * Fix spectrum peak measurement for SSB spectra. Fixes #2282. PR #2299
-    * Upgrade C++ standard to c++17
-    * Fixes for Android . PR #2288
-    * Add qtshadertools. PR #2287
-    * Add more Qt modules and set ENABLE_QT6=ON. PR #2287
-    * Update Qt optional packages for 6.8 , PR #2287
-    * Use Qt 6.8 for Windows build. PR #2287
-
-   -- Edouard Griffiths, F4EXB  <f4exb06@gmail.com>  Sat, 09 Nov 2024 17:30:44 +0100
-
-sdrangel (7.22.2-1) unstable; urgency=medium
-
-    * ChirpChat: increased preamble symbols limit from 20 to 32. Fixes #2284
-    * RTLSDR: Apply driver settings in RTLSDRThread Add sync read for WebAssembly. PR #2281
-    * SSB demod: fixed GUI and returned to previous threading model. Fixes #2273
-    * HeatMap: Catch memory allocation failures... For #2083 PR #2277
-    * Add default-qt6-windows cmake config. PR #2276
-    * Add pager notifications. Add option to ignore duplicates. Support plotting pager messages on the map. PR #2276
-    * Don't load defaults if loading a preset. PR #2274
-    * DeviceGUI::closeEvent - Don't automatically delete the GUI,.. PR #2274
-    * MainWindow: Add FSMs to avoid blocking on the GUI thread... PR #2274
-    * Fix replay buffer when FixReal is qint16. PR #2270
-    * snap: Try to get version number from latest tag. PR #2270
-    * Add libflac to snap. Set ARCH_OPT to nehalem. PR #2270
-    * Fix flac on Mac. PR #2270
-    * RemoteTCP: Update docs. PR #2270
-    * Map: Fix Kiwi list. Add SDRangel wss support. PR #2270
-    * RemoteTCPSink: Report server init errors via GUI. Send protocol to public list. PR #2270
-    * RemoteTCPInput: Add wss protocol support. PR #2270
-    * Fix DeviceAPI::deserialize. Fixes #2266. PR #2267
-
-   -- Edouard Griffiths, F4EXB  <f4exb06@gmail.com>  Sun, 20 Oct 2024 08:26:38 +0200
-
-sdrangel (7.22.1-1) unstable; urgency=medium
-
-    * wdsprx: Fix path to help file.
-    * Removed SyncMessenger from DSPDeviceSourceEngine. Part of #2159
-    * Fixed threading model for DSPDeviceSourceEngine. Part of #2159
-    * Removed SyncMessenger from DSPDeviceMIMOEngine. Part of #2159
-    * RTLSDR: make sure start and stop are effective once only. PArt of #2159
-    * Fixed threading model for DSPDeviceMIMOEngine plus other fixes. Part of #2159
-    * Removed SyncMessenger from DSPDeviceSinkEngine. Part of #2159
-    * SSBMod, AMMod, NFMMod: revised thread processing
-    * Fixed threading model for DSPDeviceSinkEngine plus other fixes. Part of #2159
-    * DeviceSet and DeviceUISet: use delete channel API instead of destroy method...
-    * BladeRF2Output: removed applySettings from stop method
-    * All device plugins: make sure start and stop are effective once only. PArt of #2159
-    * Removed the destroy method from ChannelGUI interface
-    * DeviceGUI: removed destroy method. Part of #2159
-    * Fix SopaySDR library search when system cmake package present. PR #2245
-    * Append prefix to plugin name when running on Android. PR #2245
-    * Fix compilation with newer ffmpeg libavutil. PR #2245
-    * Fix compilation for Android with Qt6. PR #2245
-    * Bump Cmake minimal version to 3.17
-    * Use new find_package(CUDA Toolkit). PR #2250
-    * Update CMakeLists.txt to allow static libraries to be built, as well as shared... PR #2252
-    * Allow plugins to be compiled as static libs, part 2. PR #2254
-    * Use opencv4 with VS2022. PR #2257
-    * Frequency Scanner: initialize pointer to FrequencyScanner. Fixes #2262
-    * Update channel list upon Morse Decoder and Demod Analyzer GUI creation. Fixes #2263
-
-   -- Edouard Griffiths, F4EXB  <f4exb06@gmail.com>  Sun, 06 Oct 2024 08:39:11 +0200
-
-sdrangel (7.22.0-1) unstable; urgency=medium
-
-    * New Rx channel based on WDSP. Issue #2156
-    * Added cubehelix based color maps. Issue #2191
-    * Fix API host address in About dialog and debug message. PR #2218
-    * Some cleanup. PR #2212
-    * Added shift to channel marker to take RIT into account. Part of #2156
-    * Added S-meter units to scale engine. Part of #2156
-    * Some typos fixes. PR #2206
-    * Map enhancements and fixes. PR #2187
-    * APT Demod: Check filename suffix is specified. PR #2190
-    * Don't change filenames on Android, PR #2190
-    * Frequency Scanner: Fix rounding error. PR #2186
-    * Update sdrangel-windows-libraries link to include latest VC redistributable. PR #2185
-
-   -- Edouard Griffiths, F4EXB  <f4exb06@gmail.com>  Tue, 13 Aug 2024 17:01:01 +0200
-
 sdrangel (7.21.4-1) unstable; urgency=medium
 
     * Code fixes. PR #2184

debian/control

@@ -42,12 +42,9 @@ Build-Depends: debhelper (>= 9),
  libopencv-imgcodecs-dev,
  libxml2-dev,
  bison,
- cmake,
  flex,
  ffmpeg,
- ninja-build,
  libfaad-dev,
- libflac-dev,
  libavcodec-dev,
  libavformat-dev,
  libopus-dev,
@@ -65,13 +62,12 @@ Architecture: any
 Depends: ${shlibs:Depends},
  ${misc:Depends},
  libasound2,
- libgl1,
- libglx-mesa0,
+ libgl1-mesa-glx,
  libqt5multimedia5-plugins,
  libqt5gamepad5,
  libqt5svg5,
  qtspeech5-speechd-plugin,
- pulseaudio | pipewire-pulse,
+ pulseaudio,
  ffmpeg,
  gstreamer1.0-libav,
  qml-module-qtlocation,

devices/CMakeLists.txt

@@ -40,6 +40,4 @@ if(ENABLE_USRP AND UHD_FOUND)
     add_subdirectory(usrp)
 endif()
 
-if(ENABLE_METIS)
-    add_subdirectory(metis)
-endif()
+add_subdirectory(metis)

devices/soapysdr/CMakeLists.txt

@@ -27,14 +27,9 @@ set_target_properties(soapysdrdevice
 
 target_link_libraries(soapysdrdevice
     ${SOAPYSDR_LINK_LIBRARIES}
-    ${SOAPYSDR_LIBRARIES}
     sdrbase
 )
 
-target_link_directories(soapysdrdevice PRIVATE
-    ${SOAPYSDR_LIBRARY_DIRS}
-)
-
 if(SOAPYSDR_EXTERNAL AND NOT LINUX)
     add_dependencies(soapysdrdevice soapysdr)
 endif()

devices/usrp/deviceusrpparam.cpp

@@ -40,7 +40,7 @@ bool DeviceUSRPParams::open(const QString &deviceStr, bool channelNumOnly)
         qDebug() << "DeviceUSRPParams::open: m_nbRxChannels: " << m_nbRxChannels << " m_nbTxChannels: " << m_nbTxChannels;
 
         // Speed up program initialisation, by not getting all properties
-        // If we could find out number of channels without ::make ing the device
+        // If we could find out number of channles without ::make ing the device
         // that would be even better
         if (!channelNumOnly)
         {

external/CMakeLists.txt

@@ -11,9 +11,9 @@
 set(CODEC2_TAG "v1.0.3")
 set(CM256CC_TAG c0e92b92aca3d1d36c990b642b937c64d363c559)
 set(MBELIB_TAG fe83b32c6a60cdd7bce8cecf3c7a0b9ec87a7667)
-set(SERIALDV_TAG "v1.1.5")
+set(SERIALDV_TAG "v1.1.4")
 set(DSDCC_TAG "v1.9.5")
-set(LIMESUITE_TAG b39cb61ed03d74c35a2de757d495e901acbb6404)
+set(LIMESUITE_TAG 70e3859a55d8d5353963a5318013c8454594769f)
 set(BLADERF_TAG "2021.02")
 set(LIBIIO_TAG 826563e41b5ce9890b75506f672017de8d76d52d)
 set(AIRSPYHF_TAG "1af81c0ca18944b8c9897c3c98dc0a991815b686")
@@ -29,11 +29,17 @@ set(SOAPYSDR_SDRPLAY_TAG "soapy-sdrplay-0.2.0")
 set(SOAPYSDR_AUDIO_TAG "soapy-audio-0.1.1")
 set(SOAPYSDR_REMOTE_TAG "soapy-remote-0.5.1")
 set(AIRSPY_TAG "37c768ce9997b32e7328eb48972a7fda0a1f8554")
-set(HACKRF_TAG "v2024.02.1")
+set(HACKRF_TAG "v2022.09.1")
 set(LIBXML2_TAG "v2.10.4")
-set(UHD_TAG "v4.7.0.0")
-set(BOOST_TAG "1.86.0")
-set(BOOST_TAG2 "1_86_0")
+set(UHD_TAG "v4.6.0.0")
+if (APPLE AND (CMAKE_HOST_SYSTEM_PROCESSOR STREQUAL x86_64))
+    # UHD fails to load with 1.80+
+    set(BOOST_TAG "1.78.0")
+    set(BOOST_TAG2 "1_78_0")
+else()
+    set(BOOST_TAG "1.83.0")
+    set(BOOST_TAG2 "1_83_0")
+endif()
 
 # For some external project macros
 include(ExternalProject)
@@ -54,7 +60,6 @@ if (WIN32)
             -DCMAKE_LIBRARY_OUTPUT_DIRECTORY_DEBUG=${SDRANGEL_BINARY_LIB_DIR}
             -DCMAKE_LIBRARY_OUTPUT_DIRECTORY_RELEASE=${SDRANGEL_BINARY_LIB_DIR}
             -DCMAKE_LIBRARY_OUTPUT_DIRECTORY_RELWITHDEBINFO=${SDRANGEL_BINARY_LIB_DIR}
-            -DCMAKE_POLICY_VERSION_MINIMUM=3.5
             )
 elseif (LINUX)
     set(COMMON_CMAKE_ARGS
@@ -421,7 +426,6 @@ if (NOT FFMPEG_FOUND AND NOT USE_PRECOMPILED_LIBS)
     if (NOT X265_FOUND OR X265_EXTERNAL)
         ExternalProject_Add(x265
             GIT_REPOSITORY https://bitbucket.org/multicoreware/x265_git.git
-            GIT_TAG 4.1
             PREFIX "${EXTERNAL_BUILD_LIBRARIES}/x265"
             SOURCE_SUBDIR "source"
             CMAKE_ARGS ${COMMON_CMAKE_ARGS} -DCMAKE_INSTALL_PREFIX=<INSTALL_DIR>
@@ -542,7 +546,7 @@ endif (NOT FFMPEG_FOUND AND NOT USE_PRECOMPILED_LIBS)
 if (NOT OpenCV_FOUND AND NOT USE_PRECOMPILED_LIBS AND ENABLE_CHANNELTX_MODATV)
     ExternalProject_Add(opencv
             GIT_REPOSITORY https://github.com/opencv/opencv.git
-            GIT_TAG 4.10.0
+            GIT_TAG 4.5.5
             DEPENDS "${FFMPEG_DEPENDS}"
             PREFIX "${EXTERNAL_BUILD_LIBRARIES}/opencv"
             CMAKE_ARGS ${COMMON_CMAKE_ARGS} -DWITH_FFMPEG=ON -DCMAKE_PREFIX_PATH=${FFMPEG_INSTALL_DIR}
@@ -847,38 +851,6 @@ if(ENABLE_FEATURE_SATELLITETRACKER OR ENABLE_CHANNELRX_DEMODAPT)
     endif ()
 endif ()
 
-if(ENABLE_CHANNELRX_REMOTETCPSINK)
-    if (WIN32)
-        set(FLAC_LIBRARIES "${SDRANGEL_BINARY_LIB_DIR}/FLAC.lib" CACHE INTERNAL "")
-    elseif (LINUX)
-        set(FLAC_LIBRARIES "${EXTERNAL_BUILD_LIBRARIES}/flac/src/flac-build/src/libFLAC/libFLAC${CMAKE_SHARED_LIBRARY_SUFFIX}" CACHE INTERNAL "")
-    elseif (APPLE)
-        set(FLAC_LIBRARIES "${EXTERNAL_BUILD_LIBRARIES}/flac/src/flac-build/src/libFLAC/libFLAC${CMAKE_SHARED_LIBRARY_SUFFIX}" CACHE INTERNAL "")
-    elseif (EMSCRIPTEN)
-        set(FLAC_LIBRARIES "${EXTERNAL_BUILD_LIBRARIES}/flac/src/flac-build/src/libFLAC/libFLAC.a" CACHE INTERNAL "")
-    endif()
-    ExternalProject_Add(flac
-            GIT_REPOSITORY https://github.com/xiph/flac.git
-            PREFIX "${EXTERNAL_BUILD_LIBRARIES}/flac"
-            CMAKE_ARGS ${COMMON_CMAKE_ARGS} -DINSTALL_MANPAGES=OFF -DBUILD_SHARED_LIBS=ON -DWITH_FORTIFY_SOURCE=OFF -DWITH_STACK_PROTECTOR=PFF -DBUILD_PROGRAMS=OFF -DBUILD_TESTING=OFF -DBUILD_EXAMPLES=OFF -DWITH_OGG=OFF -DBUILD_DOCS=OFF
-            BUILD_BYPRODUCTS "${FLAC_LIBRARIES}"
-            INSTALL_COMMAND ""
-            TEST_COMMAND ""
-            )
-    ExternalProject_Get_Property(flac source_dir binary_dir)
-    set_global(FLAC_DEPENDS flac)
-    set_global_cache(FLAC_FOUND ON)
-    set(FLAC_EXTERNAL ON CACHE INTERNAL "")
-    set(FLAC_INCLUDE_DIR "${EXTERNAL_BUILD_LIBRARIES}/flac/src/flac/include" CACHE INTERNAL "")
-    if (WIN32)
-        install(FILES "${SDRANGEL_BINARY_BIN_DIR}/FLAC${CMAKE_SHARED_LIBRARY_SUFFIX}" DESTINATION "${INSTALL_LIB_DIR}")
-    elseif (APPLE)
-        install(DIRECTORY "${EXTERNAL_BUILD_LIBRARIES}/flac/src/flac-build/src/libFLAC" DESTINATION "${INSTALL_LIB_DIR}"
-                FILES_MATCHING PATTERN "libFLAC*${CMAKE_SHARED_LIBRARY_SUFFIX}")
-        set(MACOS_EXTERNAL_LIBS_FIXUP "${MACOS_EXTERNAL_LIBS_FIXUP};${EXTERNAL_BUILD_LIBRARIES}/flac/src/flac-build/src/libFLAC")
-    endif ()
-endif ()
-
 # For Morse Decoder feature
 if(ENABLE_FEATURE_MORSEDECODER)
     if (WIN32)
@@ -1574,8 +1546,6 @@ if (WIN32 OR APPLE)
                     -DLIBUSB_LIBRARIES=${LIBUSB_LIBRARIES}
                     -DLIBUSB_INCLUDE_DIR=${LIBUSB_INCLUDE_DIR}
                     ${UHD_PYTHON_ARGS}
-                    -DPython3_FIND_FRAMEWORK=NEVER
-                    -DENABLE_PYTHON_API=OFF
                     -DCMAKE_INSTALL_NAME_DIR=<INSTALL_DIR>/lib
                 TEST_COMMAND ""
                 )

external/windows

@@ -1 +1 @@
-Subproject commit eddef8183524e5aaef978088427d4b22a5afb393
+Subproject commit 983f966a07a808289aff19190f4ff3c1516df149

fcdhid/fcdhid.h

@@ -81,7 +81,7 @@ void fcdClose(hid_device *phd);
 FCD_MODE_ENUM fcdGetMode(hid_device *phd);
 
 /** \brief Get FCD firmware version as string.
- * \param str The returned version number as a 0 terminated string (must be pre-allocated)
+ * \param str The returned vesion number as a 0 terminated string (must be pre-allocated)
  * \return The current FCD mode.
  * \sa FCD_MODE_ENUM
  */
@@ -183,7 +183,7 @@ FCD_MODE_ENUM fcdBlWriteFirmware(hid_device *phd, char *pc, int64_t n64Size);
 /** \brief Verify firmware in FCd flash.
  * \param pc Pointer to firmware data to verify against.
  * \param n64Size Size of the data in pc.
- * \return The FCD_MODE_BL if verification was successful.
+ * \return The FCD_MODE_BL if verification was succesful.
  *
  * This function verifies the firmware currently in the FCd flash against the firmware
  * image pointed to by pc. The function return FCD_MODE_BL if the verification is OK and

ft8/CMakeLists.txt

@@ -39,14 +39,10 @@ include_directories(
     ${CMAKE_SOURCE_DIR}/sdrbase
 )
 
-add_library(ft8
+add_library(ft8 SHARED
     ${ft8_SOURCES}
 )
 
-if(DEFINED FFTW3F_DEPENDS)
-    add_dependencies(ft8 "${FFTW3F_DEPENDS}")
-endif()
-
 target_link_libraries(ft8
     Boost::disable_autolinking
     ${FFTW3F_LIBRARIES}

ft8/ft8.cpp

@@ -652,7 +652,7 @@ void FT8::go(int npasses)
         // in fractions of bins in off and hz.
         //
 
-        // just do this once, reuse for every fractional fft_shift
+        // just do this once, re-use for every fractional fft_shift
         // and down_v7_f() to 200 sps.
         std::vector<std::complex<float>> bins = fftEngine_->one_fft(
             samples_, 0, samples_.size());
@@ -1938,10 +1938,6 @@ void FT8::soft_decode(const FFTEngine::ffts_t &c79, float ll174[])
 //
 void FT8::soft_decode_mags(FT8Params& params, const std::vector<std::vector<float>>& mags_, int nbSymbolBits, float ll174[])
 {
-    if ((nbSymbolBits > 16) || (nbSymbolBits < 1)) {
-        return;
-    }
-
     std::vector<std::vector<float>> mags = convert_to_snr_gen(params, nbSymbolBits, mags_);
     // statistics to decide soft probabilities.
     // distribution of strongest tones, and
@@ -1953,8 +1949,8 @@ void FT8::soft_decode_mags(FT8Params& params, const std::vector<std::vector<floa
     int lli = 0;
     int zoX = 1<<(nbSymbolBits-1);
     int zoY = nbSymbolBits;
-    std::vector<int> zeroi(zoX*zoY);
-    std::vector<int> onei(zoX*zoY);
+    int *zeroi = new int[zoX*zoY];
+    int *onei = new int[zoX*zoY];
 
     for (int biti = 0; biti < nbSymbolBits; biti++)
     {
@@ -2277,7 +2273,7 @@ std::vector<float> FT8::extract_bits(const std::vector<int> &syms, const std::ve
     return bits;
 }
 
-// decode successive pairs of symbols. exploits the likelihood
+// decode successive pairs of symbols. exploits the likelyhood
 // that they have the same phase, by summing the complex
 // correlations for each possible pair and using the max.
 void FT8::soft_decode_pairs(
@@ -2577,7 +2573,7 @@ void FT8::soft_decode_triples(
 }
 
 //
-// given log likelihood for each bit, try LDPC and OSD decoders.
+// given log likelyhood for each bit, try LDPC and OSD decoders.
 // on success, puts corrected 174 bits into a174[].
 //
 int FT8::decode(const float ll174[], int a174[], FT8Params& _params, int use_osd, std::string &comment)

ft8/ft8.h

@@ -85,9 +85,8 @@ struct FT8_API cdecode
 // total transmission time is 12.64 seconds
 
 // tunable parameters
-class FT8_API FT8Params
+struct FT8_API FT8Params
 {
-public:
     int nthreads;            // number of parallel threads, for multi-core
     int npasses_one;         // number of spectral subtraction passes
     int npasses_two;         // number of spectral subtraction passes
@@ -265,14 +264,14 @@ public:
 
     FT8Params& getParams() { return params; }
     //
-    // given log likelihood for each bit, try LDPC and OSD decoders.
+    // given log likelyhood for each bit, try LDPC and OSD decoders.
     // on success, puts corrected 174 bits into a174[].
     //
     static int decode(const float ll174[], int a174[], FT8Params& params, int use_osd, std::string &comment);
     // encode a 77 bit message into a 174 bit payload
     // adds the 14 bit CRC to obtain 91 bits
     // apply (174, 91) generator mastrix to obtain the 83 parity bits
-    // append the 83 bits to the 91 bits message e+ crc to obtain the 174 bit payload
+    // append the 83 bits to the 91 bits messag e+ crc to obbain the 174 bit payload
     static void encode(int a174[], int s77[]);
 
     //
@@ -491,7 +490,7 @@ private:
     // scaled by str.
     //
     std::vector<float> extract_bits(const std::vector<int> &syms, const std::vector<float> str);
-    // decode successive pairs of symbols. exploits the likelihood
+    // decode successive pairs of symbols. exploits the likelyhood
     // that they have the same phase, by summing the complex
     // correlations for each possible pair and using the max.
     void soft_decode_pairs(

ft8/libldpc.cpp

@@ -370,9 +370,9 @@ void LDPC::ft8_crc(int msg1[], int msglen, int out[14])
     // the new FT8 polynomial for 14-bit CRC, 0x2757,
     // with leading 1 bit.
     int div[] = {1, 1, 0, 0, 1, 1, 1, 0, 1, 0, 1, 0, 1, 1, 1};
+
     // append 14 zeros.
     int *msg = (int *)malloc(sizeof(int) * (msglen + 14));
-
     for (int i = 0; i < msglen + 14; i++)
     {
         if (i < msglen)
@@ -396,7 +396,7 @@ void LDPC::ft8_crc(int msg1[], int msglen, int out[14])
         }
     }
 
-    for (int i = 0; i < msglen + 14; i++)
+    for (int i = 0; i < 14; i++)
     {
         out[i] = msg[msglen + i];
     }

ft8/osd.h

@@ -36,7 +36,7 @@ public:
     static int osd_decode(float codeword[174], int depth, int out[91], int *out_depth);
 };
 
-} // namespace FT8
+} // namepsace FT8
 
 #endif // osd_h
 

ft8/packing.cpp

@@ -82,7 +82,7 @@ std::string Packing::unpackcall(int x)
 
     if (x <= 1002)
     {
-        snprintf(tmp, sizeof(tmp), "CQ %d", x - 3);
+        sprintf(tmp, "CQ %d", x - 3);
         return std::string(tmp);
     }
 
@@ -96,7 +96,7 @@ std::string Packing::unpackcall(int x)
         int ci3 = x / 27;
         x %= 27;
         int ci4 = x;
-        snprintf(tmp, sizeof(tmp), "CQ %c%c%c%c", c4[ci1], c4[ci2], c4[ci3], c4[ci4]);
+        sprintf(tmp, "CQ %c%c%c%c", c4[ci1], c4[ci2], c4[ci3], c4[ci4]);
         return std::string(tmp);
     }
 
@@ -193,9 +193,9 @@ std::string Packing::unpackgrid15(int ng, int ir)
     char tmp[16];
 
     if (db >= 0) {
-        snprintf(tmp, sizeof(tmp), "%s+%02d", ir ? "R" : "", db);
+        sprintf(tmp, "%s+%02d", ir ? "R" : "", db);
     } else {
-        snprintf(tmp, sizeof(tmp), "%s-%02d", ir ? "R" : "", 0 - db);
+        sprintf(tmp, "%s-%02d", ir ? "R" : "", 0 - db);
     }
 
     return std::string(tmp);
@@ -388,7 +388,7 @@ std::string Packing::unpack_5(int a77[], std::string& call1str, std::string& cal
     hashes_mu.unlock();
     call2str = std::string(ocall);
 
-    // mext bit is always for R
+    // mext bit is alway for R
     int i = 12+ 22 +1;
     // r3
     int rst = un64(a77, i, 3);
@@ -396,7 +396,7 @@ std::string Packing::unpack_5(int a77[], std::string& call1str, std::string& cal
     i += 3;
     int qsonb = un64(a77, i, 11);
     char report[16];
-    snprintf(report, sizeof(report), "%d%04d", rst, qsonb);
+    sprintf(report, "%d%04d", rst, qsonb);
     i += 11;
     // g25
     int ng = un64(a77, i, 25);
@@ -467,9 +467,9 @@ std::string Packing::unpack_0_1(int a77[], std::string& call1str, std::string& c
     char tmp[32];
 
     if (r >= 0) {
-        snprintf(tmp, sizeof(tmp), "+%02d", r);
+        sprintf(tmp, "+%02d", r);
     } else {
-        snprintf(tmp, sizeof(tmp), "-%02d", -r);
+        sprintf(tmp, "-%02d", -r);
     }
 
     locstr = std::string(tmp);
@@ -553,7 +553,7 @@ std::string Packing::unpack_3(int a77[], std::string& call1str, std::string& cal
     else
     {
         char tmp[32];
-        snprintf(tmp, sizeof(tmp), "%04d", serial);
+        sprintf(tmp, "%04d", serial);
         serialstr = std::string(tmp);
     }
 
@@ -571,7 +571,7 @@ std::string Packing::unpack_3(int a77[], std::string& call1str, std::string& cal
     }
     {
         char tmp[16];
-        snprintf(tmp, sizeof(tmp), "%d ", rst);
+        sprintf(tmp, "%d ", rst);
         msg += std::string(tmp);
     }
 
@@ -634,7 +634,7 @@ std::string Packing::unpack_0_3(int a77[], int n3, std::string& call1str, std::s
 
     {
         char tmp[16];
-        snprintf(tmp, sizeof(tmp), "%d%c ", n_transmitters + 1, clss + 'A');
+        sprintf(tmp, "%d%c ", n_transmitters + 1, clss + 'A');
         msg += std::string(tmp);
     }
 
@@ -658,9 +658,9 @@ std::string Packing::unpack(int a77[], std::string& call1, std::string& call2, s
     char tmp[64];
 
     if (i3 == 0) {
-        snprintf(tmp, sizeof(tmp), "%d.%d", i3, n3);
+        sprintf(tmp, "%d.%d", i3, n3);
     } else {
-        snprintf(tmp, sizeof(tmp), "%d", i3);
+        sprintf(tmp, "%d", i3);
     }
 
     type = std::string(tmp);
@@ -714,7 +714,7 @@ std::string Packing::unpack(int a77[], std::string& call1, std::string& call2, s
     }
 
     call1 = "UNK";
-    snprintf(tmp, sizeof(tmp), "UNK i3=%d n3=%d", i3, n3);
+    sprintf(tmp, "UNK i3=%d n3=%d", i3, n3);
     return std::string(tmp);
 }
 

gitdiff.sh

@@ -1,9 +1,2 @@
 #!/bin/sh
-BASEDIR=$(dirname $0)
-PLUGINS=$(git diff --name-only ${1}..${2} | grep plugins/ | cut -d'/' -f2,3 | sort -u)
-for plugin in $PLUGINS
-do
-    FILE=$(find $BASEDIR/plugins/$plugin -name "*plugin.cpp")
-    echo $FILE
-    sed -i -E "s/QStringLiteral\(\"7\.(.*)\"\)/QStringLiteral\(\"7\.22\.7\"\)/" $FILE
-done
+git diff --name-only ${1}..${2} | grep plugins/ | cut -d'/' -f2,3 | sort -u

httpserver/CMakeLists.txt

@@ -35,7 +35,7 @@ include_directories(
     ${CMAKE_SOURCE_DIR}/exports
 )
 
-add_library(httpserver
+add_library(httpserver SHARED
 	${httpserver_SOURCES}
 )
 

httpserver/httpconnectionhandler.cpp

@@ -249,7 +249,7 @@ void HttpConnectionHandler::read()
             }
 
             // In case of HTTP 1.0 protocol add the Connection:close header.
-            // This ensures that the HttpResponse does not activate chunked mode, which is not supported by HTTP 1.0.
+            // This ensures that the HttpResponse does not activate chunked mode, which is not spported by HTTP 1.0.
             else
             {
                 bool http1_0=QString::compare(currentRequest->getVersion(),"HTTP/1.0",Qt::CaseInsensitive)==0;

httpserver/httpconnectionhandlerpool.cpp

@@ -94,7 +94,7 @@ void HttpConnectionHandlerPool::cleanup()
             if (++idleCounter > maxIdleHandlers)
             {
                 pool.removeOne(handler);
-                qDebug("HttpConnectionHandlerPool: Removed connection handler (%p), pool size is now %i",handler,(int)pool.size());
+                qDebug("HttpConnectionHandlerPool: Removed connection handler (%p), pool size is now %i",handler,pool.size());
                 delete handler;
                 break; // remove only one handler in each interval
             }

httpserver/httplistener.cpp

@@ -19,7 +19,7 @@ HttpListener::HttpListener(QSettings* settings, HttpRequestHandler* requestHandl
     pool = 0;
     this->settings = settings;
     this->requestHandler = requestHandler;
-    // Register type of socketDescriptor for signal/slot handling
+    // Reqister type of socketDescriptor for signal/slot handling
     qRegisterMetaType<tSocketDescriptor>("tSocketDescriptor");
     // Start listening
     listen();
@@ -33,7 +33,7 @@ HttpListener::HttpListener(const HttpListenerSettings& settings, HttpRequestHand
     this->settings = 0;
     listenerSettings = settings;
     this->requestHandler = requestHandler;
-    // Register type of socketDescriptor for signal/slot handling
+    // Reqister type of socketDescriptor for signal/slot handling
     qRegisterMetaType<tSocketDescriptor>("tSocketDescriptor");
     // Start listening
     listen();

httpserver/httplistener.h

@@ -73,7 +73,7 @@ public:
     virtual ~HttpListener();
 
     /**
-      Restart listening after close().
+      Restart listeing after close().
     */
     void listen();
 
@@ -108,7 +108,7 @@ private:
     /** Configuration settings for the HTTP server as a structure */
     HttpListenerSettings listenerSettings;
 
-    /** Point to the request handler which processes all HTTP requests */
+    /** Point to the reuqest handler which processes all HTTP requests */
     HttpRequestHandler* requestHandler;
 
     /** Pool of connection handlers */

httpserver/httprequest.cpp

@@ -425,7 +425,7 @@ void HttpRequest::parseMultiPartFile()
     while (!tempFile->atEnd() && !finished && !tempFile->error())
     {
         #ifdef SUPERVERBOSE
-            qDebug("HttpRequest::parseMultiPartFile: reading multipart headers");
+            qDebug("HttpRequest::parseMultiPartFile: reading multpart headers");
         #endif
         QByteArray fieldName;
         QByteArray fileName;
@@ -464,7 +464,7 @@ void HttpRequest::parseMultiPartFile()
         }
 
         #ifdef SUPERVERBOSE
-            qDebug("HttpRequest::parseMultiPartFile: reading multipart data");
+            qDebug("HttpRequest::parseMultiPartFile: reading multpart data");
         #endif
         QTemporaryFile* uploadedFile=0;
         QByteArray fieldValue;

httpserver/httprequest.h

@@ -26,7 +26,7 @@ namespace qtwebapp {
   from a TCP socket and provides getters for the individual parts
   of the request.
   <p>
-  The following config settings are required:
+  The follwing config settings are required:
   <code><pre>
   maxRequestSize=16000
   maxMultiPartSize=1000000
@@ -73,7 +73,7 @@ public:
     void readFromSocket(QTcpSocket* socket);
 
     /**
-      Get the status of this request.
+      Get the status of this reqeust.
       @see RequestStatus
     */
     RequestStatus getStatus() const;

httpserver/staticfilecontroller.cpp

@@ -35,7 +35,7 @@ StaticFileController::StaticFileController(QSettings* settings, QObject* parent)
     maxCachedFileSize=settings->value("maxCachedFileSize","65536").toInt();
     cache.setMaxCost(settings->value("cacheSize","1000000").toInt());
     cacheTimeout=settings->value("cacheTime","60000").toInt();
-    qDebug("StaticFileController: cache timeout=%i, size=%i",cacheTimeout,(int)cache.maxCost());
+    qDebug("StaticFileController: cache timeout=%i, size=%i",cacheTimeout,cache.maxCost());
 }
 
 StaticFileController::StaticFileController(const HttpDocrootSettings& settings, QObject* parent)
@@ -56,7 +56,7 @@ StaticFileController::StaticFileController(const HttpDocrootSettings& settings,
     maxCachedFileSize=settings.maxCachedFileSize;
     cache.setMaxCost(settings.cacheSize);
     cacheTimeout=settings.cacheTime;
-    qDebug("StaticFileController: cache timeout=%i, size=%i",cacheTimeout,(int)cache.maxCost());
+    qDebug("StaticFileController: cache timeout=%i, size=%i",cacheTimeout,cache.maxCost());
 }
 
 void StaticFileController::service(HttpRequest& request, HttpResponse& response)

logging/CMakeLists.txt

@@ -21,7 +21,7 @@ include_directories(
     ${CMAKE_SOURCE_DIR}/exports
 )
 
-add_library(logging
+add_library(logging SHARED
     ${logging_SOURCES}
 )
 

logging/filelogger.h

@@ -48,7 +48,7 @@ namespace qtwebapp {
 
   @see set() describes how to set logger variables
   @see LogMessage for a description of the message decoration.
-  @see Logger for a description of the buffer.
+  @see Logger for a descrition of the buffer.
 */
 
 class LOGGING_API FileLogger : public Logger {