Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Q
qgroundcontrol
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Valentin Platzgummer
qgroundcontrol
Commits
b5fb612d
Commit
b5fb612d
authored
Nov 28, 2015
by
dogmaphobic
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix UDP Auto-Connect for iOS.
parent
951a46c1
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
8 additions
and
8 deletions
+8
-8
LinkManager.cc
src/comm/LinkManager.cc
+4
-5
LinkManager.h
src/comm/LinkManager.h
+1
-3
GeneralSettings.qml
src/ui/preferences/GeneralSettings.qml
+3
-0
No files found.
src/comm/LinkManager.cc
View file @
b5fb612d
...
@@ -95,10 +95,9 @@ void LinkManager::setToolbox(QGCToolbox *toolbox)
...
@@ -95,10 +95,9 @@ void LinkManager::setToolbox(QGCToolbox *toolbox)
_mavlinkProtocol
=
_toolbox
->
mavlinkProtocol
();
_mavlinkProtocol
=
_toolbox
->
mavlinkProtocol
();
connect
(
_mavlinkProtocol
,
&
MAVLinkProtocol
::
vehicleHeartbeatInfo
,
this
,
&
LinkManager
::
_vehicleHeartbeatInfo
);
connect
(
_mavlinkProtocol
,
&
MAVLinkProtocol
::
vehicleHeartbeatInfo
,
this
,
&
LinkManager
::
_vehicleHeartbeatInfo
);
#ifndef __ios__
connect
(
&
_portListTimer
,
&
QTimer
::
timeout
,
this
,
&
LinkManager
::
_updateAutoConnectLinks
);
connect
(
&
_portListTimer
,
&
QTimer
::
timeout
,
this
,
&
LinkManager
::
_updateAutoConnectLinks
);
_portListTimer
.
start
(
1000
);
_portListTimer
.
start
(
1000
);
#endif
}
}
LinkInterface
*
LinkManager
::
createConnectedLink
(
LinkConfiguration
*
config
,
bool
autoconnectLink
)
LinkInterface
*
LinkManager
::
createConnectedLink
(
LinkConfiguration
*
config
,
bool
autoconnectLink
)
...
@@ -415,7 +414,6 @@ SerialConfiguration* LinkManager::_autoconnectConfigurationsContainsPort(const Q
...
@@ -415,7 +414,6 @@ SerialConfiguration* LinkManager::_autoconnectConfigurationsContainsPort(const Q
}
}
#endif
#endif
#ifndef __ios__
void
LinkManager
::
_updateAutoConnectLinks
(
void
)
void
LinkManager
::
_updateAutoConnectLinks
(
void
)
{
{
if
(
_connectionsSuspended
||
qgcApp
()
->
runningUnitTests
())
{
if
(
_connectionsSuspended
||
qgcApp
()
->
runningUnitTests
())
{
...
@@ -430,6 +428,7 @@ void LinkManager::_updateAutoConnectLinks(void)
...
@@ -430,6 +428,7 @@ void LinkManager::_updateAutoConnectLinks(void)
}
}
#ifndef __ios__
QStringList
currentPorts
;
QStringList
currentPorts
;
QList
<
QGCSerialPortInfo
>
portList
=
QGCSerialPortInfo
::
availablePorts
();
QList
<
QGCSerialPortInfo
>
portList
=
QGCSerialPortInfo
::
availablePorts
();
...
@@ -522,8 +521,8 @@ void LinkManager::_updateAutoConnectLinks(void)
...
@@ -522,8 +521,8 @@ void LinkManager::_updateAutoConnectLinks(void)
_autoconnectConfigurations
.
removeOne
(
pDeleteConfig
);
_autoconnectConfigurations
.
removeOne
(
pDeleteConfig
);
delete
pDeleteConfig
;
delete
pDeleteConfig
;
}
}
#endif // __ios__
}
}
#endif
bool
LinkManager
::
anyConnectedLinks
(
void
)
bool
LinkManager
::
anyConnectedLinks
(
void
)
{
{
...
...
src/comm/LinkManager.h
View file @
b5fb612d
...
@@ -205,9 +205,7 @@ private:
...
@@ -205,9 +205,7 @@ private:
bool
_configurationsLoaded
;
///< true: Link configurations have been loaded
bool
_configurationsLoaded
;
///< true: Link configurations have been loaded
bool
_connectionsSuspended
;
///< true: all new connections should not be allowed
bool
_connectionsSuspended
;
///< true: all new connections should not be allowed
QString
_connectionsSuspendedReason
;
///< User visible reason for suspension
QString
_connectionsSuspendedReason
;
///< User visible reason for suspension
#ifndef __ios__
QTimer
_portListTimer
;
QTimer
_portListTimer
;
#endif
uint32_t
_mavlinkChannelsUsedBitMask
;
uint32_t
_mavlinkChannelsUsedBitMask
;
MAVLinkProtocol
*
_mavlinkProtocol
;
MAVLinkProtocol
*
_mavlinkProtocol
;
...
...
src/ui/preferences/GeneralSettings.qml
View file @
b5fb612d
...
@@ -201,18 +201,21 @@ Rectangle {
...
@@ -201,18 +201,21 @@ Rectangle {
QGCCheckBox
{
QGCCheckBox
{
text
:
"
Pixhawk
"
text
:
"
Pixhawk
"
visible
:
!
ScreenTools
.
isiOS
checked
:
QGroundControl
.
linkManager
.
autoconnectPixhawk
checked
:
QGroundControl
.
linkManager
.
autoconnectPixhawk
onClicked
:
QGroundControl
.
linkManager
.
autoconnectPixhawk
=
checked
onClicked
:
QGroundControl
.
linkManager
.
autoconnectPixhawk
=
checked
}
}
QGCCheckBox
{
QGCCheckBox
{
text
:
"
3DR Radio
"
text
:
"
3DR Radio
"
visible
:
!
ScreenTools
.
isiOS
checked
:
QGroundControl
.
linkManager
.
autoconnect3DRRadio
checked
:
QGroundControl
.
linkManager
.
autoconnect3DRRadio
onClicked
:
QGroundControl
.
linkManager
.
autoconnect3DRRadio
=
checked
onClicked
:
QGroundControl
.
linkManager
.
autoconnect3DRRadio
=
checked
}
}
QGCCheckBox
{
QGCCheckBox
{
text
:
"
PX4 Flow
"
text
:
"
PX4 Flow
"
visible
:
!
ScreenTools
.
isiOS
checked
:
QGroundControl
.
linkManager
.
autoconnectPX4Flow
checked
:
QGroundControl
.
linkManager
.
autoconnectPX4Flow
onClicked
:
QGroundControl
.
linkManager
.
autoconnectPX4Flow
=
checked
onClicked
:
QGroundControl
.
linkManager
.
autoconnectPX4Flow
=
checked
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a 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