From b7c43c0f02e2b27a5ca0ac77419fd4a20b336a38 Mon Sep 17 00:00:00 2001 From: Don Gagne Date: Sun, 6 Mar 2016 13:48:58 -0800 Subject: [PATCH] Fix iOS code removal --- src/comm/LinkManager.cc | 4 ++++ src/comm/LinkManager.h | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/src/comm/LinkManager.cc b/src/comm/LinkManager.cc index 6490d731b..00561839a 100644 --- a/src/comm/LinkManager.cc +++ b/src/comm/LinkManager.cc @@ -89,9 +89,11 @@ LinkManager::LinkManager(QGCApplication* app) _autoconnect3DRRadio = settings.value(_autoconnect3DRRadioKey, true).toBool(); _autoconnectPX4Flow = settings.value(_autoconnectPX4FlowKey, true).toBool(); +#ifndef __ios__ _activeLinkCheckTimer.setInterval(_activeLinkCheckTimeoutMSecs); _activeLinkCheckTimer.setSingleShot(false); connect(&_activeLinkCheckTimer, &QTimer::timeout, this, &LinkManager::_activeLinkCheck); +#endif } LinkManager::~LinkManager() @@ -849,6 +851,7 @@ bool LinkManager::isBluetoothAvailable(void) return qgcApp()->isBluetoothAvailable(); } +#ifndef __ios__ void LinkManager::_activeLinkCheck(void) { SerialLink* link = NULL; @@ -892,3 +895,4 @@ void LinkManager::_activeLinkCheck(void) QStringLiteral("Your Vehicle is not responding. If this continues shutdown QGroundControl, restart the Vehicle letting it boot completely, then start QGroundControl.")); } } +#endif diff --git a/src/comm/LinkManager.h b/src/comm/LinkManager.h index b01a1a78e..8c11ff2cb 100644 --- a/src/comm/LinkManager.h +++ b/src/comm/LinkManager.h @@ -202,7 +202,9 @@ signals: private slots: void _linkConnected(void); void _linkDisconnected(void); +#ifndef __ios__ void _activeLinkCheck(void); +#endif private: bool _connectionsSuspendedMsg(void); @@ -236,9 +238,11 @@ private: bool _autoconnect3DRRadio; bool _autoconnectPX4Flow; +#ifndef __ios__ QTimer _activeLinkCheckTimer; ///< Timer which checks for a vehicle showing up on a usb direct link QList _activeLinkCheckList; ///< List of links we are waiting for a vehicle to show up on static const int _activeLinkCheckTimeoutMSecs = 15000; ///< Amount of time to wait for a heatbeat. Keep in mind ArduPilot stack heartbeat is slow to come. +#endif static const char* _settingsGroup; static const char* _autoconnectUDPKey; -- 2.22.0