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
d955b7dc
Commit
d955b7dc
authored
Feb 16, 2019
by
Don Gagne
Browse files
Merge branch 'Stable_V3.5' of
https://github.com/mavlink/qgroundcontrol
into StableMerge
parents
efd77cee
2317cc38
Changes
2
Hide whitespace changes
Inline
Side-by-side
.appveyor.yml
View file @
d955b7dc
...
...
@@ -61,7 +61,7 @@ for:
-
branches
:
only
:
-
Stable_V3.
4
-
Stable_V3.
5
artifacts
:
-
path
:
QGroundControl-installer.exe
name
:
qgcinstaller
...
...
src/comm/LinkManager.cc
View file @
d955b7dc
...
...
@@ -994,7 +994,7 @@ void LinkManager::startAutoConnectedLinks(void)
int
LinkManager
::
_reserveMavlinkChannel
(
void
)
{
// Find a mavlink channel to use for this link, Channel 0 is reserved for internal use.
for
(
uint8_t
mavlinkChannel
=
1
;
mavlinkChannel
<
32
;
mavlinkChannel
++
)
{
for
(
uint8_t
mavlinkChannel
=
1
;
mavlinkChannel
<
MAVLINK_COMM_NUM_BUFFERS
;
mavlinkChannel
++
)
{
if
(
!
(
_mavlinkChannelsUsedBitMask
&
1
<<
mavlinkChannel
))
{
mavlink_reset_channel_status
(
mavlinkChannel
);
// Start the channel on Mav 1 protocol
...
...
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