mirror/SDRPlusPlus
0
0
Fork 0
mirror of https://github.com/AlexandreRouma/SDRPlusPlus.git synced 2025-06-25 20:07:51 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

fixed soapy bug

Browse Source
This commit is contained in:
Ryzerth
2020-12-13 14:52:54 +01:00
parent e3db19b16a
commit 46e9266752
9 changed files with 342 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
soapy_source/src/main.cpp
View File

@ -143,8 +143,6 @@ private:
hasAgc = dev->hasGainMode(SOAPY_SDR_RX, channelId);
hasIQBalance = dev->hasIQBalanceMode(SOAPY_SDR_RX, channelId);
SoapySDR::Device::unmake(dev);
config.aquire();
@ -165,12 +163,6 @@ private:
else {
agc = false;
}
if (hasIQBalance && config.conf["devices"][name].contains("iqBalance")) {
iqBalance = config.conf["devices"][name]["iqBalance"];
}
else {
iqBalance = false;
}
if (config.conf["devices"][name].contains("sampleRate")) {
selectSampleRate(config.conf["devices"][name]["sampleRate"]);
}
@ -204,9 +196,6 @@ private:
if (hasAgc) {
conf["agc"] = agc;
}
if (hasIQBalance) {
conf["iqBalance"] = iqBalance;
}
config.aquire();
config.conf["devices"][devArgs["label"]] = conf;
config.release(true);
@ -242,10 +231,6 @@ private:
_this->dev->setGainMode(SOAPY_SDR_RX, _this->channelId, _this->agc);
}
if (_this->hasIQBalance) {
_this->dev->setIQBalanceMode(SOAPY_SDR_RX, _this->channelId, _this->iqBalance);
}
_this->dev->setFrequency(SOAPY_SDR_RX, _this->channelId, _this->freq);
_this->devStream = _this->dev->setupStream(SOAPY_SDR_RX, "CF32");
@ -337,13 +322,6 @@ private:
}
}
if (_this->hasIQBalance) {
if (ImGui::Checkbox((std::string("AGC##_iq_bal_sel_") + _this->name).c_str(), &_this->iqBalance)) {
if (_this->running) { _this->dev->setIQBalanceMode(SOAPY_SDR_RX, _this->channelId, _this->iqBalance); }
_this->saveCurrent();
}
}
int i = 0;
for (auto gain : _this->gainList) {
ImGui::Text("%s gain", gain.c_str());
@ -393,8 +371,6 @@ private:
bool running = false;
bool hasAgc = false;
bool agc = false;
bool hasIQBalance = false;
bool iqBalance = false;
std::vector<double> sampleRates;
int srId = -1;
float* uiGains;