VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2025-06-04 16:02:25 -04:00
Code Issues Projects Releases Wiki Activity

BladerRF2 input support (5). Global notification of changes to buddies

Browse Source
This commit is contained in:
f4exb 2018-09-24 17:32:40 +02:00
parent df505fcdef
commit 7dfe094364
2 changed files with 119 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
devices/bladerf2/devicebladerf2shared.h
View File

@ -61,27 +61,18 @@ public:
MESSAGE_CLASS_DECLARATION MESSAGE_CLASS_DECLARATION
public: public:
bool getBiasTee() const { return m_biasTee; }
bool getRxElseTx() const { return m_rxElseTx; } bool getRxElseTx() const { return m_rxElseTx; }
static MsgReportBuddyChange* create( static MsgReportBuddyChange* create(bool rxElseTx)
bool biasTee,
bool rxElseTx)
{ {
return new MsgReportBuddyChange( return new MsgReportBuddyChange(rxElseTx);
biasTee,
rxElseTx);
} }
private: private:
bool m_biasTee;
bool m_rxElseTx; //!< tells which side initiated the message bool m_rxElseTx; //!< tells which side initiated the message
MsgReportBuddyChange( MsgReportBuddyChange(bool rxElseTx) :
bool biasTee,
bool rxElseTx) :
Message(), Message(),
m_biasTee(biasTee),
m_rxElseTx(rxElseTx) m_rxElseTx(rxElseTx)
{ } { }
}; };

121
plugins/samplesource/bladerf2input/bladerf2input.cpp
View File

