VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2025-10-31 04:50:29 -04:00
Code Issues Projects Releases Wiki Activity

SDRplayV3Input: Add SDRPLAY_RSPdxR2_ID support.

Browse Source
This commit is contained in:
srcejon 2024-06-17 10:07:53 +01:00
parent 741f1f7c87
commit 87dba4d26e
2 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
plugins/samplesource/sdrplayv3/sdrplayv3gui.cpp
View File

@ -107,6 +107,7 @@ SDRPlayV3Gui::SDRPlayV3Gui(DeviceUISet *deviceUISet, QWidget* parent) :
ui->biasTee->setVisible(false); ui->biasTee->setVisible(false);
break; break;
case SDRPLAY_RSPdx_ID: case SDRPLAY_RSPdx_ID:
case SDRPLAY_RSPdxR2_ID:
ui->tuner->addItem("1"); ui->tuner->addItem("1");
ui->antenna->addItem("A"); ui->antenna->addItem("A");
ui->antenna->addItem("B"); ui->antenna->addItem("B");

11
plugins/samplesource/sdrplayv3/sdrplayv3input.cpp
View File

@ -529,6 +529,7 @@ bool SDRPlayV3Input::applySettings(const SDRPlayV3Settings& settings, const QLis
} }
break; break;
case SDRPLAY_RSPdx_ID: case SDRPLAY_RSPdx_ID:
case SDRPLAY_RSPdxR2_ID:
m_devParams->devParams->rspDxParams.biasTEnable = settings.m_biasTee; m_devParams->devParams->rspDxParams.biasTEnable = settings.m_biasTee;
updateExt = sdrplay_api_Update_RspDx_BiasTControl; updateExt = sdrplay_api_Update_RspDx_BiasTControl;
break; break;
@ -590,6 +591,7 @@ bool SDRPlayV3Input::applySettings(const SDRPlayV3Settings& settings, const QLis
update = sdrplay_api_Update_RspDuo_RfNotchControl; update = sdrplay_api_Update_RspDuo_RfNotchControl;
break; break;
case SDRPLAY_RSPdx_ID: case SDRPLAY_RSPdx_ID:
case SDRPLAY_RSPdxR2_ID:
m_devParams->devParams->rspDxParams.rfNotchEnable = settings.m_fmNotch; m_devParams->devParams->rspDxParams.rfNotchEnable = settings.m_fmNotch;
updateExt = sdrplay_api_Update_RspDx_RfNotchControl; updateExt = sdrplay_api_Update_RspDx_RfNotchControl;
break; break;
@ -623,6 +625,7 @@ bool SDRPlayV3Input::applySettings(const SDRPlayV3Settings& settings, const QLis
update = sdrplay_api_Update_RspDuo_RfDabNotchControl; update = sdrplay_api_Update_RspDuo_RfDabNotchControl;
break; break;
case SDRPLAY_RSPdx_ID: case SDRPLAY_RSPdx_ID:
case SDRPLAY_RSPdxR2_ID:
m_devParams->devParams->rspDxParams.rfDabNotchEnable = settings.m_dabNotch; m_devParams->devParams->rspDxParams.rfDabNotchEnable = settings.m_dabNotch;
updateExt = sdrplay_api_Update_RspDx_RfDabNotchControl; updateExt = sdrplay_api_Update_RspDx_RfDabNotchControl;
break; break;
@ -656,6 +659,7 @@ bool SDRPlayV3Input::applySettings(const SDRPlayV3Settings& settings, const QLis
} }
break; break;
case SDRPLAY_RSPdx_ID: case SDRPLAY_RSPdx_ID:
case SDRPLAY_RSPdxR2_ID:
m_devParams->devParams->rspDxParams.antennaSel = (sdrplay_api_RspDx_AntennaSelectT)settings.m_antenna; m_devParams->devParams->rspDxParams.antennaSel = (sdrplay_api_RspDx_AntennaSelectT)settings.m_antenna;
updateExt = sdrplay_api_Update_RspDx_AntennaControl; updateExt = sdrplay_api_Update_RspDx_AntennaControl;
break; break;
@ -993,6 +997,9 @@ void SDRPlayV3Input::webapiFormatDeviceReport(SWGSDRangel::SWGDeviceReport& resp
case SDRPLAY_RSP1A_ID: case SDRPLAY_RSP1A_ID:
response.getSdrPlayV3Report()->setDeviceType(new QString("RSP1A")); response.getSdrPlayV3Report()->setDeviceType(new QString("RSP1A"));
break; break;
case SDRPLAY_RSP1B_ID:
response.getSdrPlayV3Report()->setDeviceType(new QString("RSP1B"));
break;
case SDRPLAY_RSP2_ID: case SDRPLAY_RSP2_ID:
response.getSdrPlayV3Report()->setDeviceType(new QString("RSP2")); response.getSdrPlayV3Report()->setDeviceType(new QString("RSP2"));
break; break;
@ -1002,6 +1009,9 @@ void SDRPlayV3Input::webapiFormatDeviceReport(SWGSDRangel::SWGDeviceReport& resp
case SDRPLAY_RSPdx_ID: case SDRPLAY_RSPdx_ID:
response.getSdrPlayV3Report()->setDeviceType(new QString("RSPdx")); response.getSdrPlayV3Report()->setDeviceType(new QString("RSPdx"));
break; break;
case SDRPLAY_RSPdxR2_ID:
response.getSdrPlayV3Report()->setDeviceType(new QString("RSPdx-R2"));
break;
default: default:
response.getSdrPlayV3Report()->setDeviceType(new QString("Unknown")); response.getSdrPlayV3Report()->setDeviceType(new QString("Unknown"));
break; break;
@ -1434,6 +1444,7 @@ const int *SDRPlayV3LNA::getAttenuations(int deviceId, qint64 frequency)
lnaAttenuation = &rspDuoAttenuation[row][0]; lnaAttenuation = &rspDuoAttenuation[row][0];
break; break;
case SDRPLAY_RSPdx_ID: case SDRPLAY_RSPdx_ID:
case SDRPLAY_RSPdxR2_ID:
if (frequency < 2000000) if (frequency < 2000000)
row = 0; row = 0;
else if (frequency < 12000000) else if (frequency < 12000000)