mirror/SDRPlusPlus
0
0
Fork 0
mirror of https://github.com/AlexandreRouma/SDRPlusPlus.git synced 2025-02-02 21:04:45 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed SoapySDR trying to set gain on no device

Browse Source
This commit is contained in:
Ryzerth 2020-08-16 18:06:21 +02:00
parent 19e07eb767
commit 03dc5d2042
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CMakeLists.txt
View File

@ -7,8 +7,8 @@ if (MSVC)
include_directories(sdrpp "C:/Program Files/PothosSDR/include/volk/") include_directories(sdrpp "C:/Program Files/PothosSDR/include/volk/")
include_directories(sdrpp "C:/Program Files/PothosSDR/include/") include_directories(sdrpp "C:/Program Files/PothosSDR/include/")
else() else()
# set(CMAKE_CXX_FLAGS "-O3 -std=c++17 -fpremissive -fsanitize=address -g") set(CMAKE_CXX_FLAGS "-O3 -std=c++17 -fpermissive -fsanitize=address -g")
set(CMAKE_CXX_FLAGS "-O3 -std=c++17 -fpremissive") # set(CMAKE_CXX_FLAGS "-O3 -std=c++17 -fpermissive")
include_directories(sdrpp "/usr/include/volk") include_directories(sdrpp "/usr/include/volk")
link_libraries(pthread) link_libraries(pthread)
link_libraries(GL) link_libraries(GL)

9
src/io/soapy.h
View File

@ -15,6 +15,7 @@ namespace io {
currentGains = new float[1]; currentGains = new float[1];
refresh(); refresh();
if (devList.size() == 0) { if (devList.size() == 0) {
dev = NULL;
return; return;
} }
setDevice(devList[0]); setDevice(devList[0]);
@ -96,7 +97,7 @@ namespace io {
} }
void setSampleRate(float sampleRate) { void setSampleRate(float sampleRate) {
if (running) { if (running || dev == NULL) {
return; return;
} }
_sampleRate = sampleRate; _sampleRate = sampleRate;
@ -104,10 +105,16 @@ namespace io {
} }
void setFrequency(float freq) { void setFrequency(float freq) {
if (dev == NULL) {
return;
}
dev->setFrequency(SOAPY_SDR_RX, 0, freq); dev->setFrequency(SOAPY_SDR_RX, 0, freq);
} }
void setGain(int gainId, float gain) { void setGain(int gainId, float gain) {
if (dev == NULL) {
return;
}
currentGains[gainId] = gain; currentGains[gainId] = gain;
dev->setGain(SOAPY_SDR_RX, 0, gainList[gainId], gain); dev->setGain(SOAPY_SDR_RX, 0, gainList[gainId], gain);
} }