From 41d56b282e8e6ae32282428cb9e9f93731f2cc45 Mon Sep 17 00:00:00 2001 From: Oleg Semyonov Date: Sun, 2 Dec 2012 13:50:03 +0200 Subject: [PATCH] [OP-724] Remove LPF from throttle input channel (not necessary) --- flight/Modules/ManualControl/manualcontrol.c | 1 - ground/openpilotgcs/src/plugins/config/configinputwidget.cpp | 2 +- shared/uavobjectdefinition/manualcontrolsettings.xml | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/flight/Modules/ManualControl/manualcontrol.c b/flight/Modules/ManualControl/manualcontrol.c index f806c14d5..67892069c 100644 --- a/flight/Modules/ManualControl/manualcontrol.c +++ b/flight/Modules/ManualControl/manualcontrol.c @@ -352,7 +352,6 @@ static void manualControlTask(void *parameters) (float)UPDATE_PERIOD_MS; lastSysTimeLPF = thisSysTime; - applyLPF(&cmd.Throttle, MANUALCONTROLSETTINGS_RESPONSETIME_THROTTLE, &settings, dT); applyLPF(&cmd.Roll, MANUALCONTROLSETTINGS_RESPONSETIME_ROLL, &settings, dT); applyLPF(&cmd.Pitch, MANUALCONTROLSETTINGS_RESPONSETIME_PITCH, &settings, dT); applyLPF(&cmd.Yaw, MANUALCONTROLSETTINGS_RESPONSETIME_YAW, &settings, dT); diff --git a/ground/openpilotgcs/src/plugins/config/configinputwidget.cpp b/ground/openpilotgcs/src/plugins/config/configinputwidget.cpp index 26c384c58..e9c9f8708 100644 --- a/ground/openpilotgcs/src/plugins/config/configinputwidget.cpp +++ b/ground/openpilotgcs/src/plugins/config/configinputwidget.cpp @@ -92,7 +92,6 @@ ConfigInputWidget::ConfigInputWidget(QWidget *parent) : // Input filter response time fields supported for some channels only switch (index) { - case ManualControlSettings::CHANNELGROUPS_THROTTLE: case ManualControlSettings::CHANNELGROUPS_ROLL: case ManualControlSettings::CHANNELGROUPS_PITCH: case ManualControlSettings::CHANNELGROUPS_YAW: @@ -102,6 +101,7 @@ ConfigInputWidget::ConfigInputWidget(QWidget *parent) : addUAVObjectToWidgetRelation("ManualControlSettings", "ResponseTime", inpForm->ui->channelResponseTime, indexRT); ++indexRT; break; + case ManualControlSettings::CHANNELGROUPS_THROTTLE: case ManualControlSettings::CHANNELGROUPS_FLIGHTMODE: case ManualControlSettings::CHANNELGROUPS_COLLECTIVE: inpForm->ui->channelResponseTime->setEnabled(false); diff --git a/shared/uavobjectdefinition/manualcontrolsettings.xml b/shared/uavobjectdefinition/manualcontrolsettings.xml index 23930f1d1..8c9c2bca5 100644 --- a/shared/uavobjectdefinition/manualcontrolsettings.xml +++ b/shared/uavobjectdefinition/manualcontrolsettings.xml @@ -13,7 +13,7 @@ + elementnames="Roll,Pitch,Yaw,Accessory0,Accessory1,Accessory2"/>