From e710f3bb9167350a219648d50eb5d959a9099c39 Mon Sep 17 00:00:00 2001 From: Fredrik Arvidsson Date: Tue, 26 Feb 2013 07:37:14 +0100 Subject: [PATCH] OP-856 Basic renaming from PRO to Revolution --- .../src/plugins/config/config.pro | 12 ++++---- .../src/plugins/config/configgadgetwidget.cpp | 30 +++++++++---------- ...o_hw_widget.cpp => configrevohwwidget.cpp} | 20 ++++++------- ...g_pro_hw_widget.h => configrevohwwidget.h} | 20 ++++++------- ...o_hw_settings.ui => configrevohwwidget.ui} | 6 ++-- 5 files changed, 44 insertions(+), 44 deletions(-) rename ground/openpilotgcs/src/plugins/config/{config_pro_hw_widget.cpp => configrevohwwidget.cpp} (70%) rename ground/openpilotgcs/src/plugins/config/{config_pro_hw_widget.h => configrevohwwidget.h} (78%) rename ground/openpilotgcs/src/plugins/config/{pro_hw_settings.ui => configrevohwwidget.ui} (95%) diff --git a/ground/openpilotgcs/src/plugins/config/config.pro b/ground/openpilotgcs/src/plugins/config/config.pro index 0bb6cdbcc..223ad0a13 100644 --- a/ground/openpilotgcs/src/plugins/config/config.pro +++ b/ground/openpilotgcs/src/plugins/config/config.pro @@ -17,7 +17,6 @@ HEADERS += configplugin.h \ configinputwidget.h \ configoutputwidget.h \ configvehicletypewidget.h \ - config_pro_hw_widget.h \ config_cc_hw_widget.h \ configccattitudewidget.h \ configpipxtremewidget.h \ @@ -39,7 +38,8 @@ HEADERS += configplugin.h \ config_global.h \ mixercurve.h \ dblspindelegate.h \ - configautotunewidget.h + configautotunewidget.h \ + configrevohwwidget.h SOURCES += configplugin.cpp \ configgadgetconfiguration.cpp \ configgadgetwidget.cpp \ @@ -50,7 +50,6 @@ SOURCES += configplugin.cpp \ configinputwidget.cpp \ configoutputwidget.cpp \ configvehicletypewidget.cpp \ - config_pro_hw_widget.cpp \ config_cc_hw_widget.cpp \ configccattitudewidget.cpp \ configstabilizationwidget.cpp \ @@ -73,10 +72,10 @@ SOURCES += configplugin.cpp \ cfg_vehicletypes/vehicleconfig.cpp \ mixercurve.cpp \ dblspindelegate.cpp \ - configautotunewidget.cpp + configautotunewidget.cpp \ + configrevohwwidget.cpp FORMS += airframe.ui \ cc_hw_settings.ui \ - pro_hw_settings.ui \ ccpm.ui \ stabilization.ui \ input.ui \ @@ -91,7 +90,8 @@ FORMS += airframe.ui \ txpid.ui \ pipxtreme.ui \ mixercurve.ui \ - autotune.ui + autotune.ui \ + configrevohwwidget.ui RESOURCES += configgadget.qrc diff --git a/ground/openpilotgcs/src/plugins/config/configgadgetwidget.cpp b/ground/openpilotgcs/src/plugins/config/configgadgetwidget.cpp index 6aea1ce17..61c63e794 100644 --- a/ground/openpilotgcs/src/plugins/config/configgadgetwidget.cpp +++ b/ground/openpilotgcs/src/plugins/config/configgadgetwidget.cpp @@ -35,7 +35,7 @@ #include "configautotunewidget.h" #include "configcamerastabilizationwidget.h" #include "configtxpidwidget.h" -#include "config_pro_hw_widget.h" +#include "configrevohwwidget.h" #include "config_cc_hw_widget.h" #include "configpipxtremewidget.h" #include "configrevowidget.h" @@ -136,7 +136,7 @@ ConfigGadgetWidget::ConfigGadgetWidget(QWidget *parent) : QWidget(parent) } help = 0; - connect(ftw,SIGNAL(currentAboutToShow(int,bool*)),this,SLOT(tabAboutToChange(int,bool*)));//,Qt::BlockingQueuedConnection); + connect(ftw,SIGNAL(currentAboutToShow(int,bool*)), this, SLOT(tabAboutToChange(int,bool*))); // Connect to the PipXStatus object updates UAVObjectManager *objManager = pm->getObject(); @@ -173,20 +173,21 @@ void ConfigGadgetWidget::resizeEvent(QResizeEvent *event) void ConfigGadgetWidget::onAutopilotDisconnect() { ftw->setCurrentIndex(ConfigGadgetWidget::hardware); - ftw->removeTab(ConfigGadgetWidget::sensors); QIcon *icon = new QIcon(); icon->addFile(":/configgadget/images/ins_normal.png", QSize(), QIcon::Normal, QIcon::Off); icon->addFile(":/configgadget/images/ins_selected.png", QSize(), QIcon::Selected, QIcon::Off); QWidget *qwd = new DefaultAttitudeWidget(this); + ftw->removeTab(ConfigGadgetWidget::sensors); ftw->insertTab(ConfigGadgetWidget::sensors, qwd, *icon, QString("INS")); - ftw->removeTab(ConfigGadgetWidget::hardware); icon = new QIcon(); icon->addFile(":/configgadget/images/hardware_normal.png", QSize(), QIcon::Normal, QIcon::Off); icon->addFile(":/configgadget/images/hardware_selected.png", QSize(), QIcon::Selected, QIcon::Off); qwd = new DefaultHwSettingsWidget(this); + ftw->removeTab(ConfigGadgetWidget::hardware); ftw->insertTab(ConfigGadgetWidget::hardware, qwd, *icon, QString("Hardware")); + ftw->setCurrentIndex(ConfigGadgetWidget::hardware); emit autopilotDisconnected(); @@ -203,40 +204,39 @@ void ConfigGadgetWidget::onAutopilotConnect() { int board = utilMngr->getBoardModel(); if ((board & 0xff00) == 1024) { // CopterControl family - // Delete the INS panel, replace with CC Panel: - ftw->setCurrentIndex(ConfigGadgetWidget::hardware); - ftw->removeTab(ConfigGadgetWidget::sensors); QIcon *icon = new QIcon(); icon->addFile(":/configgadget/images/ins_normal.png", QSize(), QIcon::Normal, QIcon::Off); icon->addFile(":/configgadget/images/ins_selected.png", QSize(), QIcon::Selected, QIcon::Off); QWidget *qwd = new ConfigCCAttitudeWidget(this); - ftw->insertTab(ConfigGadgetWidget::sensors, qwd, *icon, QString("INS")); - ftw->removeTab(ConfigGadgetWidget::hardware); + ftw->removeTab(ConfigGadgetWidget::sensors); + ftw->insertTab(ConfigGadgetWidget::sensors, qwd, *icon, QString("CopterControl")); icon = new QIcon(); icon->addFile(":/configgadget/images/hardware_normal.png", QSize(), QIcon::Normal, QIcon::Off); icon->addFile(":/configgadget/images/hardware_selected.png", QSize(), QIcon::Selected, QIcon::Off); qwd = new ConfigCCHWWidget(this); + ftw->removeTab(ConfigGadgetWidget::hardware); ftw->insertTab(ConfigGadgetWidget::hardware, qwd, *icon, QString("Hardware")); + ftw->setCurrentIndex(ConfigGadgetWidget::hardware); } else if ((board & 0xff00) == 0x0900) { - // Revolution sensor calibration - ftw->setCurrentIndex(ConfigGadgetWidget::hardware); - ftw->removeTab(ConfigGadgetWidget::sensors); + // Revolution family QIcon *icon = new QIcon(); icon->addFile(":/configgadget/images/ins_normal.png", QSize(), QIcon::Normal, QIcon::Off); icon->addFile(":/configgadget/images/ins_selected.png", QSize(), QIcon::Selected, QIcon::Off); QWidget *qwd = new ConfigRevoWidget(this); - ftw->insertTab(ConfigGadgetWidget::sensors, qwd, *icon, QString("Revo")); - ftw->removeTab(ConfigGadgetWidget::hardware); + ftw->removeTab(ConfigGadgetWidget::sensors); + ftw->insertTab(ConfigGadgetWidget::sensors, qwd, *icon, QString("Revolution")); icon = new QIcon(); icon->addFile(":/configgadget/images/hardware_normal.png", QSize(), QIcon::Normal, QIcon::Off); icon->addFile(":/configgadget/images/hardware_selected.png", QSize(), QIcon::Normal, QIcon::On); - qwd = new ConfigProHWWidget(this); + qwd = new ConfigRevoHWWidget(this); + ftw->removeTab(ConfigGadgetWidget::hardware); ftw->insertTab(ConfigGadgetWidget::hardware, qwd, *icon, QString("Hardware")); + ftw->setCurrentIndex(ConfigGadgetWidget::hardware); } else { //Unknown board diff --git a/ground/openpilotgcs/src/plugins/config/config_pro_hw_widget.cpp b/ground/openpilotgcs/src/plugins/config/configrevohwwidget.cpp similarity index 70% rename from ground/openpilotgcs/src/plugins/config/config_pro_hw_widget.cpp rename to ground/openpilotgcs/src/plugins/config/configrevohwwidget.cpp index 0f050cbc2..f1abd4b62 100644 --- a/ground/openpilotgcs/src/plugins/config/config_pro_hw_widget.cpp +++ b/ground/openpilotgcs/src/plugins/config/configrevohwwidget.cpp @@ -1,13 +1,13 @@ /** ****************************************************************************** * - * @file configtelemetrywidget.h + * @file configrevohwwidget.cpp * @author The OpenPilot Team, http://www.openpilot.org Copyright (C) 2010. * @addtogroup GCSPlugins GCS Plugins * @{ * @addtogroup ConfigPlugin Config Plugin * @{ - * @brief The Configuration Gadget used to update settings in the firmware + * @brief Revolution hardware configuration panel *****************************************************************************/ /* * This program is free software; you can redistribute it and/or modify @@ -24,7 +24,7 @@ * with this program; if not, write to the Free Software Foundation, Inc., * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include "config_pro_hw_widget.h" +#include "configrevohwwidget.h" #include #include @@ -34,19 +34,19 @@ #include -ConfigProHWWidget::ConfigProHWWidget(QWidget *parent) : ConfigTaskWidget(parent) +ConfigRevoHWWidget::ConfigRevoHWWidget(QWidget *parent) : ConfigTaskWidget(parent) { - m_telemetry = new Ui_PRO_HW_Widget(); - m_telemetry->setupUi(this); + m_ui = new Ui_RevoHWWidget(); + m_ui->setupUi(this); - addApplySaveButtons(m_telemetry->saveTelemetryToRAM,m_telemetry->saveTelemetryToSD); - addUAVObjectToWidgetRelation("HwSettings","TelemetrySpeed",m_telemetry->telemetrySpeed); + addApplySaveButtons(m_ui->saveTelemetryToRAM, m_ui->saveTelemetryToSD); + addUAVObjectToWidgetRelation("HwSettings", "TelemetrySpeed", m_ui->telemetrySpeed); enableControls(false); populateWidgets(); refreshWidgetsValues(NULL); } -ConfigProHWWidget::~ConfigProHWWidget() +ConfigRevoHWWidget::~ConfigRevoHWWidget() { // Do nothing } @@ -55,6 +55,6 @@ ConfigProHWWidget::~ConfigProHWWidget() /** Request telemetry settings from the board */ -void ConfigProHWWidget::refreshValues() +void ConfigRevoHWWidget::refreshValues() { } diff --git a/ground/openpilotgcs/src/plugins/config/config_pro_hw_widget.h b/ground/openpilotgcs/src/plugins/config/configrevohwwidget.h similarity index 78% rename from ground/openpilotgcs/src/plugins/config/config_pro_hw_widget.h rename to ground/openpilotgcs/src/plugins/config/configrevohwwidget.h index 021e19aaf..84aa3c075 100644 --- a/ground/openpilotgcs/src/plugins/config/config_pro_hw_widget.h +++ b/ground/openpilotgcs/src/plugins/config/configrevohwwidget.h @@ -1,13 +1,13 @@ /** ****************************************************************************** * - * @file configtelemetrytwidget.h + * @file configrevohwwidget.h * @author The OpenPilot Team, http://www.openpilot.org Copyright (C) 2010. * @addtogroup GCSPlugins GCS Plugins * @{ * @addtogroup ConfigPlugin Config Plugin * @{ - * @brief Telemetry configuration panel + * @brief Revolution hardware configuration panel *****************************************************************************/ /* * This program is free software; you can redistribute it and/or modify @@ -24,10 +24,10 @@ * with this program; if not, write to the Free Software Foundation, Inc., * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef CONFIGPROHWWIDGET_H -#define CONFIGPROHWWIDGET_H +#ifndef CONFIGREVOHWWIDGET_H +#define CONFIGREVOHWWIDGET_H -#include "ui_pro_hw_settings.h" +#include "ui_configrevohwwidget.h" #include "../uavobjectwidgetutils/configtaskwidget.h" #include "extensionsystem/pluginmanager.h" #include "uavobjectmanager.h" @@ -36,20 +36,20 @@ #include -class ConfigProHWWidget: public ConfigTaskWidget +class ConfigRevoHWWidget: public ConfigTaskWidget { Q_OBJECT public: - ConfigProHWWidget(QWidget *parent = 0); - ~ConfigProHWWidget(); + ConfigRevoHWWidget(QWidget *parent = 0); + ~ConfigRevoHWWidget(); private: - Ui_PRO_HW_Widget *m_telemetry; + Ui_RevoHWWidget *m_ui; private slots: virtual void refreshValues(); }; -#endif // CONFIGPROHWWIDGET_H +#endif // CONFIGREVOHWWIDGET_H diff --git a/ground/openpilotgcs/src/plugins/config/pro_hw_settings.ui b/ground/openpilotgcs/src/plugins/config/configrevohwwidget.ui similarity index 95% rename from ground/openpilotgcs/src/plugins/config/pro_hw_settings.ui rename to ground/openpilotgcs/src/plugins/config/configrevohwwidget.ui index 4c782357c..e8cc05dd1 100644 --- a/ground/openpilotgcs/src/plugins/config/pro_hw_settings.ui +++ b/ground/openpilotgcs/src/plugins/config/configrevohwwidget.ui @@ -1,7 +1,7 @@ - PRO_HW_Widget - + RevoHWWidget + 0 @@ -29,7 +29,7 @@ <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } -</style></head><body style=" font-family:'Lucida Grande'; font-size:13pt; font-weight:400; font-style:normal;"> +</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:7.8pt; font-weight:400; font-style:normal;"> <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Sans'; font-size:10pt;">Set the serial speed of your onboard telemetry modem here. It is the speed between the OpenPilot board and the onboard modem, and could be different from the radio link speed.</span></p> <p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Sans'; font-size:10pt;"><br /></p> <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Sans'; font-size:10pt;">Beware of not locking yourself out! You should only modify this setting when the OpenPilot board is connected through the USB port.</span></p></body></html>