Browse Source

Merge pull request #2682 from tcanabrava/fixBitMask

bitwise and, not boolean and, to check for bitmasks.
QGC4.4
Don Gagne 9 years ago
parent
commit
529f8ddea9
  1. 2
      src/comm/LinkManager.cc

2
src/comm/LinkManager.cc

@ -174,7 +174,7 @@ void LinkManager::_addLink(LinkInterface* link) @@ -174,7 +174,7 @@ void LinkManager::_addLink(LinkInterface* link)
// Find a mavlink channel to use for this link
for (int i=0; i<32; i++) {
if (!(_mavlinkChannelsUsedBitMask && 1 << i)) {
if (!(_mavlinkChannelsUsedBitMask & 1 << i)) {
mavlink_reset_channel_status(i);
link->_setMavlinkChannel(i);
_mavlinkChannelsUsedBitMask |= i << i;

Loading…
Cancel
Save