Skip to content

Commit

Permalink
changes for SDRplay API version 3.15 and support for RSPdx-R2
Browse files Browse the repository at this point in the history
  • Loading branch information
@fventuri
fventuri committed May 30, 2024
1 parent 2c8169d commit 8ef31b2
Show file tree
Hide file tree
Showing 4 changed files with 169 additions and 1 deletion.
6 changes: 6 additions & 0 deletions Changelog.txt
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
Release 0.5.2 (2024-05-30)
==========================

- SDRplay API v3.15
- Support for RSPdx-R2

Release 0.5.1 (2024-02-13)
==========================

Expand Down
2 changes: 1 addition & 1 deletion README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

## Dependencies

* SDRplay API - download (and install) SDRplay API from - https://www.sdrplay.com/downloads - NOTE: the current version of this module requires SDRplay API V3.14 or later
* SDRplay API - download (and install) SDRplay API from - https://www.sdrplay.com/downloads - NOTE: the current version of this module requires SDRplay API V3.15 or later
* SoapySDR - https://github.com/pothosware/SoapySDR/wiki

## Troubleshooting
Expand Down
4 changes: 4 additions & 0 deletions Registration.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,10 @@ static std::vector<SoapySDR::Kwargs> findSDRPlay(const SoapySDR::Kwargs &args)
{
modelName = "RSPdx";
}
else if (rspDevs[i].hwVer == SDRPLAY_RSPdxR2_ID)
{
modelName = "RSPdx-R2";
}
else
{
modelName = "UNKNOWN";
Expand Down
158 changes: 158 additions & 0 deletions Settings.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -125,6 +125,7 @@ std::string SoapySDRPlay::getHardwareKey(void) const
if (hwVer == SDRPLAY_RSP2_ID) return "RSP2";
if (hwVer == SDRPLAY_RSPduo_ID) return "RSPduo";
if (hwVer == SDRPLAY_RSPdx_ID) return "RSPdx";
if (hwVer == SDRPLAY_RSPdxR2_ID) return "RSPdx-R2";
return "UNKNOWN";
}

Expand Down Expand Up @@ -178,6 +179,11 @@ std::vector<std::string> SoapySDRPlay::listAntennas(const int direction, const s
antennas.push_back("Antenna B");
antennas.push_back("Antenna C");
}
else if (device.hwVer == SDRPLAY_RSPdxR2_ID) {
antennas.push_back("Antenna A");
antennas.push_back("Antenna B");
antennas.push_back("Antenna C");
}
else if (device.hwVer == SDRPLAY_RSPduo_ID) {
if (device.rspDuoMode == sdrplay_api_RspDuoMode_Single_Tuner ||
device.rspDuoMode == sdrplay_api_RspDuoMode_Master) {
Expand Down Expand Up @@ -285,6 +291,26 @@ void SoapySDRPlay::setAntenna(const int direction, const size_t channel, const s
sdrplay_api_Update(device.dev, device.tuner, sdrplay_api_Update_None, sdrplay_api_Update_RspDx_AntennaControl);
}
}
else if (device.hwVer == SDRPLAY_RSPdxR2_ID)
{
if (name == "Antenna A")
{
deviceParams->devParams->rspDxParams.antennaSel = sdrplay_api_RspDx_ANTENNA_A;
}
else if (name == "Antenna B")
{
deviceParams->devParams->rspDxParams.antennaSel = sdrplay_api_RspDx_ANTENNA_B;
}
else if (name == "Antenna C")
{
deviceParams->devParams->rspDxParams.antennaSel = sdrplay_api_RspDx_ANTENNA_C;
}

if (streamActive)
{
sdrplay_api_Update(device.dev, device.tuner, sdrplay_api_Update_None, sdrplay_api_Update_RspDx_AntennaControl);
}
}
else if (device.hwVer == SDRPLAY_RSPduo_ID)
{
bool changeToTunerA_B = false;
Expand Down Expand Up @@ -406,6 +432,18 @@ std::string SoapySDRPlay::getAntenna(const int direction, const size_t channel)
return "Antenna C";
}
}
else if (device.hwVer == SDRPLAY_RSPdxR2_ID)
{
if (deviceParams->devParams->rspDxParams.antennaSel == sdrplay_api_RspDx_ANTENNA_A) {
return "Antenna A";
}
else if (deviceParams->devParams->rspDxParams.antennaSel == sdrplay_api_RspDx_ANTENNA_B) {
return "Antenna B";
}
else if (deviceParams->devParams->rspDxParams.antennaSel == sdrplay_api_RspDx_ANTENNA_C) {
return "Antenna C";
}
}

return "RX";
}
Expand Down Expand Up @@ -591,6 +629,10 @@ SoapySDR::Range SoapySDRPlay::getGainRange(const int direction, const size_t cha
return SoapySDR::Range(0, 9);
}
else if ((name == "RFGR") && (device.hwVer == SDRPLAY_RSPdx_ID))
{
return SoapySDR::Range(0, 27);
}
else if ((name == "RFGR") && (device.hwVer == SDRPLAY_RSPdxR2_ID))
{
return SoapySDR::Range(0, 27);
}
Expand Down Expand Up @@ -1102,6 +1144,10 @@ unsigned char SoapySDRPlay::stringToHWVer(std::string hwVer)
{
return SDRPLAY_RSPdx_ID;
}
else if (strcasecmp(hwVer.c_str(), "RSPdx-R2") == 0)
{
return SDRPLAY_RSPdxR2_ID;
}
return 0;
}

