From 7486ba88031528d160e618a78522ed466e1d808f Mon Sep 17 00:00:00 2001
From: Fredrik Larson <hayvosh@openpilot.org>
Date: Tue, 2 Sep 2014 14:23:26 +1000
Subject: [PATCH] Put channels in order, make outputs match the diagrams,
 channels now reflect common fixed wing model conventions

---
 .../plugins/setupwizard/pages/outputcalibrationpage.cpp   | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/ground/openpilotgcs/src/plugins/setupwizard/pages/outputcalibrationpage.cpp b/ground/openpilotgcs/src/plugins/setupwizard/pages/outputcalibrationpage.cpp
index 41f92770e..338bba122 100644
--- a/ground/openpilotgcs/src/plugins/setupwizard/pages/outputcalibrationpage.cpp
+++ b/ground/openpilotgcs/src/plugins/setupwizard/pages/outputcalibrationpage.cpp
@@ -174,9 +174,9 @@ void OutputCalibrationPage::setupVehicle()
     case SetupWizard::FIXED_WING_DUAL_AILERON:
         loadSVGFile(FIXEDWING_SVG_FILE);
         m_wizardIndexes << 0 << 1 << 2 << 2 << 2 << 2;
-        m_vehicleElementIds << "aileron" << "aileron-frame" << "aileron-motor" << "aileron-ail-left" << "aileron-ail-right" << "aileron-rudder" << "aileron-elevator";
+        m_vehicleElementIds << "aileron" << "aileron-frame" << "aileron-motor" << "aileron-ail-left" << "aileron-ail-right" << "aileron-elevator" << "aileron-rudder";
         m_vehicleHighlightElementIndexes << 0 << 1 << 2 << 3 << 4 << 5;
-        m_channelIndex << 0 << 2 << 0 << 1 << 3 << 4;
+        m_channelIndex << 0 << 2 << 0 << 5 << 1 << 3;
 
         setupActuatorMinMaxAndNeutral(2, 2, 5);
 
@@ -185,9 +185,9 @@ void OutputCalibrationPage::setupVehicle()
     case SetupWizard::FIXED_WING_AILERON:
         loadSVGFile(FIXEDWING_SVG_FILE);
         m_wizardIndexes << 0 << 1 << 2 << 2 << 2;
-        m_vehicleElementIds << "aileron-single" << "ail2-frame" << "ail2-motor" << "ail2-aileron" << "ail2-rudder" << "ail2-elevator";
+        m_vehicleElementIds << "aileron-single" << "ail2-frame" << "ail2-motor" << "ail2-aileron" << "ail2-elevator" << "ail2-rudder";
         m_vehicleHighlightElementIndexes << 0 << 1 << 2 << 3 << 4;
-        m_channelIndex << 0 << 2 << 0 << 4 << 1;
+        m_channelIndex << 0 << 2 << 0 << 1 << 3;
 
         setupActuatorMinMaxAndNeutral(2, 2, 4);