Unverified Commit 2317cc38 authored by Don Gagne's avatar Don Gagne Committed by GitHub

Merge pull request #7232 from DonLakeFlyer/MavlinkChannels

Use correct number of available channels
parents 1b820763 954588e0
...@@ -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