From d72504d20f9c255c8e15a565c19126583d6c764b Mon Sep 17 00:00:00 2001 From: m_thread Date: Wed, 5 Nov 2014 13:49:17 +0100 Subject: [PATCH] OP-1576 Removed TxResent from GUI. Renamed some files. --- .../src/plugins/config/config.pro | 12 +- .../src/plugins/config/configgadgetwidget.cpp | 4 +- ...tremewidget.cpp => configoplinkwidget.cpp} | 25 +- ...pipxtremewidget.h => configoplinkwidget.h} | 8 +- .../config/{pipxtreme.ui => oplink.ui} | 867 +++++++++--------- 5 files changed, 434 insertions(+), 482 deletions(-) rename ground/openpilotgcs/src/plugins/config/{configpipxtremewidget.cpp => configoplinkwidget.cpp} (95%) rename ground/openpilotgcs/src/plugins/config/{configpipxtremewidget.h => configoplinkwidget.h} (92%) rename ground/openpilotgcs/src/plugins/config/{pipxtreme.ui => oplink.ui} (97%) diff --git a/ground/openpilotgcs/src/plugins/config/config.pro b/ground/openpilotgcs/src/plugins/config/config.pro index cea1b866d..f6e816e3d 100644 --- a/ground/openpilotgcs/src/plugins/config/config.pro +++ b/ground/openpilotgcs/src/plugins/config/config.pro @@ -23,7 +23,6 @@ HEADERS += \ configvehicletypewidget.h \ config_cc_hw_widget.h \ configccattitudewidget.h \ - configpipxtremewidget.h \ configstabilizationwidget.h \ assertions.h \ defaultattitudewidget.h \ @@ -57,7 +56,8 @@ HEADERS += \ calibration/sixpointcalibrationmodel.h \ calibration/levelcalibrationmodel.h \ calibration/gyrobiascalibrationmodel.h \ - calibration/calibrationuiutils.h + calibration/calibrationuiutils.h \ + configoplinkwidget.h SOURCES += \ configplugin.cpp \ @@ -71,7 +71,6 @@ SOURCES += \ config_cc_hw_widget.cpp \ configccattitudewidget.cpp \ configstabilizationwidget.cpp \ - configpipxtremewidget.cpp \ defaultattitudewidget.cpp \ defaulthwsettingswidget.cpp \ channelform.cpp \ @@ -97,7 +96,8 @@ SOURCES += \ calibration/thermal/thermalcalibrationmodel.cpp \ calibration/sixpointcalibrationmodel.cpp \ calibration/levelcalibrationmodel.cpp \ - calibration/gyrobiascalibrationmodel.cpp + calibration/gyrobiascalibrationmodel.cpp \ + configoplinkwidget.cpp FORMS += \ airframe.ui \ @@ -118,8 +118,8 @@ FORMS += \ outputchannelform.ui \ revosensors.ui \ txpid.ui \ - pipxtreme.ui \ mixercurve.ui \ - configrevohwwidget.ui + configrevohwwidget.ui \ + oplink.ui RESOURCES += configgadget.qrc diff --git a/ground/openpilotgcs/src/plugins/config/configgadgetwidget.cpp b/ground/openpilotgcs/src/plugins/config/configgadgetwidget.cpp index cd359019b..a611c6c51 100644 --- a/ground/openpilotgcs/src/plugins/config/configgadgetwidget.cpp +++ b/ground/openpilotgcs/src/plugins/config/configgadgetwidget.cpp @@ -36,7 +36,7 @@ #include "configtxpidwidget.h" #include "configrevohwwidget.h" #include "config_cc_hw_widget.h" -#include "configpipxtremewidget.h" +#include "configoplinkwidget.h" #include "configrevowidget.h" #include "defaultattitudewidget.h" #include "defaulthwsettingswidget.h" @@ -240,7 +240,7 @@ void ConfigGadgetWidget::updateOPLinkStatus(UAVObject *) icon->addFile(":/configgadget/images/pipx-normal.png", QSize(), QIcon::Normal, QIcon::Off); icon->addFile(":/configgadget/images/pipx-selected.png", QSize(), QIcon::Selected, QIcon::Off); - QWidget *qwd = new ConfigPipXtremeWidget(this); + QWidget *qwd = new ConfigOPLinkWidget(this); stackWidget->insertTab(ConfigGadgetWidget::oplink, qwd, *icon, QString("OPLink")); oplinkConnected = true; } diff --git a/ground/openpilotgcs/src/plugins/config/configpipxtremewidget.cpp b/ground/openpilotgcs/src/plugins/config/configoplinkwidget.cpp similarity index 95% rename from ground/openpilotgcs/src/plugins/config/configpipxtremewidget.cpp rename to ground/openpilotgcs/src/plugins/config/configoplinkwidget.cpp index 684f32b78..db08563f8 100644 --- a/ground/openpilotgcs/src/plugins/config/configpipxtremewidget.cpp +++ b/ground/openpilotgcs/src/plugins/config/configoplinkwidget.cpp @@ -25,7 +25,7 @@ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include "configpipxtremewidget.h" +#include "configoplinkwidget.h" #include #include @@ -38,7 +38,7 @@ static const int MIN_CHANNEL_RANGE = 10; static const float FIRST_FREQUENCY = 430.000; static const float FREQUENCY_STEP = 0.040; -ConfigPipXtremeWidget::ConfigPipXtremeWidget(QWidget *parent) : ConfigTaskWidget(parent) +ConfigOPLinkWidget::ConfigOPLinkWidget(QWidget *parent) : ConfigTaskWidget(parent) { m_oplink = new Ui_OPLinkWidget(); m_oplink->setupUi(this); @@ -83,7 +83,6 @@ ConfigPipXtremeWidget::ConfigPipXtremeWidget(QWidget *parent) : ConfigTaskWidget addWidgetBinding("OPLinkStatus", "RxFailure", m_oplink->RxFailure); addWidgetBinding("OPLinkStatus", "UAVTalkErrors", m_oplink->UAVTalkErrors); addWidgetBinding("OPLinkStatus", "TxDropped", m_oplink->Dropped); - addWidgetBinding("OPLinkStatus", "TxResent", m_oplink->Resent); addWidgetBinding("OPLinkStatus", "TxFailure", m_oplink->TxFailure); addWidgetBinding("OPLinkStatus", "Resets", m_oplink->Resets); addWidgetBinding("OPLinkStatus", "Timeouts", m_oplink->Timeouts); @@ -119,13 +118,13 @@ ConfigPipXtremeWidget::ConfigPipXtremeWidget(QWidget *parent) : ConfigTaskWidget updateEnableControls(); } -ConfigPipXtremeWidget::~ConfigPipXtremeWidget() +ConfigOPLinkWidget::~ConfigOPLinkWidget() {} /*! \brief Called by updates to @OPLinkStatus */ -void ConfigPipXtremeWidget::updateStatus(UAVObject *object) +void ConfigOPLinkWidget::updateStatus(UAVObject *object) { // Request and update of the setting object if we haven't received it yet. if (!settingsUpdated) { @@ -233,7 +232,7 @@ void ConfigPipXtremeWidget::updateStatus(UAVObject *object) /*! \brief Called by updates to @OPLinkSettings */ -void ConfigPipXtremeWidget::updateSettings(UAVObject *object) +void ConfigOPLinkWidget::updateSettings(UAVObject *object) { Q_UNUSED(object); @@ -284,20 +283,20 @@ void ConfigPipXtremeWidget::updateSettings(UAVObject *object) } } -void ConfigPipXtremeWidget::updateEnableControls() +void ConfigOPLinkWidget::updateEnableControls() { enableControls(true); ppmOnlyChanged(); } -void ConfigPipXtremeWidget::disconnected() +void ConfigOPLinkWidget::disconnected() { if (settingsUpdated) { settingsUpdated = false; } } -void ConfigPipXtremeWidget::bind() +void ConfigOPLinkWidget::bind() { QPushButton *bindButton = qobject_cast(sender()); @@ -323,7 +322,7 @@ void ConfigPipXtremeWidget::bind() } } -void ConfigPipXtremeWidget::ppmOnlyChanged() +void ConfigOPLinkWidget::ppmOnlyChanged() { bool is_ppm_only = m_oplink->PPMOnly->isChecked(); @@ -332,17 +331,17 @@ void ConfigPipXtremeWidget::ppmOnlyChanged() m_oplink->ComSpeed->setEnabled(!is_ppm_only); } -void ConfigPipXtremeWidget::minChannelChanged() +void ConfigOPLinkWidget::minChannelChanged() { channelChanged(false); } -void ConfigPipXtremeWidget::maxChannelChanged() +void ConfigOPLinkWidget::maxChannelChanged() { channelChanged(true); } -void ConfigPipXtremeWidget::channelChanged(bool isMax) +void ConfigOPLinkWidget::channelChanged(bool isMax) { int minChannel = m_oplink->MinimumChannel->value(); int maxChannel = m_oplink->MaximumChannel->value(); diff --git a/ground/openpilotgcs/src/plugins/config/configpipxtremewidget.h b/ground/openpilotgcs/src/plugins/config/configoplinkwidget.h similarity index 92% rename from ground/openpilotgcs/src/plugins/config/configpipxtremewidget.h rename to ground/openpilotgcs/src/plugins/config/configoplinkwidget.h index bd2ebd0bf..bda71c46e 100644 --- a/ground/openpilotgcs/src/plugins/config/configpipxtremewidget.h +++ b/ground/openpilotgcs/src/plugins/config/configoplinkwidget.h @@ -29,15 +29,15 @@ #include -#include "ui_pipxtreme.h" +#include "ui_oplink.h" #include "configtaskwidget.h" -class ConfigPipXtremeWidget : public ConfigTaskWidget { +class ConfigOPLinkWidget : public ConfigTaskWidget { Q_OBJECT public: - ConfigPipXtremeWidget(QWidget *parent = 0); - ~ConfigPipXtremeWidget(); + ConfigOPLinkWidget(QWidget *parent = 0); + ~ConfigOPLinkWidget(); public slots: void updateStatus(UAVObject *object1); diff --git a/ground/openpilotgcs/src/plugins/config/pipxtreme.ui b/ground/openpilotgcs/src/plugins/config/oplink.ui similarity index 97% rename from ground/openpilotgcs/src/plugins/config/pipxtreme.ui rename to ground/openpilotgcs/src/plugins/config/oplink.ui index 9cbe0265c..ca616b2e6 100644 --- a/ground/openpilotgcs/src/plugins/config/pipxtreme.ui +++ b/ground/openpilotgcs/src/plugins/config/oplink.ui @@ -49,8 +49,8 @@ 0 0 - 949 - 558 + 812 + 566 @@ -911,6 +911,374 @@ + + + + + 50 + false + + + + RX Corrected + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + + + 50 + false + + + + RX Seq. No. + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + + + 0 + 0 + + + + + 101 + 16777215 + + + + + 50 + false + + + + false + + + true + + + + + + + + 50 + false + + + + RX Rate (B/s) + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + + + 0 + 0 + + + + + 101 + 16777215 + + + + + 50 + false + + + + false + + + true + + + + + + + + 101 + 16777215 + + + + + 50 + false + + + + false + + + true + + + + + + + + 50 + false + + + + RX Good + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + + + 0 + 0 + + + + + 0 + 0 + + + + + 101 + 16777215 + + + + + 50 + false + + + + The percentage of packets that were corrected with error correction + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter + + + true + + + + + + + + 50 + false + + + + RX Errors + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + + + 0 + 0 + + + + + 0 + 0 + + + + + 101 + 16777215 + + + + + 50 + false + + + + The percentage of packets that were corrected with error correction + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter + + + true + + + + + + + + 50 + false + + + + RX Missed + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + + + 50 + false + + + + UAVTalk Errors + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + + + 101 + 16777215 + + + + + 50 + false + + + + false + + + true + + + + + + + + 0 + 0 + + + + + 101 + 16777215 + + + + + 50 + false + + + + false + + + true + + + + + + + + 50 + false + + + + Resets + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + + + 101 + 16777215 + + + + + 50 + false + + + + false + + + true + + + + + + + + 50 + false + + + + Timeouts + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + @@ -1066,34 +1434,19 @@ - - - - - 0 - 0 - - - - - 101 - 16777215 - - + + 50 false - - The number of packets that were unable to be transmitted + + TX Rate (B/s) - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter - - - true + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter @@ -1141,254 +1494,6 @@ - - - - - 50 - false - - - - TX Rate (B/s) - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - - - - - - 0 - 0 - - - - - 101 - 16777215 - - - - - 50 - false - - - - false - - - true - - - - - - - - 50 - false - - - - RX Seq. No. - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - - - - - - 0 - 0 - - - - - 101 - 16777215 - - - - - 50 - false - - - - false - - - true - - - - - - - - 50 - false - - - - RX Rate (B/s) - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - - - - - - 101 - 16777215 - - - - - 50 - false - - - - false - - - true - - - - - - - - 50 - false - - - - RX Good - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - - - - - - 0 - 0 - - - - - 0 - 0 - - - - - 101 - 16777215 - - - - - 50 - false - - - - The percentage of packets that were corrected with error correction - - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter - - - true - - - - - - - - 50 - false - - - - RX Corrected - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - - - - - - 0 - 0 - - - - - 0 - 0 - - - - - 101 - 16777215 - - - - - 50 - false - - - - The percentage of packets that were corrected with error correction - - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter - - - true - - - - - - - - 50 - false - - - - RX Errors - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - @@ -1420,22 +1525,6 @@ - - - - - 50 - false - - - - RX Missed - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - @@ -1473,107 +1562,6 @@ - - - - - 50 - false - - - - TX Dropped - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - - - - - - 0 - 0 - - - - - 101 - 16777215 - - - - - 50 - false - - - - The number of packets that were unable to be transmitted - - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter - - - true - - - - - - - - 50 - false - - - - TX Resent - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - - - - - - 50 - false - - - - Tx Failure - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - - - - - - 101 - 16777215 - - - - - 50 - false - - - - false - - - true - - - @@ -1609,24 +1597,8 @@ - - - - - 50 - false - - - - UAVTalk Errors - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - - - + + 101 @@ -1647,13 +1619,29 @@ - - - - - 0 - 0 - + + + + + 50 + false + + + + Tx Failure + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + + + 0 + 0 + @@ -1667,16 +1655,19 @@ false - - false + + The number of packets that were unable to be transmitted + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter true - - + + 50 @@ -1684,52 +1675,14 @@ - Resets + TX Dropped Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - - - 101 - 16777215 - - - - - 50 - false - - - - false - - - true - - - - - - - - 50 - false - - - - Timeouts - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - - + @@ -1745,7 +1698,7 @@ - +