diff --git a/plugins/samplesource/fcdpro/fcdprogui.cpp b/plugins/samplesource/fcdpro/fcdprogui.cpp index 4a5ad80a7..0be74957d 100644 --- a/plugins/samplesource/fcdpro/fcdprogui.cpp +++ b/plugins/samplesource/fcdpro/fcdprogui.cpp @@ -450,6 +450,20 @@ void FCDProGui::on_decim_currentIndexChanged(int index) sendSettings(); } +void FCDProGui::on_fcPos_currentIndexChanged(int index) +{ + if (index == 0) { + m_settings.m_fcPos = FCDProSettings::FC_POS_INFRA; + sendSettings(); + } else if (index == 1) { + m_settings.m_fcPos = FCDProSettings::FC_POS_SUPRA; + sendSettings(); + } else if (index == 2) { + m_settings.m_fcPos = FCDProSettings::FC_POS_CENTER; + sendSettings(); + } +} + void FCDProGui::on_setDefaults_clicked(bool checked) { (void) checked; diff --git a/plugins/samplesource/fcdpro/fcdprogui.h b/plugins/samplesource/fcdpro/fcdprogui.h index 2099b5932..a86ec6387 100644 --- a/plugins/samplesource/fcdpro/fcdprogui.h +++ b/plugins/samplesource/fcdpro/fcdprogui.h @@ -97,6 +97,7 @@ private slots: void on_gain5_currentIndexChanged(int index); void on_gain6_currentIndexChanged(int index); void on_decim_currentIndexChanged(int index); + void on_fcPos_currentIndexChanged(int index); void on_setDefaults_clicked(bool checked); void on_startStop_toggled(bool checked); void on_record_toggled(bool checked); diff --git a/plugins/samplesource/fcdpro/fcdprogui.ui b/plugins/samplesource/fcdpro/fcdprogui.ui index 7336199b2..4bcb179ae 100644 --- a/plugins/samplesource/fcdpro/fcdprogui.ui +++ b/plugins/samplesource/fcdpro/fcdprogui.ui @@ -251,6 +251,44 @@ + + + + Fp + + + + + + + + 50 + 16777215 + + + + Relative position of device center frequency + + + 2 + + + + Inf + + + + + Sup + + + + + Cen + + + + diff --git a/plugins/samplesource/fcdpro/fcdproinput.cpp b/plugins/samplesource/fcdpro/fcdproinput.cpp index eef2afad6..89750e2fe 100644 --- a/plugins/samplesource/fcdpro/fcdproinput.cpp +++ b/plugins/samplesource/fcdpro/fcdproinput.cpp @@ -332,14 +332,24 @@ void FCDProInput::applySettings(const FCDProSettings& settings, bool force) if (force || (m_settings.m_transverterDeltaFrequency != settings.m_transverterDeltaFrequency)) { reverseAPIKeys.append("transverterDeltaFrequency"); } + if ((m_settings.m_LOppmTenths != settings.m_LOppmTenths) || force) { + reverseAPIKeys.append("LOppmTenths"); + } if (force || (m_settings.m_centerFrequency != settings.m_centerFrequency) - || (m_settings.m_transverterMode != settings.m_transverterMode) - || (m_settings.m_transverterDeltaFrequency != settings.m_transverterDeltaFrequency)) + || (m_settings.m_LOppmTenths != settings.m_LOppmTenths) + || (m_settings.m_fcPos != settings.m_fcPos) + || (m_settings.m_log2Decim != settings.m_log2Decim) + || (m_settings.m_transverterMode != settings.m_transverterMode) + || (m_settings.m_transverterDeltaFrequency != settings.m_transverterDeltaFrequency)) { - qint64 deviceCenterFrequency = settings.m_centerFrequency; - deviceCenterFrequency -= settings.m_transverterMode ? settings.m_transverterDeltaFrequency : 0; - deviceCenterFrequency = deviceCenterFrequency < 0 ? 0 : deviceCenterFrequency; + qint64 deviceCenterFrequency = DeviceSampleSource::calculateDeviceCenterFrequency( + settings.m_centerFrequency, + settings.m_transverterDeltaFrequency, + settings.m_log2Decim, + (DeviceSampleSource::fcPos_t) settings.m_fcPos, + fcd_traits::sampleRate, + settings.m_transverterMode); if (m_dev != 0) { @@ -366,6 +376,17 @@ void FCDProInput::applySettings(const FCDProSettings& settings, bool force) } } + if ((m_settings.m_fcPos != settings.m_fcPos) || force) + { + reverseAPIKeys.append("fcPos"); + + if (m_FCDThread != 0) { + m_FCDThread->setFcPos((int) settings.m_fcPos); + } + + qDebug() << "FCDProInput::applySettings: set fc pos (enum) to " << (int) settings.m_fcPos; + } + if ((m_settings.m_lnaGainIndex != settings.m_lnaGainIndex) || force) { reverseAPIKeys.append("lnaGainIndex"); @@ -510,16 +531,6 @@ void FCDProInput::applySettings(const FCDProSettings& settings, bool force) } } - if ((m_settings.m_LOppmTenths != settings.m_LOppmTenths) || force) - { - reverseAPIKeys.append("LOppmTenths"); - m_settings.m_LOppmTenths = settings.m_LOppmTenths; - - if (m_dev != 0) { - set_lo_ppm(); - } - } - if ((m_settings.m_dcBlock != settings.m_dcBlock) || force) { reverseAPIKeys.append("dcBlock"); @@ -812,11 +823,6 @@ void FCDProInput::set_gain6(int index) } } -void FCDProInput::set_lo_ppm() -{ - set_center_freq((double) m_settings.m_centerFrequency); -} - int FCDProInput::webapiRunGet( SWGSDRangel::SWGDeviceState& response, QString& errorMessage) diff --git a/plugins/samplesource/fcdpro/fcdproinput.h b/plugins/samplesource/fcdpro/fcdproinput.h index 06df9e25e..c33d87f61 100644 --- a/plugins/samplesource/fcdpro/fcdproinput.h +++ b/plugins/samplesource/fcdpro/fcdproinput.h @@ -181,7 +181,6 @@ private: bool openFCDAudio(const char *filename); void closeFCDAudio(); void applySettings(const FCDProSettings& settings, bool force); - void set_lo_ppm(); void webapiFormatDeviceSettings(SWGSDRangel::SWGDeviceSettings& response, const FCDProSettings& settings); void webapiReverseSendSettings(QList& deviceSettingsKeys, const FCDProSettings& settings, bool force); diff --git a/plugins/samplesource/fcdpro/fcdprosettings.cpp b/plugins/samplesource/fcdpro/fcdprosettings.cpp index 0aa2fb4d6..976f00126 100644 --- a/plugins/samplesource/fcdpro/fcdprosettings.cpp +++ b/plugins/samplesource/fcdpro/fcdprosettings.cpp @@ -46,6 +46,7 @@ void FCDProSettings::resetToDefaults() m_gain5Index = 0; m_gain6Index = 0; m_log2Decim = 0; + m_fcPos = FC_POS_CENTER; m_transverterMode = false; m_transverterDeltaFrequency = 0; m_fileRecordName = ""; @@ -79,12 +80,13 @@ QByteArray FCDProSettings::serialize() const s.writeS32(18, m_gain5Index); s.writeS32(19, m_gain6Index); s.writeU32(20, m_log2Decim); - s.writeBool(21, m_transverterMode); - s.writeS64(22, m_transverterDeltaFrequency); - s.writeBool(23, m_useReverseAPI); - s.writeString(24, m_reverseAPIAddress); - s.writeU32(25, m_reverseAPIPort); - s.writeU32(26, m_reverseAPIDeviceIndex); + s.writeS32(21, (int) m_fcPos); + s.writeBool(22, m_transverterMode); + s.writeS64(23, m_transverterDeltaFrequency); + s.writeBool(24, m_useReverseAPI); + s.writeString(25, m_reverseAPIAddress); + s.writeU32(26, m_reverseAPIPort); + s.writeU32(27, m_reverseAPIDeviceIndex); return s.final(); } @@ -101,6 +103,7 @@ bool FCDProSettings::deserialize(const QByteArray& data) if (d.getVersion() == 1) { + int intval; uint32_t uintval; d.readBool(1, &m_dcBlock, false); @@ -123,11 +126,13 @@ bool FCDProSettings::deserialize(const QByteArray& data) d.readS32(18, &m_gain5Index, 0); d.readS32(19, &m_gain6Index, 0); d.readU32(20, &m_log2Decim, 0); - d.readBool(21, &m_transverterMode, false); - d.readS64(22, &m_transverterDeltaFrequency, 0); - d.readBool(23, &m_useReverseAPI, false); - d.readString(24, &m_reverseAPIAddress, "127.0.0.1"); - d.readU32(25, &uintval, 0); + d.readS32(21, &intval, 2); + m_fcPos = (fcPos_t) intval; + d.readBool(22, &m_transverterMode, false); + d.readS64(23, &m_transverterDeltaFrequency, 0); + d.readBool(24, &m_useReverseAPI, false); + d.readString(25, &m_reverseAPIAddress, "127.0.0.1"); + d.readU32(26, &uintval, 0); if ((uintval > 1023) && (uintval < 65535)) { m_reverseAPIPort = uintval; @@ -135,7 +140,7 @@ bool FCDProSettings::deserialize(const QByteArray& data) m_reverseAPIPort = 8888; } - d.readU32(26, &uintval, 0); + d.readU32(27, &uintval, 0); m_reverseAPIDeviceIndex = uintval > 99 ? 99 : uintval; return true; diff --git a/plugins/samplesource/fcdpro/fcdprosettings.h b/plugins/samplesource/fcdpro/fcdprosettings.h index c4f60b893..b8ab7f4db 100644 --- a/plugins/samplesource/fcdpro/fcdprosettings.h +++ b/plugins/samplesource/fcdpro/fcdprosettings.h @@ -20,6 +20,12 @@ #include struct FCDProSettings { + typedef enum { + FC_POS_INFRA = 0, + FC_POS_SUPRA, + FC_POS_CENTER + } fcPos_t; + quint64 m_centerFrequency; qint32 m_LOppmTenths; qint32 m_lnaGainIndex; @@ -39,6 +45,7 @@ struct FCDProSettings { qint32 m_gain5Index; qint32 m_gain6Index; quint32 m_log2Decim; + fcPos_t m_fcPos; bool m_dcBlock; bool m_iqCorrection; bool m_transverterMode; diff --git a/plugins/samplesource/fcdpro/fcdprothread.cpp b/plugins/samplesource/fcdpro/fcdprothread.cpp index d4961031c..c277d337e 100644 --- a/plugins/samplesource/fcdpro/fcdprothread.cpp +++ b/plugins/samplesource/fcdpro/fcdprothread.cpp @@ -30,6 +30,8 @@ FCDProThread::FCDProThread(SampleSinkFifo* sampleFifo, AudioFifo *fcdFIFO, QObje QThread(parent), m_fcdFIFO(fcdFIFO), m_running(false), + m_log2Decim(0), + m_fcPos(2), m_convertBuffer(fcd_traits::convBufSize), // nb samples m_sampleFifo(sampleFifo) { @@ -65,6 +67,11 @@ void FCDProThread::setLog2Decimation(unsigned int log2_decim) m_log2Decim = log2_decim; } +void FCDProThread::setFcPos(int fcPos) +{ + m_fcPos = fcPos; +} + void FCDProThread::run() { m_running = true; @@ -85,22 +92,90 @@ void FCDProThread::work(unsigned int n_items) uint32_t nbRead = m_fcdFIFO->read((unsigned char *) m_buf, n_items); // number of samples SampleVector::iterator it = m_convertBuffer.begin(); - switch (m_log2Decim) + if (m_log2Decim == 0) { - case 0: - m_decimators.decimate1(&it, m_buf, 2*nbRead); - break; - case 1: - m_decimators.decimate2_cen(&it, m_buf, 2*nbRead); - break; - case 2: - m_decimators.decimate4_cen(&it, m_buf, 2*nbRead); - break; - case 3: - m_decimators.decimate8_cen(&it, m_buf, 2*nbRead); - break; - default: - break; + m_decimators.decimate1(&it, m_buf, 2*nbRead); + } + else + { + if (m_fcPos == 0) // Infradyne + { + switch (m_log2Decim) + { + case 1: + m_decimators.decimate2_inf(&it, m_buf, 2*nbRead); + break; + case 2: + m_decimators.decimate4_inf(&it, m_buf, 2*nbRead); + break; + case 3: + m_decimators.decimate8_inf(&it, m_buf, 2*nbRead); + break; + case 4: + m_decimators.decimate16_inf(&it, m_buf, 2*nbRead); + break; + case 5: + m_decimators.decimate32_inf(&it, m_buf, 2*nbRead); + break; + case 6: + m_decimators.decimate64_inf(&it, m_buf, 2*nbRead); + break; + default: + break; + } + } + else if (m_fcPos == 1) // Supradyne + { + switch (m_log2Decim) + { + case 1: + m_decimators.decimate2_sup(&it, m_buf, 2*nbRead); + break; + case 2: + m_decimators.decimate4_sup(&it, m_buf, 2*nbRead); + break; + case 3: + m_decimators.decimate8_sup(&it, m_buf, 2*nbRead); + break; + case 4: + m_decimators.decimate16_sup(&it, m_buf, 2*nbRead); + break; + case 5: + m_decimators.decimate32_sup(&it, m_buf, 2*nbRead); + break; + case 6: + m_decimators.decimate64_sup(&it, m_buf, 2*nbRead); + break; + default: + break; + } + } + else // Centered + { + switch (m_log2Decim) + { + case 1: + m_decimators.decimate2_cen(&it, m_buf, 2*nbRead); + break; + case 2: + m_decimators.decimate4_cen(&it, m_buf, 2*nbRead); + break; + case 3: + m_decimators.decimate8_cen(&it, m_buf, 2*nbRead); + break; + case 4: + m_decimators.decimate16_cen(&it, m_buf, 2*nbRead); + break; + case 5: + m_decimators.decimate32_cen(&it, m_buf, 2*nbRead); + break; + case 6: + m_decimators.decimate64_cen(&it, m_buf, 2*nbRead); + break; + default: + break; + } + } } m_sampleFifo->write(m_convertBuffer.begin(), it); diff --git a/plugins/samplesource/fcdpro/fcdprothread.h b/plugins/samplesource/fcdpro/fcdprothread.h index 9bb3a8f67..ec64c2858 100644 --- a/plugins/samplesource/fcdpro/fcdprothread.h +++ b/plugins/samplesource/fcdpro/fcdprothread.h @@ -37,6 +37,7 @@ public: void startWork(); void stopWork(); void setLog2Decimation(unsigned int log2_decim); + void setFcPos(int fcPos); private: AudioFifo* m_fcdFIFO; @@ -45,6 +46,7 @@ private: QWaitCondition m_startWaiter; bool m_running; unsigned int m_log2Decim; + int m_fcPos; qint16 m_buf[fcd_traits::convBufSize*2]; // stereo (I, Q) SampleVector m_convertBuffer; diff --git a/plugins/samplesource/fcdproplus/fcdproplusgui.cpp b/plugins/samplesource/fcdproplus/fcdproplusgui.cpp index ec08e4a98..e489fd9fa 100644 --- a/plugins/samplesource/fcdproplus/fcdproplusgui.cpp +++ b/plugins/samplesource/fcdproplus/fcdproplusgui.cpp @@ -245,6 +245,20 @@ void FCDProPlusGui::on_decim_currentIndexChanged(int index) sendSettings(); } +void FCDProPlusGui::on_fcPos_currentIndexChanged(int index) +{ + if (index == 0) { + m_settings.m_fcPos = FCDProPlusSettings::FC_POS_INFRA; + sendSettings(); + } else if (index == 1) { + m_settings.m_fcPos = FCDProPlusSettings::FC_POS_SUPRA; + sendSettings(); + } else if (index == 2) { + m_settings.m_fcPos = FCDProPlusSettings::FC_POS_CENTER; + sendSettings(); + } +} + void FCDProPlusGui::on_dcOffset_toggled(bool checked) { m_settings.m_dcBlock = checked; diff --git a/plugins/samplesource/fcdproplus/fcdproplusgui.h b/plugins/samplesource/fcdproplus/fcdproplusgui.h index a18cd65d0..57c194eb3 100644 --- a/plugins/samplesource/fcdproplus/fcdproplusgui.h +++ b/plugins/samplesource/fcdproplus/fcdproplusgui.h @@ -76,6 +76,7 @@ private slots: void handleInputMessages(); void on_centerFrequency_changed(quint64 value); void on_decim_currentIndexChanged(int index); + void on_fcPos_currentIndexChanged(int index); void on_dcOffset_toggled(bool checked); void on_iqImbalance_toggled(bool checked); void on_checkBoxG_stateChanged(int state); diff --git a/plugins/samplesource/fcdproplus/fcdproplusgui.ui b/plugins/samplesource/fcdproplus/fcdproplusgui.ui index 57e8632b1..18cce4c35 100644 --- a/plugins/samplesource/fcdproplus/fcdproplusgui.ui +++ b/plugins/samplesource/fcdproplus/fcdproplusgui.ui @@ -6,7 +6,7 @@ 0 0 - 260 + 320 180 @@ -18,7 +18,7 @@ - 260 + 320 180 @@ -251,6 +251,44 @@ + + + + Fp + + + + + + + + 50 + 16777215 + + + + Relative position of device center frequency + + + 2 + + + + Inf + + + + + Sup + + + + + Cen + + + + diff --git a/plugins/samplesource/fcdproplus/fcdproplusinput.cpp b/plugins/samplesource/fcdproplus/fcdproplusinput.cpp index 9fce14197..a91643858 100644 --- a/plugins/samplesource/fcdproplus/fcdproplusinput.cpp +++ b/plugins/samplesource/fcdproplus/fcdproplusinput.cpp @@ -334,14 +334,24 @@ void FCDProPlusInput::applySettings(const FCDProPlusSettings& settings, bool for if (force || (m_settings.m_transverterDeltaFrequency != settings.m_transverterDeltaFrequency)) { reverseAPIKeys.append("transverterDeltaFrequency"); } + if ((m_settings.m_LOppmTenths != settings.m_LOppmTenths) || force) { + reverseAPIKeys.append("LOppmTenths"); + } if (force || (m_settings.m_centerFrequency != settings.m_centerFrequency) - || (m_settings.m_transverterMode != settings.m_transverterMode) - || (m_settings.m_transverterDeltaFrequency != settings.m_transverterDeltaFrequency)) + || (m_settings.m_LOppmTenths != settings.m_LOppmTenths) + || (m_settings.m_fcPos != settings.m_fcPos) + || (m_settings.m_log2Decim != settings.m_log2Decim) + || (m_settings.m_transverterMode != settings.m_transverterMode) + || (m_settings.m_transverterDeltaFrequency != settings.m_transverterDeltaFrequency)) { - qint64 deviceCenterFrequency = settings.m_centerFrequency; - deviceCenterFrequency -= settings.m_transverterMode ? settings.m_transverterDeltaFrequency : 0; - deviceCenterFrequency = deviceCenterFrequency < 0 ? 0 : deviceCenterFrequency; + qint64 deviceCenterFrequency = DeviceSampleSource::calculateDeviceCenterFrequency( + settings.m_centerFrequency, + settings.m_transverterDeltaFrequency, + settings.m_log2Decim, + (DeviceSampleSource::fcPos_t) settings.m_fcPos, + fcd_traits::sampleRate, + settings.m_transverterMode); if (m_dev != 0) { set_center_freq((double) deviceCenterFrequency); @@ -367,6 +377,17 @@ void FCDProPlusInput::applySettings(const FCDProPlusSettings& settings, bool for } } + if ((m_settings.m_fcPos != settings.m_fcPos) || force) + { + reverseAPIKeys.append("fcPos"); + + if (m_FCDThread != 0) { + m_FCDThread->setFcPos((int) settings.m_fcPos); + } + + qDebug() << "FCDProPlusInput::applySettings: set fc pos (enum) to " << (int) settings.m_fcPos; + } + if ((m_settings.m_lnaGain != settings.m_lnaGain) || force) { reverseAPIKeys.append("lnaGain"); @@ -421,16 +442,6 @@ void FCDProPlusInput::applySettings(const FCDProPlusSettings& settings, bool for } } - if ((m_settings.m_LOppmTenths != settings.m_LOppmTenths) || force) - { - reverseAPIKeys.append("LOppmTenths"); - m_settings.m_LOppmTenths = settings.m_LOppmTenths; - - if (m_dev != 0) { - set_lo_ppm(); - } - } - if ((m_settings.m_dcBlock != settings.m_dcBlock) || force) { reverseAPIKeys.append("dcBlock"); @@ -539,11 +550,6 @@ void FCDProPlusInput::set_rf_filter(int filterIndex) } } -void FCDProPlusInput::set_lo_ppm() -{ - set_center_freq((double) m_settings.m_centerFrequency); -} - int FCDProPlusInput::webapiRunGet( SWGSDRangel::SWGDeviceState& response, QString& errorMessage) diff --git a/plugins/samplesource/fcdproplus/fcdproplusinput.h b/plugins/samplesource/fcdproplus/fcdproplusinput.h index be5af4a71..426b58e30 100644 --- a/plugins/samplesource/fcdproplus/fcdproplusinput.h +++ b/plugins/samplesource/fcdproplus/fcdproplusinput.h @@ -150,7 +150,6 @@ public: void set_if_gain(int gain); void set_rf_filter(int filterIndex); void set_if_filter(int filterIndex); - void set_lo_ppm(); private: DeviceSourceAPI *m_deviceAPI; diff --git a/plugins/samplesource/fcdproplus/fcdproplussettings.cpp b/plugins/samplesource/fcdproplus/fcdproplussettings.cpp index 9eab36203..9b32a021e 100644 --- a/plugins/samplesource/fcdproplus/fcdproplussettings.cpp +++ b/plugins/samplesource/fcdproplus/fcdproplussettings.cpp @@ -35,6 +35,7 @@ void FCDProPlusSettings::resetToDefaults() m_ifFilterIndex = 0; m_LOppmTenths = 0; m_log2Decim = 0; + m_fcPos = FC_POS_CENTER; m_dcBlock = false; m_iqImbalance = false; m_transverterMode = false; @@ -56,16 +57,17 @@ QByteArray FCDProPlusSettings::serialize() const s.writeS32(4, m_ifFilterIndex); s.writeS32(5, m_rfFilterIndex); s.writeU32(6, m_log2Decim); - s.writeBool(7, m_dcBlock); - s.writeBool(8, m_iqImbalance); - s.writeS32(9, m_LOppmTenths); - s.writeU32(10, m_ifGain); - s.writeBool(11, m_transverterMode); - s.writeS64(12, m_transverterDeltaFrequency); - s.writeBool(13, m_useReverseAPI); - s.writeString(14, m_reverseAPIAddress); - s.writeU32(15, m_reverseAPIPort); - s.writeU32(16, m_reverseAPIDeviceIndex); + s.writeS32(7, (int) m_fcPos); + s.writeBool(8, m_dcBlock); + s.writeBool(9, m_iqImbalance); + s.writeS32(10, m_LOppmTenths); + s.writeU32(11, m_ifGain); + s.writeBool(12, m_transverterMode); + s.writeS64(13, m_transverterDeltaFrequency); + s.writeBool(14, m_useReverseAPI); + s.writeString(15, m_reverseAPIAddress); + s.writeU32(16, m_reverseAPIPort); + s.writeU32(17, m_reverseAPIDeviceIndex); return s.final(); } @@ -82,6 +84,7 @@ bool FCDProPlusSettings::deserialize(const QByteArray& data) if (d.getVersion() == 1) { + int intval; uint32_t uintval; d.readBool(1, &m_biasT, false); @@ -90,15 +93,17 @@ bool FCDProPlusSettings::deserialize(const QByteArray& data) d.readS32(4, &m_ifFilterIndex, 0); d.readS32(5, &m_rfFilterIndex, 0); d.readU32(6, &m_log2Decim, 0); - d.readBool(7, &m_dcBlock, false); - d.readBool(8, &m_iqImbalance, false); - d.readS32(9, &m_LOppmTenths, 0); - d.readU32(10, &m_ifGain, 0); - d.readBool(11, &m_transverterMode, false); - d.readS64(12, &m_transverterDeltaFrequency, 0); - d.readBool(13, &m_useReverseAPI, false); - d.readString(14, &m_reverseAPIAddress, "127.0.0.1"); - d.readU32(15, &uintval, 0); + d.readS32(7, &intval, 2); + m_fcPos = (fcPos_t) intval; + d.readBool(8, &m_dcBlock, false); + d.readBool(9, &m_iqImbalance, false); + d.readS32(10, &m_LOppmTenths, 0); + d.readU32(11, &m_ifGain, 0); + d.readBool(12, &m_transverterMode, false); + d.readS64(13, &m_transverterDeltaFrequency, 0); + d.readBool(14, &m_useReverseAPI, false); + d.readString(15, &m_reverseAPIAddress, "127.0.0.1"); + d.readU32(16, &uintval, 0); if ((uintval > 1023) && (uintval < 65535)) { m_reverseAPIPort = uintval; @@ -106,7 +111,7 @@ bool FCDProPlusSettings::deserialize(const QByteArray& data) m_reverseAPIPort = 8888; } - d.readU32(16, &uintval, 0); + d.readU32(17, &uintval, 0); m_reverseAPIDeviceIndex = uintval > 99 ? 99 : uintval; return true; } diff --git a/plugins/samplesource/fcdproplus/fcdproplussettings.h b/plugins/samplesource/fcdproplus/fcdproplussettings.h index ded2084de..dbbc2e4de 100644 --- a/plugins/samplesource/fcdproplus/fcdproplussettings.h +++ b/plugins/samplesource/fcdproplus/fcdproplussettings.h @@ -20,6 +20,12 @@ #include struct FCDProPlusSettings { + typedef enum { + FC_POS_INFRA = 0, + FC_POS_SUPRA, + FC_POS_CENTER + } fcPos_t; + quint64 m_centerFrequency; bool m_rangeLow; bool m_lnaGain; @@ -30,6 +36,7 @@ struct FCDProPlusSettings { qint32 m_rfFilterIndex; qint32 m_LOppmTenths; quint32 m_log2Decim; + fcPos_t m_fcPos; bool m_dcBlock; bool m_iqImbalance; bool m_transverterMode; diff --git a/plugins/samplesource/fcdproplus/fcdproplusthread.cpp b/plugins/samplesource/fcdproplus/fcdproplusthread.cpp index dd88b206e..835d245f2 100644 --- a/plugins/samplesource/fcdproplus/fcdproplusthread.cpp +++ b/plugins/samplesource/fcdproplus/fcdproplusthread.cpp @@ -29,6 +29,8 @@ FCDProPlusThread::FCDProPlusThread(SampleSinkFifo* sampleFifo, AudioFifo *fcdFIF QThread(parent), m_fcdFIFO(fcdFIFO), m_running(false), + m_log2Decim(0), + m_fcPos(2), m_convertBuffer(fcd_traits::convBufSize), // nb samples m_sampleFifo(sampleFifo) { @@ -64,6 +66,11 @@ void FCDProPlusThread::setLog2Decimation(unsigned int log2_decim) m_log2Decim = log2_decim; } +void FCDProPlusThread::setFcPos(int fcPos) +{ + m_fcPos = fcPos; +} + void FCDProPlusThread::run() { m_running = true; @@ -84,25 +91,90 @@ void FCDProPlusThread::work(unsigned int n_items) uint32_t nbRead = m_fcdFIFO->read((unsigned char *) m_buf, n_items); // number of samples SampleVector::iterator it = m_convertBuffer.begin(); - switch (m_log2Decim) + if (m_log2Decim == 0) { - case 0: - m_decimators.decimate1(&it, m_buf, 2*nbRead); - break; - case 1: - m_decimators.decimate2_cen(&it, m_buf, 2*nbRead); - break; - case 2: - m_decimators.decimate4_cen(&it, m_buf, 2*nbRead); - break; - case 3: - m_decimators.decimate8_cen(&it, m_buf, 2*nbRead); - break; - case 4: - m_decimators.decimate16_cen(&it, m_buf, 2*nbRead); - break; - default: - break; + m_decimators.decimate1(&it, m_buf, 2*nbRead); + } + else + { + if (m_fcPos == 0) // Infradyne + { + switch (m_log2Decim) + { + case 1: + m_decimators.decimate2_inf(&it, m_buf, 2*nbRead); + break; + case 2: + m_decimators.decimate4_inf(&it, m_buf, 2*nbRead); + break; + case 3: + m_decimators.decimate8_inf(&it, m_buf, 2*nbRead); + break; + case 4: + m_decimators.decimate16_inf(&it, m_buf, 2*nbRead); + break; + case 5: + m_decimators.decimate32_inf(&it, m_buf, 2*nbRead); + break; + case 6: + m_decimators.decimate64_inf(&it, m_buf, 2*nbRead); + break; + default: + break; + } + } + else if (m_fcPos == 1) // Supradyne + { + switch (m_log2Decim) + { + case 1: + m_decimators.decimate2_sup(&it, m_buf, 2*nbRead); + break; + case 2: + m_decimators.decimate4_sup(&it, m_buf, 2*nbRead); + break; + case 3: + m_decimators.decimate8_sup(&it, m_buf, 2*nbRead); + break; + case 4: + m_decimators.decimate16_sup(&it, m_buf, 2*nbRead); + break; + case 5: + m_decimators.decimate32_sup(&it, m_buf, 2*nbRead); + break; + case 6: + m_decimators.decimate64_sup(&it, m_buf, 2*nbRead); + break; + default: + break; + } + } + else // Centered + { + switch (m_log2Decim) + { + case 1: + m_decimators.decimate2_cen(&it, m_buf, 2*nbRead); + break; + case 2: + m_decimators.decimate4_cen(&it, m_buf, 2*nbRead); + break; + case 3: + m_decimators.decimate8_cen(&it, m_buf, 2*nbRead); + break; + case 4: + m_decimators.decimate16_cen(&it, m_buf, 2*nbRead); + break; + case 5: + m_decimators.decimate32_cen(&it, m_buf, 2*nbRead); + break; + case 6: + m_decimators.decimate64_cen(&it, m_buf, 2*nbRead); + break; + default: + break; + } + } } m_sampleFifo->write(m_convertBuffer.begin(), it); diff --git a/plugins/samplesource/fcdproplus/fcdproplusthread.h b/plugins/samplesource/fcdproplus/fcdproplusthread.h index 62621d782..6b4fa0e05 100644 --- a/plugins/samplesource/fcdproplus/fcdproplusthread.h +++ b/plugins/samplesource/fcdproplus/fcdproplusthread.h @@ -38,6 +38,7 @@ public: void startWork(); void stopWork(); void setLog2Decimation(unsigned int log2_decim); + void setFcPos(int fcPos); private: AudioFifo* m_fcdFIFO; @@ -46,6 +47,7 @@ private: QWaitCondition m_startWaiter; bool m_running; unsigned int m_log2Decim; + int m_fcPos; qint16 m_buf[fcd_traits::convBufSize*2]; // stereo (I, Q) SampleVector m_convertBuffer; diff --git a/plugins/samplesource/rtlsdr/rtlsdrinput.cpp b/plugins/samplesource/rtlsdr/rtlsdrinput.cpp index 24b945dac..5a14dacad 100644 --- a/plugins/samplesource/rtlsdr/rtlsdrinput.cpp +++ b/plugins/samplesource/rtlsdr/rtlsdrinput.cpp @@ -452,6 +452,30 @@ bool RTLSDRInput::applySettings(const RTLSDRSettings& settings, bool force) qDebug("RTLSDRInput::applySettings: log2decim set to %d", settings.m_log2Decim); } + if ((m_settings.m_fcPos != settings.m_fcPos) || force) + { + reverseAPIKeys.append("fcPos"); + + if (m_rtlSDRThread != 0) { + m_rtlSDRThread->setFcPos((int) settings.m_fcPos); + } + + qDebug() << "RTLSDRInput::applySettings: set fc pos (enum) to " << (int) settings.m_fcPos; + } + + if ((m_settings.m_centerFrequency != settings.m_centerFrequency) || force) { + reverseAPIKeys.append("centerFrequency"); + } + if ((m_settings.m_devSampleRate != settings.m_devSampleRate) || force) { + reverseAPIKeys.append("devSampleRate"); + } + if ((m_settings.m_transverterMode != settings.m_transverterMode) || force) { + reverseAPIKeys.append("transverterMode"); + } + if ((m_settings.m_transverterDeltaFrequency != settings.m_transverterDeltaFrequency) || force) { + reverseAPIKeys.append("transverterDeltaFrequency"); + } + if ((m_settings.m_centerFrequency != settings.m_centerFrequency) || (m_settings.m_fcPos != settings.m_fcPos) || (m_settings.m_log2Decim != settings.m_log2Decim) @@ -459,13 +483,6 @@ bool RTLSDRInput::applySettings(const RTLSDRSettings& settings, bool force) || (m_settings.m_transverterMode != settings.m_transverterMode) || (m_settings.m_transverterDeltaFrequency != settings.m_transverterDeltaFrequency) || force) { - reverseAPIKeys.append("centerFrequency"); - reverseAPIKeys.append("fcPos"); - reverseAPIKeys.append("log2Decim"); - reverseAPIKeys.append("devSampleRate"); - reverseAPIKeys.append("transverterMode"); - reverseAPIKeys.append("transverterDeltaFrequency"); - qint64 deviceCenterFrequency = DeviceSampleSource::calculateDeviceCenterFrequency( settings.m_centerFrequency, settings.m_transverterDeltaFrequency, @@ -476,15 +493,6 @@ bool RTLSDRInput::applySettings(const RTLSDRSettings& settings, bool force) forwardChange = true; - if ((m_settings.m_fcPos != settings.m_fcPos) || force) - { - if (m_rtlSDRThread != 0) { - m_rtlSDRThread->setFcPos((int) settings.m_fcPos); - } - - qDebug() << "RTLSDRInput::applySettings: set fc pos (enum) to " << (int) settings.m_fcPos; - } - if (m_dev != 0) { if (rtlsdr_set_center_freq(m_dev, deviceCenterFrequency) != 0) {