rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2025-03-15 07:29:15 +01:00
Code Issues Releases Activity

Merge branch 'laurent/OP-1737_Output_tab_minmax_greyed' into next

Browse Source 
Conflicts:
	ground/openpilotgcs/src/plugins/config/configoutputwidget.cpp
This commit is contained in:
Laurent Lalanne 2015-02-24 11:52:20 +01:00
commit aa8dde905e
3 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ground/openpilotgcs/src/plugins/config/cfg_vehicletypes/configmultirotorwidget.cpp
View File

@ -373,6 +373,7 @@ void ConfigMultiRotorWidget::resetMixers()
for (int channel = 0; channel < (int)ConfigMultiRotorWidget::CHANNEL_NUMELEM; channel++) { for (int channel = 0; channel < (int)ConfigMultiRotorWidget::CHANNEL_NUMELEM; channel++) {
resetMixerVector(mixer, channel); resetMixerVector(mixer, channel);
setMixerType(mixer, channel, VehicleConfig::MIXERTYPE_DISABLED);
} }
} }

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

@ -63,7 +63,7 @@ ConfigOutputWidget::ConfigOutputWidget(QWidget *parent) : ConfigTaskWidget(paren
UAVSettingsImportExportFactory *importexportplugin = pm->getObject<UAVSettingsImportExportFactory>(); UAVSettingsImportExportFactory *importexportplugin = pm->getObject<UAVSettingsImportExportFactory>();
connect(importexportplugin, SIGNAL(importAboutToBegin()), this, SLOT(stopTests())); connect(importexportplugin, SIGNAL(importAboutToBegin()), this, SLOT(stopTests()));
connect(m_ui->channelOutTest, SIGNAL(toggled(bool)), this, SLOT(runChannelTests(bool))); connect(ui->channelOutTest, SIGNAL(clicked(bool)), this, SLOT(runChannelTests(bool)));
// Configure the task widget // Configure the task widget
// Connect the help button // Connect the help button

9
ground/openpilotgcs/src/plugins/config/outputchannelform.cpp
View File

@ -56,13 +56,6 @@ OutputChannelForm::OutputChannelForm(const int index, QWidget *parent) :
ui.actuatorMax->setMinimum(MINOUTPUT_VALUE); ui.actuatorMax->setMinimum(MINOUTPUT_VALUE);
ui.actuatorValue->setMinimum(MINOUTPUT_VALUE); ui.actuatorValue->setMinimum(MINOUTPUT_VALUE);
// Remove keyboard focus
ui.actuatorMin->setFocusPolicy(Qt::ClickFocus);
ui.actuatorMax->setFocusPolicy(Qt::ClickFocus);
ui.actuatorRev->setFocusPolicy(Qt::ClickFocus);
ui.actuatorLink->setFocusPolicy(Qt::ClickFocus);
ui.actuatorValue->setFocusPolicy(Qt::NoFocus);
setChannelRange(); setChannelRange();
disableMouseWheelEvents(); disableMouseWheelEvents();
@ -126,7 +119,7 @@ void OutputChannelForm::enableChannelTest(bool state)
ui.actuatorMin->setEnabled(false); ui.actuatorMin->setEnabled(false);
ui.actuatorMax->setEnabled(false); ui.actuatorMax->setEnabled(false);
ui.actuatorRev->setEnabled(false); ui.actuatorRev->setEnabled(false);
} else { } else if (m_mixerType != "Disabled"){
ui.actuatorMin->setEnabled(true); ui.actuatorMin->setEnabled(true);
ui.actuatorMax->setEnabled(true); ui.actuatorMax->setEnabled(true);
if (m_mixerType != "Motor") { if (m_mixerType != "Motor") {