rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2025-01-18 03:52:11 +01:00
Code Issues Releases Activity

Merge remote-tracking branch 'origin/next' into brian/rfm22_FHSS

Browse Source
This commit is contained in:
Brian Webb 2013-03-10 15:54:08 +01:00
commit 6e7e2d39f3
3 changed files with 4 additions and 21 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,8 +38,7 @@ HEADERS += configplugin.h \
configrevowidget.h \
config_global.h \
mixercurve.h \
dblspindelegate.h \
configautotunewidget.h
dblspindelegate.h
SOURCES += configplugin.cpp \
configgadgetconfiguration.cpp \
configgadgetwidget.cpp \
@ -72,8 +71,7 @@ SOURCES += configplugin.cpp \
outputchannelform.cpp \
cfg_vehicletypes/vehicleconfig.cpp \
mixercurve.cpp \
dblspindelegate.cpp \
configautotunewidget.cpp
dblspindelegate.cpp
FORMS += airframe.ui \
cc_hw_settings.ui \
pro_hw_settings.ui \
@ -90,13 +88,5 @@ FORMS += airframe.ui \
revosensors.ui \
txpid.ui \
pipxtreme.ui \
mixercurve.ui \
autotune.ui
mixercurve.ui
RESOURCES += configgadget.qrc

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

@ -32,7 +32,6 @@
#include "configinputwidget.h"
#include "configoutputwidget.h"
#include "configstabilizationwidget.h"
#include "configautotunewidget.h"
#include "configcamerastabilizationwidget.h"
#include "configtxpidwidget.h"
#include "config_pro_hw_widget.h"
@ -103,12 +102,6 @@ ConfigGadgetWidget::ConfigGadgetWidget(QWidget *parent) : QWidget(parent)
qwd = new ConfigStabilizationWidget(this);
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->addFile(":/configgadget/images/camstab_normal.png", QSize(), QIcon::Normal, 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:
ConfigGadgetWidget(QWidget *parent = 0);
~ConfigGadgetWidget();
enum widgetTabs {hardware=0, aircraft, input, output, sensors, stabilization, camerastabilization, txpid, oplink, autotune};
enum widgetTabs {hardware=0, aircraft, input, output, sensors, stabilization, camerastabilization, txpid, oplink};
void startInputWizard();
public slots: