diff --git a/plugins/channelrx/demodlora/loraplugin.cpp b/plugins/channelrx/demodlora/loraplugin.cpp index 0d877a716..05760a0c8 100644 --- a/plugins/channelrx/demodlora/loraplugin.cpp +++ b/plugins/channelrx/demodlora/loraplugin.cpp @@ -1,13 +1,12 @@ -#include "../../channelrx/demodlora/loraplugin.h" - #include #include "plugin/pluginapi.h" -#include "../../channelrx/demodlora/lorademodgui.h" +#include "loraplugin.h" +#include "lorademodgui.h" const PluginDescriptor LoRaPlugin::m_pluginDescriptor = { QString("LoRa Demodulator"), - QString("2.0.0"), + QString("3.7.4"), QString("(c) 2015 John Greb"), QString("http://www.maintech.de"), true, diff --git a/plugins/channelrx/demodwfm/CMakeLists.txt b/plugins/channelrx/demodwfm/CMakeLists.txt index 9a924c4e9..c4d1040c4 100644 --- a/plugins/channelrx/demodwfm/CMakeLists.txt +++ b/plugins/channelrx/demodwfm/CMakeLists.txt @@ -3,12 +3,14 @@ project(wfm) set(wfm_SOURCES wfmdemod.cpp wfmdemodgui.cpp + wfmdemodsettings.cpp wfmplugin.cpp ) set(wfm_HEADERS wfmdemod.h wfmdemodgui.h + wfmdemodsettings.h wfmplugin.h ) diff --git a/plugins/channelrx/demodwfm/demodwfm.pro b/plugins/channelrx/demodwfm/demodwfm.pro index 4b24733a6..d4614bfbd 100644 --- a/plugins/channelrx/demodwfm/demodwfm.pro +++ b/plugins/channelrx/demodwfm/demodwfm.pro @@ -25,10 +25,12 @@ CONFIG(Debug):build_subdir = debug SOURCES += wfmdemod.cpp\ wfmdemodgui.cpp\ + wfmdemodsettings.cpp\ wfmplugin.cpp HEADERS += wfmdemod.h\ wfmdemodgui.h\ + wfmdemodsettings.h\ wfmplugin.h FORMS += wfmdemodgui.ui diff --git a/plugins/channelrx/demodwfm/wfmdemodsettings.cpp b/plugins/channelrx/demodwfm/wfmdemodsettings.cpp new file mode 100644 index 000000000..c308dbe09 --- /dev/null +++ b/plugins/channelrx/demodwfm/wfmdemodsettings.cpp @@ -0,0 +1,135 @@ +/////////////////////////////////////////////////////////////////////////////////// +// Copyright (C) 2017 F4EXB // +// written by Edouard Griffiths // +// // +// This program is free software; you can redistribute it and/or modify // +// it under the terms of the GNU General Public License as published by // +// the Free Software Foundation as version 3 of the License, or // +// // +// This program is distributed in the hope that it will be useful, // +// but WITHOUT ANY WARRANTY; without even the implied warranty of // +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // +// GNU General Public License V3 for more details. // +// // +// You should have received a copy of the GNU General Public License // +// along with this program. If not, see . // +/////////////////////////////////////////////////////////////////////////////////// + +#include + +#include "dsp/dspengine.h" +#include "util/simpleserializer.h" +#include "settings/serializable.h" + +#include "wfmdemodsettings.h" + +const int WFMDemodSettings::m_rfBW[] = { + 12500, 25000, 40000, 60000, 75000, 80000, 100000, 125000, 140000, 160000, 180000, 200000, 220000, 250000 +}; +const int WFMDemodSettings::m_nbRFBW = 14; + +WFMDemodSettings::WFMDemodSettings() : + m_channelMarker(0) +{ + resetToDefaults(); +} + +void WFMDemodSettings::resetToDefaults() +{ + m_inputSampleRate = 384000; + m_inputFrequencyOffset = 0; + m_rfBandwidth = getRFBW(5); + m_afBandwidth = 15000; + m_volume = 2.0; + m_squelch = -60.0; + m_audioSampleRate = DSPEngine::instance()->getAudioSampleRate(); + m_copyAudioToUDP = false; + m_udpAddress = "127.0.0.1"; + m_udpPort = 9999; + m_rgbColor = QColor(0, 0, 255).rgb(); +} + +QByteArray WFMDemodSettings::serialize() const +{ + SimpleSerializer s(1); + s.writeS32(1, m_inputFrequencyOffset); + s.writeS32(2, getRFBWIndex(m_rfBandwidth)); + s.writeS32(3, m_afBandwidth/1000.0); + s.writeS32(4, m_volume*10.0); + s.writeS32(5, m_squelch); + s.writeU32(7, m_rgbColor); + + if (m_channelMarker) { + s.writeBlob(11, m_channelMarker->serialize()); + } + + return s.final(); +} + +bool WFMDemodSettings::deserialize(const QByteArray& data) +{ + SimpleDeserializer d(data); + + if(!d.isValid()) + { + resetToDefaults(); + return false; + } + + if(d.getVersion() == 1) + { + QByteArray bytetmp; + qint32 tmp; + QString strtmp; + + d.readS32(1, &tmp, 0); + m_inputFrequencyOffset = tmp; + d.readS32(2, &tmp, 4); + m_rfBandwidth = getRFBW(tmp); + d.readS32(3, &tmp, 3); + m_afBandwidth = tmp * 1000.0; + d.readS32(4, &tmp, 20); + m_volume = tmp * 0.1; + d.readS32(5, &tmp, -60); + m_squelch = tmp; + d.readU32(7, &m_rgbColor); + + d.readBlob(11, &bytetmp); + + if (m_channelMarker) { + m_channelMarker->deserialize(bytetmp); + } + + return true; + } + else + { + resetToDefaults(); + return false; + } +} + +int WFMDemodSettings::getRFBW(int index) +{ + if (index < 0) { + return m_rfBW[0]; + } else if (index < m_nbRFBW) { + return m_rfBW[index]; + } else { + return m_rfBW[m_nbRFBW-1]; + } +} + +int WFMDemodSettings::getRFBWIndex(int rfbw) +{ + for (int i = 0; i < m_nbRFBW; i++) + { + if (rfbw <= m_rfBW[i]) + { + return i; + } + } + + return m_nbRFBW-1; +} + diff --git a/plugins/channelrx/demodwfm/wfmdemodsettings.h b/plugins/channelrx/demodwfm/wfmdemodsettings.h new file mode 100644 index 000000000..713964145 --- /dev/null +++ b/plugins/channelrx/demodwfm/wfmdemodsettings.h @@ -0,0 +1,52 @@ +/////////////////////////////////////////////////////////////////////////////////// +// Copyright (C) 2017 F4EXB // +// written by Edouard Griffiths // +// // +// This program is free software; you can redistribute it and/or modify // +// it under the terms of the GNU General Public License as published by // +// the Free Software Foundation as version 3 of the License, or // +// // +// This program is distributed in the hope that it will be useful, // +// but WITHOUT ANY WARRANTY; without even the implied warranty of // +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // +// GNU General Public License V3 for more details. // +// // +// You should have received a copy of the GNU General Public License // +// along with this program. If not, see . // +/////////////////////////////////////////////////////////////////////////////////// + +#ifndef PLUGINS_CHANNELRX_DEMODWFM_WFMDEMODSETTINGS_H_ +#define PLUGINS_CHANNELRX_DEMODWFM_WFMDEMODSETTINGS_H_ + +class Serializable; + +struct WFMDemodSettings +{ + int m_inputSampleRate; + qint64 m_inputFrequencyOffset; + Real m_rfBandwidth; + Real m_afBandwidth; + Real m_volume; + Real m_squelch; + quint32 m_audioSampleRate; + bool m_copyAudioToUDP; + QString m_udpAddress; + quint16 m_udpPort; + quint32 m_rgbColor; + + Serializable *m_channelMarker; + + static const int m_nbRFBW; + static const int m_rfBW[]; + + WFMDemodSettings(); + void resetToDefaults(); + void setChannelMarker(Serializable *channelMarker) { m_channelMarker = channelMarker; } + QByteArray serialize() const; + bool deserialize(const QByteArray& data); + + static int getRFBW(int index); + static int getRFBWIndex(int rfbw); +}; + +#endif /* PLUGINS_CHANNELRX_DEMODWFM_WFMDEMODSETTINGS_H_ */