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

API: fixed adding channels when device is MIMO

Browse Source
This commit is contained in:
f4exb 2022-01-13 02:45:25 +01:00
parent 61226c06bd
commit a1c85aac17
3 changed files with 39 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
sdrbase/maincore.h
View File

@ -340,23 +340,23 @@ public:
public: public:
int getDeviceSetIndex() const { return m_deviceSetIndex; } int getDeviceSetIndex() const { return m_deviceSetIndex; }
int getChannelRegistrationIndex() const { return m_channelRegistrationIndex; } int getChannelRegistrationIndex() const { return m_channelRegistrationIndex; }
bool isTx() const { return m_tx; } int getDirection() const { return m_direction; }
static MsgAddChannel* create(int deviceSetIndex, int channelRegistrationIndex, bool tx) static MsgAddChannel* create(int deviceSetIndex, int channelRegistrationIndex, int direction)
{ {
return new MsgAddChannel(deviceSetIndex, channelRegistrationIndex, tx); return new MsgAddChannel(deviceSetIndex, channelRegistrationIndex, direction);
} }
private: private:
int m_deviceSetIndex; int m_deviceSetIndex;
int m_channelRegistrationIndex; int m_channelRegistrationIndex;
bool m_tx; int m_direction;
MsgAddChannel(int deviceSetIndex, int channelRegistrationIndex, bool tx) : MsgAddChannel(int deviceSetIndex, int channelRegistrationIndex, int direction) :
Message(), Message(),
m_deviceSetIndex(deviceSetIndex), m_deviceSetIndex(deviceSetIndex),
m_channelRegistrationIndex(channelRegistrationIndex), m_channelRegistrationIndex(channelRegistrationIndex),
m_tx(tx) m_direction(direction)
{ } { }
}; };

6
sdrbase/webapi/webapiadapter.cpp
View File

@ -2359,7 +2359,7 @@ int WebAPIAdapter::devicesetChannelPost(
if (index < nbRegistrations) if (index < nbRegistrations)
{ {
MainCore::MsgAddChannel *msg = MainCore::MsgAddChannel::create(deviceSetIndex, index, false); MainCore::MsgAddChannel *msg = MainCore::MsgAddChannel::create(deviceSetIndex, index, 0);
m_mainCore->m_mainMessageQueue->push(msg); m_mainCore->m_mainMessageQueue->push(msg);
response.init(); response.init();
@ -2395,7 +2395,7 @@ int WebAPIAdapter::devicesetChannelPost(
if (index < nbRegistrations) if (index < nbRegistrations)
{ {
MainCore::MsgAddChannel *msg = MainCore::MsgAddChannel::create(deviceSetIndex, index, true); MainCore::MsgAddChannel *msg = MainCore::MsgAddChannel::create(deviceSetIndex, index, 1);
m_mainCore->m_mainMessageQueue->push(msg); m_mainCore->m_mainMessageQueue->push(msg);
response.init(); response.init();
@ -2431,7 +2431,7 @@ int WebAPIAdapter::devicesetChannelPost(
if (index < nbRegistrations) if (index < nbRegistrations)
{ {
MainCore::MsgAddChannel *msg = MainCore::MsgAddChannel::create(deviceSetIndex, index, true); MainCore::MsgAddChannel *msg = MainCore::MsgAddChannel::create(deviceSetIndex, index, 2);
m_mainCore->m_mainMessageQueue->push(msg); m_mainCore->m_mainMessageQueue->push(msg);
response.init(); response.init();

32
sdrgui/mainwindow.cpp
View File

@ -1170,7 +1170,35 @@ bool MainWindow::handleMessage(const Message& cmd)
{ {
MainCore::MsgAddChannel& notif = (MainCore::MsgAddChannel&) cmd; MainCore::MsgAddChannel& notif = (MainCore::MsgAddChannel&) cmd;
ui->tabInputsView->setCurrentIndex(notif.getDeviceSetIndex()); ui->tabInputsView->setCurrentIndex(notif.getDeviceSetIndex());
channelAddClicked(notif.getChannelRegistrationIndex()); int currentChannelTabIndex = ui->tabChannels->currentIndex();
if (currentChannelTabIndex >= 0)
{
DeviceUISet *deviceUI = m_deviceUIs[currentChannelTabIndex];
int channelRegistrationIndex;
if (deviceUI->m_deviceMIMOEngine)
{
int nbMIMOChannels = deviceUI->getNumberOfAvailableMIMOChannels();
int nbRxChannels = deviceUI->getNumberOfAvailableRxChannels();
int nbTxChannels = deviceUI->getNumberOfAvailableTxChannels();
int direction = notif.getDirection();
if (direction == 2) {
channelRegistrationIndex = notif.getChannelRegistrationIndex();
} else if (direction == 0) {
channelRegistrationIndex = nbMIMOChannels + notif.getChannelRegistrationIndex();
} else {
channelRegistrationIndex = nbMIMOChannels + nbRxChannels + notif.getChannelRegistrationIndex();
}
}
else
{
channelRegistrationIndex = notif.getChannelRegistrationIndex();
}
channelAddClicked(channelRegistrationIndex);
}
return true; return true;
} }
@ -2247,7 +2275,7 @@ void MainWindow::channelAddClicked(int channelIndex)
int nbMIMOChannels = deviceUI->getNumberOfAvailableMIMOChannels(); int nbMIMOChannels = deviceUI->getNumberOfAvailableMIMOChannels();
int nbRxChannels = deviceUI->getNumberOfAvailableRxChannels(); int nbRxChannels = deviceUI->getNumberOfAvailableRxChannels();
int nbTxChannels = deviceUI->getNumberOfAvailableTxChannels(); int nbTxChannels = deviceUI->getNumberOfAvailableTxChannels();
qDebug("MainWindow::channelAddClicked: MIMO: tab: nbMIMO: %d %d nbRx: %d nbTx: %d selected: %d", qDebug("MainWindow::channelAddClicked: MIMO: tab %d : nbMIMO: %d nbRx: %d nbTx: %d selected: %d",
currentChannelTabIndex, nbMIMOChannels, nbRxChannels, nbTxChannels, channelIndex); currentChannelTabIndex, nbMIMOChannels, nbRxChannels, nbTxChannels, channelIndex);
if (channelIndex < nbMIMOChannels) if (channelIndex < nbMIMOChannels)