Skip to content

Q
qgroundcontrol
Unverified Commit 8e0836a5 authored by Don Gagne's avatar Don Gagne Committed by GitHub
Browse files
Options

Merge pull request #7187 from DonLakeFlyer/NoSerialLink 

Fix broken NO_SERIAL_LINK build
parents 9165fa15 a791120f
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 0 deletions
src/comm/LinkManager.cc
View file @ 8e0836a5
...@@ -480,6 +480,7 @@ void LinkManager::_updateAutoConnectLinks(void) ...@@ -480,6 +480,7 @@ void LinkManager::_updateAutoConnectLinks(void)
emit linkConfigurationsChanged(); emit linkConfigurationsChanged();
} }
#ifndef __mobile__ #ifndef __mobile__
#ifndef NO_SERIAL_LINK
// check to see if nmea gps is configured for UDP input, if so, set it up to connect // check to see if nmea gps is configured for UDP input, if so, set it up to connect
if (_autoConnectSettings->autoConnectNmeaPort()->cookedValueString() == "UDP Port") { if (_autoConnectSettings->autoConnectNmeaPort()->cookedValueString() == "UDP Port") {
if (_nmeaSocket.localPort() != _autoConnectSettings->nmeaUdpPort()->rawValue().toUInt() if (_nmeaSocket.localPort() != _autoConnectSettings->nmeaUdpPort()->rawValue().toUInt()
...@@ -500,6 +501,7 @@ void LinkManager::_updateAutoConnectLinks(void) ...@@ -500,6 +501,7 @@ void LinkManager::_updateAutoConnectLinks(void)
_nmeaSocket.close(); _nmeaSocket.close();
} }
#endif #endif
#endif
#ifndef NO_SERIAL_LINK #ifndef NO_SERIAL_LINK
QStringList currentPorts; QStringList currentPorts;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment