From c358f975c4f1c8b6230801a10e368f656fb49f94 Mon Sep 17 00:00:00 2001 From: m_thread Date: Sat, 28 Feb 2015 09:47:23 +0100 Subject: [PATCH] Uncrustify --- .../plugins/config/cfg_vehicletypes/configccpmwidget.cpp | 6 +++--- .../plugins/setupwizard/pages/airframeinitialtuningpage.cpp | 1 + .../src/plugins/setupwizard/vehicleconfigurationhelper.cpp | 6 +++--- .../src/plugins/setupwizard/vehicleconfigurationhelper.h | 4 ++-- 4 files changed, 9 insertions(+), 8 deletions(-) diff --git a/ground/openpilotgcs/src/plugins/config/cfg_vehicletypes/configccpmwidget.cpp b/ground/openpilotgcs/src/plugins/config/cfg_vehicletypes/configccpmwidget.cpp index 11f2aee00..a770de2dd 100644 --- a/ground/openpilotgcs/src/plugins/config/cfg_vehicletypes/configccpmwidget.cpp +++ b/ground/openpilotgcs/src/plugins/config/cfg_vehicletypes/configccpmwidget.cpp @@ -398,7 +398,7 @@ void ConfigCcpmWidget::UpdateType() // Clear advanced settings table if not Custom selected (Keep previous settings) if (TypeText.compare(QString::fromUtf8("Custom - Advanced Settings"), Qt::CaseInsensitive) != 0) { - m_aircraft->ccpmAdvancedSettingsTable->clearFocus(); + m_aircraft->ccpmAdvancedSettingsTable->clearFocus(); } m_aircraft->ccpmAngleW->setEnabled(TypeInt == 1); @@ -695,7 +695,7 @@ void ConfigCcpmWidget::UpdateMixer() ; } } - int TypeInt = m_aircraft->ccpmType->count() - m_aircraft->ccpmType->currentIndex() - 1; + int TypeInt = m_aircraft->ccpmType->count() - m_aircraft->ccpmType->currentIndex() - 1; if (TypeInt != 0) { // not advanced settings // get the channel data from the ui MixerChannelData[0] = m_aircraft->ccpmEngineChannel->currentIndex(); @@ -796,7 +796,7 @@ void ConfigCcpmWidget::UpdateMixer() Channel = QString((int)ConfigCcpmWidget::CHANNEL_NUMELEM + 1); } MixerChannelData[i] = Channel.toInt(); - } + } } } diff --git a/ground/openpilotgcs/src/plugins/setupwizard/pages/airframeinitialtuningpage.cpp b/ground/openpilotgcs/src/plugins/setupwizard/pages/airframeinitialtuningpage.cpp index 86a0f553d..428521e3d 100644 --- a/ground/openpilotgcs/src/plugins/setupwizard/pages/airframeinitialtuningpage.cpp +++ b/ground/openpilotgcs/src/plugins/setupwizard/pages/airframeinitialtuningpage.cpp @@ -172,6 +172,7 @@ bool AirframeInitialTuningPage::airframeIsCompatible(int vehicleType, int vehicl void AirframeInitialTuningPage::loadFilesInDir(QString templateBasePath) { QDir templateDir(templateBasePath); + qDebug() << "Loading templates from base path:" << templateBasePath; QStringList names; names << "*.optmpl"; diff --git a/ground/openpilotgcs/src/plugins/setupwizard/vehicleconfigurationhelper.cpp b/ground/openpilotgcs/src/plugins/setupwizard/vehicleconfigurationhelper.cpp index 87c89dad1..240b520ef 100644 --- a/ground/openpilotgcs/src/plugins/setupwizard/vehicleconfigurationhelper.cpp +++ b/ground/openpilotgcs/src/plugins/setupwizard/vehicleconfigurationhelper.cpp @@ -151,7 +151,7 @@ void VehicleConfigurationHelper::applyHardwareConfiguration() break; case VehicleConfigurationSource::INPUT_PPM: if (m_configSource->getEscType() == VehicleConfigurationSource::ESC_ONESHOT || - m_configSource->getEscType() == VehicleConfigurationSource::ESC_RAPID) { + m_configSource->getEscType() == VehicleConfigurationSource::ESC_RAPID) { data.CC_RcvrPort = HwSettings::CC_RCVRPORT_PPM_PIN8ONESHOT; } else { data.CC_RcvrPort = HwSettings::CC_RCVRPORT_PPMNOONESHOT; @@ -380,10 +380,10 @@ void VehicleConfigurationHelper::applyActuatorConfiguration() if ((m_configSource->getControllerType() == VehicleConfigurationSource::CONTROLLER_CC || m_configSource->getControllerType() == VehicleConfigurationSource::CONTROLLER_CC3D) && m_configSource->getInputType() == VehicleConfigurationSource::INPUT_PWM) { - bankMode = ActuatorSettings::BANKMODE_PWM; + bankMode = ActuatorSettings::BANKMODE_PWM; escFrequence = RAPID_ESC_FREQUENCY; } else { - bankMode = ActuatorSettings::BANKMODE_PWMSYNC; + bankMode = ActuatorSettings::BANKMODE_PWMSYNC; escFrequence = PWMSYNC_ESC_FREQUENCY; } break; diff --git a/ground/openpilotgcs/src/plugins/setupwizard/vehicleconfigurationhelper.h b/ground/openpilotgcs/src/plugins/setupwizard/vehicleconfigurationhelper.h index 28caca77c..002518bf0 100644 --- a/ground/openpilotgcs/src/plugins/setupwizard/vehicleconfigurationhelper.h +++ b/ground/openpilotgcs/src/plugins/setupwizard/vehicleconfigurationhelper.h @@ -59,8 +59,8 @@ public: bool setupHardwareSettings(bool save = true); static const qint16 LEGACY_ESC_FREQUENCY = 50; static const qint16 RAPID_ESC_FREQUENCY = 490; - static const qint16 PWMSYNC_ESC_FREQUENCY = 0; - static const qint16 ONESHOT_ESC_FREQUENCY = 0; + static const qint16 PWMSYNC_ESC_FREQUENCY = 0; + static const qint16 ONESHOT_ESC_FREQUENCY = 0; static const qint16 ANALOG_SERVO_FREQUENCY = 50; static const qint16 DIGITAL_SERVO_FREQUENCY = 333; static const int MIXER_TYPE_NONE = 0;