VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2025-05-24 03:02:29 -04:00
Code Issues Projects Releases Wiki Activity

HackRF: effective Rx-Tx frequency linking

Browse Source
This commit is contained in:
f4exb 2017-09-18 00:01:29 +02:00
parent 3ac8af3024
commit a714e12387
4 changed files with 41 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
plugins/samplesink/hackrfoutput/hackrfoutput.cpp
View File

@ -187,9 +187,19 @@ bool HackRFOutput::handleMessage(const Message& message)
if (!success) if (!success)
{ {
qDebug("HackRFOutput::handleMessage: config error"); qDebug("HackRFOutput::handleMessage: MsgConfigureHackRF: config error");
} }
return true;
}
else if (DeviceHackRFShared::MsgConfigureFrequencyDelta::match(message))
{
DeviceHackRFShared::MsgConfigureFrequencyDelta& conf = (DeviceHackRFShared::MsgConfigureFrequencyDelta&) message;
HackRFOutputSettings newSettings = m_settings;
newSettings.m_centerFrequency = m_settings.m_centerFrequency + conf.getFrequencyDelta();
qDebug() << "HackRFOutput::handleMessage: DeviceHackRFShared::MsgConfigureFrequencyDelta: newFreq: " << newSettings.m_centerFrequency;
applySettings(newSettings, false);
return true; return true;
} }
else else

19
plugins/samplesink/hackrfoutput/hackrfoutputgui.cpp
View File

@ -38,7 +38,8 @@ HackRFOutputGui::HackRFOutputGui(DeviceSinkAPI *deviceAPI, QWidget* parent) :
m_deviceAPI(deviceAPI), m_deviceAPI(deviceAPI),
m_settings(), m_settings(),
m_deviceSampleSink(0), m_deviceSampleSink(0),
m_lastEngineState((DSPDeviceSinkEngine::State)-1) m_lastEngineState((DSPDeviceSinkEngine::State)-1),
m_doApplySettings(true)
{ {
m_deviceSampleSink = (HackRFOutput*) m_deviceAPI->getSampleSink(); m_deviceSampleSink = (HackRFOutput*) m_deviceAPI->getSampleSink();
@ -55,6 +56,7 @@ HackRFOutputGui::HackRFOutputGui(DeviceSinkAPI *deviceAPI, QWidget* parent) :
displaySettings(); displaySettings();
displayBandwidths(); displayBandwidths();
sendSettings();
connect(&m_inputMessageQueue, SIGNAL(messageEnqueued()), this, SLOT(handleInputMessages()), Qt::QueuedConnection); connect(&m_inputMessageQueue, SIGNAL(messageEnqueued()), this, SLOT(handleInputMessages()), Qt::QueuedConnection);
} }
@ -118,6 +120,12 @@ bool HackRFOutputGui::deserialize(const QByteArray& data)
} }
} }
void HackRFOutputGui::blockApplySettings(bool block)
{
m_doApplySettings = !block;
}
bool HackRFOutputGui::handleMessage(const Message& message) bool HackRFOutputGui::handleMessage(const Message& message)
{ {
if (HackRFOutput::MsgReportHackRF::match(message)) if (HackRFOutput::MsgReportHackRF::match(message))
@ -151,8 +159,10 @@ void HackRFOutputGui::handleInputMessages()
} }
else if (DeviceHackRFShared::MsgConfigureFrequencyDelta::match(*message)) else if (DeviceHackRFShared::MsgConfigureFrequencyDelta::match(*message))
{ {
blockApplySettings(true);
DeviceHackRFShared::MsgConfigureFrequencyDelta* deltaMsg = (DeviceHackRFShared::MsgConfigureFrequencyDelta *) message; DeviceHackRFShared::MsgConfigureFrequencyDelta* deltaMsg = (DeviceHackRFShared::MsgConfigureFrequencyDelta *) message;
ui->centerFrequency->setValue(ui->centerFrequency->getValue() + (deltaMsg->getFrequencyDelta()/1000)); ui->centerFrequency->setValue(ui->centerFrequency->getValue() + (deltaMsg->getFrequencyDelta()/1000));
blockApplySettings(false);
delete message; delete message;
} }
@ -175,6 +185,7 @@ void HackRFOutputGui::updateSampleRateAndFrequency()
void HackRFOutputGui::displaySettings() void HackRFOutputGui::displaySettings()
{ {
blockApplySettings(true);
ui->centerFrequency->setValue(m_settings.m_centerFrequency / 1000); ui->centerFrequency->setValue(m_settings.m_centerFrequency / 1000);
ui->LOppm->setValue(m_settings.m_LOppmTenths); ui->LOppm->setValue(m_settings.m_LOppmTenths);
@ -192,10 +203,12 @@ void HackRFOutputGui::displaySettings()
unsigned int bandwidthIndex = HackRFBandwidths::getBandwidthIndex(m_settings.m_bandwidth/1000); unsigned int bandwidthIndex = HackRFBandwidths::getBandwidthIndex(m_settings.m_bandwidth/1000);
ui->bbFilter->setCurrentIndex(bandwidthIndex); ui->bbFilter->setCurrentIndex(bandwidthIndex);
blockApplySettings(false);
} }
void HackRFOutputGui::displayBandwidths() void HackRFOutputGui::displayBandwidths()
{ {
blockApplySettings(true);
unsigned int savedIndex = HackRFBandwidths::getBandwidthIndex(m_settings.m_bandwidth/1000); unsigned int savedIndex = HackRFBandwidths::getBandwidthIndex(m_settings.m_bandwidth/1000);
ui->bbFilter->blockSignals(true); ui->bbFilter->blockSignals(true);
ui->bbFilter->clear(); ui->bbFilter->clear();
@ -215,6 +228,7 @@ void HackRFOutputGui::displayBandwidths()
{ {
ui->bbFilter->setCurrentIndex((int) HackRFBandwidths::m_nb_bw-1); ui->bbFilter->setCurrentIndex((int) HackRFBandwidths::m_nb_bw-1);
} }
blockApplySettings(false);
} }
void HackRFOutputGui::sendSettings() void HackRFOutputGui::sendSettings()
@ -305,10 +319,13 @@ void HackRFOutputGui::on_startStop_toggled(bool checked)
void HackRFOutputGui::updateHardware() void HackRFOutputGui::updateHardware()
{ {
if (m_doApplySettings)
{
qDebug() << "HackRFOutputGui::updateHardware"; qDebug() << "HackRFOutputGui::updateHardware";
HackRFOutput::MsgConfigureHackRF* message = HackRFOutput::MsgConfigureHackRF::create(m_settings); HackRFOutput::MsgConfigureHackRF* message = HackRFOutput::MsgConfigureHackRF::create(m_settings);
m_deviceSampleSink->getInputMessageQueue()->push(message); m_deviceSampleSink->getInputMessageQueue()->push(message);
m_updateTimer.stop(); m_updateTimer.stop();
}
} }
void HackRFOutputGui::updateStatus() void HackRFOutputGui::updateStatus()

