Skip to content

Commit 4bd3df4

Browse files
committed
LP-525 Uncrustify
1 parent f5c10ca commit 4bd3df4

5 files changed

Lines changed: 24 additions & 26 deletions

File tree

ground/gcs/src/plugins/config/commonhwsettingswidget.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ class CommonHWSettingsWidget : public QWidget {
4747

4848
void registerWidgets(ConfigTaskWidget &ct);
4949
void refreshWidgetsValues(UAVObject *obj);
50-
50+
5151
void setFeatures(quint32 features);
5252

5353
QComboBox *USBVCPComboBox();

ground/gcs/src/plugins/config/configpikoblxhwwidget.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ class ConfigPikoBLXHWWidget : public ConfigTaskWidget {
5252
Ui_PikoBLXHWWidget *m_ui;
5353

5454
QComboBox *m_cbUART[HwPikoBLXSettings::UARTPORT_NUMELEM];
55-
55+
5656
void updateFeatures();
5757

5858
bool optionConflict(int uartOption, int vcpOption);

ground/gcs/src/plugins/config/configspracingf3evohwwidget.cpp

Lines changed: 16 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -51,15 +51,15 @@ ConfigSPRacingF3EVOHWWidget::ConfigSPRacingF3EVOHWWidget(QWidget *parent) : Conf
5151
addWidgetBinding("HwSPRacingF3EVOSettings", "UARTPort", m_ui->cbUART3, 2, 1, true);
5252
addWidgetBinding("HwSPRacingF3EVOSettings", "LEDPort", m_ui->cbLEDPort);
5353
addWidgetBinding("HwSPRacingF3EVOSettings", "I2CPort", m_ui->cbI2C1);
54-
54+
5555
m_cbUART[0] = m_ui->cbUART1;
5656
m_cbUART[1] = m_ui->cbUART2;
5757
m_cbUART[2] = m_ui->cbUART3;
58-
59-
for(quint32 i = 0; i < HwSPRacingF3EVOSettings::UARTPORT_NUMELEM; ++i) {
58+
59+
for (quint32 i = 0; i < HwSPRacingF3EVOSettings::UARTPORT_NUMELEM; ++i) {
6060
connect(m_cbUART[i], static_cast<void(QComboBox::*) (int)>(&QComboBox::currentIndexChanged), this, &ConfigSPRacingF3EVOHWWidget::UARTxChanged);
6161
}
62-
62+
6363
m_ui->commonHWSettings->registerWidgets(*this);
6464

6565
connect(m_ui->commonHWSettings, &CommonHWSettingsWidget::USBVCPFunctionChanged, this, &ConfigSPRacingF3EVOHWWidget::USBVCPFunctionChanged);
@@ -75,10 +75,10 @@ ConfigSPRacingF3EVOHWWidget::~ConfigSPRacingF3EVOHWWidget()
7575
void ConfigSPRacingF3EVOHWWidget::refreshWidgetsValuesImpl(UAVObject *obj)
7676
{
7777
// is this needed? This is to force sane state
78-
// UART1Changed(0);
79-
// UART2Changed(0);
80-
// UART3Changed(0);
81-
78+
// UART1Changed(0);
79+
// UART2Changed(0);
80+
// UART3Changed(0);
81+
8282
m_ui->commonHWSettings->refreshWidgetsValues(obj);
8383
}
8484

@@ -89,9 +89,9 @@ void ConfigSPRacingF3EVOHWWidget::updateObjectsFromWidgetsImpl()
8989

9090
void ConfigSPRacingF3EVOHWWidget::updateFeatures()
9191
{
92-
quint32 features = CommonHWSettingsWidget::F_USB;
92+
quint32 features = CommonHWSettingsWidget::F_USB;
9393

94-
for(quint32 i = 0; i < HwSPRacingF3EVOSettings::UARTPORT_NUMELEM; ++i) {
94+
for (quint32 i = 0; i < HwSPRacingF3EVOSettings::UARTPORT_NUMELEM; ++i) {
9595
switch (getComboboxSelectedOption(m_cbUART[i])) {
9696
case HwSPRacingF3EVOSettings::UARTPORT_TELEMETRY:
9797
features |= CommonHWSettingsWidget::F_TELEMETRY;
@@ -132,13 +132,13 @@ bool ConfigSPRacingF3EVOHWWidget::optionConflict(int uartOption, int vcpOption)
132132
void ConfigSPRacingF3EVOHWWidget::UARTxChanged(int index)
133133
{
134134
Q_UNUSED(index);
135-
135+
136136
QComboBox *cbUARTx = qobject_cast<QComboBox *>(sender());
137-
138-
if(!cbUARTx) {
137+
138+
if (!cbUARTx) {
139139
return;
140140
}
141-
141+
142142
// Everything except HwSPRacingF3EVOSettings::UARTPORT_DISABLED and HwSPRacingF3EVOSettings::UARTPORT_DSM
143143
// is allowed on single port only.
144144
// 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)
151151
}
152152

153153
if (option != HwSPRacingF3EVOSettings::UARTPORT_DISABLED && option != HwSPRacingF3EVOSettings::UARTPORT_DSM) {
154-
155-
for(quint32 i = 0; i < HwSPRacingF3EVOSettings::UARTPORT_NUMELEM; ++i) {
154+
for (quint32 i = 0; i < HwSPRacingF3EVOSettings::UARTPORT_NUMELEM; ++i) {
156155
if (m_cbUART[i] == cbUARTx) {
157156
continue;
158157
}
@@ -181,12 +180,11 @@ void ConfigSPRacingF3EVOHWWidget::USBVCPFunctionChanged(int index)
181180

182181
int vcpOption = getComboboxSelectedOption(m_ui->commonHWSettings->USBVCPComboBox());
183182

184-
for(quint32 i = 0; i < HwSPRacingF3EVOSettings::UARTPORT_NUMELEM; ++i) {
183+
for (quint32 i = 0; i < HwSPRacingF3EVOSettings::UARTPORT_NUMELEM; ++i) {
185184
if (optionConflict(getComboboxSelectedOption(m_cbUART[i]), vcpOption)) {
186185
setComboboxSelectedOption(m_cbUART[i], HwSPRacingF3EVOSettings::UARTPORT_DISABLED);
187186
}
188187
}
189188

190189
updateFeatures();
191190
}
192-

ground/gcs/src/plugins/config/configspracingf3evohwwidget.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ class ConfigSPRacingF3EVOHWWidget : public ConfigTaskWidget {
5353
Ui_SPRacingF3EVOHWWidget *m_ui;
5454

5555
QComboBox *m_cbUART[HwSPRacingF3EVOSettings::UARTPORT_NUMELEM];
56-
56+
5757
void updateFeatures();
5858

5959
bool optionConflict(int uartOption, int vcpOption);

ground/gcs/src/plugins/config/configtinyfishhwwidget.cpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -65,8 +65,8 @@ ConfigTinyFISHHWWidget::~ConfigTinyFISHHWWidget()
6565

6666
void ConfigTinyFISHHWWidget::refreshWidgetsValuesImpl(UAVObject *obj)
6767
{
68-
// UART3Changed(0);
69-
68+
// UART3Changed(0);
69+
7070
m_ui->commonHWSettings->refreshWidgetsValues(obj);
7171
}
7272

@@ -118,10 +118,10 @@ bool ConfigTinyFISHHWWidget::optionConflict(int uartOption, int vcpOption)
118118
void ConfigTinyFISHHWWidget::UARTxChanged(int index)
119119
{
120120
Q_UNUSED(index);
121-
121+
122122
QComboBox *cbUARTx = qobject_cast<QComboBox *>(sender());
123-
124-
if(!cbUARTx) {
123+
124+
if (!cbUARTx) {
125125
return;
126126
}
127127

0 commit comments

Comments
 (0)