@ -434,18 +434,98 @@ bool BladeRF2Input::handleMessage(const Message& message)
else if (DeviceBladeRF2Shared::MsgReportBuddyChange::match(message)) else if (DeviceBladeRF2Shared::MsgReportBuddyChange::match(message))
{ {
DeviceBladeRF2Shared::MsgReportBuddyChange& report = (DeviceBladeRF2Shared::MsgReportBuddyChange&) message; DeviceBladeRF2Shared::MsgReportBuddyChange& report = (DeviceBladeRF2Shared::MsgReportBuddyChange&) message;
struct bladerf *dev = m_deviceShared.m_dev->getDev();
BladeRF2InputSettings settings = m_settings;
int status;
int tmp_int;
unsigned int tmp_uint;
uint64_t tmp_uint64;
bool tmp_bool;
bladerf_gain_mode tmp_gain_mode;
if (report.getRxElseTx()) // evaluate changes that may have been introduced by changes in a buddy
if (dev) // The BladeRF device must have been open to do so
{ {
m_settings.m_biasTee = report.getBiasTee(); if (report.getRxElseTx()) // Rx buddy change: check for: frequency, gain mode and value, bias tee, sample rate, bandwidth
{
status = bladerf_get_sample_rate(dev, BLADERF_CHANNEL_RX(m_deviceShared.m_channel), &tmp_uint);
if (status < 0) {
qCritical("BladeRF2Input::handleMessage: MsgReportBuddyChange: bladerf_get_sample_rate error: %s", bladerf_strerror(status));
} else {
settings.m_devSampleRate = tmp_uint;
} }
status = bladerf_get_frequency(dev, BLADERF_CHANNEL_RX(m_deviceShared.m_channel), &tmp_uint64);
if (status < 0) {
qCritical("BladeRF2Input::handleMessage: MsgReportBuddyChange: bladerf_get_frequency error: %s", bladerf_strerror(status));
} else {
settings.m_centerFrequency = tmp_uint64;
}
status = bladerf_get_bandwidth(dev, BLADERF_CHANNEL_RX(m_deviceShared.m_channel), &tmp_uint);
if (status < 0) {
qCritical("BladeRF2Input::handleMessage: MsgReportBuddyChange: bladerf_get_bandwidth error: %s", bladerf_strerror(status));
} else {
settings.m_bandwidth = tmp_uint;
}
status = bladerf_get_gain_mode(dev, BLADERF_CHANNEL_RX(m_deviceShared.m_channel), &tmp_gain_mode);
if (status < 0) {
qCritical("BladeRF2Input::handleMessage: MsgReportBuddyChange: bladerf_get_gain_mode error: %s", bladerf_strerror(status));
} else {
settings.m_gainMode = (int) tmp_gain_mode;
}
status = bladerf_get_gain(dev, BLADERF_CHANNEL_RX(m_deviceShared.m_channel), &tmp_int);
if (status < 0) {
qCritical("BladeRF2Input::handleMessage: MsgReportBuddyChange: bladerf_get_gain error: %s", bladerf_strerror(status));
} else {
settings.m_globalGain = tmp_int;
}
status = bladerf_get_bias_tee(dev, BLADERF_CHANNEL_RX(m_deviceShared.m_channel), &tmp_bool);
if (status < 0) {
qCritical("BladeRF2Input::handleMessage: MsgReportBuddyChange: bladerf_get_bias_tee error: %s", bladerf_strerror(status));
} else {
settings.m_biasTee = tmp_bool;
}
}
else // Tx buddy change: check for sample rate change only
{
status = bladerf_get_sample_rate(dev, BLADERF_CHANNEL_RX(m_deviceShared.m_channel), &tmp_uint);
if (status < 0) {
qCritical("BladeRF2Input::handleMessage: MsgReportBuddyChange: bladerf_get_sample_rate error: %s", bladerf_strerror(status));
} else {
settings.m_devSampleRate = tmp_uint;
}
}
// change DSP settings if buddy change introduced a change in center frequency or base rate
if ((settings.m_centerFrequency != m_settings.m_centerFrequency) || (settings.m_devSampleRate != m_settings.m_devSampleRate))
{
int sampleRate = settings.m_devSampleRate/(1<<settings.m_log2Decim);
DSPSignalNotification *notif = new DSPSignalNotification(sampleRate, settings.m_centerFrequency);
m_fileSink->handleMessage(*notif); // forward to file sink
m_deviceAPI->getDeviceEngineInputMessageQueue()->push(notif);
}
m_settings = settings; // acknowledge the new settings
// propagate settings to GUI if any
if (getMessageQueueToGUI()) if (getMessageQueueToGUI())
{ {
DeviceBladeRF2Shared::MsgReportBuddyChange *reportToGUI = DeviceBladeRF2Shared::MsgReportBuddyChange::create( MsgConfigureBladeRF2 *reportToGUI = MsgConfigureBladeRF2::create(m_settings, false);
m_settings.m_biasTee, true);
getMessageQueueToGUI()->push(reportToGUI); getMessageQueueToGUI()->push(reportToGUI);
} }
}
return true; return true;
} }
@ -499,8 +579,8 @@ bool BladeRF2Input::handleMessage(const Message& message)
bool BladeRF2Input::applySettings(const BladeRF2InputSettings& settings, bool force) bool BladeRF2Input::applySettings(const BladeRF2InputSettings& settings, bool force)
{ {
bool forwardChangeOwnDSP = false; bool forwardChangeOwnDSP = false;
bool forwardChangeRxDSP = false; bool forwardChangeRxBuddies = false;
bool forwardChangeAllDSP __attribute__((unused)) = false; bool forwardChangeTxBuddies = false;
struct bladerf *dev = m_deviceShared.m_dev->getDev(); struct bladerf *dev = m_deviceShared.m_dev->getDev();
qDebug() << "BladeRF2Input::applySettings: m_dev: " << dev; qDebug() << "BladeRF2Input::applySettings: m_dev: " << dev;
@ -514,6 +594,8 @@ bool BladeRF2Input::applySettings(const BladeRF2InputSettings& settings, bool fo
if ((m_settings.m_devSampleRate != settings.m_devSampleRate) || force) if ((m_settings.m_devSampleRate != settings.m_devSampleRate) || force)
{ {
forwardChangeOwnDSP = true; forwardChangeOwnDSP = true;
forwardChangeRxBuddies = true;
forwardChangeTxBuddies = true;
if (dev != 0) if (dev != 0)
{ {
@ -534,6 +616,8 @@ bool BladeRF2Input::applySettings(const BladeRF2InputSettings& settings, bool fo
if ((m_settings.m_bandwidth != settings.m_bandwidth) || force) if ((m_settings.m_bandwidth != settings.m_bandwidth) || force)
{ {
forwardChangeRxBuddies = true;
if (dev != 0) if (dev != 0)
{ {
unsigned int actualBandwidth; unsigned int actualBandwidth;
@ -584,6 +668,7 @@ bool BladeRF2Input::applySettings(const BladeRF2InputSettings& settings, bool fo
settings.m_devSampleRate); settings.m_devSampleRate);
forwardChangeOwnDSP = true; forwardChangeOwnDSP = true;
forwardChangeRxBuddies = true;
if (dev != 0) if (dev != 0)
{ {
@ -600,12 +685,14 @@ bool BladeRF2Input::applySettings(const BladeRF2InputSettings& settings, bool fo
if ((m_settings.m_biasTee != settings.m_biasTee) || force) if ((m_settings.m_biasTee != settings.m_biasTee) || force)
{ {
forwardChangeRxBuddies = true;
m_deviceShared.m_dev->setBiasTeeRx(settings.m_biasTee); m_deviceShared.m_dev->setBiasTeeRx(settings.m_biasTee);
forwardChangeRxDSP = true;
} }
if ((m_settings.m_globalGain != settings.m_globalGain) || force) if ((m_settings.m_globalGain != settings.m_globalGain) || force)
{ {
forwardChangeRxBuddies = true;
if (dev) if (dev)
{ {
int status = bladerf_set_gain(dev, BLADERF_CHANNEL_RX(m_deviceShared.m_channel), settings.m_globalGain); int status = bladerf_set_gain(dev, BLADERF_CHANNEL_RX(m_deviceShared.m_channel), settings.m_globalGain);
@ -621,6 +708,8 @@ bool BladeRF2Input::applySettings(const BladeRF2InputSettings& settings, bool fo
if ((m_settings.m_gainMode != settings.m_gainMode) || force) if ((m_settings.m_gainMode != settings.m_gainMode) || force)
{ {
forwardChangeRxBuddies = true;
if (dev) if (dev)
{ {
int status = bladerf_set_gain_mode(dev, BLADERF_CHANNEL_RX(m_deviceShared.m_channel), (bladerf_gain_mode) settings.m_gainMode); int status = bladerf_set_gain_mode(dev, BLADERF_CHANNEL_RX(m_deviceShared.m_channel), (bladerf_gain_mode) settings.m_gainMode);
@ -642,7 +731,7 @@ bool BladeRF2Input::applySettings(const BladeRF2InputSettings& settings, bool fo
m_deviceAPI->getDeviceEngineInputMessageQueue()->push(notif); m_deviceAPI->getDeviceEngineInputMessageQueue()->push(notif);
} }
if (forwardChangeRxDSP) if (forwardChangeRxBuddies)
{ {
// send to source buddies // send to source buddies
const std::vector<DeviceSourceAPI*>& sourceBuddies = m_deviceAPI->getSourceBuddies(); const std::vector<DeviceSourceAPI*>& sourceBuddies = m_deviceAPI->getSourceBuddies();
@ -650,12 +739,24 @@ bool BladeRF2Input::applySettings(const BladeRF2InputSettings& settings, bool fo
for (; itSource != sourceBuddies.end(); ++itSource) for (; itSource != sourceBuddies.end(); ++itSource)
{ {
DeviceBladeRF2Shared::MsgReportBuddyChange *report = DeviceBladeRF2Shared::MsgReportBuddyChange::create( DeviceBladeRF2Shared::MsgReportBuddyChange *report = DeviceBladeRF2Shared::MsgReportBuddyChange::create(true);
settings.m_biasTee, true);
(*itSource)->getSampleSourceInputMessageQueue()->push(report); (*itSource)->getSampleSourceInputMessageQueue()->push(report);
} }
} }
if (forwardChangeTxBuddies)
{
// send to sink buddies
const std::vector<DeviceSinkAPI*>& sinkBuddies = m_deviceAPI->getSinkBuddies();
std::vector<DeviceSinkAPI*>::const_iterator itSink = sinkBuddies.begin();
for (; itSink != sinkBuddies.end(); ++itSink)
{
DeviceBladeRF2Shared::MsgReportBuddyChange *report = DeviceBladeRF2Shared::MsgReportBuddyChange::create(true);
(*itSink)->getSampleSinkInputMessageQueue()->push(report);
}
}
m_settings = settings; m_settings = settings;
qDebug() << "BladeRF2Input::applySettings: " qDebug() << "BladeRF2Input::applySettings: "