VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2025-08-03 14:32:25 -04:00
Code Issues Projects Releases Wiki Activity

AM, NFM, SSB and WFM demods: changed channel Id URI

Browse Source
This commit is contained in:
f4exb 2018-05-30 22:25:57 +02:00
parent 5f08261d37
commit a839695c3a
10 changed files with 24 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
plugins/channelrx/demodam/amdemod.cpp
View File

@ -40,7 +40,7 @@
MESSAGE_CLASS_DEFINITION(AMDemod::MsgConfigureAMDemod, Message) MESSAGE_CLASS_DEFINITION(AMDemod::MsgConfigureAMDemod, Message)
MESSAGE_CLASS_DEFINITION(AMDemod::MsgConfigureChannelizer, Message) MESSAGE_CLASS_DEFINITION(AMDemod::MsgConfigureChannelizer, Message)
const QString AMDemod::m_channelIdURI = "de.maintech.sdrangelove.channel.am"; const QString AMDemod::m_channelIdURI = "sdrangel.channel.amdemod";
const QString AMDemod::m_channelId = "AMDemod"; const QString AMDemod::m_channelId = "AMDemod";
const int AMDemod::m_udpBlockSize = 512; const int AMDemod::m_udpBlockSize = 512;

2
plugins/channelrx/demodam/amdemodplugin.h
View File

