From 03a2e82ba374c12d1296ebc7548db6342d1cd62e Mon Sep 17 00:00:00 2001 From: Fredrik Arvidsson Date: Sat, 25 May 2013 09:42:26 +0200 Subject: [PATCH 1/2] OP-970 Adds antenna warning dialog when activating built in modem for Revolution. --- ground/openpilotgcs/src/plugins/config/configrevohwwidget.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/ground/openpilotgcs/src/plugins/config/configrevohwwidget.cpp b/ground/openpilotgcs/src/plugins/config/configrevohwwidget.cpp index f04b3b493..7c0feaad1 100644 --- a/ground/openpilotgcs/src/plugins/config/configrevohwwidget.cpp +++ b/ground/openpilotgcs/src/plugins/config/configrevohwwidget.cpp @@ -32,6 +32,7 @@ #include "hwsettings.h" #include #include +#include ConfigRevoHWWidget::ConfigRevoHWWidget(QWidget *parent) : ConfigTaskWidget(parent) @@ -93,7 +94,7 @@ void ConfigRevoHWWidget::setupCustomCombos() connect(m_ui->cbFlexi, SIGNAL(currentIndexChanged(int)), this, SLOT(flexiPortChanged(int))); connect(m_ui->cbMain, SIGNAL(currentIndexChanged(int)), this, SLOT(mainPortChanged(int))); - connect(m_ui->cbModem, SIGNAL(currentIndexChanged(int)), this, SLOT(modemPortChanged(int))); + connect(m_ui->cbModem, SIGNAL(currentIndexChanged(int)), this, SLOT(modemPortChanged(int))); } void ConfigRevoHWWidget::refreshWidgetsValues(UAVObject *obj) @@ -291,6 +292,7 @@ void ConfigRevoHWWidget::modemPortChanged(int index) m_ui->cbTxPower->setVisible(true); m_ui->lblInitFreq->setVisible(true); m_ui->leInitFreq->setVisible(true); + QMessageBox::warning(this, tr("Warning"), tr("Activating the Radio requires an antenna be attached, or modem damage will occur.")); } else { m_ui->lblTxPower->setVisible(false); m_ui->cbTxPower->setVisible(false); From 3c55485d88302748e13006978a4fff8a964e367b Mon Sep 17 00:00:00 2001 From: Fredrik Arvidsson Date: Sat, 25 May 2013 09:43:59 +0200 Subject: [PATCH 2/2] OP-970 Removes a comma. --- ground/openpilotgcs/src/plugins/config/configrevohwwidget.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ground/openpilotgcs/src/plugins/config/configrevohwwidget.cpp b/ground/openpilotgcs/src/plugins/config/configrevohwwidget.cpp index 7c0feaad1..73e18ba1c 100644 --- a/ground/openpilotgcs/src/plugins/config/configrevohwwidget.cpp +++ b/ground/openpilotgcs/src/plugins/config/configrevohwwidget.cpp @@ -292,7 +292,7 @@ void ConfigRevoHWWidget::modemPortChanged(int index) m_ui->cbTxPower->setVisible(true); m_ui->lblInitFreq->setVisible(true); m_ui->leInitFreq->setVisible(true); - QMessageBox::warning(this, tr("Warning"), tr("Activating the Radio requires an antenna be attached, or modem damage will occur.")); + QMessageBox::warning(this, tr("Warning"), tr("Activating the Radio requires an antenna be attached or modem damage will occur.")); } else { m_ui->lblTxPower->setVisible(false); m_ui->cbTxPower->setVisible(false);