rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2025-02-21 11:54:15 +01:00
Code Issues Releases Activity

Allow camera stabilization to control outputs 9 and 10. Also add a friendly

Browse Source 
message to indicate when the output is already assigned.
This commit is contained in:
James Cotton 2011-11-07 15:53:57 -06:00
parent 8f77d07119
commit af6eeca8ee
2 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ground/openpilotgcs/src/plugins/config/camerastabilization.ui
View File

@ -203,6 +203,13 @@
</layout> </layout>
</widget> </widget>
</item> </item>
<item>
<widget class="QLabel" name="message">
<property name="text">
<string/>
</property>
</widget>
</item>
<item> <item>
<spacer name="verticalSpacer"> <spacer name="verticalSpacer">
<property name="orientation"> <property name="orientation">

6
ground/openpilotgcs/src/plugins/config/configcamerastabilizationwidget.cpp
View File

@ -109,7 +109,7 @@ void ConfigCameraStabilizationWidget::applySettings()
// Update the mixer settings // Update the mixer settings
MixerSettings * mixerSettings = MixerSettings::GetInstance(getObjectManager()); MixerSettings * mixerSettings = MixerSettings::GetInstance(getObjectManager());
MixerSettings::DataFields mixerSettingsData = mixerSettings->getData(); MixerSettings::DataFields mixerSettingsData = mixerSettings->getData();
const int NUM_MIXERS = 8; const int NUM_MIXERS = 10;
QComboBox * selectors[3] = { QComboBox * selectors[3] = {
m_camerastabilization->rollChannel, m_camerastabilization->rollChannel,
@ -128,8 +128,11 @@ void ConfigCameraStabilizationWidget::applySettings()
&mixerSettingsData.Mixer6Type, &mixerSettingsData.Mixer6Type,
&mixerSettingsData.Mixer7Type, &mixerSettingsData.Mixer7Type,
&mixerSettingsData.Mixer8Type, &mixerSettingsData.Mixer8Type,
&mixerSettingsData.Mixer9Type,
&mixerSettingsData.Mixer10Type,
}; };
m_camerastabilization->message->setText("");
for (int i = 0; i < 3; i++) for (int i = 0; i < 3; i++)
{ {
// Channel 1 is second entry, so becomes zero // Channel 1 is second entry, so becomes zero
@ -141,6 +144,7 @@ void ConfigCameraStabilizationWidget::applySettings()
// If the mixer channel already to something that isn't what we are // If the mixer channel already to something that isn't what we are
// about to set it to reset to none // about to set it to reset to none
selectors[i]->setCurrentIndex(0); selectors[i]->setCurrentIndex(0);
m_camerastabilization->message->setText("One of the channels is already assigned, reverted to none");
} else { } else {
// Make sure no other channels have this output set // Make sure no other channels have this output set
for (int j = 0; j < NUM_MIXERS; j++) for (int j = 0; j < NUM_MIXERS; j++)