From ae5dbc3096d27d2ce4f83c466099cf27641d4b51 Mon Sep 17 00:00:00 2001 From: Laurent Lalanne Date: Thu, 19 Feb 2015 17:13:56 +0100 Subject: [PATCH] OP-1734 Change mixer values : Vtail and FixedWing rudder --- .../config/cfg_vehicletypes/configfixedwingwidget.cpp | 6 +++--- .../plugins/setupwizard/vehicleconfigurationhelper.cpp | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/ground/openpilotgcs/src/plugins/config/cfg_vehicletypes/configfixedwingwidget.cpp b/ground/openpilotgcs/src/plugins/config/cfg_vehicletypes/configfixedwingwidget.cpp index 84378e342..0640c639b 100644 --- a/ground/openpilotgcs/src/plugins/config/cfg_vehicletypes/configfixedwingwidget.cpp +++ b/ground/openpilotgcs/src/plugins/config/cfg_vehicletypes/configfixedwingwidget.cpp @@ -358,7 +358,7 @@ bool ConfigFixedWingWidget::setupFrameFixedWing(QString airframeType) // rudder channel = m_aircraft->fwRudder1ChannelBox->currentIndex() - 1; setMixerType(mixer, channel, VehicleConfig::MIXERTYPE_SERVO); - setMixerVectorValue(mixer, channel, VehicleConfig::MIXERVECTOR_YAW, 127); + setMixerVectorValue(mixer, channel, VehicleConfig::MIXERVECTOR_YAW, -127); // ailerons channel = m_aircraft->fwAileron1ChannelBox->currentIndex() - 1; @@ -542,13 +542,13 @@ bool ConfigFixedWingWidget::setupFrameVtail(QString airframeType) // First Vtail servo setMixerType(mixer, channel, VehicleConfig::MIXERTYPE_SERVO); setMixerVectorValue(mixer, channel, VehicleConfig::MIXERVECTOR_PITCH, -pitch); - setMixerVectorValue(mixer, channel, VehicleConfig::MIXERVECTOR_YAW, yaw); + setMixerVectorValue(mixer, channel, VehicleConfig::MIXERVECTOR_YAW, -yaw); // Second Vtail servo channel = m_aircraft->fwElevator2ChannelBox->currentIndex() - 1; setMixerType(mixer, channel, VehicleConfig::MIXERTYPE_SERVO); setMixerVectorValue(mixer, channel, VehicleConfig::MIXERVECTOR_PITCH, pitch); - setMixerVectorValue(mixer, channel, VehicleConfig::MIXERVECTOR_YAW, yaw); + setMixerVectorValue(mixer, channel, VehicleConfig::MIXERVECTOR_YAW, -yaw); } m_aircraft->fwStatusLabel->setText("Mixer generated"); diff --git a/ground/openpilotgcs/src/plugins/setupwizard/vehicleconfigurationhelper.cpp b/ground/openpilotgcs/src/plugins/setupwizard/vehicleconfigurationhelper.cpp index a13d8b5a6..083a8185b 100644 --- a/ground/openpilotgcs/src/plugins/setupwizard/vehicleconfigurationhelper.cpp +++ b/ground/openpilotgcs/src/plugins/setupwizard/vehicleconfigurationhelper.cpp @@ -1896,7 +1896,7 @@ void VehicleConfigurationHelper::setupDualAileron() channels[3].throttle2 = 0; channels[3].roll = 0; channels[3].pitch = 0; - channels[3].yaw = 100; + channels[3].yaw = -100; guiSettings.fixedwing.FixedWingThrottle = 3; guiSettings.fixedwing.FixedWingRoll1 = 1; @@ -1948,7 +1948,7 @@ void VehicleConfigurationHelper::setupAileron() channels[3].throttle2 = 0; channels[3].roll = 0; channels[3].pitch = 0; - channels[3].yaw = 100; + channels[3].yaw = -100; guiSettings.fixedwing.FixedWingThrottle = 3; guiSettings.fixedwing.FixedWingRoll1 = 1; @@ -1999,7 +1999,7 @@ void VehicleConfigurationHelper::setupVtail() channels[1].throttle2 = 0; channels[1].roll = 0; channels[1].pitch = 100; - channels[1].yaw = 100; + channels[1].yaw = -100; // Left Vtail Servo (Chan 4) channels[3].type = MIXER_TYPE_SERVO; @@ -2007,7 +2007,7 @@ void VehicleConfigurationHelper::setupVtail() channels[3].throttle2 = 0; channels[3].roll = 0; channels[3].pitch = -100; - channels[3].yaw = 100; + channels[3].yaw = -100; guiSettings.fixedwing.FixedWingThrottle = 3; guiSettings.fixedwing.FixedWingRoll1 = 1;