rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2024-12-01 09:24:10 +01:00
Code Issues Releases Activity

LP-201 Set new default mixer values for Y6

Browse Source
This commit is contained in:
Laurent Lalanne 2015-12-22 13:06:07 +01:00
parent cefcacbbcf
commit c837062ebc
2 changed files with 30 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ground/gcs/src/plugins/config/cfg_vehicletypes/configmultirotorwidget.cpp
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"));

54
ground/gcs/src/plugins/setupwizard/vehicleconfigurationhelper.cpp
View File

@ -770,30 +770,30 @@ void VehicleConfigurationHelper::applyMixerConfiguration(mixerChannelSettings ch
case VehicleConfigurationSource::MULTI_ROTOR_HEXA: case VehicleConfigurationSource::MULTI_ROTOR_HEXA:
case VehicleConfigurationSource::MULTI_ROTOR_HEXA_H: case VehicleConfigurationSource::MULTI_ROTOR_HEXA_H:
case VehicleConfigurationSource::MULTI_ROTOR_HEXA_X: case VehicleConfigurationSource::MULTI_ROTOR_HEXA_X:
mSettings->setMixerValueRoll((qint8) 100); mSettings->setMixerValueRoll((qint8)100);
mSettings->setMixerValuePitch((qint8) 100); mSettings->setMixerValuePitch((qint8)100);
mSettings->setMixerValueYaw((qint8) 100); mSettings->setMixerValueYaw((qint8)100);
break; break;
case VehicleConfigurationSource::MULTI_ROTOR_QUAD_X: case VehicleConfigurationSource::MULTI_ROTOR_QUAD_X:
mSettings->setMixerValueRoll((qint8) 50); mSettings->setMixerValueRoll((qint8)50);
mSettings->setMixerValuePitch((qint8) 50); mSettings->setMixerValuePitch((qint8)50);
mSettings->setMixerValueYaw((qint8) 50); mSettings->setMixerValueYaw((qint8)50);
break; break;
case VehicleConfigurationSource::MULTI_ROTOR_QUAD_PLUS: case VehicleConfigurationSource::MULTI_ROTOR_QUAD_PLUS:
mSettings->setMixerValueRoll((qint8) 100); mSettings->setMixerValueRoll((qint8)100);
mSettings->setMixerValuePitch((qint8) 100); mSettings->setMixerValuePitch((qint8)100);
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:
mSettings->setMixerValueRoll((qint8) 100); mSettings->setMixerValueRoll((qint8)100);
mSettings->setMixerValuePitch((qint8) 100); mSettings->setMixerValuePitch((qint8)100);
mSettings->setMixerValueYaw((qint8) 100); mSettings->setMixerValueYaw((qint8)100);
break; break;
case VehicleConfigurationSource::MULTI_ROTOR_OCTO_COAX_X: case VehicleConfigurationSource::MULTI_ROTOR_OCTO_COAX_X:
case VehicleConfigurationSource::MULTI_ROTOR_OCTO_COAX_PLUS: case VehicleConfigurationSource::MULTI_ROTOR_OCTO_COAX_PLUS:
@ -805,9 +805,9 @@ void VehicleConfigurationHelper::applyMixerConfiguration(mixerChannelSettings ch
break; break;
} }
case VehicleConfigurationSource::VEHICLE_FIXEDWING: case VehicleConfigurationSource::VEHICLE_FIXEDWING:
mSettings->setMixerValueRoll((qint8) 100); mSettings->setMixerValueRoll((qint8)100);
mSettings->setMixerValuePitch((qint8) 100); mSettings->setMixerValuePitch((qint8)100);
mSettings->setMixerValueYaw((qint8) 100); mSettings->setMixerValueYaw((qint8)100);
maxThrottle = 1; maxThrottle = 1;
break; break;
case VehicleConfigurationSource::VEHICLE_HELI: case VehicleConfigurationSource::VEHICLE_HELI:
@ -816,22 +816,22 @@ void VehicleConfigurationHelper::applyMixerConfiguration(mixerChannelSettings ch
{ {
switch (m_configSource->getVehicleSubType()) { switch (m_configSource->getVehicleSubType()) {
case VehicleConfigurationSource::GROUNDVEHICLE_MOTORCYCLE: case VehicleConfigurationSource::GROUNDVEHICLE_MOTORCYCLE:
mSettings->setMixerValueRoll((qint8) 100); mSettings->setMixerValueRoll((qint8)100);
mSettings->setMixerValuePitch((qint8) 100); mSettings->setMixerValuePitch((qint8)100);
mSettings->setMixerValueYaw((qint8) 100); mSettings->setMixerValueYaw((qint8)100);
maxThrottle = 1; maxThrottle = 1;
break; break;
case VehicleConfigurationSource::GROUNDVEHICLE_CAR: case VehicleConfigurationSource::GROUNDVEHICLE_CAR:
mSettings->setMixerValueRoll((qint8) 100); mSettings->setMixerValueRoll((qint8)100);
mSettings->setMixerValuePitch((qint8) 100); mSettings->setMixerValuePitch((qint8)100);
mSettings->setMixerValueYaw((qint8) 100); mSettings->setMixerValueYaw((qint8)100);
maxThrottle = 1; maxThrottle = 1;
minThrottle = 0; minThrottle = 0;
break; break;
case VehicleConfigurationSource::GROUNDVEHICLE_DIFFERENTIAL: case VehicleConfigurationSource::GROUNDVEHICLE_DIFFERENTIAL:
mSettings->setMixerValueRoll((qint8) 100); mSettings->setMixerValueRoll((qint8)100);
mSettings->setMixerValuePitch((qint8) 100); mSettings->setMixerValuePitch((qint8)100);
mSettings->setMixerValueYaw((qint8) 100); mSettings->setMixerValueYaw((qint8)100);
maxThrottle = 0.8; maxThrottle = 0.8;
minThrottle = 0; minThrottle = 0;
break; break;