diff --git a/applications/platform/acquisition-server/src/drivers/brainproducts-actichamp/ovasCConfigurationBrainProductsActiCHamp.cpp b/applications/platform/acquisition-server/src/drivers/brainproducts-actichamp/ovasCConfigurationBrainProductsActiCHamp.cpp index d62e8cbde9889069e47ff736ed0dfac36c662bbf..d48e157ad4e5f8eec9e7b79d86cd4fce69d029f5 100644 --- a/applications/platform/acquisition-server/src/drivers/brainproducts-actichamp/ovasCConfigurationBrainProductsActiCHamp.cpp +++ b/applications/platform/acquisition-server/src/drivers/brainproducts-actichamp/ovasCConfigurationBrainProductsActiCHamp.cpp @@ -55,7 +55,9 @@ bool CConfigurationBrainProductsActiCHamp::preConfigure() } } - gtk_spin_button_set_range(m_buttonChannelsEnabled, gdouble(1), static_cast<gdouble>(m_deviceSelection.devices[m_deviceSelection.selectionIndex].availableEEGChannels)); + if (m_deviceSelection.devices.size() > m_deviceSelection.selectionIndex) { + gtk_spin_button_set_range(m_buttonChannelsEnabled, gdouble(1),static_cast<gdouble>(m_deviceSelection.devices[m_deviceSelection.selectionIndex].availableEEGChannels)); + } if (m_deviceSelection.devices.empty()) { gtk_spin_button_set_value(GTK_SPIN_BUTTON(m_nChannels), 0); diff --git a/applications/platform/acquisition-server/src/drivers/brainproducts-actichamp/ovasCDriverBrainProductsActiCHamp.cpp b/applications/platform/acquisition-server/src/drivers/brainproducts-actichamp/ovasCDriverBrainProductsActiCHamp.cpp index dab4fbbc9037d88c8d29a60639099311f79a01a0..b2df1249aa25c1ed41ef9912c650237a484bccd6 100644 --- a/applications/platform/acquisition-server/src/drivers/brainproducts-actichamp/ovasCDriverBrainProductsActiCHamp.cpp +++ b/applications/platform/acquisition-server/src/drivers/brainproducts-actichamp/ovasCDriverBrainProductsActiCHamp.cpp @@ -117,9 +117,7 @@ bool CDriverBrainProductsActiCHamp::setActiveShieldGain() bool CDriverBrainProductsActiCHamp::configure() { - if(!getAvailableDevices()) { - return false; - } + getAvailableDevices(); CConfigurationBrainProductsActiCHamp config(Directories::getDataDir() + "/applications/acquisition-server/interface-BrainProducts-ActiCHamp.ui", m_deviceSelection, m_activeShieldGain, m_nEEGChannels, m_useAuxChannels, diff --git a/applications/platform/acquisition-server/src/drivers/brainproducts-base/CDriverBrainProductsBase.cpp b/applications/platform/acquisition-server/src/drivers/brainproducts-base/CDriverBrainProductsBase.cpp index 3ac90496f67107c66cfe3a0b1d8d545e1f3c9de6..22ccfac222d4319733946e199bff050c725db4d4 100644 --- a/applications/platform/acquisition-server/src/drivers/brainproducts-base/CDriverBrainProductsBase.cpp +++ b/applications/platform/acquisition-server/src/drivers/brainproducts-base/CDriverBrainProductsBase.cpp @@ -208,7 +208,7 @@ bool CDriverBrainProductsBase::loop() bool CDriverBrainProductsBase::getAvailableDevices() { // Interface type - std::string hwi("SIM"); + std::string hwi("ANY"); // container for Device address std::string deviceAddress = ""; @@ -229,9 +229,7 @@ bool CDriverBrainProductsBase::getAvailableDevices() << "CDriverBrainProductsBase::getAvailableDevices: Enumerate devices\n"; int res = EnumerateDevices(&hwi[0], int32_t(hwi.size()), deviceAddress.data(), 0); if (res == 0) { - m_driverCtx.getLogManager() << Kernel::LogLevel_Error - << "CDriverBrainProductsBase::getAvailableDevices: No amplifier connected! \n" - << " device address = " << deviceAddress << "\n"; + m_driverCtx.getLogManager() << Kernel::LogLevel_Warning << "CDriverBrainProductsBase::getAvailableDevices: No amplifier connected! \n"; return false; } if (res < 0) { diff --git a/applications/platform/acquisition-server/src/drivers/brainproducts-liveamp/ovasCDriverBrainProductsLiveAmp.cpp b/applications/platform/acquisition-server/src/drivers/brainproducts-liveamp/ovasCDriverBrainProductsLiveAmp.cpp index b3f930e6f2d1426f7434705667d199c744a383d6..6caebf61b61cb354a75adb96f5667fd5718ccfea 100644 --- a/applications/platform/acquisition-server/src/drivers/brainproducts-liveamp/ovasCDriverBrainProductsLiveAmp.cpp +++ b/applications/platform/acquisition-server/src/drivers/brainproducts-liveamp/ovasCDriverBrainProductsLiveAmp.cpp @@ -116,9 +116,7 @@ bool CDriverBrainProductsLiveAmp::configure() * The last connection fails, unless EnumerateDevices is called before. * Therefore, this call needs to happen each time */ - if(!getAvailableDevices()) { - return false; - } + getAvailableDevices(); for (size_t i = 0; i < m_deviceSelection.devices.size(); ++i) { if (m_deviceSelection.devices[i].id == m_sSerialNumber) {