rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2025-01-18 03:52:11 +01:00
Code Issues Releases Activity

GCS USB: Implement structure for only adding new devices but need a way of

Browse Source 
identifying them
This commit is contained in:
James Cotton 2012-09-08 13:23:37 -05:00
parent e5ab9f0fda
commit 44e7c4542f
1 changed files with 34 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
ground/openpilotgcs/src/plugins/coreplugin/connectionmanager.cpp
View File

@ -295,29 +295,52 @@ void ConnectionManager::resumePolling()
*/
void ConnectionManager::updateConnectionList(IConnection *connection)
{
for (QLinkedList<devListItem>::iterator iter = m_devList.begin(); iter != m_devList.end(); )
QList <IConnection::device> availableDev = connection->availableDevices();
// Go through the list of connections of that type. If they are not in the
// available device list then remove them. If they are connected, then
// disconnect them.
for (QLinkedList<devListItem>::iterator iter = m_devList.begin(); iter != m_devList.end(); )
{
if (iter->connection == connection)
{
if (m_connectionDevice.connection && m_connectionDevice.connection == connection)
{ // we are currently using the one we are about to erase
//onConnectionClosed(m_connectionDevice.connection);
disconnectDevice();
}
// See if device exists in the updated availability list
bool found = false;
foreach (IConnection::device dev, availableDev)
if (false) // TODO: Need some way of indicating a IOConnection::device matches a devListItem
found = true;
iter = m_devList.erase(iter);
if (!found) {
if (m_connectionDevice.connection && m_connectionDevice.connection == connection)
{ // we are currently using the one we are about to erase
//onConnectionClosed(m_connectionDevice.connection);
disconnectDevice();
}
iter = m_devList.erase(iter);
}
}
else
++iter;
}
// Go through the list of available devices. If they are not present in the device list
// add them.
//and add them back in the list
QList <IConnection::device> availableDev = connection->availableDevices();
foreach (IConnection::device dev, availableDev)
{
QString cbName = connection->shortName() + ": " + dev.name;
QString disp = connection->shortName() + " : " + dev.displayName;
registerDevice(connection,cbName,dev.name,disp);
bool found = false;
foreach (devListItem devList, m_devList)
if (false)
found = true;
if (!found) {
QString cbName = connection->shortName() + ": " + dev.name;
QString disp = connection->shortName() + " : " + dev.displayName;
registerDevice(connection,cbName,dev.name,disp);
}
}
}