rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2025-03-01 18:29:16 +01:00
Code Issues Releases Activity

Merge branch 'rel-nano-15.05' into corvuscorax/fixedwingautotakeofftest

Browse Source
This commit is contained in:
Corvus Corax 2015-06-06 12:03:17 +02:00
commit a41ef23659
4 changed files with 21 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
WHATSNEW.txt
View File

@ -1,4 +1,10 @@
Release Notes - OpenPilot - Version RELEASE-15.05 RC6
Release Notes - OpenPilot - Version RELEASE-15.05 RC7
RC7 changes relative to RC6:
1. Nano hardware page fixes
2. Upgrade google map version
3. xtal frequency changes again to suit an sbus receiver.
4. OP-1875 reinit EKF on changes to AuxMagSettings
RC6 changes relative to RC5:
1. Altvario AltHold PID updates

7
ground/openpilotgcs/src/plugins/uavobjectwidgetutils/configtaskwidget.cpp
View File

@ -213,6 +213,7 @@ bool ConfigTaskWidget::isComboboxOptionSelected(QComboBox *combo, int optionValu
{
bool ok;
int value = combo->currentData().toInt(&ok);
return ok ? value == optionValue : false;
}
@ -220,14 +221,18 @@ int ConfigTaskWidget::getComboboxSelectedOption(QComboBox *combo)
{
bool ok;
int index = combo->currentData().toInt(&ok);
return ok ? index : -1;
return ok ? index : combo->currentIndex();
}
void ConfigTaskWidget::setComboboxSelectedOption(QComboBox *combo, int optionValue)
{
int index = combo->findData(QVariant(optionValue));
if (index != -1) {
combo->setCurrentIndex(index);
} else {
combo->setCurrentIndex(optionValue);
}
}