From db926f289d1b08c15cb176ad4d3967f989bc4b4b Mon Sep 17 00:00:00 2001 From: Philippe Renon Date: Fri, 6 Nov 2015 22:03:37 +0100 Subject: [PATCH] uncrustified --- ground/gcs/src/plugins/config/configstabilizationwidget.cpp | 1 + .../src/plugins/setupwizard/vehicleconfigurationhelper.cpp | 4 ++-- ground/gcs/src/plugins/uploader/op_dfu.cpp | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/ground/gcs/src/plugins/config/configstabilizationwidget.cpp b/ground/gcs/src/plugins/config/configstabilizationwidget.cpp index ac8455a6e..827b2125e 100644 --- a/ground/gcs/src/plugins/config/configstabilizationwidget.cpp +++ b/ground/gcs/src/plugins/config/configstabilizationwidget.cpp @@ -639,6 +639,7 @@ void ConfigStabilizationWidget::onBoardConnected() void ConfigStabilizationWidget::stabBankChanged(int index) { bool dirty = isDirty(); + disconnect(this, SIGNAL(widgetContentsChanged(QWidget *)), this, SLOT(processLinkedWidgets(QWidget *))); updateObjectFromThrottleCurve(); diff --git a/ground/gcs/src/plugins/setupwizard/vehicleconfigurationhelper.cpp b/ground/gcs/src/plugins/setupwizard/vehicleconfigurationhelper.cpp index dbce5ec5a..56dd61fd9 100644 --- a/ground/gcs/src/plugins/setupwizard/vehicleconfigurationhelper.cpp +++ b/ground/gcs/src/plugins/setupwizard/vehicleconfigurationhelper.cpp @@ -241,7 +241,7 @@ void VehicleConfigurationHelper::applyHardwareConfiguration() AuxMagSettings *magSettings = AuxMagSettings::GetInstance(m_uavoManager); Q_ASSERT(magSettings); AuxMagSettings::DataFields magsData = magSettings->getData(); - magsData.Type = AuxMagSettings::TYPE_GPSV9; + magsData.Type = AuxMagSettings::TYPE_GPSV9; magsData.Usage = AuxMagSettings::USAGE_AUXONLY; magSettings->setData(magsData); addModifiedObject(magSettings, tr("Writing External Mag sensor settings")); @@ -255,7 +255,7 @@ void VehicleConfigurationHelper::applyHardwareConfiguration() AuxMagSettings *magSettings = AuxMagSettings::GetInstance(m_uavoManager); Q_ASSERT(magSettings); AuxMagSettings::DataFields magsData = magSettings->getData(); - magsData.Type = AuxMagSettings::TYPE_FLEXI; + magsData.Type = AuxMagSettings::TYPE_FLEXI; magsData.Usage = AuxMagSettings::USAGE_AUXONLY; magSettings->setData(magsData); addModifiedObject(magSettings, tr("Writing I2C Mag sensor settings")); diff --git a/ground/gcs/src/plugins/uploader/op_dfu.cpp b/ground/gcs/src/plugins/uploader/op_dfu.cpp index d05374c76..cce249f7f 100644 --- a/ground/gcs/src/plugins/uploader/op_dfu.cpp +++ b/ground/gcs/src/plugins/uploader/op_dfu.cpp @@ -574,7 +574,7 @@ OP_DFU::Status DFUObject::StatusRequest() buf[8] = 0; buf[9] = 0; - int result = sendData(buf, BUF_LEN); + int result = sendData(buf, BUF_LEN); int retry_cnt = 0; const int MaxSendRetry = 10, SendRetryIntervalMS = 1000; while (result < 0 && retry_cnt < MaxSendRetry) {