1
0
mirror of https://github.com/f4exb/sdrangel.git synced 2026-06-03 06:24:48 -04:00

Remote sink / input: pass center frequency in Hz

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
@@ -287,7 +287,7 @@ void RemoteInputGui::updateSampleRateAndFrequency()
ui->deviceRateText->setText(tr("%1k").arg((float)m_streamSampleRate / 1000));
blockApplySettings(true);
ui->centerFrequency->setValue(m_streamCenterFrequency / 1000);
ui->centerFrequencyHz->setValue(0); // TODO
ui->centerFrequencyHz->setValue(m_streamCenterFrequency % 1000);
blockApplySettings(false);
}
@@ -296,7 +296,7 @@ void RemoteInputGui::displaySettings()
blockApplySettings(true);
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->apiAddress->setText(m_settings.m_apiAddress);
@@ -195,16 +195,16 @@ void RemoteInputUDPHandler::processData()
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);
if (m_outputMessageQueueToGUI)
{
RemoteInput::MsgReportRemoteInputStreamData *report = RemoteInput::MsgReportRemoteInputStreamData::create(
m_samplerate,
m_centerFrequency * 1000, // Frequency in Hz for the GUI
m_centerFrequency, // Frequency in Hz for the GUI
m_tv_msec);
m_outputMessageQueueToGUI->push(report);
@@ -47,7 +47,7 @@ public:
int getNbOriginalBlocks() const { return RemoteNbOrginalBlocks; }
bool isStreaming() const { return m_masterTimerConnected; }
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(); }
uint64_t getTVmSec() const { return m_tv_msec; }
int getMinNbBlocks() { return m_remoteInputBuffer.getMinNbBlocks(); }
@@ -71,7 +71,7 @@ private:
qint64 m_udpReadBytes;
SampleSinkFifo *m_sampleFifo;
uint32_t m_samplerate;
uint32_t m_centerFrequency;
uint64_t m_centerFrequency;
uint64_t m_tv_msec;
MessageQueue *m_outputMessageQueueToGUI;
uint32_t m_tickCount;