From c837062ebc118f058c580e80356a6c0f76de9f76 Mon Sep 17 00:00:00 2001 From: Laurent Lalanne Date: Tue, 22 Dec 2015 13:06:07 +0100 Subject: [PATCH] LP-201 Set new default mixer values for Y6 --- .../configmultirotorwidget.cpp | 6 +-- .../vehicleconfigurationhelper.cpp | 54 +++++++++---------- 2 files changed, 30 insertions(+), 30 deletions(-) diff --git a/ground/gcs/src/plugins/config/cfg_vehicletypes/configmultirotorwidget.cpp b/ground/gcs/src/plugins/config/cfg_vehicletypes/configmultirotorwidget.cpp index e90f838e9..751f7c36d 100644 --- a/ground/gcs/src/plugins/config/cfg_vehicletypes/configmultirotorwidget.cpp +++ b/ground/gcs/src/plugins/config/cfg_vehicletypes/configmultirotorwidget.cpp @@ -230,9 +230,9 @@ void ConfigMultiRotorWidget::setupUI(QString frameType) setComboCurrentIndex(m_aircraft->multirotorFrameType, m_aircraft->multirotorFrameType->findText("Hexacopter Y6")); - m_aircraft->mrRollMixLevel->setValue(100); - m_aircraft->mrPitchMixLevel->setValue(50); - setYawMixLevel(66); + m_aircraft->mrRollMixLevel->setValue(86); + m_aircraft->mrPitchMixLevel->setValue(100); + setYawMixLevel(100); } else if (frameType == "Octo" || frameType == "Octocopter") { setComboCurrentIndex(m_aircraft->multirotorFrameType, m_aircraft->multirotorFrameType->findText("Octocopter")); diff --git a/ground/gcs/src/plugins/setupwizard/vehicleconfigurationhelper.cpp b/ground/gcs/src/plugins/setupwizard/vehicleconfigurationhelper.cpp index 566ab24fd..381ca6464 100644 --- a/ground/gcs/src/plugins/setupwizard/vehicleconfigurationhelper.cpp +++ b/ground/gcs/src/plugins/setupwizard/vehicleconfigurationhelper.cpp @@ -770,30 +770,30 @@ void VehicleConfigurationHelper::applyMixerConfiguration(mixerChannelSettings ch case VehicleConfigurationSource::MULTI_ROTOR_HEXA: case VehicleConfigurationSource::MULTI_ROTOR_HEXA_H: case VehicleConfigurationSource::MULTI_ROTOR_HEXA_X: - mSettings->setMixerValueRoll((qint8) 100); - mSettings->setMixerValuePitch((qint8) 100); - mSettings->setMixerValueYaw((qint8) 100); + mSettings->setMixerValueRoll((qint8)100); + mSettings->setMixerValuePitch((qint8)100); + mSettings->setMixerValueYaw((qint8)100); break; case VehicleConfigurationSource::MULTI_ROTOR_QUAD_X: - mSettings->setMixerValueRoll((qint8) 50); - mSettings->setMixerValuePitch((qint8) 50); - mSettings->setMixerValueYaw((qint8) 50); + mSettings->setMixerValueRoll((qint8)50); + mSettings->setMixerValuePitch((qint8)50); + mSettings->setMixerValueYaw((qint8)50); break; case VehicleConfigurationSource::MULTI_ROTOR_QUAD_PLUS: - mSettings->setMixerValueRoll((qint8) 100); - mSettings->setMixerValuePitch((qint8) 100); - mSettings->setMixerValueYaw((qint8) 50); + mSettings->setMixerValueRoll((qint8)100); + mSettings->setMixerValuePitch((qint8)100); + mSettings->setMixerValueYaw((qint8)50); break; case VehicleConfigurationSource::MULTI_ROTOR_HEXA_COAX_Y: - mSettings->setMixerValueRoll((qint8) 100); - mSettings->setMixerValuePitch((qint8) 50); - mSettings->setMixerValueYaw((qint8) 66); + mSettings->setMixerValueRoll((qint8)86); + mSettings->setMixerValuePitch((qint8)100); + mSettings->setMixerValueYaw((qint8)100); break; case VehicleConfigurationSource::MULTI_ROTOR_OCTO: case VehicleConfigurationSource::MULTI_ROTOR_OCTO_X: - mSettings->setMixerValueRoll((qint8) 100); - mSettings->setMixerValuePitch((qint8) 100); - mSettings->setMixerValueYaw((qint8) 100); + mSettings->setMixerValueRoll((qint8)100); + mSettings->setMixerValuePitch((qint8)100); + mSettings->setMixerValueYaw((qint8)100); break; case VehicleConfigurationSource::MULTI_ROTOR_OCTO_COAX_X: case VehicleConfigurationSource::MULTI_ROTOR_OCTO_COAX_PLUS: @@ -805,9 +805,9 @@ void VehicleConfigurationHelper::applyMixerConfiguration(mixerChannelSettings ch break; } case VehicleConfigurationSource::VEHICLE_FIXEDWING: - mSettings->setMixerValueRoll((qint8) 100); - mSettings->setMixerValuePitch((qint8) 100); - mSettings->setMixerValueYaw((qint8) 100); + mSettings->setMixerValueRoll((qint8)100); + mSettings->setMixerValuePitch((qint8)100); + mSettings->setMixerValueYaw((qint8)100); maxThrottle = 1; break; case VehicleConfigurationSource::VEHICLE_HELI: @@ -816,22 +816,22 @@ void VehicleConfigurationHelper::applyMixerConfiguration(mixerChannelSettings ch { switch (m_configSource->getVehicleSubType()) { case VehicleConfigurationSource::GROUNDVEHICLE_MOTORCYCLE: - mSettings->setMixerValueRoll((qint8) 100); - mSettings->setMixerValuePitch((qint8) 100); - mSettings->setMixerValueYaw((qint8) 100); + mSettings->setMixerValueRoll((qint8)100); + mSettings->setMixerValuePitch((qint8)100); + mSettings->setMixerValueYaw((qint8)100); maxThrottle = 1; break; case VehicleConfigurationSource::GROUNDVEHICLE_CAR: - mSettings->setMixerValueRoll((qint8) 100); - mSettings->setMixerValuePitch((qint8) 100); - mSettings->setMixerValueYaw((qint8) 100); + mSettings->setMixerValueRoll((qint8)100); + mSettings->setMixerValuePitch((qint8)100); + mSettings->setMixerValueYaw((qint8)100); maxThrottle = 1; minThrottle = 0; break; case VehicleConfigurationSource::GROUNDVEHICLE_DIFFERENTIAL: - mSettings->setMixerValueRoll((qint8) 100); - mSettings->setMixerValuePitch((qint8) 100); - mSettings->setMixerValueYaw((qint8) 100); + mSettings->setMixerValueRoll((qint8)100); + mSettings->setMixerValuePitch((qint8)100); + mSettings->setMixerValueYaw((qint8)100); maxThrottle = 0.8; minThrottle = 0; break;