Remove incomplete Mixers page

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 \

qgroundcontrol.qrc

@@ -41,7 +41,6 @@
         <file alias="MainWindowNative.qml">src/ui/MainWindowNative.qml</file>
         <file alias="MavlinkSettings.qml">src/ui/preferences/MavlinkSettings.qml</file>
         <file alias="PlanView.qml">src/PlanView/PlanView.qml</file>
-        <file alias="MixersComponent.qml">src/AutoPilotPlugins/Common/MixersComponent.qml</file>
         <file alias="MockLink.qml">src/ui/preferences/MockLink.qml</file>
         <file alias="MockLinkSettings.qml">src/ui/preferences/MockLinkSettings.qml</file>
         <file alias="MotorComponent.qml">src/AutoPilotPlugins/Common/MotorComponent.qml</file>

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));

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;

src/AutoPilotPlugins/Common/MixersComponent.cc

-/****************************************************************************
- *
- *   (c) 2009-2016 QGROUNDCONTROL PROJECT <http://www.qgroundcontrol.org>
- *
- * 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();
-}

src/AutoPilotPlugins/Common/MixersComponent.h

-/****************************************************************************
- *
- *   (c) 2009-2016 QGROUNDCONTROL PROJECT <http://www.qgroundcontrol.org>
- *
- * 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

src/AutoPilotPlugins/Common/MixersComponent.qml

-/****************************************************************************
- *
- *   (c) 2009-2016 QGROUNDCONTROL PROJECT <http://www.qgroundcontrol.org>
- *
- * 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

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);

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;