@ -26,7 +26,7 @@ class BasebandSampleSink;
class AMDemodPlugin : public QObject, PluginInterface { class AMDemodPlugin : public QObject, PluginInterface {
Q_OBJECT Q_OBJECT
Q_INTERFACES(PluginInterface) Q_INTERFACES(PluginInterface)
Q_PLUGIN_METADATA(IID "de.maintech.sdrangelove.channel.am") Q_PLUGIN_METADATA(IID "sdrangel.channel.amdemod")
public: public:
explicit AMDemodPlugin(QObject* parent = NULL); explicit AMDemodPlugin(QObject* parent = NULL);

2
plugins/channelrx/demodnfm/nfmdemod.cpp
View File

@ -40,7 +40,7 @@ MESSAGE_CLASS_DEFINITION(NFMDemod::MsgConfigureNFMDemod, Message)
MESSAGE_CLASS_DEFINITION(NFMDemod::MsgConfigureChannelizer, Message) MESSAGE_CLASS_DEFINITION(NFMDemod::MsgConfigureChannelizer, Message)
MESSAGE_CLASS_DEFINITION(NFMDemod::MsgReportCTCSSFreq, Message) MESSAGE_CLASS_DEFINITION(NFMDemod::MsgReportCTCSSFreq, Message)
const QString NFMDemod::m_channelIdURI = "de.maintech.sdrangelove.channel.nfm"; const QString NFMDemod::m_channelIdURI = "sdrangel.channel.nfmdemod";
const QString NFMDemod::m_channelId = "NFMDemod"; const QString NFMDemod::m_channelId = "NFMDemod";
static const double afSqTones[2] = {1000.0, 6000.0}; // {1200.0, 8000.0}; static const double afSqTones[2] = {1000.0, 6000.0}; // {1200.0, 8000.0};

2
plugins/channelrx/demodnfm/nfmplugin.h
View File

@ -10,7 +10,7 @@ class BasebandSampleSink;
class NFMPlugin : public QObject, PluginInterface { class NFMPlugin : public QObject, PluginInterface {
Q_OBJECT Q_OBJECT
Q_INTERFACES(PluginInterface) Q_INTERFACES(PluginInterface)
Q_PLUGIN_METADATA(IID "de.maintech.sdrangelove.channel.nfm") Q_PLUGIN_METADATA(IID "sdrangel.channel.nfmdemod")
public: public:
explicit NFMPlugin(QObject* parent = NULL); explicit NFMPlugin(QObject* parent = NULL);

2
plugins/channelrx/demodssb/ssbdemod.cpp
View File

@ -40,7 +40,7 @@ MESSAGE_CLASS_DEFINITION(SSBDemod::MsgConfigureSSBDemod, Message)
MESSAGE_CLASS_DEFINITION(SSBDemod::MsgConfigureSSBDemodPrivate, Message) MESSAGE_CLASS_DEFINITION(SSBDemod::MsgConfigureSSBDemodPrivate, Message)
MESSAGE_CLASS_DEFINITION(SSBDemod::MsgConfigureChannelizer, Message) MESSAGE_CLASS_DEFINITION(SSBDemod::MsgConfigureChannelizer, Message)
const QString SSBDemod::m_channelIdURI = "de.maintech.sdrangelove.channel.ssb"; const QString SSBDemod::m_channelIdURI = "sdrangel.channel.ssbdemod";
const QString SSBDemod::m_channelId = "SSBDemod"; const QString SSBDemod::m_channelId = "SSBDemod";
SSBDemod::SSBDemod(DeviceSourceAPI *deviceAPI) : SSBDemod::SSBDemod(DeviceSourceAPI *deviceAPI) :

2
plugins/channelrx/demodssb/ssbplugin.h
View File

@ -10,7 +10,7 @@ class BasebandSampleSink;
class SSBPlugin : public QObject, PluginInterface { class SSBPlugin : public QObject, PluginInterface {
Q_OBJECT Q_OBJECT
Q_INTERFACES(PluginInterface) Q_INTERFACES(PluginInterface)
Q_PLUGIN_METADATA(IID "de.maintech.sdrangelove.channel.ssb") Q_PLUGIN_METADATA(IID "sdrangel.channel.ssbdemod")
public: public:
explicit SSBPlugin(QObject* parent = NULL); explicit SSBPlugin(QObject* parent = NULL);

2
plugins/channelrx/demodwfm/wfmdemod.cpp
View File

@ -39,7 +39,7 @@
MESSAGE_CLASS_DEFINITION(WFMDemod::MsgConfigureWFMDemod, Message) MESSAGE_CLASS_DEFINITION(WFMDemod::MsgConfigureWFMDemod, Message)
MESSAGE_CLASS_DEFINITION(WFMDemod::MsgConfigureChannelizer, Message) MESSAGE_CLASS_DEFINITION(WFMDemod::MsgConfigureChannelizer, Message)
const QString WFMDemod::m_channelIdURI = "de.maintech.sdrangelove.channel.wfm"; const QString WFMDemod::m_channelIdURI = "sdrangel.channel.wfmdemod";
const QString WFMDemod::m_channelId = "WFMDemod"; const QString WFMDemod::m_channelId = "WFMDemod";
const int WFMDemod::m_udpBlockSize = 512; const int WFMDemod::m_udpBlockSize = 512;

2
plugins/channelrx/demodwfm/wfmplugin.h
View File

@ -10,7 +10,7 @@ class BasebandSampleSink;
class WFMPlugin : public QObject, PluginInterface { class WFMPlugin : public QObject, PluginInterface {
Q_OBJECT Q_OBJECT
Q_INTERFACES(PluginInterface) Q_INTERFACES(PluginInterface)
Q_PLUGIN_METADATA(IID "de.maintech.sdrangelove.channel.wfm") Q_PLUGIN_METADATA(IID "sdrangel.channel.wfmdemod")
public: public:
explicit WFMPlugin(QObject* parent = NULL); explicit WFMPlugin(QObject* parent = NULL);

8
sdrgui/device/deviceuiset.cpp
View File

@ -356,6 +356,14 @@ bool DeviceUISet::compareRxChannelURIs(const QString& registerdChannelURI, const
{ {
if ((xChannelURI == "sdrangel.channel.chanalyzerng") || (xChannelURI == "sdrangel.channel.chanalyzer")) { // renamed ChanalyzerNG to Chanalyzer in 4.0.0 if ((xChannelURI == "sdrangel.channel.chanalyzerng") || (xChannelURI == "sdrangel.channel.chanalyzer")) { // renamed ChanalyzerNG to Chanalyzer in 4.0.0
return registerdChannelURI == "sdrangel.channel.chanalyzer"; return registerdChannelURI == "sdrangel.channel.chanalyzer";
} else if ((xChannelURI == "de.maintech.sdrangelove.channel.am") || (xChannelURI == "sdrangel.channel.amdemod")) {
return registerdChannelURI == "sdrangel.channel.amdemod";
} else if ((xChannelURI == "de.maintech.sdrangelove.channel.nfm") || (xChannelURI == "sdrangel.channel.nfmdemod")) {
return registerdChannelURI == "sdrangel.channel.nfmdemod";
} else if ((xChannelURI == "de.maintech.sdrangelove.channel.ssb") || (xChannelURI == "sdrangel.channel.ssbdemod")) {
return registerdChannelURI == "sdrangel.channel.ssbdemod";
} else if ((xChannelURI == "de.maintech.sdrangelove.channel.wfm") || (xChannelURI == "sdrangel.channel.wfmdemod")) {
return registerdChannelURI == "sdrangel.channel.wfmdemod";
} else { } else {
return registerdChannelURI == xChannelURI; return registerdChannelURI == xChannelURI;
} }

8
sdrsrv/device/deviceset.cpp
View File

@ -376,6 +376,14 @@ bool DeviceSet::compareRxChannelURIs(const QString& registerdChannelURI, const Q
{ {
if ((xChannelURI == "sdrangel.channel.chanalyzerng") || (xChannelURI == "sdrangel.channel.chanalyzer")) { // renamed ChanalyzerNG to Chanalyzer in 4.0.0 if ((xChannelURI == "sdrangel.channel.chanalyzerng") || (xChannelURI == "sdrangel.channel.chanalyzer")) { // renamed ChanalyzerNG to Chanalyzer in 4.0.0
return registerdChannelURI == "sdrangel.channel.chanalyzer"; return registerdChannelURI == "sdrangel.channel.chanalyzer";
} else if ((xChannelURI == "de.maintech.sdrangelove.channel.am") || (xChannelURI == "sdrangel.channel.amdemod")) {
return registerdChannelURI == "sdrangel.channel.amdemod";
} else if ((xChannelURI == "de.maintech.sdrangelove.channel.nfm") || (xChannelURI == "sdrangel.channel.nfmdemod")) {
return registerdChannelURI == "sdrangel.channel.nfmdemod";
} else if ((xChannelURI == "de.maintech.sdrangelove.channel.ssb") || (xChannelURI == "sdrangel.channel.ssbdemod")) {
return registerdChannelURI == "sdrangel.channel.ssbdemod";
} else if ((xChannelURI == "de.maintech.sdrangelove.channel.wfm") || (xChannelURI == "sdrangel.channel.wfmdemod")) {
return registerdChannelURI == "sdrangel.channel.wfmdemod";
} else { } else {
return registerdChannelURI == xChannelURI; return registerdChannelURI == xChannelURI;
} }