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
5280b8a6
Commit
5280b8a6
authored
Feb 08, 2018
by
DonLakeFlyer
Browse files
Fix bugs in updating priority link
* Also handles correct prioritization of high latency links
parent
4c339fa5
Changes
1
Hide whitespace changes
Inline
Side-by-side
src/Vehicle/Vehicle.cc
View file @
5280b8a6
...
...
@@ -1490,39 +1490,65 @@ void Vehicle::_updatePriorityLink(void)
{
LinkInterface
*
newPriorityLink
=
NULL
;
#ifndef NO_SERIAL_LINK
// Note that this routine specificallty does not clear _priorityLink when there are no links remaining.
// This routine specifically does not clear _priorityLink when there are no links remaining.
// By doing this we hold a reference on the last link as the Vehicle shuts down. Thus preventing shutdown
// ordering NULL pointer crashes where priorityLink() is still called during shutdown sequence.
if
(
_links
.
count
()
==
0
)
{
return
;
}
// Check for the existing priority link to still be valid
for
(
int
i
=
0
;
i
<
_links
.
count
();
i
++
)
{
if
(
_priorityLink
.
data
()
==
_links
[
i
])
{
// Still valid
return
;
}
}
// The previous priority link is no longer valid. We must no find the best link available in this priority order:
// Direct USB connection
// Not a high latency link
// Any link
#ifndef NO_SERIAL_LINK
// Search for direct usb connection
for
(
int
i
=
0
;
i
<
_links
.
count
();
i
++
)
{
LinkInterface
*
link
=
_links
[
i
];
if
(
link
->
isConnected
())
{
SerialLink
*
pSerialLink
=
qobject_cast
<
SerialLink
*>
(
link
);
if
(
pSerialLink
)
{
LinkConfiguration
*
config
=
pSerialLink
->
getLinkConfiguration
();
if
(
config
)
{
SerialConfiguration
*
pSerialConfig
=
qobject_cast
<
SerialConfiguration
*>
(
config
);
if
(
pSerialConfig
&&
pSerialConfig
->
usbDirect
())
{
if
(
_priorityLink
.
data
()
!=
link
)
{
newPriorityLink
=
link
;
break
;
}
return
;
SerialLink
*
pSerialLink
=
qobject_cast
<
SerialLink
*>
(
link
);
if
(
pSerialLink
)
{
LinkConfiguration
*
config
=
pSerialLink
->
getLinkConfiguration
();
if
(
config
)
{
SerialConfiguration
*
pSerialConfig
=
qobject_cast
<
SerialConfiguration
*>
(
config
);
if
(
pSerialConfig
&&
pSerialConfig
->
usbDirect
())
{
if
(
_priorityLink
.
data
()
!=
link
)
{
newPriorityLink
=
link
;
break
;
}
return
;
}
}
}
}
#endif
if
(
!
newPriorityLink
&&
!
_priorityLink
.
data
()
&&
_links
.
count
())
{
newPriorityLink
=
_links
[
0
];
if
(
!
newPriorityLink
)
{
// Search for non-high latency link
for
(
int
i
=
0
;
i
<
_links
.
count
();
i
++
)
{
LinkInterface
*
link
=
_links
[
i
];
if
(
!
link
->
highLatency
())
{
newPriorityLink
=
link
;
break
;
}
}
}
if
(
newPriorityLink
)
{
_priorityLink
=
_toolbox
->
linkManager
()
->
sharedLinkInterfacePointerForLink
(
newPriorityL
ink
);
_updateHighLatencyLink
()
;
if
(
!
newPriorityLink
)
{
// Use any l
ink
newPriorityLink
=
_links
[
0
]
;
}
_priorityLink
=
_toolbox
->
linkManager
()
->
sharedLinkInterfacePointerForLink
(
newPriorityLink
);
_updateHighLatencyLink
();
}
void
Vehicle
::
_updateAttitude
(
UASInterface
*
,
double
roll
,
double
pitch
,
double
yaw
,
quint64
)
...
...
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