From b37958b919d95997748a2d38b2980194b74d18c7 Mon Sep 17 00:00:00 2001 From: Don Gagne Date: Mon, 14 Dec 2015 13:20:08 -0800 Subject: [PATCH] Remove unused methods --- .../APM/APMAirframeComponent.cc | 25 -------------- .../APM/APMAirframeComponent.h | 2 -- .../APM/APMFlightModesComponent.cc | 17 ---------- .../APM/APMFlightModesComponent.h | 2 -- src/AutoPilotPlugins/APM/APMRadioComponent.cc | 21 ------------ src/AutoPilotPlugins/APM/APMRadioComponent.h | 2 -- .../APM/APMSafetyComponent.cc | 17 ---------- src/AutoPilotPlugins/APM/APMSafetyComponent.h | 2 -- .../APM/APMSensorsComponent.cc | 17 ---------- .../APM/APMSensorsComponent.h | 2 -- src/AutoPilotPlugins/PX4/AirframeComponent.cc | 21 ------------ src/AutoPilotPlugins/PX4/AirframeComponent.h | 2 -- .../PX4/FlightModesComponent.cc | 33 ------------------- .../PX4/FlightModesComponent.h | 2 -- src/AutoPilotPlugins/PX4/PX4RadioComponent.cc | 21 ------------ src/AutoPilotPlugins/PX4/PX4RadioComponent.h | 2 -- src/AutoPilotPlugins/PX4/PowerComponent.cc | 19 ----------- src/AutoPilotPlugins/PX4/PowerComponent.h | 2 -- src/AutoPilotPlugins/PX4/SafetyComponent.cc | 19 ----------- src/AutoPilotPlugins/PX4/SafetyComponent.h | 2 -- src/AutoPilotPlugins/PX4/SensorsComponent.cc | 21 ------------ src/AutoPilotPlugins/PX4/SensorsComponent.h | 2 -- src/VehicleSetup/VehicleComponent.h | 3 -- 23 files changed, 256 deletions(-) diff --git a/src/AutoPilotPlugins/APM/APMAirframeComponent.cc b/src/AutoPilotPlugins/APM/APMAirframeComponent.cc index 906be71ee..1c90064d8 100644 --- a/src/AutoPilotPlugins/APM/APMAirframeComponent.cc +++ b/src/AutoPilotPlugins/APM/APMAirframeComponent.cc @@ -65,18 +65,6 @@ bool APMAirframeComponent::setupComplete(void) const #endif } -QString APMAirframeComponent::setupStateDescription(void) const -{ - const char* stateDescription; - - if (requiresSetup()) { - stateDescription = "Requires calibration"; - } else { - stateDescription = "Calibrated"; - } - return QString(stateDescription); -} - QStringList APMAirframeComponent::setupCompleteChangedTriggerList(void) const { // You'll need to figure out which parameters trigger setup complete @@ -87,19 +75,6 @@ QStringList APMAirframeComponent::setupCompleteChangedTriggerList(void) const #endif } -QStringList APMAirframeComponent::paramFilterList(void) const -{ -#if 0 - QStringList list; - - list << "SYS_AUTOSTART"; - - return list; -#else - return QStringList(); -#endif -} - QUrl APMAirframeComponent::setupSource(void) const { return QUrl::fromUserInput("qrc:/qml/APMAirframeComponent.qml"); diff --git a/src/AutoPilotPlugins/APM/APMAirframeComponent.h b/src/AutoPilotPlugins/APM/APMAirframeComponent.h index 4231af7cc..a37f9d3f9 100644 --- a/src/AutoPilotPlugins/APM/APMAirframeComponent.h +++ b/src/AutoPilotPlugins/APM/APMAirframeComponent.h @@ -42,9 +42,7 @@ public: virtual QString iconResource(void) const; virtual bool requiresSetup(void) const; virtual bool setupComplete(void) const; - virtual QString setupStateDescription(void) const; virtual QUrl setupSource(void) const; - virtual QStringList paramFilterList(void) const; virtual QUrl summaryQmlSource(void) const; virtual QString prerequisiteSetup(void) const; diff --git a/src/AutoPilotPlugins/APM/APMFlightModesComponent.cc b/src/AutoPilotPlugins/APM/APMFlightModesComponent.cc index afa0b4bf7..774565480 100644 --- a/src/AutoPilotPlugins/APM/APMFlightModesComponent.cc +++ b/src/AutoPilotPlugins/APM/APMFlightModesComponent.cc @@ -55,28 +55,11 @@ bool APMFlightModesComponent::setupComplete(void) const return true; } -QString APMFlightModesComponent::setupStateDescription(void) const -{ - const char* stateDescription; - - if (requiresSetup()) { - stateDescription = "Requires calibration"; - } else { - stateDescription = "Calibrated"; - } - return QString(stateDescription); -} - QStringList APMFlightModesComponent::setupCompleteChangedTriggerList(void) const { return QStringList(); } -QStringList APMFlightModesComponent::paramFilterList(void) const -{ - return QStringList(); -} - QUrl APMFlightModesComponent::setupSource(void) const { return QUrl::fromUserInput("qrc:/qml/APMFlightModesComponent.qml"); diff --git a/src/AutoPilotPlugins/APM/APMFlightModesComponent.h b/src/AutoPilotPlugins/APM/APMFlightModesComponent.h index 3a82fadef..349e08d3d 100644 --- a/src/AutoPilotPlugins/APM/APMFlightModesComponent.h +++ b/src/AutoPilotPlugins/APM/APMFlightModesComponent.h @@ -42,9 +42,7 @@ public: virtual QString iconResource(void) const; virtual bool requiresSetup(void) const; virtual bool setupComplete(void) const; - virtual QString setupStateDescription(void) const; virtual QUrl setupSource(void) const; - virtual QStringList paramFilterList(void) const; virtual QUrl summaryQmlSource(void) const; virtual QString prerequisiteSetup(void) const; diff --git a/src/AutoPilotPlugins/APM/APMRadioComponent.cc b/src/AutoPilotPlugins/APM/APMRadioComponent.cc index 0c2e8b9b7..c42a1d553 100644 --- a/src/AutoPilotPlugins/APM/APMRadioComponent.cc +++ b/src/AutoPilotPlugins/APM/APMRadioComponent.cc @@ -67,18 +67,6 @@ bool APMRadioComponent::setupComplete(void) const return true; } -QString APMRadioComponent::setupStateDescription(void) const -{ - const char* stateDescription; - - if (requiresSetup()) { - stateDescription = "Requires calibration"; - } else { - stateDescription = "Calibrated"; - } - return QString(stateDescription); -} - QStringList APMRadioComponent::setupCompleteChangedTriggerList(void) const { QStringList triggers; @@ -88,15 +76,6 @@ QStringList APMRadioComponent::setupCompleteChangedTriggerList(void) const return triggers; } -QStringList APMRadioComponent::paramFilterList(void) const -{ - QStringList list; - - list << "RC*"; - - return list; -} - QUrl APMRadioComponent::setupSource(void) const { return QUrl::fromUserInput("qrc:/qml/RadioComponent.qml"); diff --git a/src/AutoPilotPlugins/APM/APMRadioComponent.h b/src/AutoPilotPlugins/APM/APMRadioComponent.h index 44df877c4..0a179430d 100644 --- a/src/AutoPilotPlugins/APM/APMRadioComponent.h +++ b/src/AutoPilotPlugins/APM/APMRadioComponent.h @@ -42,9 +42,7 @@ public: virtual QString iconResource(void) const; virtual bool requiresSetup(void) const; virtual bool setupComplete(void) const; - virtual QString setupStateDescription(void) const; virtual QUrl setupSource(void) const; - virtual QStringList paramFilterList(void) const; virtual QUrl summaryQmlSource(void) const; virtual QString prerequisiteSetup(void) const; diff --git a/src/AutoPilotPlugins/APM/APMSafetyComponent.cc b/src/AutoPilotPlugins/APM/APMSafetyComponent.cc index 4d18ab761..1346fa6e1 100644 --- a/src/AutoPilotPlugins/APM/APMSafetyComponent.cc +++ b/src/AutoPilotPlugins/APM/APMSafetyComponent.cc @@ -60,28 +60,11 @@ bool APMSafetyComponent::setupComplete(void) const return true; } -QString APMSafetyComponent::setupStateDescription(void) const -{ - const char* stateDescription; - - if (requiresSetup()) { - stateDescription = "Requires setup"; - } else { - stateDescription = "Setup complete"; - } - return QString(stateDescription); -} - QStringList APMSafetyComponent::setupCompleteChangedTriggerList(void) const { return QStringList(); } -QStringList APMSafetyComponent::paramFilterList(void) const -{ - return QStringList(); -} - QUrl APMSafetyComponent::setupSource(void) const { QString qmlFile; diff --git a/src/AutoPilotPlugins/APM/APMSafetyComponent.h b/src/AutoPilotPlugins/APM/APMSafetyComponent.h index bb8ed68d8..ad6dfa898 100644 --- a/src/AutoPilotPlugins/APM/APMSafetyComponent.h +++ b/src/AutoPilotPlugins/APM/APMSafetyComponent.h @@ -42,9 +42,7 @@ public: virtual QString iconResource(void) const; virtual bool requiresSetup(void) const; virtual bool setupComplete(void) const; - virtual QString setupStateDescription(void) const; virtual QUrl setupSource(void) const; - virtual QStringList paramFilterList(void) const; virtual QUrl summaryQmlSource(void) const; virtual QString prerequisiteSetup(void) const; diff --git a/src/AutoPilotPlugins/APM/APMSensorsComponent.cc b/src/AutoPilotPlugins/APM/APMSensorsComponent.cc index 7df8c2869..49f4b599f 100644 --- a/src/AutoPilotPlugins/APM/APMSensorsComponent.cc +++ b/src/AutoPilotPlugins/APM/APMSensorsComponent.cc @@ -60,18 +60,6 @@ bool APMSensorsComponent::setupComplete(void) const return !compassSetupNeeded() && !accelSetupNeeded(); } -QString APMSensorsComponent::setupStateDescription(void) const -{ - const char* stateDescription; - - if (requiresSetup()) { - stateDescription = "Requires calibration"; - } else { - stateDescription = "Calibrated"; - } - return QString(stateDescription); -} - QStringList APMSensorsComponent::setupCompleteChangedTriggerList(void) const { QStringList triggers; @@ -91,11 +79,6 @@ QStringList APMSensorsComponent::setupCompleteChangedTriggerList(void) const return triggers; } -QStringList APMSensorsComponent::paramFilterList(void) const -{ - return QStringList(); -} - QUrl APMSensorsComponent::setupSource(void) const { return QUrl::fromUserInput("qrc:/qml/APMSensorsComponent.qml"); diff --git a/src/AutoPilotPlugins/APM/APMSensorsComponent.h b/src/AutoPilotPlugins/APM/APMSensorsComponent.h index c22e9492f..fec2fa0db 100644 --- a/src/AutoPilotPlugins/APM/APMSensorsComponent.h +++ b/src/AutoPilotPlugins/APM/APMSensorsComponent.h @@ -45,9 +45,7 @@ public: virtual QString iconResource(void) const; virtual bool requiresSetup(void) const; virtual bool setupComplete(void) const; - virtual QString setupStateDescription(void) const; virtual QUrl setupSource(void) const; - virtual QStringList paramFilterList(void) const; virtual QUrl summaryQmlSource(void) const; virtual QString prerequisiteSetup(void) const; diff --git a/src/AutoPilotPlugins/PX4/AirframeComponent.cc b/src/AutoPilotPlugins/PX4/AirframeComponent.cc index 26ad00137..24f6dcdb2 100644 --- a/src/AutoPilotPlugins/PX4/AirframeComponent.cc +++ b/src/AutoPilotPlugins/PX4/AirframeComponent.cc @@ -145,32 +145,11 @@ bool AirframeComponent::setupComplete(void) const return _autopilot->getParameterFact(FactSystem::defaultComponentId, "SYS_AUTOSTART")->rawValue().toInt() != 0; } -QString AirframeComponent::setupStateDescription(void) const -{ - const char* stateDescription; - - if (requiresSetup()) { - stateDescription = "Requires calibration"; - } else { - stateDescription = "Calibrated"; - } - return QString(stateDescription); -} - QStringList AirframeComponent::setupCompleteChangedTriggerList(void) const { return QStringList("SYS_AUTOSTART"); } -QStringList AirframeComponent::paramFilterList(void) const -{ - QStringList list; - - list << "SYS_AUTOSTART"; - - return list; -} - QUrl AirframeComponent::setupSource(void) const { return QUrl::fromUserInput("qrc:/qml/AirframeComponent.qml"); diff --git a/src/AutoPilotPlugins/PX4/AirframeComponent.h b/src/AutoPilotPlugins/PX4/AirframeComponent.h index b43d5907b..a31e5b7b6 100644 --- a/src/AutoPilotPlugins/PX4/AirframeComponent.h +++ b/src/AutoPilotPlugins/PX4/AirframeComponent.h @@ -46,9 +46,7 @@ public: virtual QString iconResource(void) const; virtual bool requiresSetup(void) const; virtual bool setupComplete(void) const; - virtual QString setupStateDescription(void) const; virtual QUrl setupSource(void) const; - virtual QStringList paramFilterList(void) const; virtual QUrl summaryQmlSource(void) const; virtual QString prerequisiteSetup(void) const; diff --git a/src/AutoPilotPlugins/PX4/FlightModesComponent.cc b/src/AutoPilotPlugins/PX4/FlightModesComponent.cc index a36a1e50a..66ad52af8 100644 --- a/src/AutoPilotPlugins/PX4/FlightModesComponent.cc +++ b/src/AutoPilotPlugins/PX4/FlightModesComponent.cc @@ -33,16 +33,6 @@ struct SwitchListItem { const char* name; }; -/// @brief Used to translate from RC_MAP_* parameters name to user string -static const SwitchListItem switchList[] = { - { "RC_MAP_MODE_SW", "Mode Switch:" }, // First entry must be mode switch - { "RC_MAP_POSCTL_SW", "Position Control Switch:" }, - { "RC_MAP_LOITER_SW", "Loiter Switch:" }, - { "RC_MAP_RETURN_SW", "Return Switch:" }, - { "RC_MAP_ACRO_SW", "Acro Switch:" }, -}; -static const size_t cSwitchList = sizeof(switchList) / sizeof(switchList[0]); - FlightModesComponent::FlightModesComponent(Vehicle* vehicle, AutoPilotPlugin* autopilot, QObject* parent) : PX4Component(vehicle, autopilot, parent), _name(tr("Flight Modes")) @@ -77,34 +67,11 @@ bool FlightModesComponent::setupComplete(void) const _autopilot->getParameterFact(FactSystem::defaultComponentId, "RC_MAP_MODE_SW")->rawValue().toInt() != 0; } -QString FlightModesComponent::setupStateDescription(void) const -{ - const char* stateDescription; - - if (requiresSetup()) { - stateDescription = "Requires calibration"; - } else { - stateDescription = "Calibrated"; - } - return QString(stateDescription); -} - QStringList FlightModesComponent::setupCompleteChangedTriggerList(void) const { return QStringList("RC_MAP_MODE_SW"); } -QStringList FlightModesComponent::paramFilterList(void) const -{ - QStringList list; - - for (size_t i=0; igetParameterFact(FactSystem::defaultComponentId, "BAT_N_CELLS")->rawValue().toInt() != 0; } -QString PowerComponent::setupStateDescription(void) const -{ - const char* stateDescription; - - if (requiresSetup()) { - stateDescription = "Requires setup"; - } else { - stateDescription = "Setup complete"; - } - return QString(stateDescription); -} - QStringList PowerComponent::setupCompleteChangedTriggerList(void) const { return QStringList(); } -QStringList PowerComponent::paramFilterList(void) const -{ - QStringList list; - - return list; -} - QUrl PowerComponent::setupSource(void) const { return QUrl::fromUserInput("qrc:/qml/PowerComponent.qml"); diff --git a/src/AutoPilotPlugins/PX4/PowerComponent.h b/src/AutoPilotPlugins/PX4/PowerComponent.h index 7d2105524..3bddfa3e6 100644 --- a/src/AutoPilotPlugins/PX4/PowerComponent.h +++ b/src/AutoPilotPlugins/PX4/PowerComponent.h @@ -46,9 +46,7 @@ public: virtual QString iconResource (void) const; virtual bool requiresSetup (void) const; virtual bool setupComplete (void) const; - virtual QString setupStateDescription (void) const; virtual QUrl setupSource (void) const; - virtual QStringList paramFilterList (void) const; virtual QUrl summaryQmlSource (void) const; virtual QString prerequisiteSetup (void) const; diff --git a/src/AutoPilotPlugins/PX4/SafetyComponent.cc b/src/AutoPilotPlugins/PX4/SafetyComponent.cc index 27dfb9fd8..52330744d 100644 --- a/src/AutoPilotPlugins/PX4/SafetyComponent.cc +++ b/src/AutoPilotPlugins/PX4/SafetyComponent.cc @@ -60,30 +60,11 @@ bool SafetyComponent::setupComplete(void) const return true; } -QString SafetyComponent::setupStateDescription(void) const -{ - const char* stateDescription; - - if (requiresSetup()) { - stateDescription = "Requires setup"; - } else { - stateDescription = "Setup complete"; - } - return QString(stateDescription); -} - QStringList SafetyComponent::setupCompleteChangedTriggerList(void) const { return QStringList(); } -QStringList SafetyComponent::paramFilterList(void) const -{ - QStringList list; - - return list; -} - QUrl SafetyComponent::setupSource(void) const { return QUrl::fromUserInput("qrc:/qml/SafetyComponent.qml"); diff --git a/src/AutoPilotPlugins/PX4/SafetyComponent.h b/src/AutoPilotPlugins/PX4/SafetyComponent.h index 7b11f59b8..b6f9c1857 100644 --- a/src/AutoPilotPlugins/PX4/SafetyComponent.h +++ b/src/AutoPilotPlugins/PX4/SafetyComponent.h @@ -47,9 +47,7 @@ public: virtual QString iconResource(void) const; virtual bool requiresSetup(void) const; virtual bool setupComplete(void) const; - virtual QString setupStateDescription(void) const; virtual QUrl setupSource(void) const; - virtual QStringList paramFilterList(void) const; virtual QUrl summaryQmlSource(void) const; virtual QString prerequisiteSetup(void) const; diff --git a/src/AutoPilotPlugins/PX4/SensorsComponent.cc b/src/AutoPilotPlugins/PX4/SensorsComponent.cc index d810c6a94..5f059eb63 100644 --- a/src/AutoPilotPlugins/PX4/SensorsComponent.cc +++ b/src/AutoPilotPlugins/PX4/SensorsComponent.cc @@ -70,18 +70,6 @@ bool SensorsComponent::setupComplete(void) const return true; } -QString SensorsComponent::setupStateDescription(void) const -{ - const char* stateDescription; - - if (requiresSetup()) { - stateDescription = "Requires calibration"; - } else { - stateDescription = "Calibrated"; - } - return QString(stateDescription); -} - QStringList SensorsComponent::setupCompleteChangedTriggerList(void) const { QStringList triggers; @@ -105,15 +93,6 @@ QStringList SensorsComponent::setupCompleteChangedTriggerList(void) const return triggers; } -QStringList SensorsComponent::paramFilterList(void) const -{ - QStringList list; - - list << "SENS_*" << "CAL_*"; - - return list; -} - QUrl SensorsComponent::setupSource(void) const { return QUrl::fromUserInput("qrc:/qml/SensorsComponent.qml"); diff --git a/src/AutoPilotPlugins/PX4/SensorsComponent.h b/src/AutoPilotPlugins/PX4/SensorsComponent.h index aa79968d3..5e5349fcf 100644 --- a/src/AutoPilotPlugins/PX4/SensorsComponent.h +++ b/src/AutoPilotPlugins/PX4/SensorsComponent.h @@ -46,9 +46,7 @@ public: virtual QString iconResource(void) const; virtual bool requiresSetup(void) const; virtual bool setupComplete(void) const; - virtual QString setupStateDescription(void) const; virtual QUrl setupSource(void) const; - virtual QStringList paramFilterList(void) const; virtual QUrl summaryQmlSource(void) const; virtual QString prerequisiteSetup(void) const; diff --git a/src/VehicleSetup/VehicleComponent.h b/src/VehicleSetup/VehicleComponent.h index d777e7ae9..dcc3ea114 100644 --- a/src/VehicleSetup/VehicleComponent.h +++ b/src/VehicleSetup/VehicleComponent.h @@ -46,7 +46,6 @@ class VehicleComponent : public QObject Q_PROPERTY(QString description READ description CONSTANT) Q_PROPERTY(bool requiresSetup READ requiresSetup CONSTANT) Q_PROPERTY(bool setupComplete READ setupComplete STORED false NOTIFY setupCompleteChanged) - Q_PROPERTY(QString setupStateDescription READ setupStateDescription STORED false) Q_PROPERTY(QString iconResource READ iconResource CONSTANT) Q_PROPERTY(QUrl setupSource READ setupSource CONSTANT) Q_PROPERTY(QUrl summaryQmlSource READ summaryQmlSource CONSTANT) @@ -61,9 +60,7 @@ public: virtual QString iconResource(void) const = 0; virtual bool requiresSetup(void) const = 0; virtual bool setupComplete(void) const = 0; - virtual QString setupStateDescription(void) const = 0; virtual QUrl setupSource(void) const = 0; - virtual QStringList paramFilterList(void) const = 0; virtual QUrl summaryQmlSource(void) const = 0; virtual QString prerequisiteSetup(void) const = 0; -- 2.22.0