diff --git a/ground/gcs/src/plugins/config/configgadgetwidget.cpp b/ground/gcs/src/plugins/config/configgadgetwidget.cpp index c4ee8429f..c121865a7 100644 --- a/ground/gcs/src/plugins/config/configgadgetwidget.cpp +++ b/ground/gcs/src/plugins/config/configgadgetwidget.cpp @@ -196,6 +196,7 @@ void ConfigGadgetWidget::onAutopilotConnect() // Check what Board type we are talking to, and if necessary, remove/add tabs in the config gadget ExtensionSystem::PluginManager *pm = ExtensionSystem::PluginManager::instance(); UAVObjectUtilManager *utilMngr = pm->getObject(); + if (utilMngr) { int board = utilMngr->getBoardModel(); if ((board & 0xff00) == 0x0400) { @@ -253,6 +254,7 @@ void ConfigGadgetWidget::onOPLinkConnect() // qDebug() << "ConfigGadgetWidget::onOPLinkConnect"; ConfigTaskWidget *widget = new ConfigOPLinkWidget(this); + widget->bind(); stackWidget->replaceTab(ConfigGadgetWidget::OPLink, widget); } @@ -262,6 +264,7 @@ void ConfigGadgetWidget::onOPLinkDisconnect() // qDebug() << "ConfigGadgetWidget::onOPLinkDisconnect"; QWidget *widget = new DefaultConfigWidget(this, tr("OPLink Configuration")); + stackWidget->replaceTab(ConfigGadgetWidget::OPLink, widget); } diff --git a/ground/gcs/src/plugins/config/defaultconfigwidget.cpp b/ground/gcs/src/plugins/config/defaultconfigwidget.cpp index be8a8b315..4c3d93900 100644 --- a/ground/gcs/src/plugins/config/defaultconfigwidget.cpp +++ b/ground/gcs/src/plugins/config/defaultconfigwidget.cpp @@ -1,13 +1,13 @@ /** ****************************************************************************** * - * @file defaultattitudewidget.cpp - * @author The OpenPilot Team, http://www.openpilot.org Copyright (C) 2010. + * @file defaultconfigwidget.cpp + * @author The LibrePilot Project, http://www.librepilot.org Copyright (C) 2015. * @addtogroup GCSPlugins GCS Plugins * @{ * @addtogroup ConfigPlugin Config Plugin * @{ - * @brief Placeholder for attitude panel until board is connected. + * @brief Placeholder for config widget until board connected. *****************************************************************************/ /* * This program is free software; you can redistribute it and/or modify @@ -28,10 +28,9 @@ #include "ui_defaultconfig.h" -DefaultConfigWidget::DefaultConfigWidget(QWidget *parent, QString title) : - QWidget(parent), - ui(new Ui_defaultconfig) +DefaultConfigWidget::DefaultConfigWidget(QWidget *parent, QString title) : QWidget(parent) { + ui = new Ui_defaultconfig(); ui->setupUi(this); ui->tabWidget->setTabText(0, title); diff --git a/ground/gcs/src/plugins/config/defaultconfigwidget.h b/ground/gcs/src/plugins/config/defaultconfigwidget.h index bd0e35713..7079fdc93 100644 --- a/ground/gcs/src/plugins/config/defaultconfigwidget.h +++ b/ground/gcs/src/plugins/config/defaultconfigwidget.h @@ -1,13 +1,13 @@ /** ****************************************************************************** * - * @file defaultccattitudewidget.h - * @author The OpenPilot Team, http://www.openpilot.org Copyright (C) 2010. + * @file defaultconfigwidget.h + * @author The LibrePilot Project, http://www.librepilot.org Copyright (C) 2015. * @addtogroup GCSPlugins GCS Plugins * @{ * @addtogroup ConfigPlugin Config Plugin * @{ - * @brief Placeholder for attitude settings widget until board connected. + * @brief Placeholder for config widget until board connected. *****************************************************************************/ /* * This program is free software; you can redistribute it and/or modify