diff --git a/ground/openpilotgcs/src/plugins/config/configinputwidget.cpp b/ground/openpilotgcs/src/plugins/config/configinputwidget.cpp
index d1040724f..19b1d843a 100644
--- a/ground/openpilotgcs/src/plugins/config/configinputwidget.cpp
+++ b/ground/openpilotgcs/src/plugins/config/configinputwidget.cpp
@@ -146,6 +146,10 @@ ConfigInputWidget::ConfigInputWidget(QWidget *parent) :
addUAVObjectToWidgetRelation("ManualControlSettings", "Stabilization2Settings", ui->fmsSsPos2Yaw, "Yaw", 1, true);
addUAVObjectToWidgetRelation("ManualControlSettings", "Stabilization3Settings", ui->fmsSsPos3Yaw, "Yaw", 1, true);
+ addUAVObjectToWidgetRelation("StabilizationSettings", "FlightModeMap", ui->pidBankSs1, "Stabilized1", 1, true);
+ addUAVObjectToWidgetRelation("StabilizationSettings", "FlightModeMap", ui->pidBankSs2, "Stabilized2", 1, true);
+ addUAVObjectToWidgetRelation("StabilizationSettings", "FlightModeMap", ui->pidBankSs3, "Stabilized3", 1, true);
+
addUAVObjectToWidgetRelation("ManualControlSettings", "Arming", ui->armControl);
addUAVObjectToWidgetRelation("ManualControlSettings", "ArmedTimeout", ui->armTimeout, 0, 1000);
connect(ManualControlCommand::GetInstance(getObjectManager()), SIGNAL(objectUpdated(UAVObject *)), this, SLOT(moveFMSlider()));
diff --git a/ground/openpilotgcs/src/plugins/config/input.ui b/ground/openpilotgcs/src/plugins/config/input.ui
index 0f4e78a1e..1049a15a9 100644
--- a/ground/openpilotgcs/src/plugins/config/input.ui
+++ b/ground/openpilotgcs/src/plugins/config/input.ui
@@ -14,7 +14,16 @@
Form
-
+
+ 12
+
+
+ 12
+
+
+ 12
+
+
12
-
@@ -30,7 +39,16 @@
0
-
+
+ 0
+
+
+ 0
+
+
+ 0
+
+
0
-
@@ -111,15 +129,24 @@
0
0
850
- 572
+ 589
-
+
+ 12
+
+
+ 12
+
+
+ 12
+
+
12
- -1
+ 6
-
@@ -146,7 +173,16 @@
-
+
+ 12
+
+
+ 12
+
+
+ 12
+
+
12
-
@@ -245,11 +281,20 @@
-
+
+ 12
+
+
+ 12
+
+
+ 12
+
+
12
-
-
+
0
@@ -260,28 +305,28 @@
true
-
- -
-
-
- -
-
-
- -
-
-
-
- 0
- 0
-
-
-
- true
-
-
-
+
-
-
+
+
+ -
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+ true
+
+
+
+ -
+
-
@@ -418,7 +463,16 @@
Flight Mode Switch Settings
-
+
+ 0
+
+
+ 0
+
+
+ 0
+
+
0
-
@@ -499,284 +553,22 @@
0
0
850
- 572
+ 589
-
+
+ 12
+
+
+ 12
+
+
+ 12
+
+
12
- -
-
-
-
-
-
- Configure each stabilization mode for each axis
-
-
-
- 9
-
-
- 12
-
-
-
-
-
- Qt::Horizontal
-
-
- QSizePolicy::Minimum
-
-
-
- 5
- 20
-
-
-
-
- -
-
-
- Qt::StrongFocus
-
-
-
- -
-
-
-
- 0
- 20
-
-
-
-
- 16777215
- 20
-
-
-
- background-color: qlineargradient(spread:reflect, x1:0.507, y1:0, x2:0.507, y2:0.772, stop:0.208955 rgba(74, 74, 74, 255), stop:0.78607 rgba(36, 36, 36, 255));
-color: rgb(255, 255, 255);
-border-radius: 5;
-font: bold 12px;
-margin:1px;
-
-
- Yaw
-
-
- Qt::AlignCenter
-
-
-
- -
-
-
- Qt::Horizontal
-
-
-
- 5
- 20
-
-
-
-
- -
-
-
- Stabilized1
-
-
- Qt::AlignCenter
-
-
-
- -
-
-
- Qt::Horizontal
-
-
-
- 5
- 20
-
-
-
-
- -
-
-
- Qt::StrongFocus
-
-
-
- -
-
-
- Stabilized2
-
-
- Qt::AlignCenter
-
-
-
- -
-
-
- Qt::StrongFocus
-
-
-
- -
-
-
- Qt::StrongFocus
-
-
-
- -
-
-
-
- 0
- 20
-
-
-
-
- 16777215
- 20
-
-
-
- background-color: qlineargradient(spread:reflect, x1:0.507, y1:0, x2:0.507, y2:0.772, stop:0.208955 rgba(74, 74, 74, 255), stop:0.78607 rgba(36, 36, 36, 255));
-color: rgb(255, 255, 255);
-border-radius: 5;
-font: bold 12px;
-margin:1px;
-
-
- Pitch
-
-
- Qt::AlignCenter
-
-
-
- -
-
-
-
- 0
- 20
-
-
-
-
- 16777215
- 20
-
-
-
- background-color: qlineargradient(spread:reflect, x1:0.507, y1:0, x2:0.507, y2:0.772, stop:0.208955 rgba(74, 74, 74, 255), stop:0.78607 rgba(36, 36, 36, 255));
-color: rgb(255, 255, 255);
-border-radius: 5;
-font: bold 12px;
-margin:1px;
-
-
- Roll
-
-
- Qt::AlignCenter
-
-
-
- -
-
-
- Qt::StrongFocus
-
-
-
- -
-
-
-
- 102
- 0
-
-
-
- Qt::StrongFocus
-
-
-
- -
-
-
- Qt::StrongFocus
-
-
-
- -
-
-
-
- 102
- 0
-
-
-
- Qt::StrongFocus
-
-
-
- -
-
-
-
- 102
- 0
-
-
-
- Qt::StrongFocus
-
-
-
- -
-
-
- Stabilized3
-
-
- Qt::AlignCenter
-
-
-
- -
-
-
- Qt::Horizontal
-
-
-
- 40
- 20
-
-
-
-
-
-
-
-
@@ -795,7 +587,16 @@ margin:1px;
FlightMode Switch Positions
-
+
+ 12
+
+
+ 12
+
+
+ 12
+
+
12
-
@@ -1070,6 +871,9 @@ Setup the flight mode channel on the RC Input tab if you have not done so alread
Qt::Horizontal
+
+ QSizePolicy::Expanding
+
40
@@ -1180,6 +984,367 @@ channel value for each flight mode.
+ -
+
+
+
+
+
+ Stabilization Modes Configuration
+
+
+
+ 9
+
+
+ 12
+
+
-
+
+
+ Qt::Horizontal
+
+
+ QSizePolicy::Minimum
+
+
+
+ 5
+ 20
+
+
+
+
+ -
+
+
+
+ 0
+ 20
+
+
+
+
+ 16777215
+ 20
+
+
+
+ background-color: qlineargradient(spread:reflect, x1:0.507, y1:0, x2:0.507, y2:0.772, stop:0.208955 rgba(74, 74, 74, 255), stop:0.78607 rgba(36, 36, 36, 255));
+color: rgb(255, 255, 255);
+border-radius: 5;
+font: bold 12px;
+margin:1px;
+
+
+ Yaw
+
+
+ Qt::AlignCenter
+
+
+
+ -
+
+
+ Qt::Horizontal
+
+
+ QSizePolicy::MinimumExpanding
+
+
+
+ 20
+ 20
+
+
+
+
+ -
+
+
+ Qt::StrongFocus
+
+
+
+ -
+
+
+ Stabilized 1
+
+
+ Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter
+
+
+
+ -
+
+
+ Qt::Horizontal
+
+
+ QSizePolicy::MinimumExpanding
+
+
+
+ 20
+ 20
+
+
+
+
+ -
+
+
+ Stabilized 2
+
+
+ Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter
+
+
+
+ -
+
+
+ Qt::StrongFocus
+
+
+
+ -
+
+
+ Qt::StrongFocus
+
+
+
+ -
+
+
+ Qt::StrongFocus
+
+
+
+ -
+
+
+
+ 0
+ 20
+
+
+
+
+ 16777215
+ 20
+
+
+
+ background-color: qlineargradient(spread:reflect, x1:0.507, y1:0, x2:0.507, y2:0.772, stop:0.208955 rgba(74, 74, 74, 255), stop:0.78607 rgba(36, 36, 36, 255));
+color: rgb(255, 255, 255);
+border-radius: 5;
+font: bold 12px;
+margin:1px;
+
+
+ Roll
+
+
+ Qt::AlignCenter
+
+
+
+ -
+
+
+
+ 0
+ 20
+
+
+
+
+ 16777215
+ 20
+
+
+
+ background-color: qlineargradient(spread:reflect, x1:0.507, y1:0, x2:0.507, y2:0.772, stop:0.208955 rgba(74, 74, 74, 255), stop:0.78607 rgba(36, 36, 36, 255));
+color: rgb(255, 255, 255);
+border-radius: 5;
+font: bold 12px;
+margin:1px;
+
+
+ Pitch
+
+
+ Qt::AlignCenter
+
+
+
+ -
+
+
+ Qt::StrongFocus
+
+
+
+ -
+
+
+
+ 102
+ 0
+
+
+
+ Qt::StrongFocus
+
+
+
+ -
+
+
+ Qt::StrongFocus
+
+
+
+ -
+
+
+
+ 102
+ 0
+
+
+
+ Qt::StrongFocus
+
+
+
+ -
+
+
+ Stabilized 3
+
+
+ Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter
+
+
+
+ -
+
+
+
+ 102
+ 0
+
+
+
+ Qt::StrongFocus
+
+
+
+ -
+
+
+
+ 102
+ 0
+
+
+
+ Qt::StrongFocus
+
+
+
+ -
+
+
+
+ 102
+ 0
+
+
+
+ Qt::StrongFocus
+
+
+
+ -
+
+
+ Qt::Horizontal
+
+
+
+ 40
+ 20
+
+
+
+
+ -
+
+
+
+ 0
+ 20
+
+
+
+
+ 16777215
+ 20
+
+
+
+ background-color: qlineargradient(spread:reflect, x1:0.507, y1:0, x2:0.507, y2:0.772, stop:0.208955 rgba(74, 74, 74, 255), stop:0.78607 rgba(36, 36, 36, 255));
+color: rgb(255, 255, 255);
+border-radius: 5;
+font: bold 12px;
+margin:1px;
+
+
+ PID Bank
+
+
+ Qt::AlignCenter
+
+
+
+ -
+
+
+
+ 102
+ 0
+
+
+
+ Qt::StrongFocus
+
+
+
+ -
+
+
+ Qt::Horizontal
+
+
+ QSizePolicy::MinimumExpanding
+
+
+
+ 20
+ 20
+
+
+
+
+
+
+
-
@@ -1207,7 +1372,16 @@ channel value for each flight mode.
Arming Settings
-
+
+ 0
+
+
+ 0
+
+
+ 0
+
+
0
-
@@ -1288,11 +1462,20 @@ channel value for each flight mode.
0
0
850
- 572
+ 589
-
+
+ 12
+
+
+ 12
+
+
+ 12
+
+
12
-