Expand All @@ -1127,6 +1173,9 @@ std::string SoapySDRPlay::HWVertoString(unsigned char hwVer)
case SDRPLAY_RSPdx_ID:
return "RSPdx";
break;
case SDRPLAY_RSPdxR2_ID:
return "RSPdx-R2";
break;
}
return "";
}
Expand Down Expand Up @@ -1304,6 +1353,44 @@ SoapySDR::ArgInfoList SoapySDRPlay::getSettingInfo(void) const
RfGainArg.options.push_back("27");
setArgs.push_back(RfGainArg);
}
else if (device.hwVer == SDRPLAY_RSPdxR2_ID)
{
SoapySDR::ArgInfo RfGainArg;
RfGainArg.key = "rfgain_sel";
RfGainArg.value = "4";
RfGainArg.name = "RF Gain Select";
RfGainArg.description = "RF Gain Select";
RfGainArg.type = SoapySDR::ArgInfo::STRING;
RfGainArg.options.push_back("0");
RfGainArg.options.push_back("1");
RfGainArg.options.push_back("2");
RfGainArg.options.push_back("3");
RfGainArg.options.push_back("4");
RfGainArg.options.push_back("5");
RfGainArg.options.push_back("6");
RfGainArg.options.push_back("7");
RfGainArg.options.push_back("8");
RfGainArg.options.push_back("9");
RfGainArg.options.push_back("10");
RfGainArg.options.push_back("11");
RfGainArg.options.push_back("12");
RfGainArg.options.push_back("13");
RfGainArg.options.push_back("14");
RfGainArg.options.push_back("15");
RfGainArg.options.push_back("16");
RfGainArg.options.push_back("17");
RfGainArg.options.push_back("18");
RfGainArg.options.push_back("19");
RfGainArg.options.push_back("20");
RfGainArg.options.push_back("21");
RfGainArg.options.push_back("22");
RfGainArg.options.push_back("23");
RfGainArg.options.push_back("24");
RfGainArg.options.push_back("25");
RfGainArg.options.push_back("26");
RfGainArg.options.push_back("27");
setArgs.push_back(RfGainArg);
}
else
{
SoapySDR::ArgInfo RfGainArg;
Expand Down Expand Up @@ -1457,6 +1544,40 @@ SoapySDR::ArgInfoList SoapySDRPlay::getSettingInfo(void) const
HDRArg.type = SoapySDR::ArgInfo::BOOL;
setArgs.push_back(HDRArg);
}
else if (device.hwVer == SDRPLAY_RSPdxR2_ID) // RSPdx-R2
{
SoapySDR::ArgInfo BiasTArg;
BiasTArg.key = "biasT_ctrl";
BiasTArg.value = "true";
BiasTArg.name = "BiasT Enable";
BiasTArg.description = "BiasT Control";
BiasTArg.type = SoapySDR::ArgInfo::BOOL;
setArgs.push_back(BiasTArg);

SoapySDR::ArgInfo RfNotchArg;
RfNotchArg.key = "rfnotch_ctrl";
RfNotchArg.value = "true";
RfNotchArg.name = "RfNotch Enable";
RfNotchArg.description = "RF Notch Filter Control";
RfNotchArg.type = SoapySDR::ArgInfo::BOOL;
setArgs.push_back(RfNotchArg);

SoapySDR::ArgInfo DabNotchArg;
DabNotchArg.key = "dabnotch_ctrl";
DabNotchArg.value = "true";
DabNotchArg.name = "DabNotch Enable";
DabNotchArg.description = "DAB Notch Filter Control";
DabNotchArg.type = SoapySDR::ArgInfo::BOOL;
setArgs.push_back(DabNotchArg);

SoapySDR::ArgInfo HDRArg;
HDRArg.key = "hdr_ctrl";
HDRArg.value = "true";
HDRArg.name = "HDR Enable";
HDRArg.description = "RSPdx HDR Control";
HDRArg.type = SoapySDR::ArgInfo::BOOL;
setArgs.push_back(HDRArg);
}

