Commit b7c43c0f authored by Don Gagne's avatar Don Gagne

Fix iOS code removal

parent 25d24b38
......@@ -89,9 +89,11 @@ LinkManager::LinkManager(QGCApplication* app)
_autoconnect3DRRadio = settings.value(_autoconnect3DRRadioKey, true).toBool();
_autoconnectPX4Flow = settings.value(_autoconnectPX4FlowKey, true).toBool();
#ifndef __ios__
connect(&_activeLinkCheckTimer, &QTimer::timeout, this, &LinkManager::_activeLinkCheck);
......@@ -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."));
......@@ -202,7 +202,9 @@ signals:
private slots:
void _linkConnected(void);
void _linkDisconnected(void);
#ifndef __ios__
void _activeLinkCheck(void);
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<SerialLink*> _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.
static const char* _settingsGroup;
static const char* _autoconnectUDPKey;
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