1
0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2025-03-15 07:29:15 +01:00

Merged in f5soh/librepilot/LP-201_Y6_mixer (pull request #146)

LP-201 Set new default mixer values for Y6
This commit is contained in:
Lalanne Laurent 2016-01-09 12:57:52 +01:00
commit 33c87b86f4
2 changed files with 6 additions and 6 deletions

View File

@ -230,9 +230,9 @@ void ConfigMultiRotorWidget::setupUI(QString frameType)
setComboCurrentIndex(m_aircraft->multirotorFrameType, setComboCurrentIndex(m_aircraft->multirotorFrameType,
m_aircraft->multirotorFrameType->findText("Hexacopter Y6")); m_aircraft->multirotorFrameType->findText("Hexacopter Y6"));
m_aircraft->mrRollMixLevel->setValue(100); m_aircraft->mrRollMixLevel->setValue(86);
m_aircraft->mrPitchMixLevel->setValue(50); m_aircraft->mrPitchMixLevel->setValue(100);
setYawMixLevel(66); setYawMixLevel(100);
} else if (frameType == "Octo" || frameType == "Octocopter") { } else if (frameType == "Octo" || frameType == "Octocopter") {
setComboCurrentIndex(m_aircraft->multirotorFrameType, m_aircraft->multirotorFrameType->findText("Octocopter")); setComboCurrentIndex(m_aircraft->multirotorFrameType, m_aircraft->multirotorFrameType->findText("Octocopter"));

View File

@ -785,9 +785,9 @@ void VehicleConfigurationHelper::applyMixerConfiguration(mixerChannelSettings ch
mSettings->setMixerValueYaw((qint8)50); mSettings->setMixerValueYaw((qint8)50);
break; break;
case VehicleConfigurationSource::MULTI_ROTOR_HEXA_COAX_Y: case VehicleConfigurationSource::MULTI_ROTOR_HEXA_COAX_Y:
mSettings->setMixerValueRoll((qint8)100); mSettings->setMixerValueRoll((qint8)86);
mSettings->setMixerValuePitch((qint8)50); mSettings->setMixerValuePitch((qint8)100);
mSettings->setMixerValueYaw((qint8)66); mSettings->setMixerValueYaw((qint8)100);
break; break;
case VehicleConfigurationSource::MULTI_ROTOR_OCTO: case VehicleConfigurationSource::MULTI_ROTOR_OCTO:
case VehicleConfigurationSource::MULTI_ROTOR_OCTO_X: case VehicleConfigurationSource::MULTI_ROTOR_OCTO_X: