From 3a5acb59bbf333be612eea9a33d80e368ae4af29 Mon Sep 17 00:00:00 2001 From: Don Gagne Date: Sun, 10 Feb 2019 13:53:56 -0800 Subject: [PATCH 1/2] Switch to Stable 3.5 --- .appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.appveyor.yml b/.appveyor.yml index 5f5d0b7..57050f4 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -61,7 +61,7 @@ for: - branches: only: - - Stable_V3.4 + - Stable_V3.5 artifacts: - path: QGroundControl-installer.exe name: qgcinstaller From 954588e0e0062ec789b8b2b095660922af179f1f Mon Sep 17 00:00:00 2001 From: Don Gagne Date: Fri, 15 Feb 2019 15:04:49 -0800 Subject: [PATCH 2/2] USe correct number of available channels --- src/comm/LinkManager.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/comm/LinkManager.cc b/src/comm/LinkManager.cc index 957af8c..43e46a8 100644 --- a/src/comm/LinkManager.cc +++ b/src/comm/LinkManager.cc @@ -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