From 4bd3df43aad405dc2ec8a47b9a3f9ba0b6fe184e Mon Sep 17 00:00:00 2001 From: Vladimir Zidar Date: Mon, 23 Oct 2017 22:56:27 +0200 Subject: [PATCH] LP-525 Uncrustify --- .../plugins/config/commonhwsettingswidget.h | 2 +- .../plugins/config/configpikoblxhwwidget.h | 2 +- .../config/configspracingf3evohwwidget.cpp | 34 +++++++++---------- .../config/configspracingf3evohwwidget.h | 2 +- .../plugins/config/configtinyfishhwwidget.cpp | 10 +++--- 5 files changed, 24 insertions(+), 26 deletions(-) diff --git a/ground/gcs/src/plugins/config/commonhwsettingswidget.h b/ground/gcs/src/plugins/config/commonhwsettingswidget.h index a66f9eb63..77b56c29a 100644 --- a/ground/gcs/src/plugins/config/commonhwsettingswidget.h +++ b/ground/gcs/src/plugins/config/commonhwsettingswidget.h @@ -47,7 +47,7 @@ public: void registerWidgets(ConfigTaskWidget &ct); void refreshWidgetsValues(UAVObject *obj); - + void setFeatures(quint32 features); QComboBox *USBVCPComboBox(); diff --git a/ground/gcs/src/plugins/config/configpikoblxhwwidget.h b/ground/gcs/src/plugins/config/configpikoblxhwwidget.h index 5351d178b..28b474e87 100644 --- a/ground/gcs/src/plugins/config/configpikoblxhwwidget.h +++ b/ground/gcs/src/plugins/config/configpikoblxhwwidget.h @@ -52,7 +52,7 @@ private: Ui_PikoBLXHWWidget *m_ui; QComboBox *m_cbUART[HwPikoBLXSettings::UARTPORT_NUMELEM]; - + void updateFeatures(); bool optionConflict(int uartOption, int vcpOption); diff --git a/ground/gcs/src/plugins/config/configspracingf3evohwwidget.cpp b/ground/gcs/src/plugins/config/configspracingf3evohwwidget.cpp index f106d9f71..93eda6884 100644 --- a/ground/gcs/src/plugins/config/configspracingf3evohwwidget.cpp +++ b/ground/gcs/src/plugins/config/configspracingf3evohwwidget.cpp @@ -51,15 +51,15 @@ ConfigSPRacingF3EVOHWWidget::ConfigSPRacingF3EVOHWWidget(QWidget *parent) : Conf addWidgetBinding("HwSPRacingF3EVOSettings", "UARTPort", m_ui->cbUART3, 2, 1, true); addWidgetBinding("HwSPRacingF3EVOSettings", "LEDPort", m_ui->cbLEDPort); addWidgetBinding("HwSPRacingF3EVOSettings", "I2CPort", m_ui->cbI2C1); - + m_cbUART[0] = m_ui->cbUART1; m_cbUART[1] = m_ui->cbUART2; m_cbUART[2] = m_ui->cbUART3; - - for(quint32 i = 0; i < HwSPRacingF3EVOSettings::UARTPORT_NUMELEM; ++i) { + + for (quint32 i = 0; i < HwSPRacingF3EVOSettings::UARTPORT_NUMELEM; ++i) { connect(m_cbUART[i], static_cast(&QComboBox::currentIndexChanged), this, &ConfigSPRacingF3EVOHWWidget::UARTxChanged); } - + m_ui->commonHWSettings->registerWidgets(*this); connect(m_ui->commonHWSettings, &CommonHWSettingsWidget::USBVCPFunctionChanged, this, &ConfigSPRacingF3EVOHWWidget::USBVCPFunctionChanged); @@ -75,10 +75,10 @@ ConfigSPRacingF3EVOHWWidget::~ConfigSPRacingF3EVOHWWidget() void ConfigSPRacingF3EVOHWWidget::refreshWidgetsValuesImpl(UAVObject *obj) { // is this needed? This is to force sane state -// UART1Changed(0); -// UART2Changed(0); -// UART3Changed(0); - +// UART1Changed(0); +// UART2Changed(0); +// UART3Changed(0); + m_ui->commonHWSettings->refreshWidgetsValues(obj); } @@ -89,9 +89,9 @@ void ConfigSPRacingF3EVOHWWidget::updateObjectsFromWidgetsImpl() void ConfigSPRacingF3EVOHWWidget::updateFeatures() { - quint32 features = CommonHWSettingsWidget::F_USB; + quint32 features = CommonHWSettingsWidget::F_USB; - for(quint32 i = 0; i < HwSPRacingF3EVOSettings::UARTPORT_NUMELEM; ++i) { + for (quint32 i = 0; i < HwSPRacingF3EVOSettings::UARTPORT_NUMELEM; ++i) { switch (getComboboxSelectedOption(m_cbUART[i])) { case HwSPRacingF3EVOSettings::UARTPORT_TELEMETRY: features |= CommonHWSettingsWidget::F_TELEMETRY; @@ -132,13 +132,13 @@ bool ConfigSPRacingF3EVOHWWidget::optionConflict(int uartOption, int vcpOption) void ConfigSPRacingF3EVOHWWidget::UARTxChanged(int index) { Q_UNUSED(index); - + QComboBox *cbUARTx = qobject_cast(sender()); - - if(!cbUARTx) { + + if (!cbUARTx) { return; } - + // Everything except HwSPRacingF3EVOSettings::UARTPORT_DISABLED and HwSPRacingF3EVOSettings::UARTPORT_DSM // is allowed on single port only. // HoTT SUMD & SUMH belong to the same receiver group, therefore cannot be configure at the same time @@ -151,8 +151,7 @@ void ConfigSPRacingF3EVOHWWidget::UARTxChanged(int index) } if (option != HwSPRacingF3EVOSettings::UARTPORT_DISABLED && option != HwSPRacingF3EVOSettings::UARTPORT_DSM) { - - for(quint32 i = 0; i < HwSPRacingF3EVOSettings::UARTPORT_NUMELEM; ++i) { + for (quint32 i = 0; i < HwSPRacingF3EVOSettings::UARTPORT_NUMELEM; ++i) { if (m_cbUART[i] == cbUARTx) { continue; } @@ -181,7 +180,7 @@ void ConfigSPRacingF3EVOHWWidget::USBVCPFunctionChanged(int index) int vcpOption = getComboboxSelectedOption(m_ui->commonHWSettings->USBVCPComboBox()); - for(quint32 i = 0; i < HwSPRacingF3EVOSettings::UARTPORT_NUMELEM; ++i) { + for (quint32 i = 0; i < HwSPRacingF3EVOSettings::UARTPORT_NUMELEM; ++i) { if (optionConflict(getComboboxSelectedOption(m_cbUART[i]), vcpOption)) { setComboboxSelectedOption(m_cbUART[i], HwSPRacingF3EVOSettings::UARTPORT_DISABLED); } @@ -189,4 +188,3 @@ void ConfigSPRacingF3EVOHWWidget::USBVCPFunctionChanged(int index) updateFeatures(); } - diff --git a/ground/gcs/src/plugins/config/configspracingf3evohwwidget.h b/ground/gcs/src/plugins/config/configspracingf3evohwwidget.h index 7c4c73ff7..cf8a85372 100644 --- a/ground/gcs/src/plugins/config/configspracingf3evohwwidget.h +++ b/ground/gcs/src/plugins/config/configspracingf3evohwwidget.h @@ -53,7 +53,7 @@ private: Ui_SPRacingF3EVOHWWidget *m_ui; QComboBox *m_cbUART[HwSPRacingF3EVOSettings::UARTPORT_NUMELEM]; - + void updateFeatures(); bool optionConflict(int uartOption, int vcpOption); diff --git a/ground/gcs/src/plugins/config/configtinyfishhwwidget.cpp b/ground/gcs/src/plugins/config/configtinyfishhwwidget.cpp index 7f0771125..a24a1c002 100644 --- a/ground/gcs/src/plugins/config/configtinyfishhwwidget.cpp +++ b/ground/gcs/src/plugins/config/configtinyfishhwwidget.cpp @@ -65,8 +65,8 @@ ConfigTinyFISHHWWidget::~ConfigTinyFISHHWWidget() void ConfigTinyFISHHWWidget::refreshWidgetsValuesImpl(UAVObject *obj) { -// UART3Changed(0); - +// UART3Changed(0); + m_ui->commonHWSettings->refreshWidgetsValues(obj); } @@ -118,10 +118,10 @@ bool ConfigTinyFISHHWWidget::optionConflict(int uartOption, int vcpOption) void ConfigTinyFISHHWWidget::UARTxChanged(int index) { Q_UNUSED(index); - + QComboBox *cbUARTx = qobject_cast(sender()); - - if(!cbUARTx) { + + if (!cbUARTx) { return; }