From d81d1c50ae8a871becee0c0086dd5f623bfd1f6c Mon Sep 17 00:00:00 2001 From: Jacob Walser Date: Fri, 7 Apr 2017 17:02:00 -0400 Subject: [PATCH] Revert "Add GuidedModeCapability to ArduPlane fw plugin" This reverts commit 26367517d16568356d23e90368a9fd54db541b48. --- src/FirmwarePlugin/APM/ArduPlaneFirmwarePlugin.cc | 9 --------- src/FirmwarePlugin/APM/ArduPlaneFirmwarePlugin.h | 1 - 2 files changed, 10 deletions(-) diff --git a/src/FirmwarePlugin/APM/ArduPlaneFirmwarePlugin.cc b/src/FirmwarePlugin/APM/ArduPlaneFirmwarePlugin.cc index c621be81a..996551e10 100644 --- a/src/FirmwarePlugin/APM/ArduPlaneFirmwarePlugin.cc +++ b/src/FirmwarePlugin/APM/ArduPlaneFirmwarePlugin.cc @@ -86,12 +86,3 @@ int ArduPlaneFirmwarePlugin::remapParamNameHigestMinorVersionNumber(int majorVer // Remapping supports up to 3.8 return majorVersionNumber == 3 ? 8 : Vehicle::versionNotSetValue; } - -bool ArduPlaneFirmwarePlugin::isCapable(const Vehicle* vehicle, FirmwareCapabilities capabilities) -{ - Q_UNUSED(vehicle); - - uint32_t vehicleCapabilities = SetFlightModeCapability | GuidedModeCapability | PauseVehicleCapability; - - return (capabilities & vehicleCapabilities) == capabilities; -} diff --git a/src/FirmwarePlugin/APM/ArduPlaneFirmwarePlugin.h b/src/FirmwarePlugin/APM/ArduPlaneFirmwarePlugin.h index ab038b804..dfa434081 100644 --- a/src/FirmwarePlugin/APM/ArduPlaneFirmwarePlugin.h +++ b/src/FirmwarePlugin/APM/ArduPlaneFirmwarePlugin.h @@ -59,7 +59,6 @@ public: QString offlineEditingParamFile(Vehicle* vehicle) final { Q_UNUSED(vehicle); return QStringLiteral(":/FirmwarePlugin/APM/Plane.OfflineEditing.params"); } const FirmwarePlugin::remapParamNameMajorVersionMap_t& paramNameRemapMajorVersionMap(void) const final { return _remapParamName; } int remapParamNameHigestMinorVersionNumber(int majorVersionNumber) const final; - bool isCapable(const Vehicle *vehicle, FirmwareCapabilities capabilities) final; private: static bool _remapParamNameIntialized; -- 2.22.0