comicsansg/CubicSDR
comicsansg
/
CubicSDR
mirror of https://github.com/cjcliffe/CubicSDR.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #159 from jocover/more_device_names_support 

fix setCORR bug and more device names support
This commit is contained in:
Charles J. Cliffe 2015-10-11 13:11:21 -04:00
parent 2b08c5d248 1ec45e84d5
commit 3570cef3f2
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/sdr/SDRDeviceInfo.cpp
View File

@ -99,11 +99,11 @@ void SDRDeviceChannel::setHardwareDC(const bool& hardware) {
const bool& SDRDeviceChannel::hasCORR() const { const bool& SDRDeviceChannel::hasCORR() const {
return hardwareDC; return hasCorr;
} }
void SDRDeviceChannel::setCORR(const bool& hardware) { void SDRDeviceChannel::setCORR(const bool& hasCorr) {
hardwareDC = hardware; this->hasCorr = hasCorr;
} }

2
src/sdr/SDREnumerator.cpp
View File

@ -143,7 +143,7 @@ std::vector<SDRDeviceInfo *> *SDREnumerator::enumerate_devices(std::string remot
std::cout << " " << it->first << " = " << it->second << std::endl; std::cout << " " << it->first << " = " << it->second << std::endl;
if (it->first == "driver") { if (it->first == "driver") {
dev->setDriver(it->second); dev->setDriver(it->second);
} else if (it->first == "label") { } else if (it->first == "label" || it->first == "device") {
dev->setName(it->second); dev->setName(it->second);
} }
} }