rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2025-02-26 15:54:15 +01:00
Code Issues Releases Activity

LP-525 Uncrustify

Browse Source
This commit is contained in:
Vladimir Zidar 2017-10-23 22:56:27 +02:00
parent f5c10ca611
commit 4bd3df43aa
5 changed files with 24 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
ground/gcs/src/plugins/config/configspracingf3evohwwidget.cpp
View File

@ -56,7 +56,7 @@ ConfigSPRacingF3EVOHWWidget::ConfigSPRacingF3EVOHWWidget(QWidget *parent) : Conf
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<void(QComboBox::*) (int)>(&QComboBox::currentIndexChanged), this, &ConfigSPRacingF3EVOHWWidget::UARTxChanged);
}
@ -75,9 +75,9 @@ 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;
@ -135,7 +135,7 @@ void ConfigSPRacingF3EVOHWWidget::UARTxChanged(int index)
QComboBox *cbUARTx = qobject_cast<QComboBox *>(sender());
if(!cbUARTx) {
if (!cbUARTx) {
return;
}
@ -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();
}

4
ground/gcs/src/plugins/config/configtinyfishhwwidget.cpp
View File

@ -65,7 +65,7 @@ ConfigTinyFISHHWWidget::~ConfigTinyFISHHWWidget()
void ConfigTinyFISHHWWidget::refreshWidgetsValuesImpl(UAVObject *obj)
{
// UART3Changed(0);
// UART3Changed(0);
m_ui->commonHWSettings->refreshWidgetsValues(obj);
}
@ -121,7 +121,7 @@ void ConfigTinyFISHHWWidget::UARTxChanged(int index)
QComboBox *cbUARTx = qobject_cast<QComboBox *>(sender());
if(!cbUARTx) {
if (!cbUARTx) {
return;
}