VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2025-05-31 14:22:26 -04:00
Code Issues Projects Releases Wiki Activity

Remote sink / input: pass center frequency in Hz

Browse Source
This commit is contained in:
f4exb 2019-04-26 03:07:50 +02:00
parent 74a9c5d36c
commit c269472f6e
5 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
plugins/channelrx/remotesink/remotesink.cpp
View File

@ -129,7 +129,7 @@ void RemoteSink::feed(const SampleVector::const_iterator& begin, const SampleVec
RemoteMetaDataFEC metaData; RemoteMetaDataFEC metaData;
gettimeofday(&tv, 0); gettimeofday(&tv, 0);
metaData.m_centerFrequency = m_centerFrequency + (m_frequencyOffset/1000); // FIXME: precision issue metaData.m_centerFrequency = m_centerFrequency + m_frequencyOffset;
metaData.m_sampleRate = m_sampleRate; metaData.m_sampleRate = m_sampleRate;
metaData.m_sampleBytes = (SDR_RX_SAMP_SZ <= 16 ? 2 : 4); metaData.m_sampleBytes = (SDR_RX_SAMP_SZ <= 16 ? 2 : 4);
metaData.m_sampleBits = SDR_RX_SAMP_SZ; metaData.m_sampleBits = SDR_RX_SAMP_SZ;

2
plugins/channelrx/remotesink/remotesink.h
View File

@ -136,7 +136,7 @@ public:
QString& errorMessage); QString& errorMessage);
/** Set center frequency given in Hz */ /** Set center frequency given in Hz */
void setCenterFrequency(uint64_t centerFrequency) { m_centerFrequency = centerFrequency / 1000; } void setCenterFrequency(uint64_t centerFrequency) { m_centerFrequency = centerFrequency; }
/** Set sample rate given in Hz */ /** Set sample rate given in Hz */
void setSampleRate(uint32_t sampleRate) { m_sampleRate = sampleRate; } void setSampleRate(uint32_t sampleRate) { m_sampleRate = sampleRate; }

4
plugins/samplesource/remoteinput/remoteinputgui.cpp
View File

@ -287,7 +287,7 @@ void RemoteInputGui::updateSampleRateAndFrequency()
ui->deviceRateText->setText(tr("%1k").arg((float)m_streamSampleRate / 1000)); ui->deviceRateText->setText(tr("%1k").arg((float)m_streamSampleRate / 1000));
blockApplySettings(true); blockApplySettings(true);
ui->centerFrequency->setValue(m_streamCenterFrequency / 1000); ui->centerFrequency->setValue(m_streamCenterFrequency / 1000);
ui->centerFrequencyHz->setValue(0); // TODO ui->centerFrequencyHz->setValue(m_streamCenterFrequency % 1000);
blockApplySettings(false); blockApplySettings(false);
} }
@ -296,7 +296,7 @@ void RemoteInputGui::displaySettings()
blockApplySettings(true); blockApplySettings(true);
ui->centerFrequency->setValue(m_streamCenterFrequency / 1000); ui->centerFrequency->setValue(m_streamCenterFrequency / 1000);
ui->centerFrequencyHz->setValue(0); // TODO ui->centerFrequencyHz->setValue(m_streamCenterFrequency % 1000);
ui->deviceRateText->setText(tr("%1k").arg(m_streamSampleRate / 1000.0)); ui->deviceRateText->setText(tr("%1k").arg(m_streamSampleRate / 1000.0));
ui->apiAddress->setText(m_settings.m_apiAddress); ui->apiAddress->setText(m_settings.m_apiAddress);

6
plugins/samplesource/remoteinput/remoteinputudphandler.cpp
View File

@ -195,16 +195,16 @@ void RemoteInputUDPHandler::processData()
if (change && (m_samplerate != 0)) if (change && (m_samplerate != 0))
{ {
qDebug("RemoteInputUDPHandler::processData: m_samplerate: %u m_centerFrequency: %u kHz", m_samplerate, m_centerFrequency); qDebug("RemoteInputUDPHandler::processData: m_samplerate: %u S/s m_centerFrequency: %lu Hz", m_samplerate, m_centerFrequency);
DSPSignalNotification *notif = new DSPSignalNotification(m_samplerate, m_centerFrequency * 1000); // Frequency in Hz for the DSP engine DSPSignalNotification *notif = new DSPSignalNotification(m_samplerate, m_centerFrequency); // Frequency in Hz for the DSP engine
m_deviceAPI->getDeviceEngineInputMessageQueue()->push(notif); m_deviceAPI->getDeviceEngineInputMessageQueue()->push(notif);
if (m_outputMessageQueueToGUI) if (m_outputMessageQueueToGUI)
{ {
RemoteInput::MsgReportRemoteInputStreamData *report = RemoteInput::MsgReportRemoteInputStreamData::create( RemoteInput::MsgReportRemoteInputStreamData *report = RemoteInput::MsgReportRemoteInputStreamData::create(
m_samplerate, m_samplerate,
m_centerFrequency * 1000, // Frequency in Hz for the GUI m_centerFrequency, // Frequency in Hz for the GUI
m_tv_msec); m_tv_msec);
m_outputMessageQueueToGUI->push(report); m_outputMessageQueueToGUI->push(report);

4
plugins/samplesource/remoteinput/remoteinputudphandler.h
View File

@ -47,7 +47,7 @@ public:
int getNbOriginalBlocks() const { return RemoteNbOrginalBlocks; } int getNbOriginalBlocks() const { return RemoteNbOrginalBlocks; }
bool isStreaming() const { return m_masterTimerConnected; } bool isStreaming() const { return m_masterTimerConnected; }
int getSampleRate() const { return m_samplerate; } int getSampleRate() const { return m_samplerate; }
int getCenterFrequency() const { return m_centerFrequency * 1000; } int getCenterFrequency() const { return m_centerFrequency; }
int getBufferGauge() const { return m_remoteInputBuffer.getBufferGauge(); } int getBufferGauge() const { return m_remoteInputBuffer.getBufferGauge(); }
uint64_t getTVmSec() const { return m_tv_msec; } uint64_t getTVmSec() const { return m_tv_msec; }
int getMinNbBlocks() { return m_remoteInputBuffer.getMinNbBlocks(); } int getMinNbBlocks() { return m_remoteInputBuffer.getMinNbBlocks(); }
@ -71,7 +71,7 @@ private:
qint64 m_udpReadBytes; qint64 m_udpReadBytes;
SampleSinkFifo *m_sampleFifo; SampleSinkFifo *m_sampleFifo;
uint32_t m_samplerate; uint32_t m_samplerate;
uint32_t m_centerFrequency; uint64_t m_centerFrequency;
uint64_t m_tv_msec; uint64_t m_tv_msec;
MessageQueue *m_outputMessageQueueToGUI; MessageQueue *m_outputMessageQueueToGUI;
uint32_t m_tickCount; uint32_t m_tickCount;