diff --git a/qgroundcontrol.pro b/qgroundcontrol.pro
index eec8df795c809df081bac2f68da26ed837a58afd..d1c4f2cbe56f8153681fd409709d3cf30e8158e4 100644
--- a/qgroundcontrol.pro
+++ b/qgroundcontrol.pro
@@ -819,7 +819,6 @@ HEADERS+= \
src/AutoPilotPlugins/AutoPilotPlugin.h \
src/AutoPilotPlugins/Common/ESP8266Component.h \
src/AutoPilotPlugins/Common/ESP8266ComponentController.h \
- src/AutoPilotPlugins/Common/MixersComponent.h \
src/AutoPilotPlugins/Common/MotorComponent.h \
src/AutoPilotPlugins/Common/RadioComponentController.h \
src/AutoPilotPlugins/Common/SyslinkComponent.h \
@@ -844,7 +843,6 @@ SOURCES += \
src/AutoPilotPlugins/AutoPilotPlugin.cc \
src/AutoPilotPlugins/Common/ESP8266Component.cc \
src/AutoPilotPlugins/Common/ESP8266ComponentController.cc \
- src/AutoPilotPlugins/Common/MixersComponent.cc \
src/AutoPilotPlugins/Common/MotorComponent.cc \
src/AutoPilotPlugins/Common/RadioComponentController.cc \
src/AutoPilotPlugins/Common/SyslinkComponent.cc \
diff --git a/qgroundcontrol.qrc b/qgroundcontrol.qrc
index b947baa6072c1c923e6e9d16cbb05ba3001dbd49..312d45503aaf934410bae786ae1dc5949128bba2 100644
--- a/qgroundcontrol.qrc
+++ b/qgroundcontrol.qrc
@@ -41,7 +41,6 @@
src/ui/MainWindowNative.qml
src/ui/preferences/MavlinkSettings.qml
src/PlanView/PlanView.qml
- src/AutoPilotPlugins/Common/MixersComponent.qml
src/ui/preferences/MockLink.qml
src/ui/preferences/MockLinkSettings.qml
src/AutoPilotPlugins/Common/MotorComponent.qml
diff --git a/src/AutoPilotPlugins/APM/APMAutoPilotPlugin.cc b/src/AutoPilotPlugins/APM/APMAutoPilotPlugin.cc
index 10c974021f2d2ce5ee6088927e6452c6ba711203..1df7e73923bba6e97fde80c1e60b80a13e777e64 100644
--- a/src/AutoPilotPlugins/APM/APMAutoPilotPlugin.cc
+++ b/src/AutoPilotPlugins/APM/APMAutoPilotPlugin.cc
@@ -28,7 +28,6 @@
#include "APMLightsComponent.h"
#include "APMSubFrameComponent.h"
#include "ESP8266Component.h"
-#include "MixersComponent.h"
/// This is the AutoPilotPlugin implementatin for the MAV_AUTOPILOT_ARDUPILOT type.
APMAutoPilotPlugin::APMAutoPilotPlugin(Vehicle* vehicle, QObject* parent)
@@ -50,7 +49,6 @@ APMAutoPilotPlugin::APMAutoPilotPlugin(Vehicle* vehicle, QObject* parent)
, _tuningComponent(NULL)
, _airframeFacts(new APMAirframeLoader(this, vehicle->uas(), this))
, _esp8266Component(NULL)
- , _mixersComponent(NULL)
{
APMAirframeLoader::loadAirframeFactMetaData();
}
@@ -107,10 +105,6 @@ const QVariantList& APMAutoPilotPlugin::vehicleComponents(void)
_tuningComponent->setupTriggerSignals();
_components.append(QVariant::fromValue((VehicleComponent*)_tuningComponent));
- _mixersComponent = new MixersComponent(_vehicle, this);
- _mixersComponent->setupTriggerSignals();
- _components.append(QVariant::fromValue((VehicleComponent*)_mixersComponent));
-
_cameraComponent = new APMCameraComponent(_vehicle, this);
_cameraComponent->setupTriggerSignals();
_components.append(QVariant::fromValue((VehicleComponent*)_cameraComponent));
diff --git a/src/AutoPilotPlugins/APM/APMAutoPilotPlugin.h b/src/AutoPilotPlugins/APM/APMAutoPilotPlugin.h
index 952f3f543024292289ab81b4b25227dfdbff7a9c..fb25685966e88bf2d1199a6ddea9f3bfc62b6ed9 100644
--- a/src/AutoPilotPlugins/APM/APMAutoPilotPlugin.h
+++ b/src/AutoPilotPlugins/APM/APMAutoPilotPlugin.h
@@ -27,7 +27,6 @@ class APMCameraComponent;
class APMLightsComponent;
class APMSubFrameComponent;
class ESP8266Component;
-class MixersComponent;
/// This is the APM specific implementation of the AutoPilot class.
class APMAutoPilotPlugin : public AutoPilotPlugin
@@ -60,7 +59,6 @@ protected:
APMTuningComponent* _tuningComponent;
APMAirframeLoader* _airframeFacts;
ESP8266Component* _esp8266Component;
- MixersComponent* _mixersComponent;
private:
QVariantList _components;
diff --git a/src/AutoPilotPlugins/Common/MixersComponent.cc b/src/AutoPilotPlugins/Common/MixersComponent.cc
deleted file mode 100644
index 67b821b15dfcaa92fba4b19d70415a6a8830f6c4..0000000000000000000000000000000000000000
--- a/src/AutoPilotPlugins/Common/MixersComponent.cc
+++ /dev/null
@@ -1,57 +0,0 @@
-/****************************************************************************
- *
- * (c) 2009-2016 QGROUNDCONTROL PROJECT
- *
- * QGroundControl is licensed according to the terms in the file
- * COPYING.md in the root of the source code directory.
- *
- ****************************************************************************/
-
-#include "MixersComponent.h"
-#include "ParameterManager.h"
-
-MixersComponent::MixersComponent(Vehicle* vehicle, AutoPilotPlugin* autopilot, QObject* parent)
- : VehicleComponent(vehicle, autopilot, parent)
- , _name(tr("Mixers"))
-{
-}
-
-QString MixersComponent::name(void) const
-{
- return _name;
-}
-
-QString MixersComponent::description(void) const
-{
- return tr("Mixers tuning is used to blah, blah, blah... [WIP]");
-}
-
-QString MixersComponent::iconResource(void) const
-{
- return QStringLiteral("/qmlimages/TuningComponentIcon.png");
-}
-
-bool MixersComponent::requiresSetup(void) const
-{
- return false;
-}
-
-bool MixersComponent::setupComplete(void) const
-{
- return true;
-}
-
-QStringList MixersComponent::setupCompleteChangedTriggerList(void) const
-{
- return QStringList();
-}
-
-QUrl MixersComponent::setupSource(void) const
-{
- return QUrl::fromUserInput(QStringLiteral("qrc:/qml/MixersComponent.qml"));
-}
-
-QUrl MixersComponent::summaryQmlSource(void) const
-{
- return QUrl();
-}
diff --git a/src/AutoPilotPlugins/Common/MixersComponent.h b/src/AutoPilotPlugins/Common/MixersComponent.h
deleted file mode 100644
index 6ad0c351b6d1946b850acc16e79690b21ddb051c..0000000000000000000000000000000000000000
--- a/src/AutoPilotPlugins/Common/MixersComponent.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/****************************************************************************
- *
- * (c) 2009-2016 QGROUNDCONTROL PROJECT
- *
- * QGroundControl is licensed according to the terms in the file
- * COPYING.md in the root of the source code directory.
- *
- ****************************************************************************/
-
-#ifndef MixersComponent_H
-#define MixersComponent_H
-
-#include "VehicleComponent.h"
-
-// Mixers Tuning vehicle component
-class MixersComponent : public VehicleComponent
-{
- Q_OBJECT
-
-public:
- MixersComponent(Vehicle* vehicle, AutoPilotPlugin* autopilot, QObject* parent = NULL);
-
- // Virtuals from VehicleComponent
- QStringList setupCompleteChangedTriggerList(void) const final;
-
- // Virtuals from VehicleComponent
- QString name(void) const final;
- QString description(void) const final;
- QString iconResource(void) const final;
- bool requiresSetup(void) const final;
- bool setupComplete(void) const final;
- QUrl setupSource(void) const final;
- QUrl summaryQmlSource(void) const final;
- bool allowSetupWhileArmed(void) const final { return true; }
-
-private:
- const QString _name;
- QVariantList _summaryItems;
-};
-
-#endif
diff --git a/src/AutoPilotPlugins/Common/MixersComponent.qml b/src/AutoPilotPlugins/Common/MixersComponent.qml
deleted file mode 100644
index e628ba5bec06962432dcd75bfd8ed64bfe60c989..0000000000000000000000000000000000000000
--- a/src/AutoPilotPlugins/Common/MixersComponent.qml
+++ /dev/null
@@ -1,38 +0,0 @@
-/****************************************************************************
- *
- * (c) 2009-2016 QGROUNDCONTROL PROJECT
- *
- * QGroundControl is licensed according to the terms in the file
- * COPYING.md in the root of the source code directory.
- *
- ****************************************************************************/
-
-import QtQuick 2.3
-import QtQuick.Controls 1.2
-
-import QGroundControl.FactSystem 1.0
-import QGroundControl.FactControls 1.0
-import QGroundControl.Palette 1.0
-import QGroundControl.Controls 1.0
-import QGroundControl.ScreenTools 1.0
-
-// Mixer Tuning setup page
-SetupPage {
- id: tuningPage
- pageComponent: tuningPageComponent
-
- Component {
- id: tuningPageComponent
-
- Column {
- width: availableWidth
- spacing: _margins
-
- FactPanelController { id: controller; factPanel: tuningPage.viewPanel }
-
- QGCPalette { id: palette; colorGroupEnabled: true }
-
- QGCLabel { text: qsTr("Lot of Qml code goes here...") }
- } // Column
- } // Component
-} // SetupView
diff --git a/src/AutoPilotPlugins/PX4/PX4AutoPilotPlugin.cc b/src/AutoPilotPlugins/PX4/PX4AutoPilotPlugin.cc
index 1b1dd0a8fe241c8e369d3e6ce50bd2a665487c63..75b88512cdda4c0c9964999928338809f1fcffa8 100644
--- a/src/AutoPilotPlugins/PX4/PX4AutoPilotPlugin.cc
+++ b/src/AutoPilotPlugins/PX4/PX4AutoPilotPlugin.cc
@@ -39,7 +39,6 @@ PX4AutoPilotPlugin::PX4AutoPilotPlugin(Vehicle* vehicle, QObject* parent)
, _powerComponent(NULL)
, _motorComponent(NULL)
, _tuningComponent(NULL)
- , _mixersComponent(NULL)
, _syslinkComponent(NULL)
{
if (!vehicle) {
@@ -100,13 +99,6 @@ const QVariantList& PX4AutoPilotPlugin::vehicleComponents(void)
_tuningComponent->setupTriggerSignals();
_components.append(QVariant::fromValue((VehicleComponent*)_tuningComponent));
-#if 0
- // Coming soon
- _mixersComponent = new MixersComponent(_vehicle, this);
- _mixersComponent->setupTriggerSignals();
- _components.append(QVariant::fromValue((VehicleComponent*)_mixersComponent));
-#endif
-
//-- Is there support for cameras?
if(_vehicle->parameterManager()->parameterExists(_vehicle->id(), "TRIG_MODE")) {
_cameraComponent = new CameraComponent(_vehicle, this);
diff --git a/src/AutoPilotPlugins/PX4/PX4AutoPilotPlugin.h b/src/AutoPilotPlugins/PX4/PX4AutoPilotPlugin.h
index f886176e6983e3e22f37a0e7143868086a3c94b6..fb1c3cc8aad9bb55e2085268af7356331e497bd1 100644
--- a/src/AutoPilotPlugins/PX4/PX4AutoPilotPlugin.h
+++ b/src/AutoPilotPlugins/PX4/PX4AutoPilotPlugin.h
@@ -23,7 +23,6 @@
#include "PowerComponent.h"
#include "MotorComponent.h"
#include "PX4TuningComponent.h"
-#include "MixersComponent.h"
#include "SyslinkComponent.h"
#include "Vehicle.h"
@@ -58,7 +57,6 @@ protected:
PowerComponent* _powerComponent;
MotorComponent* _motorComponent;
PX4TuningComponent* _tuningComponent;
- MixersComponent* _mixersComponent;
SyslinkComponent* _syslinkComponent;
private:
QVariantList _components;