From fb41258e575e607b41a75e40d9e90afcb6e0e479 Mon Sep 17 00:00:00 2001 From: Corvus Corax Date: Sun, 4 May 2014 12:03:56 +0200 Subject: [PATCH] OP-1309 fixed missing assignment in manualcontrol FM switch --- flight/modules/ManualControl/manualcontrol.c | 3 ++ .../openpilotgcs/src/plugins/config/input.ui | 30 +++++++++++++++++++ 2 files changed, 33 insertions(+) diff --git a/flight/modules/ManualControl/manualcontrol.c b/flight/modules/ManualControl/manualcontrol.c index 8ddea6df0..97676149f 100644 --- a/flight/modules/ManualControl/manualcontrol.c +++ b/flight/modules/ManualControl/manualcontrol.c @@ -193,6 +193,9 @@ static void manualControlTask(void) case FLIGHTSTATUS_FLIGHTMODE_STABILIZED1: case FLIGHTSTATUS_FLIGHTMODE_STABILIZED2: case FLIGHTSTATUS_FLIGHTMODE_STABILIZED3: + case FLIGHTSTATUS_FLIGHTMODE_STABILIZED4: + case FLIGHTSTATUS_FLIGHTMODE_STABILIZED5: + case FLIGHTSTATUS_FLIGHTMODE_STABILIZED6: handler = &handler_STABILIZED; break; #ifndef PIOS_EXCLUDE_ADVANCED_FEATURES diff --git a/ground/openpilotgcs/src/plugins/config/input.ui b/ground/openpilotgcs/src/plugins/config/input.ui index dd8400a07..884ac85a5 100644 --- a/ground/openpilotgcs/src/plugins/config/input.ui +++ b/ground/openpilotgcs/src/plugins/config/input.ui @@ -771,6 +771,36 @@ margin:1px; + + + + Stabilized 4 + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter + + + + + + + Stabilized 5 + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter + + + + + + + Stabilized 6 + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter + + +