Skip to content

Q
qgroundcontrol
Unverified Commit 3d09d445 authored by Don Gagne's avatar Don Gagne Committed by GitHub
Browse files
Options

Merge pull request #7234 from DonLakeFlyer/StableMerge 

Stable merge
parents 3436500f d955b7dc
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
.appveyor.yml
View file @ 3d09d445
...@@ -61,7 +61,7 @@ for: ...@@ -61,7 +61,7 @@ for:
- -
branches: branches:
only: only:
- Stable_V3.4 - Stable_V3.5
artifacts: artifacts:
- path: QGroundControl-installer.exe - path: QGroundControl-installer.exe
name: qgcinstaller name: qgcinstaller
......
src/comm/LinkManager.cc
View file @ 3d09d445
...@@ -994,7 +994,7 @@ void LinkManager::startAutoConnectedLinks(void) ...@@ -994,7 +994,7 @@ void LinkManager::startAutoConnectedLinks(void)
int LinkManager::_reserveMavlinkChannel(void) int LinkManager::_reserveMavlinkChannel(void)
{ {
// Find a mavlink channel to use for this link, Channel 0 is reserved for internal use. // 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)) { if (!(_mavlinkChannelsUsedBitMask & 1 << mavlinkChannel)) {
mavlink_reset_channel_status(mavlinkChannel); mavlink_reset_channel_status(mavlinkChannel);
// Start the channel on Mav 1 protocol // Start the channel on Mav 1 protocol
......
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