2
plugins/samplesink/hackrfoutput/hackrfoutputgui.h
View File

@ -73,11 +73,13 @@ private:
quint64 m_deviceCenterFrequency; //!< Center frequency in device quint64 m_deviceCenterFrequency; //!< Center frequency in device
int m_lastEngineState; int m_lastEngineState;
MessageQueue m_inputMessageQueue; MessageQueue m_inputMessageQueue;
bool m_doApplySettings;
void displaySettings(); void displaySettings();
void displayBandwidths(); void displayBandwidths();
void sendSettings(); void sendSettings();
void updateSampleRateAndFrequency(); void updateSampleRateAndFrequency();
void blockApplySettings(bool block);
private slots: private slots:
void handleInputMessages(); void handleInputMessages();

9
plugins/samplesource/hackrfinput/hackrfinput.cpp
View File

@ -312,13 +312,16 @@ bool HackRFInput::applySettings(const HackRFInputSettings& settings, bool force)
if (m_settings.m_linkTxFrequency && (m_deviceAPI->getSinkBuddies().size() > 0)) if (m_settings.m_linkTxFrequency && (m_deviceAPI->getSinkBuddies().size() > 0))
{ {
DeviceSinkAPI *buddy = m_deviceAPI->getSinkBuddies()[0]; DeviceSinkAPI *buddy = m_deviceAPI->getSinkBuddies()[0];
DeviceHackRFShared::MsgConfigureFrequencyDelta *deltaMsg = DeviceHackRFShared::MsgConfigureFrequencyDelta::create(
settings.m_centerFrequency - m_settings.m_centerFrequency);
if (buddy->getSampleSinkGUIMessageQueue()) if (buddy->getSampleSinkGUIMessageQueue())
{ {
DeviceHackRFShared::MsgConfigureFrequencyDelta *deltaMsg = DeviceHackRFShared::MsgConfigureFrequencyDelta::create(settings.m_centerFrequency - m_settings.m_centerFrequency); DeviceHackRFShared::MsgConfigureFrequencyDelta *deltaMsgToGUI = new DeviceHackRFShared::MsgConfigureFrequencyDelta(*deltaMsg);
buddy->getSampleSinkGUIMessageQueue()->push(deltaMsg); buddy->getSampleSinkGUIMessageQueue()->push(deltaMsgToGUI);
} }
// TODO: send to buddy sample sink
buddy->getSampleSinkInputMessageQueue()->push(deltaMsg);
} }
} }