mirror of
				https://github.com/AlexandreRouma/SDRPlusPlus.git
				synced 2025-10-30 00:18:10 +01:00 
			
		
		
		
	fix macos ci + fix hydrasdr vid/pid
This commit is contained in:
		
							
								
								
									
										4
									
								
								.github/workflows/build_all.yml
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										4
									
								
								.github/workflows/build_all.yml
									
									
									
									
										vendored
									
									
								
							| @@ -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 ../../ | ||||
|   | ||||
| @@ -11,6 +11,7 @@ namespace backend { | ||||
|     extern const std::vector<DevVIDPID> AIRSPY_VIDPIDS; | ||||
|     extern const std::vector<DevVIDPID> AIRSPYHF_VIDPIDS; | ||||
|     extern const std::vector<DevVIDPID> HACKRF_VIDPIDS; | ||||
|     extern const std::vector<DevVIDPID> HYDRASDR_VIDPIDS; | ||||
|     extern const std::vector<DevVIDPID> RTL_SDR_VIDPIDS; | ||||
|  | ||||
|     int getDeviceFD(int& vid, int& pid, const std::vector<DevVIDPID>& allowedVidPids); | ||||
|   | ||||
| @@ -408,6 +408,11 @@ namespace backend { | ||||
|         { 0x1d50, 0xcc15 } | ||||
|     }; | ||||
|  | ||||
|     const std::vector<DevVIDPID> HYDRASDR_VIDPIDS = { | ||||
|         { 0x1d50, 0x60a1 }, | ||||
|         { 0x38af, 0x0001 } | ||||
|     }; | ||||
|  | ||||
|     const std::vector<DevVIDPID> RTL_SDR_VIDPIDS = { | ||||
|         { 0x0bda, 0x2832 }, | ||||
|         { 0x0bda, 0x2838 }, | ||||
|   | ||||
| @@ -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 | ||||
|   | ||||
		Reference in New Issue
	
	Block a user