VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2026-06-20 06:38:36 -04:00
Code Issues Projects Releases Wiki Activity

BladeRF2 output: tried to fix SO->MO and MO->SO cycle

Browse Source
This commit is contained in:
f4exb
2018-10-02 06:11:34 +02:00
parent 49a0dbac40
commit f4976485fc
3 changed files with 33 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files
devices/bladerf2/devicebladerf2.cpp
+11 -27
View File
@@ -150,7 +150,7 @@ bool DeviceBladeRF2::openRx(int channel)
if (status < 0)
{
qCritical("DeviceBladeRF2::openRx: Failed to enable Rx channel %d: %s",
qCritical("DeviceBladeRF2::openRx: failed to enable Rx channel %d: %s",
channel, bladerf_strerror(status));
return false;
}
@@ -163,8 +163,8 @@ bool DeviceBladeRF2::openRx(int channel)
}
else
{
qCritical("DeviceBladeRF2::openRx: Rx channel %d already opened", channel);
return false;
qDebug("DeviceBladeRF2::openRx: Rx channel %d already opened", channel);
return true;
}
}
@@ -201,8 +201,8 @@ bool DeviceBladeRF2::openTx(int channel)
}
else
{
qCritical("DeviceBladeRF2::openTx: Tx channel %d already opened", channel);
return false;
qDebug("DeviceBladeRF2::openTx: Tx channel %d already opened", channel);
return true;
}
}
@@ -220,26 +220,18 @@ void DeviceBladeRF2::closeRx(int channel)
if (m_rxOpen[channel])
{
for (int i = 0; i < m_nbRxChannels; i++)
{
if ((i != channel) && (m_rxOpen[i]))
{
qDebug("DeviceBladeRF2::closeRx: not closing channel %d as %d is still open", channel, i);
}
}
int status = bladerf_enable_module(m_dev, BLADERF_CHANNEL_RX(channel), false);
m_rxOpen[channel] = false;
if (status < 0) {
qCritical("DeviceBladeRF2::closeRx: cannot close channel %d: %s", channel, bladerf_strerror(status));
qCritical("DeviceBladeRF2::closeRx: failed to disable Rx channel %d: %s", channel, bladerf_strerror(status));
} else {
qDebug("DeviceBladeRF2::closeRx: channel %d closed", channel);
qDebug("DeviceBladeRF2::closeRx: Rx channel %d disabled", channel);
}
}
else
{
qCritical("DeviceBladeRF2::closeRx: Rx channel %d already closed", channel);
qDebug("DeviceBladeRF2::closeRx: Rx channel %d already closed", channel);
}
}
@@ -257,26 +249,18 @@ void DeviceBladeRF2::closeTx(int channel)
if (m_txOpen[channel])
{
for (int i = 0; i < m_nbTxChannels; i++)
{
if ((i != channel) && (m_txOpen[i]))
{
qDebug("DeviceBladeRF2::closeTx: not closing channel %d as %d is still open", channel, i);
}
}
int status = bladerf_enable_module(m_dev, BLADERF_CHANNEL_TX(channel), false);
m_txOpen[channel] = false;
if (status < 0) {
qCritical("DeviceBladeRF2::closeTx: cannot close channel %d: %s", channel, bladerf_strerror(status));
qCritical("DeviceBladeRF2::closeTx: failed to disable Tx channel %d: %s", channel, bladerf_strerror(status));
} else {
qDebug("DeviceBladeRF2::closeTx: channel %d closed", channel);
qDebug("DeviceBladeRF2::closeTx: Tx channel %d disabled", channel);
}
}
else
{
qCritical("DeviceBladeRF2::closeTx: Rx channel %d already closed", channel);
qDebug("DeviceBladeRF2::closeTx: Rx channel %d already closed", channel);
}
}