Skip to content

Commit 2a3fb12

Browse files
fix macos ci + fix hydrasdr vid/pid
1 parent e82202e commit 2a3fb12

File tree

4 files changed

+9
-3
lines changed

4 files changed

+9
-3
lines changed

.github/workflows/build_all.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ jobs:
113113
run: brew install pkg-config libusb fftw glfw airspy airspyhf portaudio hackrf libbladerf codec2 zstd autoconf automake libtool spdlog && pip3 install mako
114114

115115
- name: Install volk
116-
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 ../../
116+
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 ../../
117117

118118
- name: Install SDRplay API
119119
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:
182182
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 ../../
183183

184184
- name: Install libad9361
185-
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 ../../
185+
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 ../../
186186

187187
- name: Install LimeSuite
188188
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 ../../

core/backends/android/android_backend.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ namespace backend {
1111
extern const std::vector<DevVIDPID> AIRSPY_VIDPIDS;
1212
extern const std::vector<DevVIDPID> AIRSPYHF_VIDPIDS;
1313
extern const std::vector<DevVIDPID> HACKRF_VIDPIDS;
14+
extern const std::vector<DevVIDPID> HYDRASDR_VIDPIDS;
1415
extern const std::vector<DevVIDPID> RTL_SDR_VIDPIDS;
1516

1617
int getDeviceFD(int& vid, int& pid, const std::vector<DevVIDPID>& allowedVidPids);

core/backends/android/backend.cpp

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -408,6 +408,11 @@ namespace backend {
408408
{ 0x1d50, 0xcc15 }
409409
};
410410

411+
const std::vector<DevVIDPID> HYDRASDR_VIDPIDS = {
412+
{ 0x1d50, 0x60a1 },
413+
{ 0x38af, 0x0001 }
414+
};
415+
411416
const std::vector<DevVIDPID> RTL_SDR_VIDPIDS = {
412417
{ 0x0bda, 0x2832 },
413418
{ 0x0bda, 0x2838 },

source_modules/hydrasdr_source/src/main.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ class HydraSDRSourceModule : public ModuleManager::Instance {
9595
#else
9696
// Check for device presence
9797
int vid, pid;
98-
devFd = backend::getDeviceFD(vid, pid, backend::AIRSPY_VIDPIDS);
98+
devFd = backend::getDeviceFD(vid, pid, backend::HYDRASDR_VIDPIDS);
9999
if (devFd < 0) { return; }
100100

101101
// Get device info

0 commit comments

Comments
 (0)