rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2024-11-29 07:24:13 +01:00
Code Issues Releases Activity

OP-1422_Tricopter_mixers_settings Wizard : Wrong mixer type for servo (was ReversedMotor). M3/M4 bugfix

Browse Source
This commit is contained in:
Laurent Lalanne 2014-08-27 02:24:14 +02:00
parent 0edf70d0aa
commit 4099507bf6
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ground/openpilotgcs/src/plugins/config/cfg_vehicletypes/configmultirotorwidget.cpp
View File

@ -621,7 +621,6 @@ void ConfigMultiRotorWidget::refreshWidgetsValues(QString frameType)
setComboCurrentIndex(m_aircraft->multiMotorChannelBox1, multi.VTOLMotorNW); setComboCurrentIndex(m_aircraft->multiMotorChannelBox1, multi.VTOLMotorNW);
setComboCurrentIndex(m_aircraft->multiMotorChannelBox2, multi.VTOLMotorNE); setComboCurrentIndex(m_aircraft->multiMotorChannelBox2, multi.VTOLMotorNE);
setComboCurrentIndex(m_aircraft->multiMotorChannelBox3, multi.VTOLMotorS); setComboCurrentIndex(m_aircraft->multiMotorChannelBox3, multi.VTOLMotorS);
setComboCurrentIndex(m_aircraft->multiMotorChannelBox4, multi.VTOLMotorS);
setComboCurrentIndex(m_aircraft->triYawChannelBox, multi.TRIYaw); setComboCurrentIndex(m_aircraft->triYawChannelBox, multi.TRIYaw);
int channel = m_aircraft->multiMotorChannelBox1->currentIndex() - 1; int channel = m_aircraft->multiMotorChannelBox1->currentIndex() - 1;

3
ground/openpilotgcs/src/plugins/setupwizard/vehicleconfigurationhelper.h
View File

@ -66,7 +66,8 @@ signals:
private: private:
static const int MIXER_TYPE_DISABLED = 0; static const int MIXER_TYPE_DISABLED = 0;
static const int MIXER_TYPE_MOTOR = 1; static const int MIXER_TYPE_MOTOR = 1;
static const int MIXER_TYPE_SERVO = 2; static const int MIXER_TYPE_REVERSABLEMOTOR = 2;
static const int MIXER_TYPE_SERVO = 3;
static const float DEFAULT_ENABLED_ACCEL_TAU = 0.1; static const float DEFAULT_ENABLED_ACCEL_TAU = 0.1;
VehicleConfigurationSource *m_configSource; VehicleConfigurationSource *m_configSource;