diff --git a/src/comm/LinkManager.cc b/src/comm/LinkManager.cc index 2356d3c73964d977898f2d71134578ae67669dfd..a425e1a81ef45e4f1e32b975dc55868cba74b8e0 100644 --- a/src/comm/LinkManager.cc +++ b/src/comm/LinkManager.cc @@ -21,13 +21,13 @@ #include "UDPLink.h" #include "TCPLink.h" #include "SettingsManager.h" -#include "PositionManager.h" #ifdef QGC_ENABLE_BLUETOOTH #include "BluetoothLink.h" #endif #ifndef __mobile__ #include "GPSManager.h" +#include "PositionManager.h" #endif QGC_LOGGING_CATEGORY(LinkManagerLog, "LinkManagerLog") @@ -51,7 +51,9 @@ LinkManager::LinkManager(QGCApplication* app, QGCToolbox* toolbox) , _mavlinkChannelsUsedBitMask(1) // We never use channel 0 to avoid sequence numbering problems , _autoConnectSettings(NULL) , _mavlinkProtocol(NULL) +#ifndef __mobile__ , _nmeaPort(NULL) +#endif { qmlRegisterUncreatableType ("QGroundControl", 1, 0, "LinkManager", "Reference only"); qmlRegisterUncreatableType ("QGroundControl", 1, 0, "LinkConfiguration", "Reference only"); @@ -66,7 +68,9 @@ LinkManager::LinkManager(QGCApplication* app, QGCToolbox* toolbox) LinkManager::~LinkManager() { +#ifndef __mobile__ delete _nmeaPort; +#endif } void LinkManager::setToolbox(QGCToolbox *toolbox) @@ -502,6 +506,7 @@ void LinkManager::_updateAutoConnectLinks(void) QGCSerialPortInfo::BoardType_t boardType; QString boardName; +#ifndef __mobile__ if (portInfo.systemLocation().trimmed() == _autoConnectSettings->autoConnectNmeaPort()->cookedValueString()) { if (portInfo.systemLocation().trimmed() != _nmeaDeviceName) { _nmeaDeviceName = portInfo.systemLocation().trimmed(); @@ -525,7 +530,9 @@ void LinkManager::_updateAutoConnectLinks(void) _nmeaPort->setBaudRate(_nmeaBaud); qCDebug(LinkManagerLog) << "Configuring nmea baudrate" << _nmeaBaud; } - } else if (portInfo.getBoardInfo(boardType, boardName)) { + } else +#endif + if (portInfo.getBoardInfo(boardType, boardName)) { if (portInfo.isBootloader()) { // Don't connect to bootloader qCDebug(LinkManagerLog) << "Waiting for bootloader to finish" << portInfo.systemLocation(); diff --git a/src/comm/LinkManager.h b/src/comm/LinkManager.h index 13b35a1a2b1238d817d9b4da2e0924debc655730..bd719e364305cc1dc8048d5b55a75af7ec4521e7 100644 --- a/src/comm/LinkManager.h +++ b/src/comm/LinkManager.h @@ -235,9 +235,11 @@ private: static const int _autoconnectConnectDelayMSecs; // NMEA GPS device for GCS position +#ifndef __mobile__ QString _nmeaDeviceName; QSerialPort* _nmeaPort; uint32_t _nmeaBaud; +#endif }; #endif diff --git a/src/ui/preferences/GeneralSettings.qml b/src/ui/preferences/GeneralSettings.qml index 8fb65980bffb5fbb89b6c283a5e73fca9d9d5e85..5277fb370830a87082725ab394302e874389cdb1 100644 --- a/src/ui/preferences/GeneralSettings.qml +++ b/src/ui/preferences/GeneralSettings.qml @@ -493,7 +493,7 @@ QGCView { Row { width: parent.width spacing: ScreenTools.defaultFontPixelWidth - visible: !ScreenTools.isiOS + visible: !ScreenTools.isMobile && QGroundControl.settingsManager.autoConnectSettings.autoConnectNmeaPort.visible && QGroundControl.settingsManager.autoConnectSettings.autoConnectNmeaBaud.visible