-
-
Notifications
You must be signed in to change notification settings - Fork 4.7k
Add keyword search to VehicleConfig and Settings pages #14239
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
DonLakeFlyer
merged 1 commit into
mavlink:master
from
DonLakeFlyer:keyword-search-and-cleanup
Mar 29, 2026
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,65 @@ | ||
| #include "APMFailsafesComponent.h" | ||
| #include "Vehicle.h" | ||
| #include "QGCMAVLink.h" | ||
|
|
||
| APMFailsafesComponent::APMFailsafesComponent(Vehicle *vehicle, AutoPilotPlugin *autopilot, QObject *parent) | ||
| : VehicleComponent(vehicle, autopilot, AutoPilotPlugin::UnknownVehicleComponent, parent) | ||
| { | ||
|
|
||
| } | ||
|
|
||
| QString APMFailsafesComponent::vehicleConfigJson() const | ||
| { | ||
| return QStringLiteral(":/qml/QGroundControl/AutoPilotPlugins/APM/VehicleConfig/APMFailsafes.VehicleConfig.json"); | ||
| } | ||
|
|
||
| QString APMFailsafesComponent::description() const | ||
| { | ||
| switch (_vehicle->vehicleType()) { | ||
| case MAV_TYPE_SUBMARINE: | ||
| return tr("Configure failsafe actions and leak detection."); | ||
| case MAV_TYPE_GROUND_ROVER: | ||
| return tr("Configure battery, GCS, throttle, and EKF failsafes."); | ||
| case MAV_TYPE_FIXED_WING: | ||
| return tr("Configure battery, GCS, and throttle failsafes."); | ||
| default: | ||
| return tr("Configure battery, GCS, RC, throttle, EKF, and dead reckoning failsafes."); | ||
| } | ||
| } | ||
|
|
||
| QUrl APMFailsafesComponent::setupSource() const | ||
| { | ||
| switch (_vehicle->vehicleType()) { | ||
| case MAV_TYPE_SUBMARINE: | ||
| case MAV_TYPE_FIXED_WING: | ||
| case MAV_TYPE_QUADROTOR: | ||
| case MAV_TYPE_COAXIAL: | ||
| case MAV_TYPE_HELICOPTER: | ||
| case MAV_TYPE_HEXAROTOR: | ||
| case MAV_TYPE_OCTOROTOR: | ||
| case MAV_TYPE_TRICOPTER: | ||
| case MAV_TYPE_GROUND_ROVER: | ||
| return QUrl::fromUserInput(QStringLiteral("qrc:/qml/QGroundControl/AutoPilotPlugins/APM/APMFailsafesComponent.qml")); | ||
| default: | ||
| return QUrl::fromUserInput(QStringLiteral("qrc:/qml/QGroundControl/AutoPilotPlugins/APM/APMNotSupported.qml")); | ||
| } | ||
| } | ||
|
|
||
| QUrl APMFailsafesComponent::summaryQmlSource() const | ||
| { | ||
| switch (_vehicle->vehicleType()) { | ||
| case MAV_TYPE_SUBMARINE: | ||
| return QUrl::fromUserInput(QStringLiteral("qrc:/qml/QGroundControl/AutoPilotPlugins/APM/APMFailsafesComponentSummarySub.qml")); | ||
| case MAV_TYPE_FIXED_WING: | ||
| case MAV_TYPE_QUADROTOR: | ||
| case MAV_TYPE_COAXIAL: | ||
| case MAV_TYPE_HELICOPTER: | ||
| case MAV_TYPE_HEXAROTOR: | ||
| case MAV_TYPE_OCTOROTOR: | ||
| case MAV_TYPE_TRICOPTER: | ||
| case MAV_TYPE_GROUND_ROVER: | ||
| return QUrl::fromUserInput(QStringLiteral("qrc:/qml/QGroundControl/AutoPilotPlugins/APM/APMFailsafesComponentSummary.qml")); | ||
| default: | ||
| return QUrl(); | ||
| } | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,27 @@ | ||
| #pragma once | ||
|
|
||
| #include "VehicleComponent.h" | ||
|
|
||
| class APMFailsafesComponent : public VehicleComponent | ||
| { | ||
| Q_OBJECT | ||
|
|
||
| public: | ||
| explicit APMFailsafesComponent(Vehicle *vehicle, AutoPilotPlugin *autopilot, QObject *parent = nullptr); | ||
|
|
||
| QStringList setupCompleteChangedTriggerList() const final { return QStringList(); } | ||
|
|
||
| QString name() const final { return _name; } | ||
| QString description() const final; | ||
| QString vehicleConfigJson() const final; | ||
| QString iconResource() const final { return QStringLiteral("/qmlimages/SafetyComponentIcon.png"); } | ||
| bool requiresSetup() const final { return false; } | ||
| bool setupComplete() const final { return true; } | ||
| QUrl setupSource() const final; | ||
| QUrl summaryQmlSource() const final; | ||
| bool allowSetupWhileArmed() const final { return true; } | ||
| bool allowSetupWhileFlying() const final { return true; } | ||
|
|
||
| private: | ||
| const QString _name = tr("Failsafes"); | ||
| }; |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
description()/summaryQmlSource()include aMAV_TYPE_SUBMARINEcase, butsetupSource()has no submarine case and falls back toAPMNotSupported.qml. Either add submarine handling insetupSource()(with a corresponding setup QML) or remove submarine support from the description/summary so the component isn’t shown as configurable when it can’t be opened.