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

I was aparantly missing a call to updateAirframe(frameType);

Browse Source
This commit is contained in:
Kevin Finisterre 2013-12-18 17:28:25 -05:00
parent de9a30e424
commit 6ee5baa146
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -268,6 +268,8 @@ void ConfigFixedWingWidget::refreshWidgetsValues(QString frameType)
getMixerVectorValue(mixer, channel, VehicleConfig::MIXERVECTOR_PITCH) * 100); getMixerVectorValue(mixer, channel, VehicleConfig::MIXERVECTOR_PITCH) * 100);
} }
} }
updateAirframe(frameType);
} }
/** /**
@ -275,20 +277,15 @@ void ConfigFixedWingWidget::refreshWidgetsValues(QString frameType)
*/ */
QString ConfigFixedWingWidget::updateConfigObjectsFromWidgets() QString ConfigFixedWingWidget::updateConfigObjectsFromWidgets()
{ {
QString airframeType = "FixedWing";
// Save the curve (common to all Fixed wing frames)
UAVDataObject *mixer = dynamic_cast<UAVDataObject *>(getObjectManager()->getObject(QString("MixerSettings"))); UAVDataObject *mixer = dynamic_cast<UAVDataObject *>(getObjectManager()->getObject(QString("MixerSettings")));
Q_ASSERT(mixer); Q_ASSERT(mixer);
// Remove Feed Forward, it is pointless on a plane:
setMixerValue(mixer, "FeedForward", 0.0);
// Set the throttle curve // Set the throttle curve
setThrottleCurve(mixer, VehicleConfig::MIXER_THROTTLECURVE1, m_aircraft->fixedWingThrottle->getCurve()); setThrottleCurve(mixer, VehicleConfig::MIXER_THROTTLECURVE1, m_aircraft->fixedWingThrottle->getCurve());
// All airframe types must start with "FixedWing" QString airframeType;
if (m_aircraft->fixedWingType->currentText() == "Elevator aileron rudder") { if (m_aircraft->fixedWingType->currentText() == "Elevator aileron rudder") {
airframeType = "FixedWing"; airframeType = "FixedWing";
setupFrameFixedWing(airframeType); setupFrameFixedWing(airframeType);
@ -296,6 +293,9 @@ QString ConfigFixedWingWidget::updateConfigObjectsFromWidgets()
airframeType = "FixedWingVtail"; airframeType = "FixedWingVtail";
setupFrameVtail(airframeType); setupFrameVtail(airframeType);
} }
// Remove Feed Forward, it is pointless on a plane:
setMixerValue(mixer, "FeedForward", 0.0);
return airframeType; return airframeType;
} }