From 562ad3229e085904547b943e14181c10f36eb5f8 Mon Sep 17 00:00:00 2001 From: Attila Body Date: Tue, 1 Jul 2025 15:18:01 +0200 Subject: [PATCH] Insignificant formatting change --- .clang-format | 9 +++------ src/console_handler.cpp | 8 ++++---- src/dma_helper.cpp | 10 +++++----- src/ringbuffer.cpp | 4 ++-- src/usart_core.cpp | 6 +++--- 5 files changed, 17 insertions(+), 20 deletions(-) diff --git a/.clang-format b/.clang-format index 624e7ab..d420259 100644 --- a/.clang-format +++ b/.clang-format @@ -4,7 +4,7 @@ IndentWidth: 4 TabWidth: 4 BreakBeforeBraces: Custom AllowShortFunctionsOnASingleLine: Inline -AllowShortIfStatementsOnASingleLine: true +AllowShortBlocksOnASingleLine: false AllowShortLambdasOnASingleLine: true AllowAllArgumentsOnNextLine: true IndentCaseLabels: true @@ -13,15 +13,12 @@ NamespaceIndentation: None FixNamespaceComments: false PackConstructorInitializers: Never AlignAfterOpenBracket: AlwaysBreak +BreakConstructorInitializersBeforeComma: true InsertBraces: true -SpaceBeforeParens: Custom -SpaceBeforeParensOptions: - AfterControlStatements: true - AfterFunctionDefinitionName: false BraceWrapping: AfterClass: true # false AfterControlStatement: false - AfterEnum: false # false + AfterEnum: true # false AfterFunction: true # false AfterNamespace: false AfterObjCDeclaration: true # false diff --git a/src/console_handler.cpp b/src/console_handler.cpp index 9ff43e7..60f17d7 100644 --- a/src/console_handler.cpp +++ b/src/console_handler.cpp @@ -17,10 +17,10 @@ namespace f4ll { console_handler::console_handler( USART_TypeDef *usart, DMA_TypeDef *dma, uint32_t stream_rx, uint32_t stream_tx, uint8_t *rx_buffer, size_type rx_buffer_size, uint8_t *tx_buffer, size_type tx_buffer_size, iconsole_input *rx_callback) - : usart_core(usart, dma, stream_rx, stream_tx), - m_tx_buffer(tx_buffer, tx_buffer_size), - m_rx_buffer(rx_buffer, rx_buffer_size), - m_rx_callback(rx_callback) + : usart_core(usart, dma, stream_rx, stream_tx) + , m_tx_buffer(tx_buffer, tx_buffer_size) + , m_rx_buffer(rx_buffer, rx_buffer_size) + , m_rx_callback(rx_callback) { LL_USART_EnableIT_IDLE(usart); LL_USART_EnableIT_ERROR(usart); diff --git a/src/dma_helper.cpp b/src/dma_helper.cpp index 42e2e11..96d643d 100644 --- a/src/dma_helper.cpp +++ b/src/dma_helper.cpp @@ -10,12 +10,12 @@ q * ll_dmahelper.cpp namespace f4ll { dma_helper::dma_helper(DMA_TypeDef *dma, uint32_t stream) - : m_dma(dma), - m_stream(stream), - m_is_reg( + : m_dma(dma) + , m_stream(stream) + , m_is_reg( (dma == DMA1) ? ((m_stream < LL_DMA_STREAM_4) ? &DMA1->LISR : &DMA1->HISR) - : ((m_stream < LL_DMA_STREAM_4) ? &DMA2->LISR : &DMA2->HISR)), - m_ifc_reg( + : ((m_stream < LL_DMA_STREAM_4) ? &DMA2->LISR : &DMA2->HISR)) + , m_ifc_reg( (dma == DMA1) ? ((m_stream < LL_DMA_STREAM_4) ? &DMA1->LIFCR : &DMA1->HIFCR) : ((m_stream < LL_DMA_STREAM_4) ? &DMA2->LIFCR : &DMA2->HIFCR)) { diff --git a/src/ringbuffer.cpp b/src/ringbuffer.cpp index ae81ac2..a665a5a 100644 --- a/src/ringbuffer.cpp +++ b/src/ringbuffer.cpp @@ -5,8 +5,8 @@ namespace f4ll { ringbuffer_ext::ringbuffer_ext(uint8_t *bptr, size_type bsize) - : m_buffer(bptr), - m_bsize(bsize) + : m_buffer(bptr) + , m_bsize(bsize) { } diff --git a/src/usart_core.cpp b/src/usart_core.cpp index c0051d6..f4be7cf 100644 --- a/src/usart_core.cpp +++ b/src/usart_core.cpp @@ -10,9 +10,9 @@ namespace f4ll { usart_core::usart_core(USART_TypeDef *usart, DMA_TypeDef *dma, uint32_t streamRx, uint32_t streamTx) - : m_usart(usart), - m_rx_dma(dma, streamRx), - m_tx_dma(dma, streamTx) + : m_usart(usart) + , m_rx_dma(dma, streamRx) + , m_tx_dma(dma, streamTx) { uint32_t status = usart->SR; volatile uint32_t tmpreg = usart->DR; // clearing some of the error/status bits in the USART