rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2024-12-03 11:24:10 +01:00
Code Issues Releases Activity

Revert "HotFix: temporary disable AutoTune UI until better tested"

Browse Source 
The "next" is the bleeding edge of development, so put back
autotune stuff temporary disabled for RELEASE-12.10.1.

This reverts commit a17d0f8084.
This commit is contained in:
Oleg Semyonov 2012-11-14 17:28:23 +02:00
parent 79f95983da
commit 0e9d7137ff
3 changed files with 21 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
ground/openpilotgcs/src/plugins/config/config.pro
View File

@ -38,7 +38,8 @@ HEADERS += configplugin.h \
configrevowidget.h \ configrevowidget.h \
config_global.h \ config_global.h \
mixercurve.h \ mixercurve.h \
dblspindelegate.h dblspindelegate.h \
configautotunewidget.h
SOURCES += configplugin.cpp \ SOURCES += configplugin.cpp \
configgadgetconfiguration.cpp \ configgadgetconfiguration.cpp \
configgadgetwidget.cpp \ configgadgetwidget.cpp \
@ -71,7 +72,8 @@ SOURCES += configplugin.cpp \
outputchannelform.cpp \ outputchannelform.cpp \
cfg_vehicletypes/vehicleconfig.cpp \ cfg_vehicletypes/vehicleconfig.cpp \
mixercurve.cpp \ mixercurve.cpp \
dblspindelegate.cpp dblspindelegate.cpp \
configautotunewidget.cpp
FORMS += airframe.ui \ FORMS += airframe.ui \
cc_hw_settings.ui \ cc_hw_settings.ui \
pro_hw_settings.ui \ pro_hw_settings.ui \
@ -88,5 +90,13 @@ FORMS += airframe.ui \
revosensors.ui \ revosensors.ui \
txpid.ui \ txpid.ui \
pipxtreme.ui \ pipxtreme.ui \
mixercurve.ui mixercurve.ui \
autotune.ui
RESOURCES += configgadget.qrc RESOURCES += configgadget.qrc

7
ground/openpilotgcs/src/plugins/config/configgadgetwidget.cpp
View File

@ -32,6 +32,7 @@
#include "configinputwidget.h" #include "configinputwidget.h"
#include "configoutputwidget.h" #include "configoutputwidget.h"
#include "configstabilizationwidget.h" #include "configstabilizationwidget.h"
#include "configautotunewidget.h"
#include "configcamerastabilizationwidget.h" #include "configcamerastabilizationwidget.h"
#include "configtxpidwidget.h" #include "configtxpidwidget.h"
#include "config_pro_hw_widget.h" #include "config_pro_hw_widget.h"
@ -102,6 +103,12 @@ ConfigGadgetWidget::ConfigGadgetWidget(QWidget *parent) : QWidget(parent)
qwd = new ConfigStabilizationWidget(this); qwd = new ConfigStabilizationWidget(this);
ftw->insertTab(ConfigGadgetWidget::stabilization, qwd, *icon, QString("Stabilization")); ftw->insertTab(ConfigGadgetWidget::stabilization, qwd, *icon, QString("Stabilization"));
icon = new QIcon();
icon->addFile(":/configgadget/images/autotune_normal.png", QSize(), QIcon::Normal, QIcon::Off);
icon->addFile(":/configgadget/images/autotune_selected.png", QSize(), QIcon::Selected, QIcon::Off);
qwd = new ConfigAutotuneWidget(this);
ftw->insertTab(ConfigGadgetWidget::autotune, qwd, *icon, QString("Autotune"));
icon = new QIcon(); icon = new QIcon();
icon->addFile(":/configgadget/images/camstab_normal.png", QSize(), QIcon::Normal, QIcon::Off); icon->addFile(":/configgadget/images/camstab_normal.png", QSize(), QIcon::Normal, QIcon::Off);
icon->addFile(":/configgadget/images/camstab_selected.png", QSize(), QIcon::Selected, QIcon::Off); icon->addFile(":/configgadget/images/camstab_selected.png", QSize(), QIcon::Selected, QIcon::Off);

2
ground/openpilotgcs/src/plugins/config/configgadgetwidget.h
View File

@ -48,7 +48,7 @@ class ConfigGadgetWidget: public QWidget
public: public:
ConfigGadgetWidget(QWidget *parent = 0); ConfigGadgetWidget(QWidget *parent = 0);
~ConfigGadgetWidget(); ~ConfigGadgetWidget();
enum widgetTabs {hardware=0, aircraft, input, output, sensors, stabilization, camerastabilization, txpid, pipxtreme}; enum widgetTabs {hardware=0, aircraft, input, output, sensors, stabilization, camerastabilization, txpid, pipxtreme, autotune};
void startInputWizard(); void startInputWizard();
public slots: public slots: