From 6214c0ea30ca1c47703ba9bd35a0255b5d7673e1 Mon Sep 17 00:00:00 2001 From: Alessio Morale Date: Sun, 3 Jul 2016 17:10:46 +0200 Subject: [PATCH] Uncrustify --- flight/pios/inc/pios_exti.h | 8 ++++---- flight/pios/stm32f0x/pios_exti.c | 15 +++++++-------- flight/pios/stm32f10x/pios_exti.c | 15 +++++++-------- flight/pios/stm32f4xx/pios_exti.c | 15 +++++++-------- .../src/plugins/serialconnection/serialplugin.cpp | 5 +++-- 5 files changed, 28 insertions(+), 30 deletions(-) diff --git a/flight/pios/inc/pios_exti.h b/flight/pios/inc/pios_exti.h index f59f4270a..081271b66 100644 --- a/flight/pios/inc/pios_exti.h +++ b/flight/pios/inc/pios_exti.h @@ -35,14 +35,14 @@ #include -typedef bool (* pios_exti_vector_t)(void); +typedef bool (*pios_exti_vector_t)(void); struct pios_exti_cfg { pios_exti_vector_t vector; uint32_t line; /* use EXTI_LineN macros */ - struct stm32_gpio pin; - struct stm32_irq irq; - struct stm32_exti exti; + struct stm32_gpio pin; + struct stm32_irq irq; + struct stm32_exti exti; }; /* must be added to any pios_exti_cfg definition for it to be valid */ diff --git a/flight/pios/stm32f0x/pios_exti.c b/flight/pios/stm32f0x/pios_exti.c index 29203eb62..8abf9e0f9 100644 --- a/flight/pios/stm32f0x/pios_exti.c +++ b/flight/pios/stm32f0x/pios_exti.c @@ -34,7 +34,7 @@ #ifdef PIOS_INCLUDE_EXTI /* Map EXTI line to full config */ -#define EXTI_MAX_LINES 16 +#define EXTI_MAX_LINES 16 static pios_exti_vector_t pios_exti_vector[EXTI_MAX_LINES]; @@ -161,7 +161,7 @@ int32_t PIOS_EXTI_Init(const struct pios_exti_cfg *cfg) /* Following is not entirely correct! There is cfg->pin.pin_source to serve this purpose, and GPIO_Pin can also contain more than one bit set */ uint8_t exti_source_pin = PIOS_EXTI_gpio_pin_to_exti_source_pin(cfg->pin.init.GPIO_Pin); SYSCFG_EXTILineConfig(exti_source_port, exti_source_pin); - EXTI_Init((EXTI_InitTypeDef*)&cfg->exti.init); + EXTI_Init((EXTI_InitTypeDef *)&cfg->exti.init); /* Enable the interrupt channel */ NVIC_Init(&cfg->irq.init); @@ -173,26 +173,25 @@ int32_t PIOS_EXTI_DeInit(const struct pios_exti_cfg *cfg) { uint8_t line_index = PIOS_EXTI_line_to_index(cfg->line); - if(pios_exti_vector[line_index] == cfg->vector) { - + if (pios_exti_vector[line_index] == cfg->vector) { EXTI_InitTypeDef disable = cfg->exti.init; disable.EXTI_LineCmd = DISABLE; - + EXTI_Init(&disable); pios_exti_vector[line_index] = 0; return 0; } - + return -1; } static bool PIOS_EXTI_generic_irq_handler(uint8_t line_index) { - if(pios_exti_vector[line_index]) { + if (pios_exti_vector[line_index]) { return pios_exti_vector[line_index](); } - + /* Unconfigured interrupt just fired! */ return false; } diff --git a/flight/pios/stm32f10x/pios_exti.c b/flight/pios/stm32f10x/pios_exti.c index 958f8d056..f1a3693d8 100644 --- a/flight/pios/stm32f10x/pios_exti.c +++ b/flight/pios/stm32f10x/pios_exti.c @@ -34,7 +34,7 @@ #ifdef PIOS_INCLUDE_EXTI /* Map EXTI line to full config */ -#define EXTI_MAX_LINES 16 +#define EXTI_MAX_LINES 16 static pios_exti_vector_t pios_exti_vector[EXTI_MAX_LINES]; @@ -174,26 +174,25 @@ int32_t PIOS_EXTI_DeInit(const struct pios_exti_cfg *cfg) { uint8_t line_index = PIOS_EXTI_line_to_index(cfg->line); - if(pios_exti_vector[line_index] == cfg->vector) { - + if (pios_exti_vector[line_index] == cfg->vector) { EXTI_InitTypeDef disable = cfg->exti.init; disable.EXTI_LineCmd = DISABLE; - + EXTI_Init(&disable); pios_exti_vector[line_index] = 0; - + return 0; } - + return -1; } static bool PIOS_EXTI_generic_irq_handler(uint8_t line_index) { - if(pios_exti_vector[line_index]) { + if (pios_exti_vector[line_index]) { return pios_exti_vector[line_index](); } - + /* Unconfigured interrupt just fired! */ return false; } diff --git a/flight/pios/stm32f4xx/pios_exti.c b/flight/pios/stm32f4xx/pios_exti.c index 8b3a45bff..55f59a90e 100644 --- a/flight/pios/stm32f4xx/pios_exti.c +++ b/flight/pios/stm32f4xx/pios_exti.c @@ -33,7 +33,7 @@ #ifdef PIOS_INCLUDE_EXTI -#define EXTI_MAX_LINES 16 +#define EXTI_MAX_LINES 16 static pios_exti_vector_t pios_exti_vector[EXTI_MAX_LINES]; @@ -174,26 +174,25 @@ int32_t PIOS_EXTI_DeInit(const struct pios_exti_cfg *cfg) { uint8_t line_index = PIOS_EXTI_line_to_index(cfg->line); - if(pios_exti_vector[line_index] == cfg->vector) { - + if (pios_exti_vector[line_index] == cfg->vector) { EXTI_InitTypeDef disable = cfg->exti.init; disable.EXTI_LineCmd = DISABLE; - + EXTI_Init(&disable); pios_exti_vector[line_index] = 0; - + return 0; } - + return -1; } static bool PIOS_EXTI_generic_irq_handler(uint8_t line_index) { - if(pios_exti_vector[line_index]) { + if (pios_exti_vector[line_index]) { return pios_exti_vector[line_index](); } - + /* Unconfigured interrupt just fired! */ return false; } diff --git a/ground/gcs/src/plugins/serialconnection/serialplugin.cpp b/ground/gcs/src/plugins/serialconnection/serialplugin.cpp index f97cd8cfb..dcaed9919 100644 --- a/ground/gcs/src/plugins/serialconnection/serialplugin.cpp +++ b/ground/gcs/src/plugins/serialconnection/serialplugin.cpp @@ -162,8 +162,9 @@ QIODevice *SerialConnection::openDevice(const QString &deviceName) // don't specify a parent when constructing the QSerialPort as this object will be moved // to a different thread later on (see telemetrymanager.cpp) serialHandle = new QSerialPort(port); - connect(serialHandle, static_cast(&QSerialPort::error), - [=](QSerialPort::SerialPortError error) { qWarning() << "serial port error:" << error; }); + connect(serialHandle, static_cast(&QSerialPort::error), + [ = ](QSerialPort::SerialPortError error) { qWarning() << "serial port error:" << error; } + ); // we need to handle port settings here... if (serialHandle->open(QIODevice::ReadWrite)) { if (serialHandle->setBaudRate(m_config->speed().toInt())