From 2a3fb12f613f6ab5d2b2dae5d35d939514780338 Mon Sep 17 00:00:00 2001 From: AlexandreRouma Date: Sun, 5 Oct 2025 16:51:42 -0400 Subject: [PATCH] fix macos ci + fix hydrasdr vid/pid --- .github/workflows/build_all.yml | 4 ++-- core/backends/android/android_backend.h | 1 + core/backends/android/backend.cpp | 5 +++++ source_modules/hydrasdr_source/src/main.cpp | 2 +- 4 files changed, 9 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build_all.yml b/.github/workflows/build_all.yml index 5d65a3e8..5e9002d1 100644 --- a/.github/workflows/build_all.yml +++ b/.github/workflows/build_all.yml @@ -113,7 +113,7 @@ jobs: run: brew install pkg-config libusb fftw glfw airspy airspyhf portaudio hackrf libbladerf codec2 zstd autoconf automake libtool spdlog && pip3 install mako - name: Install volk - run: git clone --recursive https://github.com/gnuradio/volk && cd volk && mkdir build && cd build && cmake -DCMAKE_OSX_DEPLOYMENT_TARGET=10.15 -DCMAKE_BUILD_TYPE=Release .. && make -j3 && sudo make install && cd ../../ + run: git clone --recursive https://github.com/gnuradio/volk && cd volk && mkdir build && cd build && cmake -DCMAKE_OSX_DEPLOYMENT_TARGET=10.15 -DCMAKE_BUILD_TYPE=Release -DCMAKE_POLICY_VERSION_MINIMUM=3.5 .. && make -j3 && sudo make install && cd ../../ - 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 / @@ -182,7 +182,7 @@ jobs: run: wget https://github.com/analogdevicesinc/libiio/archive/refs/tags/v0.25.zip && 7z x v0.25.zip && cd libiio-0.25 && mkdir build && cd build && cmake -DCMAKE_OSX_DEPLOYMENT_TARGET=10.15 -DCMAKE_BUILD_TYPE=Release .. && make -j3 && sudo make install && cd ../../ - name: Install libad9361 - run: git clone https://github.com/analogdevicesinc/libad9361-iio && cd libad9361-iio && mkdir build && cd build && cmake -DCMAKE_OSX_DEPLOYMENT_TARGET=10.15 -DCMAKE_BUILD_TYPE=Release .. && make -j3 && sudo make install && cd ../../ + run: git clone https://github.com/analogdevicesinc/libad9361-iio && cd libad9361-iio && mkdir build && cd build && cmake -DCMAKE_OSX_DEPLOYMENT_TARGET=10.15 -DCMAKE_BUILD_TYPE=Release -DCMAKE_POLICY_VERSION_MINIMUM=3.5 .. && make -j3 && sudo make install && cd ../../ - name: Install LimeSuite run: git clone https://github.com/myriadrf/LimeSuite && cd LimeSuite && mkdir builddir && cd builddir && cmake -DCMAKE_OSX_DEPLOYMENT_TARGET=10.15 -DCMAKE_BUILD_TYPE=Release .. && make -j3 && sudo make install && cd ../../ diff --git a/core/backends/android/android_backend.h b/core/backends/android/android_backend.h index 50fdf515..462ce06b 100644 --- a/core/backends/android/android_backend.h +++ b/core/backends/android/android_backend.h @@ -11,6 +11,7 @@ namespace backend { extern const std::vector AIRSPY_VIDPIDS; extern const std::vector AIRSPYHF_VIDPIDS; extern const std::vector HACKRF_VIDPIDS; + extern const std::vector HYDRASDR_VIDPIDS; extern const std::vector RTL_SDR_VIDPIDS; int getDeviceFD(int& vid, int& pid, const std::vector& allowedVidPids); diff --git a/core/backends/android/backend.cpp b/core/backends/android/backend.cpp index 270fafee..cfe4d5ad 100644 --- a/core/backends/android/backend.cpp +++ b/core/backends/android/backend.cpp @@ -408,6 +408,11 @@ namespace backend { { 0x1d50, 0xcc15 } }; + const std::vector HYDRASDR_VIDPIDS = { + { 0x1d50, 0x60a1 }, + { 0x38af, 0x0001 } + }; + const std::vector RTL_SDR_VIDPIDS = { { 0x0bda, 0x2832 }, { 0x0bda, 0x2838 }, diff --git a/source_modules/hydrasdr_source/src/main.cpp b/source_modules/hydrasdr_source/src/main.cpp index 6c0eb061..76afa4e3 100644 --- a/source_modules/hydrasdr_source/src/main.cpp +++ b/source_modules/hydrasdr_source/src/main.cpp @@ -95,7 +95,7 @@ public: #else // Check for device presence int vid, pid; - devFd = backend::getDeviceFD(vid, pid, backend::AIRSPY_VIDPIDS); + devFd = backend::getDeviceFD(vid, pid, backend::HYDRASDR_VIDPIDS); if (devFd < 0) { return; } // Get device info