VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2025-06-17 13:52:47 -04:00
Code Issues Projects Releases Wiki Activity

Merge pull request #2342 from srcejon/fix_2332

Browse Source 
Stop device while loading device set.
This commit is contained in:
Edouard Griffiths 2024-11-26 23:09:14 +01:00 committed by GitHub
commit 1f0a8e3690
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 42 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
sdrgui/device/deviceuiset.cpp
View File

@ -39,6 +39,7 @@
#include "channel/channelutils.h" #include "channel/channelutils.h"
#include "channel/channelapi.h" #include "channel/channelapi.h"
#include "channel/channelgui.h" #include "channel/channelgui.h"
#include "channel/channelwebapiutils.h"
#include "mainspectrum/mainspectrumgui.h" #include "mainspectrum/mainspectrumgui.h"
#include "settings/preset.h" #include "settings/preset.h"
#include "util/simpleserializer.h" #include "util/simpleserializer.h"
@ -258,12 +259,47 @@ void DeviceUISet::loadDeviceSetSettings(
m_mainSpectrumGUI->hide(); m_mainSpectrumGUI->hide();
} }
if (m_deviceSourceEngine) { // source device // Stop device while changing channels
loadRxChannelSettings(preset, pluginAPI, workspaces, currentWorkspace); if (m_deviceAPI->state() == DeviceAPI::EngineState::StRunning)
} else if (m_deviceSinkEngine) { // sink device {
loadTxChannelSettings(preset, pluginAPI, workspaces, currentWorkspace); int deviceIndex = m_deviceAPI->getDeviceSetIndex();
} else if (m_deviceMIMOEngine) { // MIMO device
loadMIMOChannelSettings(preset, pluginAPI, workspaces, currentWorkspace); // Load settings after stopping device
auto connection = new QMetaObject::Connection();
*connection = connect(m_deviceAPI, &DeviceAPI::stateChanged, this, [=]() {
if (m_deviceAPI->state() != DeviceAPI::EngineState::StRunning)
{
// Load channel settings
if (m_deviceSourceEngine) {
loadRxChannelSettings(preset, pluginAPI, workspaces, currentWorkspace);
} else if (m_deviceSinkEngine) {
loadTxChannelSettings(preset, pluginAPI, workspaces, currentWorkspace);
} else if (m_deviceMIMOEngine) {
loadMIMOChannelSettings(preset, pluginAPI, workspaces, currentWorkspace);
}
// Restart device
ChannelWebAPIUtils::run(deviceIndex);
QObject::disconnect(*connection);
delete connection;
}
});
// We use WebAPI rather than m_deviceAPI->stopDeviceEngine();
// so that the start/stop button in the Device GUI is correctly updated
ChannelWebAPIUtils::stop(deviceIndex);
}
else
{
// Load channel settings
if (m_deviceSourceEngine) {
loadRxChannelSettings(preset, pluginAPI, workspaces, currentWorkspace);
} else if (m_deviceSinkEngine) {
loadTxChannelSettings(preset, pluginAPI, workspaces, currentWorkspace);
} else if (m_deviceMIMOEngine) {
loadMIMOChannelSettings(preset, pluginAPI, workspaces, currentWorkspace);
}
} }
} }