From 631c1b23617f11a189dd46ad78d7317b161b5643 Mon Sep 17 00:00:00 2001 From: abeck70 Date: Sat, 6 Jun 2015 08:00:16 +1000 Subject: [PATCH] Release 15.05 RC7 WhatsNew Update And uncrustify --- WHATSNEW.txt | 8 +++++++- .../src/plugins/config/configrevohwwidget.cpp | 6 +++--- .../src/plugins/config/configrevonanohwwidget.cpp | 6 +++--- .../src/plugins/uavobjectwidgetutils/configtaskwidget.cpp | 7 +++++-- 4 files changed, 18 insertions(+), 9 deletions(-) diff --git a/WHATSNEW.txt b/WHATSNEW.txt index da3f8adf0..3025fcc56 100644 --- a/WHATSNEW.txt +++ b/WHATSNEW.txt @@ -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 diff --git a/ground/openpilotgcs/src/plugins/config/configrevohwwidget.cpp b/ground/openpilotgcs/src/plugins/config/configrevohwwidget.cpp index 1f3d0e2e3..867acb13d 100644 --- a/ground/openpilotgcs/src/plugins/config/configrevohwwidget.cpp +++ b/ground/openpilotgcs/src/plugins/config/configrevohwwidget.cpp @@ -123,7 +123,7 @@ void ConfigRevoHWWidget::updateObjectsFromWidgets() // If any port is configured to be GPS port, enable GPS module if it is not enabled. // Otherwise disable GPS module. if (isComboboxOptionSelected(m_ui->cbFlexi, HwSettings::RM_FLEXIPORT_GPS) - || isComboboxOptionSelected(m_ui->cbMain, HwSettings::RM_MAINPORT_GPS)) { + || isComboboxOptionSelected(m_ui->cbMain, HwSettings::RM_MAINPORT_GPS)) { data.OptionalModules[HwSettings::OPTIONALMODULES_GPS] = HwSettings::OPTIONALMODULES_ENABLED; } else { data.OptionalModules[HwSettings::OPTIONALMODULES_GPS] = HwSettings::OPTIONALMODULES_DISABLED; @@ -168,7 +168,7 @@ void ConfigRevoHWWidget::usbVCPPortChanged(int index) // _USBTELEMETRY modes are mutual exclusive if (isComboboxOptionSelected(m_ui->cbUSBVCPFunction, HwSettings::USB_VCPPORT_USBTELEMETRY) - && isComboboxOptionSelected(m_ui->cbUSBHIDFunction, HwSettings::USB_HIDPORT_USBTELEMETRY)) { + && isComboboxOptionSelected(m_ui->cbUSBHIDFunction, HwSettings::USB_HIDPORT_USBTELEMETRY)) { setComboboxSelectedOption(m_ui->cbUSBHIDFunction, HwSettings::USB_HIDPORT_DISABLED); } } @@ -179,7 +179,7 @@ void ConfigRevoHWWidget::usbHIDPortChanged(int index) // _USBTELEMETRY modes are mutual exclusive if (isComboboxOptionSelected(m_ui->cbUSBHIDFunction, HwSettings::USB_HIDPORT_USBTELEMETRY) - && isComboboxOptionSelected(m_ui->cbUSBVCPFunction, HwSettings::USB_VCPPORT_USBTELEMETRY)) { + && isComboboxOptionSelected(m_ui->cbUSBVCPFunction, HwSettings::USB_VCPPORT_USBTELEMETRY)) { setComboboxSelectedOption(m_ui->cbUSBVCPFunction, HwSettings::USB_VCPPORT_DISABLED); } } diff --git a/ground/openpilotgcs/src/plugins/config/configrevonanohwwidget.cpp b/ground/openpilotgcs/src/plugins/config/configrevonanohwwidget.cpp index 32e8199df..3c56dd338 100644 --- a/ground/openpilotgcs/src/plugins/config/configrevonanohwwidget.cpp +++ b/ground/openpilotgcs/src/plugins/config/configrevonanohwwidget.cpp @@ -120,7 +120,7 @@ void ConfigRevoNanoHWWidget::updateObjectsFromWidgets() // If any port is configured to be GPS port, enable GPS module if it is not enabled. // Otherwise disable GPS module. if (isComboboxOptionSelected(m_ui->cbFlexi, HwSettings::RM_FLEXIPORT_GPS) - || isComboboxOptionSelected(m_ui->cbMain, HwSettings::RM_MAINPORT_GPS)) { + || isComboboxOptionSelected(m_ui->cbMain, HwSettings::RM_MAINPORT_GPS)) { data.OptionalModules[HwSettings::OPTIONALMODULES_GPS] = HwSettings::OPTIONALMODULES_ENABLED; } else { data.OptionalModules[HwSettings::OPTIONALMODULES_GPS] = HwSettings::OPTIONALMODULES_DISABLED; @@ -165,7 +165,7 @@ void ConfigRevoNanoHWWidget::usbVCPPortChanged(int index) // _USBTELEMETRY modes are mutual exclusive if (isComboboxOptionSelected(m_ui->cbUSBVCPFunction, HwSettings::USB_VCPPORT_USBTELEMETRY) - && isComboboxOptionSelected(m_ui->cbUSBHIDFunction, HwSettings::USB_HIDPORT_USBTELEMETRY)) { + && isComboboxOptionSelected(m_ui->cbUSBHIDFunction, HwSettings::USB_HIDPORT_USBTELEMETRY)) { setComboboxSelectedOption(m_ui->cbUSBHIDFunction, HwSettings::USB_HIDPORT_DISABLED); } } @@ -176,7 +176,7 @@ void ConfigRevoNanoHWWidget::usbHIDPortChanged(int index) // _USBTELEMETRY modes are mutual exclusive if (isComboboxOptionSelected(m_ui->cbUSBHIDFunction, HwSettings::USB_HIDPORT_USBTELEMETRY) - && isComboboxOptionSelected(m_ui->cbUSBVCPFunction, HwSettings::USB_VCPPORT_USBTELEMETRY)) { + && isComboboxOptionSelected(m_ui->cbUSBVCPFunction, HwSettings::USB_VCPPORT_USBTELEMETRY)) { setComboboxSelectedOption(m_ui->cbUSBVCPFunction, HwSettings::USB_VCPPORT_DISABLED); } } diff --git a/ground/openpilotgcs/src/plugins/uavobjectwidgetutils/configtaskwidget.cpp b/ground/openpilotgcs/src/plugins/uavobjectwidgetutils/configtaskwidget.cpp index 6e246db32..ed1c22b8d 100644 --- a/ground/openpilotgcs/src/plugins/uavobjectwidgetutils/configtaskwidget.cpp +++ b/ground/openpilotgcs/src/plugins/uavobjectwidgetutils/configtaskwidget.cpp @@ -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,12 +221,14 @@ int ConfigTaskWidget::getComboboxSelectedOption(QComboBox *combo) { bool ok; int index = combo->currentData().toInt(&ok); + return ok ? index : -1; } void ConfigTaskWidget::setComboboxSelectedOption(QComboBox *combo, int optionValue) { int index = combo->findData(QVariant(optionValue)); + if (index != -1) { combo->setCurrentIndex(index); } @@ -239,7 +242,7 @@ int ConfigTaskWidget::getComboboxIndexForOption(QComboBox *combo, int optionValu void ConfigTaskWidget::enableComboBoxOptionItem(QComboBox *combo, int optionValue, bool enable) { combo->model()->setData(combo->model()->index(getComboboxIndexForOption(combo, optionValue), 0), - !enable ? QVariant(0) : QVariant(1 | 32), Qt::UserRole - 1); + !enable ? QVariant(0) : QVariant(1 | 32), Qt::UserRole - 1); } void ConfigTaskWidget::saveObjectToSD(UAVObject *obj) @@ -1039,7 +1042,7 @@ void ConfigTaskWidget::loadWidgetLimits(QWidget *widget, UAVObjectField *field, cb->clear(); QStringList options = field->getOptions(); - for(int optionIndex = 0; optionIndex < options.count(); optionIndex++) { + for (int optionIndex = 0; optionIndex < options.count(); optionIndex++) { if (hasLimits) { if (m_currentBoardId > -1 && field->isWithinLimits(options.at(optionIndex), index, m_currentBoardId)) { cb->addItem(options.at(optionIndex), QVariant(optionIndex));