Skip to content

Q
qgroundcontrol
Commit 780a4256 authored by Don Gagne's avatar Don Gagne Committed by GitHub
Browse files
Options

Merge pull request #5759 from DonLakeFlyer/APMCustom 

ArduPilot plugins: final -> override to allow custom builds to use as base class
parents a90bd0f1 5d30eecd
Show whitespace changes
Inline Side-by-side
Showing with 42 additions and 42 deletions
src/AutoPilotPlugins/APM/APMAirframeComponent.h
View file @ 780a4256
...@@ -21,16 +21,16 @@ public: ...@@ -21,16 +21,16 @@ public:
APMAirframeComponent(Vehicle* vehicle, AutoPilotPlugin* autopilot, QObject* parent = NULL); APMAirframeComponent(Vehicle* vehicle, AutoPilotPlugin* autopilot, QObject* parent = NULL);
// Virtuals from VehicleComponent // Virtuals from VehicleComponent
QStringList setupCompleteChangedTriggerList(void) const final; QStringList setupCompleteChangedTriggerList(void) const override;
// Virtuals from VehicleComponent // Virtuals from VehicleComponent
QString name(void) const final; QString name(void) const override;
QString description(void) const final; QString description(void) const override;
QString iconResource(void) const final; QString iconResource(void) const override;
bool requiresSetup(void) const final; bool requiresSetup(void) const override;
bool setupComplete(void) const final; bool setupComplete(void) const override;
QUrl setupSource(void) const final; QUrl setupSource(void) const override;
QUrl summaryQmlSource(void) const final; QUrl summaryQmlSource(void) const override;
private: private:
bool _requiresFrameSetup; ///< true: FRAME parameter must be set bool _requiresFrameSetup; ///< true: FRAME parameter must be set
......
src/AutoPilotPlugins/APM/APMAutoPilotPlugin.h
View file @ 780a4256
...@@ -38,7 +38,7 @@ public: ...@@ -38,7 +38,7 @@ public:
~APMAutoPilotPlugin(); ~APMAutoPilotPlugin();
// Overrides from AutoPilotPlugin // Overrides from AutoPilotPlugin
const QVariantList& vehicleComponents(void) final; const QVariantList& vehicleComponents(void) override;
QString prerequisiteSetup(VehicleComponent* component) const override; QString prerequisiteSetup(VehicleComponent* component) const override;
protected: protected:
......
src/AutoPilotPlugins/APM/APMSafetyComponent.h
View file @ 780a4256
...@@ -21,17 +21,17 @@ public: ...@@ -21,17 +21,17 @@ public:
APMSafetyComponent(Vehicle* vehicle, AutoPilotPlugin* autopilot, QObject* parent = NULL); APMSafetyComponent(Vehicle* vehicle, AutoPilotPlugin* autopilot, QObject* parent = NULL);
// Virtuals from VehicleComponent // Virtuals from VehicleComponent
QStringList setupCompleteChangedTriggerList(void) const final; QStringList setupCompleteChangedTriggerList(void) const override;
// Virtuals from VehicleComponent // Virtuals from VehicleComponent
QString name(void) const final; QString name(void) const override;
QString description(void) const final; QString description(void) const override;
QString iconResource(void) const final; QString iconResource(void) const override;
bool requiresSetup(void) const final; bool requiresSetup(void) const override;
bool setupComplete(void) const final; bool setupComplete(void) const override;
QUrl setupSource(void) const final; QUrl setupSource(void) const override;
QUrl summaryQmlSource(void) const final; QUrl summaryQmlSource(void) const override;
bool allowSetupWhileArmed(void) const final { return true; } bool allowSetupWhileArmed(void) const override { return true; }
private: private:
const QString _name; const QString _name;
......
src/FirmwarePlugin/APM/APMFirmwarePlugin.h
View file @ 780a4256
...@@ -70,36 +70,36 @@ class APMFirmwarePlugin : public FirmwarePlugin ...@@ -70,36 +70,36 @@ class APMFirmwarePlugin : public FirmwarePlugin
public: public:
// Overrides from FirmwarePlugin // Overrides from FirmwarePlugin
QList<VehicleComponent*> componentsForVehicle(AutoPilotPlugin* vehicle) final; QList<VehicleComponent*> componentsForVehicle(AutoPilotPlugin* vehicle) override;
QList<MAV_CMD> supportedMissionCommands(void) final; QList<MAV_CMD> supportedMissionCommands(void) override;
AutoPilotPlugin* autopilotPlugin (Vehicle* vehicle) final; AutoPilotPlugin* autopilotPlugin (Vehicle* vehicle) override;
bool isVtol (const Vehicle* vehicle) const final; bool isVtol (const Vehicle* vehicle) const override;
bool isCapable (const Vehicle *vehicle, FirmwareCapabilities capabilities) override; bool isCapable (const Vehicle *vehicle, FirmwareCapabilities capabilities) override;
void setGuidedMode (Vehicle* vehicle, bool guidedMode) final; void setGuidedMode (Vehicle* vehicle, bool guidedMode) override;
void guidedModeTakeoff (Vehicle* vehicle) final; void guidedModeTakeoff (Vehicle* vehicle) override;
void guidedModeGotoLocation (Vehicle* vehicle, const QGeoCoordinate& gotoCoord) final; void guidedModeGotoLocation (Vehicle* vehicle, const QGeoCoordinate& gotoCoord) override;
void startMission (Vehicle* vehicle) final; void startMission (Vehicle* vehicle) override;
QStringList flightModes (Vehicle* vehicle) final; QStringList flightModes (Vehicle* vehicle) override;
QString flightMode (uint8_t base_mode, uint32_t custom_mode) const final; QString flightMode (uint8_t base_mode, uint32_t custom_mode) const override;
bool setFlightMode (const QString& flightMode, uint8_t* base_mode, uint32_t* custom_mode) final; bool setFlightMode (const QString& flightMode, uint8_t* base_mode, uint32_t* custom_mode) override;
bool isGuidedMode (const Vehicle* vehicle) const final; bool isGuidedMode (const Vehicle* vehicle) const override;
QString rtlFlightMode (void) const final { return QString("RTL"); } QString rtlFlightMode (void) const override { return QString("RTL"); }
QString missionFlightMode (void) const final { return QString("Auto"); } QString missionFlightMode (void) const override { return QString("Auto"); }
void pauseVehicle (Vehicle* vehicle) final; void pauseVehicle (Vehicle* vehicle) override;
void guidedModeRTL (Vehicle* vehicle) final; void guidedModeRTL (Vehicle* vehicle) override;
void guidedModeChangeAltitude (Vehicle* vehicle, double altitudeChange) override; void guidedModeChangeAltitude (Vehicle* vehicle, double altitudeChange) override;
int manualControlReservedButtonCount(void) override; int manualControlReservedButtonCount(void) override;
bool adjustIncomingMavlinkMessage (Vehicle* vehicle, mavlink_message_t* message) override; bool adjustIncomingMavlinkMessage (Vehicle* vehicle, mavlink_message_t* message) override;
void adjustOutgoingMavlinkMessage (Vehicle* vehicle, LinkInterface* outgoingLink, mavlink_message_t* message) final; void adjustOutgoingMavlinkMessage (Vehicle* vehicle, LinkInterface* outgoingLink, mavlink_message_t* message) override;
void initializeVehicle (Vehicle* vehicle) final; void initializeVehicle (Vehicle* vehicle) override;
bool sendHomePositionToVehicle (void) final; bool sendHomePositionToVehicle (void) override;
void addMetaDataToFact (QObject* parameterMetaData, Fact* fact, MAV_TYPE vehicleType) final; void addMetaDataToFact (QObject* parameterMetaData, Fact* fact, MAV_TYPE vehicleType) override;
QString missionCommandOverrides (MAV_TYPE vehicleType) const override; QString missionCommandOverrides (MAV_TYPE vehicleType) const override;
QString getVersionParam (void) final { return QStringLiteral("SYSID_SW_MREV"); } QString getVersionParam (void) override { return QStringLiteral("SYSID_SW_MREV"); }
QString internalParameterMetaDataFile (Vehicle* vehicle) final; QString internalParameterMetaDataFile (Vehicle* vehicle) override;
void getParameterMetaDataVersionInfo (const QString& metaDataFile, int& majorVersion, int& minorVersion) final { APMParameterMetaData::getParameterMetaDataVersionInfo(metaDataFile, majorVersion, minorVersion); } void getParameterMetaDataVersionInfo (const QString& metaDataFile, int& majorVersion, int& minorVersion) override { APMParameterMetaData::getParameterMetaDataVersionInfo(metaDataFile, majorVersion, minorVersion); }
QObject* loadParameterMetaData (const QString& metaDataFile) final; QObject* loadParameterMetaData (const QString& metaDataFile) override;
QString brandImageIndoor (const Vehicle* vehicle) const override { Q_UNUSED(vehicle); return QStringLiteral("/qmlimages/APM/BrandImage"); } QString brandImageIndoor (const Vehicle* vehicle) const override { Q_UNUSED(vehicle); return QStringLiteral("/qmlimages/APM/BrandImage"); }
QString brandImageOutdoor (const Vehicle* vehicle) const override { Q_UNUSED(vehicle); return QStringLiteral("/qmlimages/APM/BrandImage"); } QString brandImageOutdoor (const Vehicle* vehicle) const override { Q_UNUSED(vehicle); return QStringLiteral("/qmlimages/APM/BrandImage"); }
......
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