mirror/SDRPlusPlus
0
0
Fork 0
mirror of https://github.com/AlexandreRouma/SDRPlusPlus.git synced 2024-12-26 02:48:31 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix unusable bw

Browse Source
This commit is contained in:
cropinghigh 2020-12-28 16:05:35 +03:00
parent 42dbcec93f
commit 8e764f48ae
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
soapy_source/src/main.cpp
View File

@ -213,7 +213,7 @@ private:
} }
if(config.conf["devices"][name].contains("bandwidth")) { if(config.conf["devices"][name].contains("bandwidth")) {
uiBandwidthId = config.conf["devices"][name]["bandwidth"]; uiBandwidthId = config.conf["devices"][name]["bandwidth"];
} else if(bandwidthList.size() > 1) { } else if(bandwidthList.size() > 2) {
uiBandwidthId = 0; uiBandwidthId = 0;
} }
if (hasAgc && config.conf["devices"][name].contains("agc")) { if (hasAgc && config.conf["devices"][name].contains("agc")) {
@ -235,7 +235,7 @@ private:
uiGains[i] = gainRanges[i].minimum(); uiGains[i] = gainRanges[i].minimum();
i++; i++;
} }
if(bandwidthList.size() > 1) if(bandwidthList.size() > 2)
uiBandwidthId = 0; uiBandwidthId = 0;
if (hasAgc) { if (hasAgc) {
agc = false; agc = false;
@ -254,7 +254,7 @@ private:
conf["gains"][gain] = uiGains[i]; conf["gains"][gain] = uiGains[i];
i++; i++;
} }
if(bandwidthList.size() > 1) if(bandwidthList.size() > 2)
conf["bandwidth"] = uiBandwidthId; conf["bandwidth"] = uiBandwidthId;
if (hasAgc) { if (hasAgc) {
conf["agc"] = agc; conf["agc"] = agc;
@ -289,7 +289,7 @@ private:
_this->dev->setGain(SOAPY_SDR_RX, _this->channelId, gain, _this->uiGains[i]); _this->dev->setGain(SOAPY_SDR_RX, _this->channelId, gain, _this->uiGains[i]);
i++; i++;
} }
if(_this->bandwidthList.size() > 1) { if(_this->bandwidthList.size() > 2) {
if(_this->bandwidthList[_this->uiBandwidthId] == -1) if(_this->bandwidthList[_this->uiBandwidthId] == -1)
_this->dev->setBandwidth(SOAPY_SDR_RX, _this->channelId, _this->selectBwBySr(_this->sampleRates[_this->srId])); _this->dev->setBandwidth(SOAPY_SDR_RX, _this->channelId, _this->selectBwBySr(_this->sampleRates[_this->srId]));
else else
@ -353,7 +353,7 @@ private:
if (ImGui::Combo(CONCAT("##_sr_select_", _this->name), &_this->srId, _this->txtSrList.c_str())) { if (ImGui::Combo(CONCAT("##_sr_select_", _this->name), &_this->srId, _this->txtSrList.c_str())) {
_this->selectSampleRate(_this->sampleRates[_this->srId]); _this->selectSampleRate(_this->sampleRates[_this->srId]);
if(_this->bandwidthList.size() > 1 && _this->running && _this->bandwidthList[_this->uiBandwidthId] == -1) if(_this->bandwidthList.size() > 2 && _this->running && _this->bandwidthList[_this->uiBandwidthId] == -1)
_this->dev->setBandwidth(SOAPY_SDR_RX, _this->channelId, _this->selectBwBySr(_this->sampleRates[_this->srId])); _this->dev->setBandwidth(SOAPY_SDR_RX, _this->channelId, _this->selectBwBySr(_this->sampleRates[_this->srId]));
_this->saveCurrent(); _this->saveCurrent();
} }
@ -413,7 +413,7 @@ private:
} }
i++; i++;
} }
if(_this->bandwidthList.size() > 1) { if(_this->bandwidthList.size() > 2) {
float bwLen = ImGui::CalcTextSize("Bandwidth").x + 5.0f; float bwLen = ImGui::CalcTextSize("Bandwidth").x + 5.0f;
ImGui::Text("Bandwidth"); ImGui::Text("Bandwidth");
ImGui::SameLine(); ImGui::SameLine();