From af6eeca8ee14bf18773ec9a9819b72534eb6957a Mon Sep 17 00:00:00 2001
From: James Cotton <peabody124@gmail.com>
Date: Mon, 7 Nov 2011 15:53:57 -0600
Subject: [PATCH] Allow camera stabilization to control outputs 9 and 10.  Also
 add a friendly message to indicate when the output is already assigned.

---
 .../openpilotgcs/src/plugins/config/camerastabilization.ui | 7 +++++++
 .../src/plugins/config/configcamerastabilizationwidget.cpp | 6 +++++-
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/ground/openpilotgcs/src/plugins/config/camerastabilization.ui b/ground/openpilotgcs/src/plugins/config/camerastabilization.ui
index c6ab98e09..76ff38fcb 100644
--- a/ground/openpilotgcs/src/plugins/config/camerastabilization.ui
+++ b/ground/openpilotgcs/src/plugins/config/camerastabilization.ui
@@ -203,6 +203,13 @@
      </layout>
     </widget>
    </item>
+   <item>
+    <widget class="QLabel" name="message">
+     <property name="text">
+      <string/>
+     </property>
+    </widget>
+   </item>
    <item>
     <spacer name="verticalSpacer">
      <property name="orientation">
diff --git a/ground/openpilotgcs/src/plugins/config/configcamerastabilizationwidget.cpp b/ground/openpilotgcs/src/plugins/config/configcamerastabilizationwidget.cpp
index 739de0241..7eaa397b9 100644
--- a/ground/openpilotgcs/src/plugins/config/configcamerastabilizationwidget.cpp
+++ b/ground/openpilotgcs/src/plugins/config/configcamerastabilizationwidget.cpp
@@ -109,7 +109,7 @@ void ConfigCameraStabilizationWidget::applySettings()
     // Update the mixer settings
     MixerSettings * mixerSettings = MixerSettings::GetInstance(getObjectManager());
     MixerSettings::DataFields mixerSettingsData = mixerSettings->getData();
-    const int NUM_MIXERS = 8;
+    const int NUM_MIXERS = 10;
 
     QComboBox * selectors[3] = {
         m_camerastabilization->rollChannel,
@@ -128,8 +128,11 @@ void ConfigCameraStabilizationWidget::applySettings()
         &mixerSettingsData.Mixer6Type,
         &mixerSettingsData.Mixer7Type,
         &mixerSettingsData.Mixer8Type,
+        &mixerSettingsData.Mixer9Type,
+        &mixerSettingsData.Mixer10Type,
     };
 
+    m_camerastabilization->message->setText("");
     for (int i = 0; i < 3; i++)
     {
         // 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
             // about to set it to reset to none
             selectors[i]->setCurrentIndex(0);
+            m_camerastabilization->message->setText("One of the channels is already assigned, reverted to none");
         } else {
             // Make sure no other channels have this output set
             for (int j = 0; j < NUM_MIXERS; j++)