From 6f3f7b9972b960a9bb1c4fca64be39cfb6ab4f75 Mon Sep 17 00:00:00 2001
From: Alessio Morale <alessiomorale@gmail.com>
Date: Fri, 30 Jan 2015 21:43:59 +0100
Subject: [PATCH] OP-1683 - fix limits handling and definitions

---
 .../src/plugins/config/configoutputwidget.cpp        | 12 ++++++------
 shared/uavobjectdefinition/actuatorsettings.xml      |  8 ++++++--
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/ground/openpilotgcs/src/plugins/config/configoutputwidget.cpp b/ground/openpilotgcs/src/plugins/config/configoutputwidget.cpp
index 8347f45ff..a11e3bb77 100644
--- a/ground/openpilotgcs/src/plugins/config/configoutputwidget.cpp
+++ b/ground/openpilotgcs/src/plugins/config/configoutputwidget.cpp
@@ -98,12 +98,12 @@ ConfigOutputWidget::ConfigOutputWidget(QWidget *parent) : ConfigTaskWidget(paren
     addWidget(ui->cb_outputRate1);
     addWidget(ui->spinningArmed);
 
-    addWidgetBinding("ActuatorSettings", "BankMode", ui->cb_outputMode1, 0);
-    addWidgetBinding("ActuatorSettings", "BankMode", ui->cb_outputMode2, 1);
-    addWidgetBinding("ActuatorSettings", "BankMode", ui->cb_outputMode3, 2);
-    addWidgetBinding("ActuatorSettings", "BankMode", ui->cb_outputMode4, 3);
-    addWidgetBinding("ActuatorSettings", "BankMode", ui->cb_outputMode5, 4);
-    addWidgetBinding("ActuatorSettings", "BankMode", ui->cb_outputMode6, 5);
+    addWidgetBinding("ActuatorSettings", "BankMode", ui->cb_outputMode1, 0, 0, true);
+    addWidgetBinding("ActuatorSettings", "BankMode", ui->cb_outputMode2, 1, 0, true);
+    addWidgetBinding("ActuatorSettings", "BankMode", ui->cb_outputMode3, 2, 0, true);
+    addWidgetBinding("ActuatorSettings", "BankMode", ui->cb_outputMode4, 3, 0, true);
+    addWidgetBinding("ActuatorSettings", "BankMode", ui->cb_outputMode5, 4, 0, true);
+    addWidgetBinding("ActuatorSettings", "BankMode", ui->cb_outputMode6, 5, 0, true);
 
     disconnect(this, SLOT(refreshWidgetsValues(UAVObject *)));
 
diff --git a/shared/uavobjectdefinition/actuatorsettings.xml b/shared/uavobjectdefinition/actuatorsettings.xml
index 5b6a5186d..303770f4d 100644
--- a/shared/uavobjectdefinition/actuatorsettings.xml
+++ b/shared/uavobjectdefinition/actuatorsettings.xml
@@ -3,8 +3,12 @@
         <description>Settings for the @ref ActuatorModule that controls the channel assignments for the mixer based on AircraftType</description>
         <field name="BankUpdateFreq" units="Hz" type="uint16" elements="6" defaultvalue="50"/>
         <field name="BankMode" type="enum" units="" elements="6" options="PWM,OneShot,OneShot125" defaultvalue="PWM"
-        limits="%0401NE:OneShot:OneShot125,\
-            %0402NE:OneShot:OneShot125;"
+        limits="%0401NE:OneShot:OneShot125,%0402NE:OneShot:OneShot125; \
+        %0401NE:OneShot:OneShot125,%0402NE:OneShot:OneShot125; \
+        %0401NE:OneShot:OneShot125,%0402NE:OneShot:OneShot125; \
+        %0401NE:OneShot:OneShot125,%0402NE:OneShot:OneShot125; \
+        %0401NE:OneShot:OneShot125,%0402NE:OneShot:OneShot125; \
+        %0401NE:OneShot:OneShot125,%0402NE:OneShot:OneShot125;"
         />
         <field name="ChannelMax" units="us" type="int16" elements="12" defaultvalue="1000"/>
         <field name="ChannelNeutral" units="us" type="int16" elements="12" defaultvalue="1000"/>