rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2024-11-30 08:24:11 +01:00
Code Issues Releases Activity

Merge remote-tracking branch 'origin/pt/OP587' into next

Browse Source 
Conflicts:
	ground/openpilotgcs/src/plugins/config/configoutputwidget.cpp
This commit is contained in:
James Cotton 2011-11-11 10:06:20 -06:00
commit 207e2b9e0e
2 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ground/openpilotgcs/src/plugins/config/configoutputwidget.cpp
View File

@ -40,6 +40,7 @@
#include <QUrl>
#include "actuatorcommand.h"
#include "systemalarms.h"
#include "uavsettingsimportexport/uavsettingsimportexportfactory.h"
ConfigOutputWidget::ConfigOutputWidget(QWidget *parent) : ConfigTaskWidget(parent)
{
@ -50,6 +51,12 @@ ConfigOutputWidget::ConfigOutputWidget(QWidget *parent) : ConfigTaskWidget(paren
setupButtons(m_config->saveRCOutputToRAM,m_config->saveRCOutputToSD);
addUAVObject("ActuatorSettings");
UAVSettingsImportExportFactory * importexportplugin = pm->getObject<UAVSettingsImportExportFactory>();
connect(importexportplugin,SIGNAL(importAboutToBegin()),this,SLOT(stopTests()));
setupButtons(m_config->saveRCOutputToRAM,m_config->saveRCOutputToSD);
addUAVObject("ActuatorSettings");
// First of all, put all the channel widgets into lists, so that we can
// manipulate those:
@ -589,4 +596,7 @@ void ConfigOutputWidget::openHelp()
QDesktopServices::openUrl( QUrl("http://wiki.openpilot.org/display/Doc/Output+Configuration", QUrl::StrictMode) );
}
void ConfigOutputWidget::stopTests()
{
m_config->channelOutTest->setChecked(false);
}

1
ground/openpilotgcs/src/plugins/config/configoutputwidget.h
View File

@ -71,6 +71,7 @@ private:
private slots:
void stopTests();
virtual void refreshWidgetsValues();
void updateObjectsFromWidgets();
void runChannelTests(bool state);