rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2025-01-19 04:52:12 +01:00
Code Issues Releases Activity

OP-1603 Same ouput for mixer table (Wizard and Config plugin)

Browse Source
This commit is contained in:
Laurent Lalanne 2014-11-08 23:08:51 +01:00
parent 55e16453c2
commit a13f7cd6be
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ground/openpilotgcs/src/plugins/config/cfg_vehicletypes/configfixedwingwidget.cpp
View File

@ -249,7 +249,7 @@ void ConfigFixedWingWidget::refreshWidgetsValues(QString frameType)
m_aircraft->elevonSlider1->setValue( m_aircraft->elevonSlider1->setValue(
getMixerVectorValue(mixer, channel, VehicleConfig::MIXERVECTOR_ROLL) * 100); getMixerVectorValue(mixer, channel, VehicleConfig::MIXERVECTOR_ROLL) * 100);
m_aircraft->elevonSlider2->setValue( m_aircraft->elevonSlider2->setValue(
getMixerVectorValue(mixer, channel, VehicleConfig::MIXERVECTOR_PITCH) * 100); getMixerVectorValue(mixer, channel, VehicleConfig::MIXERVECTOR_PITCH) * -100);
} }
} else if (frameType == "FixedWingVtail") { } else if (frameType == "FixedWingVtail") {
int channel = m_aircraft->fwElevator1ChannelBox->currentIndex() - 1; int channel = m_aircraft->fwElevator1ChannelBox->currentIndex() - 1;
@ -425,7 +425,7 @@ bool ConfigFixedWingWidget::setupFrameElevon(QString airframeType)
if (channel > -1) { if (channel > -1) {
setMixerType(mixer, channel, VehicleConfig::MIXERTYPE_SERVO); setMixerType(mixer, channel, VehicleConfig::MIXERTYPE_SERVO);
value = (double)(m_aircraft->elevonSlider2->value() * 1.27); value = (double)(m_aircraft->elevonSlider2->value() * 1.27);
setMixerVectorValue(mixer, channel, VehicleConfig::MIXERVECTOR_PITCH, value); setMixerVectorValue(mixer, channel, VehicleConfig::MIXERVECTOR_PITCH, -value);
value = (double)(m_aircraft->elevonSlider1->value() * 1.27); value = (double)(m_aircraft->elevonSlider1->value() * 1.27);
setMixerVectorValue(mixer, channel, VehicleConfig::MIXERVECTOR_ROLL, value); setMixerVectorValue(mixer, channel, VehicleConfig::MIXERVECTOR_ROLL, value);
@ -434,7 +434,7 @@ bool ConfigFixedWingWidget::setupFrameElevon(QString airframeType)
value = (double)(m_aircraft->elevonSlider2->value() * 1.27); value = (double)(m_aircraft->elevonSlider2->value() * 1.27);
setMixerVectorValue(mixer, channel, VehicleConfig::MIXERVECTOR_PITCH, value); setMixerVectorValue(mixer, channel, VehicleConfig::MIXERVECTOR_PITCH, value);
value = (double)(m_aircraft->elevonSlider1->value() * 1.27); value = (double)(m_aircraft->elevonSlider1->value() * 1.27);
setMixerVectorValue(mixer, channel, VehicleConfig::MIXERVECTOR_ROLL, -value); setMixerVectorValue(mixer, channel, VehicleConfig::MIXERVECTOR_ROLL, value);
} }
m_aircraft->fwStatusLabel->setText("Mixer generated"); m_aircraft->fwStatusLabel->setText("Mixer generated");

2
ground/openpilotgcs/src/plugins/setupwizard/vehicleconfigurationhelper.cpp
View File

@ -1790,7 +1790,7 @@ void VehicleConfigurationHelper::setupElevon()
channels[0].pitch = -100; channels[0].pitch = -100;
channels[0].yaw = 0; channels[0].yaw = 0;
// Elevon Servo 1 (Chan 2) // Elevon Servo 2 (Chan 2)
channels[1].type = MIXER_TYPE_SERVO; channels[1].type = MIXER_TYPE_SERVO;
channels[1].throttle1 = 0; channels[1].throttle1 = 0;
channels[1].throttle2 = 0; channels[1].throttle2 = 0;