Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Valentin Platzgummer
qgroundcontrol
Commits
b5fb612d
Commit
b5fb612d
authored
Nov 28, 2015
by
dogmaphobic
Browse files
Fix UDP Auto-Connect for iOS.
parent
951a46c1
Changes
3
Hide whitespace changes
Inline
Side-by-side
src/comm/LinkManager.cc
View file @
b5fb612d
...
...
@@ -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
<
QGCSerialPortInfo
>
portList
=
QGCSerialPortInfo
::
availablePorts
();
...
...
@@ -522,8 +521,8 @@ void LinkManager::_updateAutoConnectLinks(void)
_autoconnectConfigurations
.
removeOne
(
pDeleteConfig
);
delete
pDeleteConfig
;
}
#endif // __ios__
}
#endif
bool
LinkManager
::
anyConnectedLinks
(
void
)
{
...
...
src/comm/LinkManager.h
View file @
b5fb612d
...
...
@@ -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
;
...
...
src/ui/preferences/GeneralSettings.qml
View file @
b5fb612d
...
...
@@ -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
}
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment