fix some settings not applied on start for RSP1B and RSPdxR2
Some checks failed
Build Binaries / build_debian_sid (push) Failing after 4s
Build Binaries / build_ubuntu_focal (push) Failing after 3s
Build Binaries / build_ubuntu_oracular (push) Failing after 4s
Build Binaries / build_android (push) Failing after 4s
Build Binaries / build_debian_buster (push) Failing after 4s
Build Binaries / build_debian_bullseye (push) Failing after 4s
Build Binaries / build_debian_bookworm (push) Failing after 4s
Build Binaries / build_ubuntu_jammy (push) Failing after 3s
Build Binaries / build_ubuntu_noble (push) Failing after 4s
Build Binaries / check_spelling (push) Failing after 3s
Build Binaries / check_formatting (push) Successful in 4s
Build Binaries / build_windows (push) Has been cancelled
Build Binaries / build_macos_intel (push) Has been cancelled
Build Binaries / build_macos_arm (push) Has been cancelled
Build Binaries / build_raspios_bullseye_armhf (push) Has been cancelled
Build Binaries / create_full_archive (push) Has been cancelled
Build Binaries / update_nightly_release (push) Has been cancelled

This commit is contained in:
AlexandreRouma 2024-12-19 04:26:30 +01:00
parent 45e4286f38
commit 46bcba7594

View File

@ -78,6 +78,8 @@ const char* ifModeTxt =
const char* rspduo_antennaPortsTxt = "Tuner 1 (50Ohm)\0Tuner 1 (Hi-Z)\0Tuner 2 (50Ohm)\0";
#define MAX_DEV_COUNT 16
class SDRPlaySourceModule : public ModuleManager::Instance {
public:
SDRPlaySourceModule(std::string name) {
@ -146,9 +148,9 @@ public:
devNameList.clear();
devListTxt = "";
sdrplay_api_DeviceT devArr[128];
sdrplay_api_DeviceT devArr[MAX_DEV_COUNT];
unsigned int numDev = 0;
sdrplay_api_GetDevices(devArr, &numDev, 128);
sdrplay_api_GetDevices(devArr, &numDev, MAX_DEV_COUNT);
for (unsigned int i = 0; i < numDev; i++) {
devList.push_back(devArr[i]);
@ -532,7 +534,7 @@ private:
_this->bufferSize = (float)_this->sampleRate / 200.0f;
// RSP1A Options
if (_this->openDev.hwVer == SDRPLAY_RSP1A_ID) {
if (_this->openDev.hwVer == SDRPLAY_RSP1A_ID || _this->openDev.hwVer == SDRPLAY_RSP1B_ID) {
_this->openDevParams->devParams->rsp1aParams.rfNotchEnable = _this->rsp1a_fmmwNotch;
_this->openDevParams->devParams->rsp1aParams.rfDabNotchEnable = _this->rsp1a_dabNotch;
_this->channelParams->rsp1aTunerParams.biasTEnable = _this->rsp1a_biasT;
@ -562,7 +564,7 @@ private:
sdrplay_api_Update(_this->openDev.dev, _this->openDev.tuner, sdrplay_api_Update_RspDuo_RfDabNotchControl, sdrplay_api_Update_Ext1_None);
sdrplay_api_Update(_this->openDev.dev, _this->openDev.tuner, sdrplay_api_Update_RspDuo_Tuner1AmNotchControl, sdrplay_api_Update_Ext1_None);
}
else if (_this->openDev.hwVer == SDRPLAY_RSPdx_ID) {
else if (_this->openDev.hwVer == SDRPLAY_RSPdx_ID || _this->openDev.hwVer == SDRPLAY_RSPdxR2_ID) {
_this->openDevParams->devParams->rspDxParams.rfNotchEnable = _this->rspdx_fmmwNotch;
_this->openDevParams->devParams->rspDxParams.rfDabNotchEnable = _this->rspdx_dabNotch;
_this->openDevParams->devParams->rspDxParams.biasTEnable = _this->rspdx_biasT;