mirror
/
sdrangel
kopia lustrzana https://github.com/f4exb/sdrangel
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

SDRplayV3Input: Add SDRPLAY_RSPdxR2_ID support.

pull/2172/head
srcejon 2024-06-17 10:07:53 +01:00
rodzic 741f1f7c87
commit 87dba4d26e
2 zmienionych plików z 12 dodań i 0 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

1
plugins/samplesource/sdrplayv3/sdrplayv3gui.cpp
Wyświetl plik

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

11
plugins/samplesource/sdrplayv3/sdrplayv3input.cpp
Wyświetl plik

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