diff --git a/src/comm/LinkManager.cc b/src/comm/LinkManager.cc index 5b43a7ab65a4b7fb7a9d60b2ae62b173da60082a..bc707a2d636c5364c036f9cf1a47a36cc37f8cfa 100644 --- a/src/comm/LinkManager.cc +++ b/src/comm/LinkManager.cc @@ -95,10 +95,9 @@ void LinkManager::setToolbox(QGCToolbox *toolbox) _mavlinkProtocol = _toolbox->mavlinkProtocol(); connect(_mavlinkProtocol, &MAVLinkProtocol::vehicleHeartbeatInfo, this, &LinkManager::_vehicleHeartbeatInfo); -#ifndef __ios__ connect(&_portListTimer, &QTimer::timeout, this, &LinkManager::_updateAutoConnectLinks); _portListTimer.start(1000); -#endif + } LinkInterface* LinkManager::createConnectedLink(LinkConfiguration* config, bool autoconnectLink) @@ -415,7 +414,6 @@ SerialConfiguration* LinkManager::_autoconnectConfigurationsContainsPort(const Q } #endif -#ifndef __ios__ void LinkManager::_updateAutoConnectLinks(void) { if (_connectionsSuspended || qgcApp()->runningUnitTests()) { @@ -429,7 +427,8 @@ void LinkManager::_updateAutoConnectLinks(void) createConnectedLink(_autoconnectUDPConfig, true /* persistenLink */); } - + +#ifndef __ios__ QStringList currentPorts; QList portList = QGCSerialPortInfo::availablePorts(); @@ -522,8 +521,8 @@ void LinkManager::_updateAutoConnectLinks(void) _autoconnectConfigurations.removeOne(pDeleteConfig); delete pDeleteConfig; } +#endif // __ios__ } -#endif bool LinkManager::anyConnectedLinks(void) { diff --git a/src/comm/LinkManager.h b/src/comm/LinkManager.h index 521efa6a95d0f608471af406ae2aafe3440de03c..49f4b75c16347b257f911a50d69515b1531f6390 100644 --- a/src/comm/LinkManager.h +++ b/src/comm/LinkManager.h @@ -139,7 +139,7 @@ public: /// false: if autoconnect link, link is marked as inactive and linkInactive is signalled /// false: if not autoconnect link, link is disconnected Q_INVOKABLE bool disconnectLink(LinkInterface* link, bool disconnectAutoconnectLink); - + /// Called to notify that a heartbeat was received with the specified information. Will transition /// a link to active as needed. /// @param link Heartbeat came through on this link @@ -205,9 +205,7 @@ private: bool _configurationsLoaded; ///< true: Link configurations have been loaded bool _connectionsSuspended; ///< true: all new connections should not be allowed QString _connectionsSuspendedReason; ///< User visible reason for suspension -#ifndef __ios__ QTimer _portListTimer; -#endif uint32_t _mavlinkChannelsUsedBitMask; MAVLinkProtocol* _mavlinkProtocol; diff --git a/src/ui/preferences/GeneralSettings.qml b/src/ui/preferences/GeneralSettings.qml index edc8249f7ca2c5d529971441e0c0fcb1100717ec..109895ba70927f702141fa35dbf3e318ba395685 100644 --- a/src/ui/preferences/GeneralSettings.qml +++ b/src/ui/preferences/GeneralSettings.qml @@ -201,18 +201,21 @@ Rectangle { QGCCheckBox { text: "Pixhawk" + visible: !ScreenTools.isiOS checked: QGroundControl.linkManager.autoconnectPixhawk onClicked: QGroundControl.linkManager.autoconnectPixhawk = checked } QGCCheckBox { text: "3DR Radio" + visible: !ScreenTools.isiOS checked: QGroundControl.linkManager.autoconnect3DRRadio onClicked: QGroundControl.linkManager.autoconnect3DRRadio = checked } QGCCheckBox { text: "PX4 Flow" + visible: !ScreenTools.isiOS checked: QGroundControl.linkManager.autoconnectPX4Flow onClicked: QGroundControl.linkManager.autoconnectPX4Flow = checked }