kopia lustrzana https://github.com/f4exb/sdrangel
Porównaj commity
11 Commity
fcd94aaaf8
...
64cb4cf890
Autor | SHA1 | Data |
---|---|---|
f4exb | 64cb4cf890 | |
f4exb | 99b3c72469 | |
Edouard Griffiths | acb3b17fe3 | |
Jon Beniston | b4c50d71a7 | |
Jon Beniston | 3a07978ece | |
f4exb | ea891c0ad7 | |
Edouard Griffiths | 6c4789dbad | |
wysiwyng | 4ca0ead35d | |
wysiwyng | 24e3fb2d76 | |
wysiwyng | 3c7909620d | |
f4exb | ac651ff798 |
24
CHANGELOG
24
CHANGELOG
|
@ -1,3 +1,27 @@
|
|||
sdrangel (7.18.0-1) unstable; urgency=medium
|
||||
|
||||
* Upgrade to SDRPlay API to 3.14 and support for RSP 1B
|
||||
|
||||
-- Edouard Griffiths, F4EXB <f4exb06@gmail.com> Wed, 21 Feb 2024 12:53:33 +0100
|
||||
|
||||
sdrangel (7.18.0-1) unstable; urgency=medium
|
||||
|
||||
* New SkyMap feature PR #1986
|
||||
* Add AvailableChannelOrFeatureHandler. PR #1986
|
||||
* Use MainCore code for managing available channel and feature list. PR #1986
|
||||
* Optimize eumerator of origin device PR #1984
|
||||
* Fix SimpltPTT device id; Add "None" Rx/Tx device option PR #1983
|
||||
* Fix LimeSDR MIMO Tx gain mode. PR #1973
|
||||
* Fix GUI handle Startstop message. PR #1973
|
||||
* Speedup compilation on all platforms using ccache. PR #1967
|
||||
* Demod Analyzer plugin: channel selection via api. PR #1956
|
||||
* Sat Tracker: Update default TLEs to latest URLs. PR #1954
|
||||
* Fix failure due to access by null pointer. PR #1952 Issue #1951
|
||||
* Fix frequency calculation for SSB spectrum. PR #1946
|
||||
* File Input: Fix seeking over .wav header. PR #1946
|
||||
|
||||
-- Edouard Griffiths, F4EXB <f4exb06@gmail.com> Sun, 18 Feb 2024 10:46:39 +0100
|
||||
|
||||
sdrangel (7.17.3-1) unstable; urgency=medium
|
||||
|
||||
* Map updates: Allow selection of which device to tune to frequency. PR #1911
|
||||
|
|
|
@ -19,8 +19,8 @@ set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
|
|||
|
||||
# configure version
|
||||
set(sdrangel_VERSION_MAJOR "7")
|
||||
set(sdrangel_VERSION_MINOR "17")
|
||||
set(sdrangel_VERSION_PATCH "3")
|
||||
set(sdrangel_VERSION_MINOR "18")
|
||||
set(sdrangel_VERSION_PATCH "1")
|
||||
set(sdrangel_VERSION_SUFFIX "")
|
||||
|
||||
# SDRAngel cmake options
|
||||
|
@ -177,6 +177,7 @@ endif()
|
|||
|
||||
find_program(CCACHE "ccache")
|
||||
if(CCACHE)
|
||||
message(STATUS "Using ccache ${CCACHE}")
|
||||
set(CMAKE_C_COMPILER_LAUNCHER ${CCACHE})
|
||||
set(CMAKE_CXX_COMPILER_LAUNCHER ${CCACHE})
|
||||
if(APPLE)
|
||||
|
|
|
@ -4,4 +4,4 @@ mkdir -p sdrplayapi && cd sdrplayapi
|
|||
|
||||
git clone https://github.com/srcejon/sdrplayapi.git
|
||||
cd sdrplayapi
|
||||
sudo yes | sh install_lib.sh
|
||||
sudo yes | bash install_lib.sh
|
||||
|
|
|
@ -1,3 +1,27 @@
|
|||
sdrangel (7.18.0-1) unstable; urgency=medium
|
||||
|
||||
* Upgrade to SDRPlay API to 3.14 and support for RSP 1B
|
||||
|
||||
-- Edouard Griffiths, F4EXB <f4exb06@gmail.com> Wed, 21 Feb 2024 12:53:33 +0100
|
||||
|
||||
sdrangel (7.18.0-1) unstable; urgency=medium
|
||||
|
||||
* New SkyMap feature PR #1986
|
||||
* Add AvailableChannelOrFeatureHandler. PR #1986
|
||||
* Use MainCore code for managing available channel and feature list. PR #1986
|
||||
* Optimize eumerator of origin device PR #1984
|
||||
* Fix SimpltPTT device id; Add "None" Rx/Tx device option PR #1983
|
||||
* Fix LimeSDR MIMO Tx gain mode. PR #1973
|
||||
* Fix GUI handle Startstop message. PR #1973
|
||||
* Speedup compilation on all platforms using ccache. PR #1967
|
||||
* Demod Analyzer plugin: channel selection via api. PR #1956
|
||||
* Sat Tracker: Update default TLEs to latest URLs. PR #1954
|
||||
* Fix failure due to access by null pointer. PR #1952 Issue #1951
|
||||
* Fix frequency calculation for SSB spectrum. PR #1946
|
||||
* File Input: Fix seeking over .wav header. PR #1946
|
||||
|
||||
-- Edouard Griffiths, F4EXB <f4exb06@gmail.com> Sun, 18 Feb 2024 10:46:39 +0100
|
||||
|
||||
sdrangel (7.17.3-1) unstable; urgency=medium
|
||||
|
||||
* Map updates: Allow selection of which device to tune to frequency. PR #1911
|
||||
|
|
|
@ -22,7 +22,7 @@ set(MIRISDR_TAG "v2.0.0")
|
|||
set(LIBSIGMF_TAG "new-namespaces")
|
||||
|
||||
set(PTHREADS4W_TAG "Version-2-11-0-release")
|
||||
set(RTLSDR_TAG 1261fbb285297da08f4620b18871b6d6d9ec2a7b)
|
||||
set(RTLSDR_TAG "v2.0.1")
|
||||
set(RTLSDR_UDEV OFF)
|
||||
set(SOAPYSDR_TAG "soapy-sdr-0.7.1")
|
||||
set(SOAPYSDR_SDRPLAY_TAG "soapy-sdrplay-0.2.0")
|
||||
|
@ -31,7 +31,7 @@ set(SOAPYSDR_REMOTE_TAG "soapy-remote-0.5.1")
|
|||
set(AIRSPY_TAG "37c768ce9997b32e7328eb48972a7fda0a1f8554")
|
||||
set(HACKRF_TAG "v2022.09.1")
|
||||
set(LIBXML2_TAG "v2.10.4")
|
||||
set(UHD_TAG "v4.5.0.0")
|
||||
set(UHD_TAG "v4.6.0.0")
|
||||
if (APPLE AND (CMAKE_HOST_SYSTEM_PROCESSOR STREQUAL x86_64))
|
||||
# UHD fails to load with 1.80+
|
||||
set(BOOST_TAG "1.78.0")
|
||||
|
|
|
@ -1 +1 @@
|
|||
Subproject commit a3f4cd7f7e1250a7fa79fce9d5edc573747ca819
|
||||
Subproject commit da914afa4b7f2453882953ca1bf292bb83093626
|
|
@ -33,7 +33,7 @@
|
|||
const PluginDescriptor FreqScannerPlugin::m_pluginDescriptor = {
|
||||
FreqScanner::m_channelId,
|
||||
QStringLiteral("Frequency Scanner"),
|
||||
QStringLiteral("7.17.3"),
|
||||
QStringLiteral("7.18.0"),
|
||||
QStringLiteral("(c) Jon Beniston, M7RCE"),
|
||||
QStringLiteral("https://github.com/f4exb/sdrangel"),
|
||||
true,
|
||||
|
|
|
@ -29,7 +29,7 @@
|
|||
const PluginDescriptor RadioAstronomyPlugin::m_pluginDescriptor = {
|
||||
RadioAstronomy::m_channelId,
|
||||
QStringLiteral("Radio Astronomy"),
|
||||
QStringLiteral("7.17.3"),
|
||||
QStringLiteral("7.18.0"),
|
||||
QStringLiteral("(c) Jon Beniston, M7RCE"),
|
||||
QStringLiteral("https://github.com/f4exb/sdrangel"),
|
||||
true,
|
||||
|
|
|
@ -61,7 +61,8 @@ public:
|
|||
SOAPY_SDR,
|
||||
TEST_SOURCE,
|
||||
USRP,
|
||||
XTRX
|
||||
XTRX,
|
||||
SDRPLAY_V3_RSP1B
|
||||
};
|
||||
|
||||
enum Command {
|
||||
|
|
|
@ -35,7 +35,7 @@
|
|||
const PluginDescriptor RemoteTCPSinkPlugin::m_pluginDescriptor = {
|
||||
RemoteTCPSink::m_channelId,
|
||||
QStringLiteral("Remote TCP channel sink"),
|
||||
QStringLiteral("7.17.3"),
|
||||
QStringLiteral("7.18.1"),
|
||||
QStringLiteral("(c) Jon Beniston, M7RCE"),
|
||||
QStringLiteral("https://github.com/f4exb/sdrangel"),
|
||||
true,
|
||||
|
|
|
@ -359,6 +359,7 @@ RemoteTCPProtocol::Device RemoteTCPSinkSink::getDevice()
|
|||
QHash<QString, RemoteTCPProtocol::Device> sdrplayMap = {
|
||||
{"RSP1", RemoteTCPProtocol::SDRPLAY_V3_RSP1},
|
||||
{"RSP1A", RemoteTCPProtocol::SDRPLAY_V3_RSP1A},
|
||||
{"RSP1B", RemoteTCPProtocol::SDRPLAY_V3_RSP1B},
|
||||
{"RSP2", RemoteTCPProtocol::SDRPLAY_V3_RSP2},
|
||||
{"RSPduo", RemoteTCPProtocol::SDRPLAY_V3_RSPDUO},
|
||||
{"RSPdx", RemoteTCPProtocol::SDRPLAY_V3_RSPDX},
|
||||
|
|
|
@ -34,7 +34,7 @@
|
|||
const PluginDescriptor AISPlugin::m_pluginDescriptor = {
|
||||
AIS::m_featureId,
|
||||
QStringLiteral("AIS"),
|
||||
QStringLiteral("7.17.1"),
|
||||
QStringLiteral("7.18.0"),
|
||||
QStringLiteral("(c) Jon Beniston, M7RCE"),
|
||||
QStringLiteral("https://github.com/f4exb/sdrangel"),
|
||||
true,
|
||||
|
|
|
@ -34,7 +34,7 @@
|
|||
const PluginDescriptor APRSPlugin::m_pluginDescriptor = {
|
||||
APRS::m_featureId,
|
||||
QStringLiteral("APRS"),
|
||||
QStringLiteral("7.17.1"),
|
||||
QStringLiteral("7.18.0"),
|
||||
QStringLiteral("(c) Jon Beniston, M7RCE"),
|
||||
QStringLiteral("https://github.com/f4exb/sdrangel"),
|
||||
true,
|
||||
|
|
|
@ -31,7 +31,7 @@
|
|||
const PluginDescriptor DemodAnalyzerPlugin::m_pluginDescriptor = {
|
||||
DemodAnalyzer::m_featureId,
|
||||
QStringLiteral("Demod Analyzer"),
|
||||
QStringLiteral("7.17.1"),
|
||||
QStringLiteral("7.18.0"),
|
||||
QStringLiteral("(c) Edouard Griffiths, F4EXB"),
|
||||
QStringLiteral("https://github.com/f4exb/sdrangel"),
|
||||
true,
|
||||
|
|
|
@ -34,7 +34,7 @@
|
|||
const PluginDescriptor GS232ControllerPlugin::m_pluginDescriptor = {
|
||||
GS232Controller::m_featureId,
|
||||
QStringLiteral("Rotator Controller"),
|
||||
QStringLiteral("7.17.1"),
|
||||
QStringLiteral("7.18.0"),
|
||||
QStringLiteral("(c) Jon Beniston, M7RCE"),
|
||||
QStringLiteral("https://github.com/f4exb/sdrangel"),
|
||||
true,
|
||||
|
|
|
@ -34,7 +34,7 @@
|
|||
const PluginDescriptor PERTesterPlugin::m_pluginDescriptor = {
|
||||
PERTester::m_featureId,
|
||||
QStringLiteral("Packet Error Rate Tester"),
|
||||
QStringLiteral("7.17.1"),
|
||||
QStringLiteral("7.18.0"),
|
||||
QStringLiteral("(c) Jon Beniston, M7RCE"),
|
||||
QStringLiteral("https://github.com/f4exb/sdrangel"),
|
||||
true,
|
||||
|
|
|
@ -33,7 +33,7 @@
|
|||
const PluginDescriptor RadiosondePlugin::m_pluginDescriptor = {
|
||||
Radiosonde::m_featureId,
|
||||
QStringLiteral("Radiosonde"),
|
||||
QStringLiteral("7.17.1"),
|
||||
QStringLiteral("7.18.0"),
|
||||
QStringLiteral("(c) Jon Beniston, M7RCE"),
|
||||
QStringLiteral("https://github.com/f4exb/sdrangel"),
|
||||
true,
|
||||
|
|
|
@ -34,7 +34,7 @@
|
|||
const PluginDescriptor SatelliteTrackerPlugin::m_pluginDescriptor = {
|
||||
SatelliteTracker::m_featureId,
|
||||
QStringLiteral("Satellite Tracker"),
|
||||
QStringLiteral("7.17.1"),
|
||||
QStringLiteral("7.18.0"),
|
||||
QStringLiteral("(c) Jon Beniston, M7RCE and Daniel Warner (SGP4 library)"),
|
||||
QStringLiteral("https://github.com/f4exb/sdrangel"),
|
||||
true,
|
||||
|
|
|
@ -31,7 +31,7 @@
|
|||
const PluginDescriptor SimplePTTPlugin::m_pluginDescriptor = {
|
||||
SimplePTT::m_featureId,
|
||||
QStringLiteral("Simple PTT"),
|
||||
QStringLiteral("7.17.2"),
|
||||
QStringLiteral("7.18.0"),
|
||||
QStringLiteral("(c) Edouard Griffiths, F4EXB"),
|
||||
QStringLiteral("https://github.com/f4exb/sdrangel"),
|
||||
true,
|
||||
|
|
|
@ -34,7 +34,7 @@
|
|||
const PluginDescriptor StarTrackerPlugin::m_pluginDescriptor = {
|
||||
StarTracker::m_featureId,
|
||||
QStringLiteral("Star Tracker"),
|
||||
QStringLiteral("7.17.3"),
|
||||
QStringLiteral("7.18.0"),
|
||||
QStringLiteral("(c) Jon Beniston, M7RCE"),
|
||||
QStringLiteral("https://github.com/f4exb/sdrangel"),
|
||||
true,
|
||||
|
|
|
@ -33,7 +33,7 @@
|
|||
const PluginDescriptor BladeRF2MIMOPlugin::m_pluginDescriptor = {
|
||||
QStringLiteral("BladeRF2"),
|
||||
QStringLiteral("BladeRF2 MIMO"),
|
||||
QStringLiteral("7.17.1"),
|
||||
QStringLiteral("7.18.0"),
|
||||
QStringLiteral("(c) Edouard Griffiths, F4EXB"),
|
||||
QStringLiteral("https://github.com/f4exb/sdrangel"),
|
||||
true,
|
||||
|
|
|
@ -34,7 +34,7 @@
|
|||
const PluginDescriptor LimeSDRMIMOPlugin::m_pluginDescriptor = {
|
||||
QStringLiteral("LimeSDR"),
|
||||
QStringLiteral("LimeSDR MIMO"),
|
||||
QStringLiteral("7.17.1"),
|
||||
QStringLiteral("7.18.0"),
|
||||
QStringLiteral("(c) Edouard Griffiths, F4EXB"),
|
||||
QStringLiteral("https://github.com/f4exb/sdrangel"),
|
||||
true,
|
||||
|
|
|
@ -34,7 +34,7 @@
|
|||
const PluginDescriptor PlutoSDRMIMOPlugin::m_pluginDescriptor = {
|
||||
QStringLiteral("PlutoSDR"),
|
||||
QStringLiteral("PlutoSDR MIMO"),
|
||||
QStringLiteral("7.17.1"),
|
||||
QStringLiteral("7.18.0"),
|
||||
QStringLiteral("(c) Edouard Griffiths, F4EXB"),
|
||||
QStringLiteral("https://github.com/f4exb/sdrangel"),
|
||||
true,
|
||||
|
|
|
@ -312,6 +312,7 @@ const QHash<RemoteTCPProtocol::Device, const AndroidSDRDriverInputGui::DeviceGai
|
|||
{RemoteTCPProtocol::HACK_RF, &m_hackRFGains},
|
||||
{RemoteTCPProtocol::SDRPLAY_V3_RSP1, &m_sdrplayV3Gains},
|
||||
{RemoteTCPProtocol::SDRPLAY_V3_RSP1A, &m_sdrplayV3Gains},
|
||||
{RemoteTCPProtocol::SDRPLAY_V3_RSP1B, &m_sdrplayV3Gains},
|
||||
{RemoteTCPProtocol::SDRPLAY_V3_RSP2, &m_sdrplayV3Gains},
|
||||
{RemoteTCPProtocol::SDRPLAY_V3_RSPDUO, &m_sdrplayV3Gains},
|
||||
{RemoteTCPProtocol::SDRPLAY_V3_RSPDX, &m_sdrplayV3Gains},
|
||||
|
|
|
@ -33,7 +33,7 @@
|
|||
const PluginDescriptor FileInputPlugin::m_pluginDescriptor = {
|
||||
QStringLiteral("FileInput"),
|
||||
QStringLiteral("File device input"),
|
||||
QStringLiteral("7.17.3"),
|
||||
QStringLiteral("7.18.0"),
|
||||
QStringLiteral("(c) Edouard Griffiths, F4EXB"),
|
||||
QStringLiteral("https://github.com/f4exb/sdrangel"),
|
||||
true,
|
||||
|
|
|
@ -207,6 +207,7 @@ bool RemoteTCPInputGui::handleMessage(const Message& message)
|
|||
{RemoteTCPProtocol::SDRPLAY_1, "SDRplay1"},
|
||||
{RemoteTCPProtocol::SDRPLAY_V3_RSP1, "SDRplayV3 RSP1"},
|
||||
{RemoteTCPProtocol::SDRPLAY_V3_RSP1A, "SDRplayV3 RSP1A"},
|
||||
{RemoteTCPProtocol::SDRPLAY_V3_RSP1B, "SDRplayV3 RSP1B"},
|
||||
{RemoteTCPProtocol::SDRPLAY_V3_RSP2, "SDRplayV3 RSP2"},
|
||||
{RemoteTCPProtocol::SDRPLAY_V3_RSPDUO, "SDRplayV3 RSPduo"},
|
||||
{RemoteTCPProtocol::SDRPLAY_V3_RSPDX, "SDRplayV3 RSPdx"},
|
||||
|
@ -408,6 +409,7 @@ const QHash<RemoteTCPProtocol::Device, const RemoteTCPInputGui::SampleRateRange
|
|||
{RemoteTCPProtocol::LIME_SDR, &m_limeSampleRateRange},
|
||||
{RemoteTCPProtocol::SDRPLAY_V3_RSP1, &m_sdrPlaySampleRateRange},
|
||||
{RemoteTCPProtocol::SDRPLAY_V3_RSP1A, &m_sdrPlaySampleRateRange},
|
||||
{RemoteTCPProtocol::SDRPLAY_V3_RSP1B, &m_sdrPlaySampleRateRange},
|
||||
{RemoteTCPProtocol::SDRPLAY_V3_RSP2, &m_sdrPlaySampleRateRange},
|
||||
{RemoteTCPProtocol::SDRPLAY_V3_RSPDUO, &m_sdrPlaySampleRateRange},
|
||||
{RemoteTCPProtocol::SDRPLAY_V3_RSPDX, &m_sdrPlaySampleRateRange},
|
||||
|
@ -499,6 +501,7 @@ const QHash<RemoteTCPProtocol::Device, const RemoteTCPInputGui::DeviceGains *> R
|
|||
{RemoteTCPProtocol::LIME_SDR, &m_limeGains},
|
||||
{RemoteTCPProtocol::SDRPLAY_V3_RSP1, &m_sdrplayV3Gains},
|
||||
{RemoteTCPProtocol::SDRPLAY_V3_RSP1A, &m_sdrplayV3Gains},
|
||||
{RemoteTCPProtocol::SDRPLAY_V3_RSP1B, &m_sdrplayV3Gains},
|
||||
{RemoteTCPProtocol::SDRPLAY_V3_RSP2, &m_sdrplayV3Gains},
|
||||
{RemoteTCPProtocol::SDRPLAY_V3_RSPDUO, &m_sdrplayV3Gains},
|
||||
{RemoteTCPProtocol::SDRPLAY_V3_RSPDX, &m_sdrplayV3Gains},
|
||||
|
|
|
@ -34,7 +34,7 @@
|
|||
const PluginDescriptor RemoteTCPInputPlugin::m_pluginDescriptor = {
|
||||
QStringLiteral("RemoteTCPInput"),
|
||||
QStringLiteral("Remote TCP device input"),
|
||||
QStringLiteral("7.17.1"),
|
||||
QStringLiteral("7.18.1"),
|
||||
QStringLiteral("(c) Jon Beniston, M7RCE"),
|
||||
QStringLiteral("https://github.com/f4exb/sdrangel"),
|
||||
true,
|
||||
|
|
|
@ -60,7 +60,7 @@ target_link_libraries(${TARGET_NAME}
|
|||
if (APPLE AND (CMAKE_HOST_SYSTEM_PROCESSOR STREQUAL arm64))
|
||||
add_custom_command(TARGET ${TARGET_NAME}
|
||||
POST_BUILD COMMAND
|
||||
${CMAKE_INSTALL_NAME_TOOL} -change libsdrplay_api.so.3.12 /usr/local/lib/libsdrplay_api.so.3.12 $<TARGET_FILE:${TARGET_NAME}>)
|
||||
${CMAKE_INSTALL_NAME_TOOL} -change libsdrplay_api.so.3.14 /usr/local/lib/libsdrplay_api.so.3.14 $<TARGET_FILE:${TARGET_NAME}>)
|
||||
endif()
|
||||
|
||||
install(TARGETS ${TARGET_NAME} DESTINATION ${INSTALL_FOLDER})
|
||||
|
|
|
@ -6,7 +6,7 @@ This plugin supports input from SDRplay RSP devices using V3 of SDRplay's API, i
|
|||
|
||||
<h2>Driver Prerequisites</h2>
|
||||
|
||||
This plugin requires the SDRplay API V3.07 to have been installed and for the service to be running. It can be downloaded for Windows, Linux and Mac from: https://www.sdrplay.com/softwarehome/
|
||||
This plugin requires the SDRplay API V3.14 to have been installed and for the service to be running. It can be downloaded for Windows, Linux and Mac from: https://www.sdrplay.com/softwarehome/
|
||||
|
||||
<h2>Interface</h2>
|
||||
|
||||
|
|
|
@ -87,6 +87,7 @@ SDRPlayV3Gui::SDRPlayV3Gui(DeviceUISet *deviceUISet, QWidget* parent) :
|
|||
ui->extRef->setVisible(false);
|
||||
break;
|
||||
case SDRPLAY_RSP1A_ID:
|
||||
case SDRPLAY_RSP1B_ID:
|
||||
ui->tuner->addItem("1");
|
||||
ui->antenna->addItem("50Ohm");
|
||||
ui->amNotch->setVisible(false);
|
||||
|
|
|
@ -513,6 +513,7 @@ bool SDRPlayV3Input::applySettings(const SDRPlayV3Settings& settings, const QLis
|
|||
switch (getDeviceId())
|
||||
{
|
||||
case SDRPLAY_RSP1A_ID:
|
||||
case SDRPLAY_RSP1B_ID:
|
||||
m_devParams->rxChannelA->rsp1aTunerParams.biasTEnable = settings.m_biasTee;
|
||||
update = sdrplay_api_Update_Rsp1a_BiasTControl;
|
||||
break;
|
||||
|
@ -574,6 +575,7 @@ bool SDRPlayV3Input::applySettings(const SDRPlayV3Settings& settings, const QLis
|
|||
switch (getDeviceId())
|
||||
{
|
||||
case SDRPLAY_RSP1A_ID:
|
||||
case SDRPLAY_RSP1B_ID:
|
||||
m_devParams->devParams->rsp1aParams.rfNotchEnable = settings.m_fmNotch;
|
||||
update = sdrplay_api_Update_Rsp1a_RfNotchControl;
|
||||
break;
|
||||
|
@ -610,6 +612,7 @@ bool SDRPlayV3Input::applySettings(const SDRPlayV3Settings& settings, const QLis
|
|||
switch (getDeviceId())
|
||||
{
|
||||
case SDRPLAY_RSP1A_ID:
|
||||
case SDRPLAY_RSP1B_ID:
|
||||
m_devParams->devParams->rsp1aParams.rfDabNotchEnable = settings.m_dabNotch;
|
||||
update = sdrplay_api_Update_Rsp1a_RfDabNotchControl;
|
||||
break;
|
||||
|
@ -658,7 +661,7 @@ bool SDRPlayV3Input::applySettings(const SDRPlayV3Settings& settings, const QLis
|
|||
updateExt = sdrplay_api_Update_RspDx_AntennaControl;
|
||||
break;
|
||||
default:
|
||||
// SDRPLAY_RSP1_ID and SDRPLAY_RSP1A_ID only have one antenna
|
||||
// SDRPLAY_RSP1_ID, SDRPLAY_RSP1A_ID, SDRPLAY_RSP1B_ID only have one antenna
|
||||
break;
|
||||
}
|
||||
if ((err = sdrplay_api_Update(m_dev->dev, m_dev->tuner, update, updateExt)) != sdrplay_api_Success)
|
||||
|
@ -1335,6 +1338,15 @@ const int SDRPlayV3LNA::rsp1AAttenuation[4][11] =
|
|||
{ 9, 0, 6, 12, 20, 26, 32, 38, 43, 62}
|
||||
};
|
||||
|
||||
const int SDRPlayV3LNA::rsp1BAttenuation[5][11] =
|
||||
{
|
||||
{7, 0, 6, 12, 18, 37, 42, 61},
|
||||
{10, 0, 6, 12, 18, 20, 26, 32, 38, 57, 62},
|
||||
{10, 0, 6, 12, 18, 20, 26, 32, 38, 57, 62},
|
||||
{10, 0, 7, 13, 19, 20, 27, 33, 39, 45, 64},
|
||||
{ 9, 0, 6, 12, 20, 26, 32, 38, 43, 62}
|
||||
};
|
||||
|
||||
const int SDRPlayV3LNA::rsp2Attenuation[3][10] =
|
||||
{
|
||||
{9, 0, 10, 15, 21, 24, 34, 39, 45, 64},
|
||||
|
@ -1389,6 +1401,19 @@ const int *SDRPlayV3LNA::getAttenuations(int deviceId, qint64 frequency)
|
|||
row = 3;
|
||||
lnaAttenuation = &rsp1AAttenuation[row][0];
|
||||
break;
|
||||
case SDRPLAY_RSP1B_ID:
|
||||
if (frequency < 50000000)
|
||||
row = 0;
|
||||
else if (frequency < 60000000)
|
||||
row = 1;
|
||||
else if (frequency < 420000000)
|
||||
row = 2;
|
||||
else if (frequency < 1000000000)
|
||||
row = 3;
|
||||
else
|
||||
row = 4;
|
||||
lnaAttenuation = &rsp1BAttenuation[row][0];
|
||||
break;
|
||||
case SDRPLAY_RSP2_ID:
|
||||
if (frequency < 420000000)
|
||||
row = 0;
|
||||
|
|
|
@ -217,6 +217,7 @@ public:
|
|||
private:
|
||||
static const int rsp1Attenuation[3][5];
|
||||
static const int rsp1AAttenuation[4][11];
|
||||
static const int rsp1BAttenuation[5][11];
|
||||
static const int rsp2Attenuation[3][10];
|
||||
static const int rspDuoAttenuation[5][11];
|
||||
static const int rspDxAttenuation[7][29];
|
||||
|
|
|
@ -32,7 +32,7 @@
|
|||
const PluginDescriptor SDRPlayV3Plugin::m_pluginDescriptor = {
|
||||
QStringLiteral("SDRPlayV3"),
|
||||
QStringLiteral("SDRPlayV3 Input"),
|
||||
QStringLiteral("7.17.3"),
|
||||
QStringLiteral("7.18.1"),
|
||||
QStringLiteral("(c) Jon Beniston, M7RCE and Edouard Griffiths, F4EXB"),
|
||||
QStringLiteral("https://github.com/f4exb/sdrangel"),
|
||||
true,
|
||||
|
|
|
@ -13460,7 +13460,7 @@ margin-bottom: 20px;
|
|||
"properties" : {
|
||||
"deviceType" : {
|
||||
"type" : "string",
|
||||
"description" : "SDRplay device type. Can be RSP1, RSP1A, RSP2, RSPduo, RSPdx, Unknown"
|
||||
"description" : "SDRplay device type. Can be RSP1, RSP1A, RSP1B, RSP2, RSPduo, RSPdx, Unknown"
|
||||
},
|
||||
"bandwidths" : {
|
||||
"type" : "array",
|
||||
|
|
|
@ -73,7 +73,7 @@ SDRPlayV3Report:
|
|||
properties:
|
||||
deviceType:
|
||||
type: string
|
||||
description: SDRplay device type. Can be RSP1, RSP1A, RSP2, RSPduo, RSPdx, Unknown
|
||||
description: SDRplay device type. Can be RSP1, RSP1A, RSP1B, RSP2, RSPduo, RSPdx, Unknown
|
||||
bandwidths:
|
||||
type: array
|
||||
items:
|
||||
|
|
|
@ -73,7 +73,7 @@ SDRPlayV3Report:
|
|||
properties:
|
||||
deviceType:
|
||||
type: string
|
||||
description: SDRplay device type. Can be RSP1, RSP1A, RSP2, RSPduo, RSPdx, Unknown
|
||||
description: SDRplay device type. Can be RSP1, RSP1A, RSP1B, RSP2, RSPduo, RSPdx, Unknown
|
||||
bandwidths:
|
||||
type: array
|
||||
items:
|
||||
|
|
|
@ -13460,7 +13460,7 @@ margin-bottom: 20px;
|
|||
"properties" : {
|
||||
"deviceType" : {
|
||||
"type" : "string",
|
||||
"description" : "SDRplay device type. Can be RSP1, RSP1A, RSP2, RSPduo, RSPdx, Unknown"
|
||||
"description" : "SDRplay device type. Can be RSP1, RSP1A, RSP1B, RSP2, RSPduo, RSPdx, Unknown"
|
||||
},
|
||||
"bandwidths" : {
|
||||
"type" : "array",
|
||||
|
|
Ładowanie…
Reference in New Issue