|
|
|
@ -52,8 +52,10 @@ LinkManager::LinkManager(QGCApplication* app, QGCToolbox* toolbox)
@@ -52,8 +52,10 @@ LinkManager::LinkManager(QGCApplication* app, QGCToolbox* toolbox)
|
|
|
|
|
, _autoConnectSettings(NULL) |
|
|
|
|
, _mavlinkProtocol(NULL) |
|
|
|
|
#ifndef __mobile__ |
|
|
|
|
#ifndef NO_SERIAL_LINK |
|
|
|
|
, _nmeaPort(NULL) |
|
|
|
|
#endif |
|
|
|
|
#endif |
|
|
|
|
{ |
|
|
|
|
qmlRegisterUncreatableType<LinkManager> ("QGroundControl", 1, 0, "LinkManager", "Reference only"); |
|
|
|
|
qmlRegisterUncreatableType<LinkConfiguration> ("QGroundControl", 1, 0, "LinkConfiguration", "Reference only"); |
|
|
|
@ -69,8 +71,10 @@ LinkManager::LinkManager(QGCApplication* app, QGCToolbox* toolbox)
@@ -69,8 +71,10 @@ LinkManager::LinkManager(QGCApplication* app, QGCToolbox* toolbox)
|
|
|
|
|
LinkManager::~LinkManager() |
|
|
|
|
{ |
|
|
|
|
#ifndef __mobile__ |
|
|
|
|
#ifndef NO_SERIAL_LINK |
|
|
|
|
delete _nmeaPort; |
|
|
|
|
#endif |
|
|
|
|
#endif |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
void LinkManager::setToolbox(QGCToolbox *toolbox) |
|
|
|
@ -513,6 +517,7 @@ void LinkManager::_updateAutoConnectLinks(void)
@@ -513,6 +517,7 @@ void LinkManager::_updateAutoConnectLinks(void)
|
|
|
|
|
QGCSerialPortInfo::BoardType_t boardType; |
|
|
|
|
QString boardName; |
|
|
|
|
|
|
|
|
|
#ifndef NO_SERIAL_LINK |
|
|
|
|
#ifndef __mobile__ |
|
|
|
|
if (portInfo.systemLocation().trimmed() == _autoConnectSettings->autoConnectNmeaPort()->cookedValueString()) { |
|
|
|
|
if (portInfo.systemLocation().trimmed() != _nmeaDeviceName) { |
|
|
|
@ -539,6 +544,7 @@ void LinkManager::_updateAutoConnectLinks(void)
@@ -539,6 +544,7 @@ void LinkManager::_updateAutoConnectLinks(void)
|
|
|
|
|
} |
|
|
|
|
} else |
|
|
|
|
#endif |
|
|
|
|
#endif |
|
|
|
|
if (portInfo.getBoardInfo(boardType, boardName)) { |
|
|
|
|
if (portInfo.isBootloader()) { |
|
|
|
|
// Don't connect to bootloader
|
|
|
|
|