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

Fix custom mixer throttle 1 curve.

Browse Source
This commit is contained in:
zedamota 2011-06-11 19:39:24 +01:00
parent dcccae7270
commit cac495cebb
1 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
ground/openpilotgcs/src/plugins/config/configairframewidget.cpp
View File

@ -471,6 +471,7 @@ void ConfigAirframeWidget::requestAircraftUpdate()
// is a straight line (that's how the mixer works on the mainboard): // is a straight line (that's how the mixer works on the mainboard):
double temp=0; //used to check if default value(all 0s) is being returned double temp=0; //used to check if default value(all 0s) is being returned
if (field->getValue(0).toInt() <= -10) { if (field->getValue(0).toInt() <= -10) {
double temp=1;
for (double i=0; i<field->getNumElements(); i++) { for (double i=0; i<field->getNumElements(); i++) {
curveValues.append(i/(field->getNumElements()-1)); curveValues.append(i/(field->getNumElements()-1));
} }
@ -1757,13 +1758,26 @@ void ConfigAirframeWidget::updateCustomAirframeUI()
QList<double> curveValues; QList<double> curveValues;
// If the 1st element of the curve is <= -10, then the curve // If the 1st element of the curve is <= -10, then the curve
// is a straight line (that's how the mixer works on the mainboard): // is a straight line (that's how the mixer works on the mainboard):
double temp=0; //used to check if default value(all 0s) is being returned
if (field->getValue(0).toInt() <= -10) { if (field->getValue(0).toInt() <= -10) {
double temp=1;
for (double i=0; i<field->getNumElements(); i++) { for (double i=0; i<field->getNumElements(); i++) {
curveValues.append(i/(field->getNumElements()-1)); curveValues.append(i/(field->getNumElements()-1));
} }
} else { } else {
double value;
for (unsigned int i=0; i < field->getNumElements(); i++) { for (unsigned int i=0; i < field->getNumElements(); i++) {
curveValues.append(field->getValue(i).toDouble()); value=field->getValue(i).toDouble();
temp+=value;
curveValues.append(value);
}
}
// Setup all Throttle1 curves for all types of airframes
if(temp==0)
{ curveValues.clear();
for (double i=0; i<field->getNumElements(); i++) {
curveValues.append(1*(i/(field->getNumElements()-1)));
} }
} }
m_aircraft->customThrottle1Curve->initCurve(curveValues); m_aircraft->customThrottle1Curve->initCurve(curveValues);