return setArgs;
}
Expand Down Expand Up @@ -1574,6 +1695,14 @@ void SoapySDRPlay::writeSetting(const std::string &key, const std::string &value
sdrplay_api_Update(device.dev, device.tuner, sdrplay_api_Update_None, sdrplay_api_Update_RspDx_BiasTControl);
}
}
else if (device.hwVer == SDRPLAY_RSPdxR2_ID)
{
deviceParams->devParams->rspDxParams.biasTEnable = biasTen;
if (streamActive)
{
sdrplay_api_Update(device.dev, device.tuner, sdrplay_api_Update_None, sdrplay_api_Update_RspDx_BiasTControl);
}
}
}
else if (key == "rfnotch_ctrl")
{
Expand Down Expand Up @@ -1623,6 +1752,14 @@ void SoapySDRPlay::writeSetting(const std::string &key, const std::string &value
sdrplay_api_Update(device.dev, device.tuner, sdrplay_api_Update_None, sdrplay_api_Update_RspDx_RfNotchControl);
}
}
else if (device.hwVer == SDRPLAY_RSPdxR2_ID)
{
deviceParams->devParams->rspDxParams.rfNotchEnable = notchEn;
if (streamActive)
{
sdrplay_api_Update(device.dev, device.tuner, sdrplay_api_Update_None, sdrplay_api_Update_RspDx_RfNotchControl);
}
}
}
else if (key == "dabnotch_ctrl")
{
Expand Down Expand Up @@ -1653,6 +1790,14 @@ void SoapySDRPlay::writeSetting(const std::string &key, const std::string &value
sdrplay_api_Update(device.dev, device.tuner, sdrplay_api_Update_None, sdrplay_api_Update_RspDx_RfDabNotchControl);
}
}
else if (device.hwVer == SDRPLAY_RSPdxR2_ID)
{
deviceParams->devParams->rspDxParams.rfDabNotchEnable = dabNotchEn;
if (streamActive)
{
sdrplay_api_Update(device.dev, device.tuner, sdrplay_api_Update_None, sdrplay_api_Update_RspDx_RfDabNotchControl);
}
}
}
else if (key == "hdr_ctrl")
{
Expand All @@ -1668,6 +1813,15 @@ void SoapySDRPlay::writeSetting(const std::string &key, const std::string &value
sdrplay_api_Update(device.dev, device.tuner, sdrplay_api_Update_None, sdrplay_api_Update_RspDx_HdrEnable);
}
}
else if (device.hwVer == SDRPLAY_RSPdxR2_ID)
{
deviceParams->devParams->rspDxParams.hdrEnable = hdrEn;
SoapySDR_logf(SOAPY_SDR_INFO, "--> rspDxParams.hdrEnable=%d", deviceParams->devParams->rspDxParams.hdrEnable);
if (streamActive)
{
sdrplay_api_Update(device.dev, device.tuner, sdrplay_api_Update_None, sdrplay_api_Update_RspDx_HdrEnable);
}
}
}
}

Expand Down Expand Up @@ -1712,6 +1866,7 @@ std::string SoapySDRPlay::readSetting(const std::string &key) const
else if (device.hwVer == SDRPLAY_RSPduo_ID) biasTen = chParams->rspDuoTunerParams.biasTEnable;
else if (device.hwVer == SDRPLAY_RSP1A_ID || device.hwVer == SDRPLAY_RSP1B_ID) biasTen = chParams->rsp1aTunerParams.biasTEnable;
else if (device.hwVer == SDRPLAY_RSPdx_ID) biasTen = deviceParams->devParams->rspDxParams.biasTEnable;
else if (device.hwVer == SDRPLAY_RSPdxR2_ID) biasTen = deviceParams->devParams->rspDxParams.biasTEnable;
if (biasTen == 0) return "false";
else return "true";
}
Expand All @@ -1732,6 +1887,7 @@ std::string SoapySDRPlay::readSetting(const std::string &key) const
}
else if (device.hwVer == SDRPLAY_RSP1A_ID || device.hwVer == SDRPLAY_RSP1B_ID) notchEn = deviceParams->devParams->rsp1aParams.rfNotchEnable;
else if (device.hwVer == SDRPLAY_RSPdx_ID) notchEn = deviceParams->devParams->rspDxParams.rfNotchEnable;
else if (device.hwVer == SDRPLAY_RSPdxR2_ID) notchEn = deviceParams->devParams->rspDxParams.rfNotchEnable;
if (notchEn == 0) return "false";
else return "true";
}
Expand All @@ -1741,13 +1897,15 @@ std::string SoapySDRPlay::readSetting(const std::string &key) const
if (device.hwVer == SDRPLAY_RSPduo_ID) dabNotchEn = chParams->rspDuoTunerParams.rfDabNotchEnable;
else if (device.hwVer == SDRPLAY_RSP1A_ID || device.hwVer == SDRPLAY_RSP1B_ID) dabNotchEn = deviceParams->devParams->rsp1aParams.rfDabNotchEnable;
else if (device.hwVer == SDRPLAY_RSPdx_ID) dabNotchEn = deviceParams->devParams->rspDxParams.rfDabNotchEnable;
else if (device.hwVer == SDRPLAY_RSPdxR2_ID) dabNotchEn = deviceParams->devParams->rspDxParams.rfDabNotchEnable;
if (dabNotchEn == 0) return "false";
else return "true";
}
else if (key == "hdr_ctrl")
{
unsigned char hdrEn = 0;
if (device.hwVer == SDRPLAY_RSPdx_ID) hdrEn = deviceParams->devParams->rspDxParams.hdrEnable;
if (device.hwVer == SDRPLAY_RSPdxR2_ID) hdrEn = deviceParams->devParams->rspDxParams.hdrEnable;
if (hdrEn == 0) return "false";
else return "true";
}
Expand Down

0 comments on commit 8ef31b2

Please sign in to comment.