Skip to content

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

Merge pull request #7728 from DonLakeFlyer/OfflineCapability 

Fix/update offline vehicle capability bits and mavlink version
parents 657e4166 f7270a56
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 7 deletions
src/Vehicle/Vehicle.cc
View file @ 7fd844d6
...@@ -348,8 +348,10 @@ Vehicle::Vehicle(MAV_AUTOPILOT firmwareType, ...@@ -348,8 +348,10 @@ Vehicle::Vehicle(MAV_AUTOPILOT firmwareType,
, _globalPositionIntMessageAvailable(false) , _globalPositionIntMessageAvailable(false)
, _defaultCruiseSpeed(_settingsManager->appSettings()->offlineEditingCruiseSpeed()->rawValue().toDouble()) , _defaultCruiseSpeed(_settingsManager->appSettings()->offlineEditingCruiseSpeed()->rawValue().toDouble())
, _defaultHoverSpeed(_settingsManager->appSettings()->offlineEditingHoverSpeed()->rawValue().toDouble()) , _defaultHoverSpeed(_settingsManager->appSettings()->offlineEditingHoverSpeed()->rawValue().toDouble())
, _mavlinkProtocolRequestComplete(true)
, _maxProtoVersion(200)
, _vehicleCapabilitiesKnown(true) , _vehicleCapabilitiesKnown(true)
, _capabilityBits(_firmwareType == MAV_AUTOPILOT_ARDUPILOTMEGA ? 0 : MAV_PROTOCOL_CAPABILITY_MISSION_FENCE | MAV_PROTOCOL_CAPABILITY_MISSION_RALLY) , _capabilityBits(MAV_PROTOCOL_CAPABILITY_MISSION_FENCE | MAV_PROTOCOL_CAPABILITY_MISSION_RALLY)
, _highLatencyLink(false) , _highLatencyLink(false)
, _receivingAttitudeQuaternion(false) , _receivingAttitudeQuaternion(false)
, _cameras(nullptr) , _cameras(nullptr)
...@@ -574,12 +576,6 @@ void Vehicle::_offlineFirmwareTypeSettingChanged(QVariant value) ...@@ -574,12 +576,6 @@ void Vehicle::_offlineFirmwareTypeSettingChanged(QVariant value)
_firmwareType = static_cast<MAV_AUTOPILOT>(value.toInt()); _firmwareType = static_cast<MAV_AUTOPILOT>(value.toInt());
_firmwarePlugin = _firmwarePluginManager->firmwarePluginForAutopilot(_firmwareType, _vehicleType); _firmwarePlugin = _firmwarePluginManager->firmwarePluginForAutopilot(_firmwareType, _vehicleType);
emit firmwareTypeChanged(); emit firmwareTypeChanged();
if (_firmwareType == MAV_AUTOPILOT_ARDUPILOTMEGA) {
_capabilityBits = 0;
} else {
_capabilityBits = MAV_PROTOCOL_CAPABILITY_MISSION_FENCE | MAV_PROTOCOL_CAPABILITY_MISSION_RALLY;
}
emit capabilityBitsChanged(_capabilityBits);
} }
void Vehicle::_offlineVehicleTypeSettingChanged(QVariant value) void Vehicle::_offlineVehicleTypeSettingChanged(QVariant value)
......
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