From 24c3fba8415e9790ce2f8d1a9ac2b63a36d4b0fd Mon Sep 17 00:00:00 2001 From: Lorenz Meier Date: Fri, 24 Jun 2016 13:49:39 +0200 Subject: [PATCH] Temporarily disable MAVLink version check as the QGC settings have no effect and it will mess with the upgrade from v1 to v2 and has no real value --- src/Vehicle/MultiVehicleManager.cc | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/src/Vehicle/MultiVehicleManager.cc b/src/Vehicle/MultiVehicleManager.cc index a4cdf14..0e9a3ad 100644 --- a/src/Vehicle/MultiVehicleManager.cc +++ b/src/Vehicle/MultiVehicleManager.cc @@ -87,15 +87,15 @@ void MultiVehicleManager::_vehicleHeartbeatInfo(LinkInterface* link, int vehicle _app->showMessage(QString("Warning: A vehicle is using the same system id as QGroundControl: %1").arg(vehicleId)); } - QSettings settings; - bool mavlinkVersionCheck = settings.value("VERSION_CHECK_ENABLED", true).toBool(); - if (mavlinkVersionCheck && vehicleMavlinkVersion != MAVLINK_VERSION) { - _ignoreVehicleIds += vehicleId; - _app->showMessage(QString("The MAVLink protocol version on vehicle #%1 and QGroundControl differ! " - "It is unsafe to use different MAVLink versions. " - "QGroundControl therefore refuses to connect to vehicle #%1, which sends MAVLink version %2 (QGroundControl uses version %3).").arg(vehicleId).arg(vehicleMavlinkVersion).arg(MAVLINK_VERSION)); - return; - } +// QSettings settings; +// bool mavlinkVersionCheck = settings.value("VERSION_CHECK_ENABLED", true).toBool(); +// if (mavlinkVersionCheck && vehicleMavlinkVersion != MAVLINK_VERSION) { +// _ignoreVehicleIds += vehicleId; +// _app->showMessage(QString("The MAVLink protocol version on vehicle #%1 and QGroundControl differ! " +// "It is unsafe to use different MAVLink versions. " +// "QGroundControl therefore refuses to connect to vehicle #%1, which sends MAVLink version %2 (QGroundControl uses version %3).").arg(vehicleId).arg(vehicleMavlinkVersion).arg(MAVLINK_VERSION)); +// return; +// } Vehicle* vehicle = new Vehicle(link, vehicleId, (MAV_AUTOPILOT)vehicleFirmwareType, (MAV_TYPE)vehicleType, _firmwarePluginManager, _autopilotPluginManager, _joystickManager); connect(vehicle, &Vehicle::allLinksInactive, this, &MultiVehicleManager::_deleteVehiclePhase1);