Insignificant formatting change
This commit is contained in:
parent
8abfd9edae
commit
562ad3229e
5 changed files with 17 additions and 20 deletions
|
@ -4,7 +4,7 @@ IndentWidth: 4
|
||||||
TabWidth: 4
|
TabWidth: 4
|
||||||
BreakBeforeBraces: Custom
|
BreakBeforeBraces: Custom
|
||||||
AllowShortFunctionsOnASingleLine: Inline
|
AllowShortFunctionsOnASingleLine: Inline
|
||||||
AllowShortIfStatementsOnASingleLine: true
|
AllowShortBlocksOnASingleLine: false
|
||||||
AllowShortLambdasOnASingleLine: true
|
AllowShortLambdasOnASingleLine: true
|
||||||
AllowAllArgumentsOnNextLine: true
|
AllowAllArgumentsOnNextLine: true
|
||||||
IndentCaseLabels: true
|
IndentCaseLabels: true
|
||||||
|
@ -13,15 +13,12 @@ NamespaceIndentation: None
|
||||||
FixNamespaceComments: false
|
FixNamespaceComments: false
|
||||||
PackConstructorInitializers: Never
|
PackConstructorInitializers: Never
|
||||||
AlignAfterOpenBracket: AlwaysBreak
|
AlignAfterOpenBracket: AlwaysBreak
|
||||||
|
BreakConstructorInitializersBeforeComma: true
|
||||||
InsertBraces: true
|
InsertBraces: true
|
||||||
SpaceBeforeParens: Custom
|
|
||||||
SpaceBeforeParensOptions:
|
|
||||||
AfterControlStatements: true
|
|
||||||
AfterFunctionDefinitionName: false
|
|
||||||
BraceWrapping:
|
BraceWrapping:
|
||||||
AfterClass: true # false
|
AfterClass: true # false
|
||||||
AfterControlStatement: false
|
AfterControlStatement: false
|
||||||
AfterEnum: false # false
|
AfterEnum: true # false
|
||||||
AfterFunction: true # false
|
AfterFunction: true # false
|
||||||
AfterNamespace: false
|
AfterNamespace: false
|
||||||
AfterObjCDeclaration: true # false
|
AfterObjCDeclaration: true # false
|
||||||
|
|
|
@ -17,10 +17,10 @@ namespace f4ll {
|
||||||
console_handler::console_handler(
|
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,
|
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)
|
uint8_t *tx_buffer, size_type tx_buffer_size, iconsole_input *rx_callback)
|
||||||
: usart_core(usart, dma, stream_rx, stream_tx),
|
: usart_core(usart, dma, stream_rx, stream_tx)
|
||||||
m_tx_buffer(tx_buffer, tx_buffer_size),
|
, m_tx_buffer(tx_buffer, tx_buffer_size)
|
||||||
m_rx_buffer(rx_buffer, rx_buffer_size),
|
, m_rx_buffer(rx_buffer, rx_buffer_size)
|
||||||
m_rx_callback(rx_callback)
|
, m_rx_callback(rx_callback)
|
||||||
{
|
{
|
||||||
LL_USART_EnableIT_IDLE(usart);
|
LL_USART_EnableIT_IDLE(usart);
|
||||||
LL_USART_EnableIT_ERROR(usart);
|
LL_USART_EnableIT_ERROR(usart);
|
||||||
|
|
|
@ -10,12 +10,12 @@ q * ll_dmahelper.cpp
|
||||||
namespace f4ll {
|
namespace f4ll {
|
||||||
|
|
||||||
dma_helper::dma_helper(DMA_TypeDef *dma, uint32_t stream)
|
dma_helper::dma_helper(DMA_TypeDef *dma, uint32_t stream)
|
||||||
: m_dma(dma),
|
: m_dma(dma)
|
||||||
m_stream(stream),
|
, m_stream(stream)
|
||||||
m_is_reg(
|
, m_is_reg(
|
||||||
(dma == DMA1) ? ((m_stream < LL_DMA_STREAM_4) ? &DMA1->LISR : &DMA1->HISR)
|
(dma == DMA1) ? ((m_stream < LL_DMA_STREAM_4) ? &DMA1->LISR : &DMA1->HISR)
|
||||||
: ((m_stream < LL_DMA_STREAM_4) ? &DMA2->LISR : &DMA2->HISR)),
|
: ((m_stream < LL_DMA_STREAM_4) ? &DMA2->LISR : &DMA2->HISR))
|
||||||
m_ifc_reg(
|
, m_ifc_reg(
|
||||||
(dma == DMA1) ? ((m_stream < LL_DMA_STREAM_4) ? &DMA1->LIFCR : &DMA1->HIFCR)
|
(dma == DMA1) ? ((m_stream < LL_DMA_STREAM_4) ? &DMA1->LIFCR : &DMA1->HIFCR)
|
||||||
: ((m_stream < LL_DMA_STREAM_4) ? &DMA2->LIFCR : &DMA2->HIFCR))
|
: ((m_stream < LL_DMA_STREAM_4) ? &DMA2->LIFCR : &DMA2->HIFCR))
|
||||||
{
|
{
|
||||||
|
|
|
@ -5,8 +5,8 @@
|
||||||
namespace f4ll {
|
namespace f4ll {
|
||||||
|
|
||||||
ringbuffer_ext::ringbuffer_ext(uint8_t *bptr, size_type bsize)
|
ringbuffer_ext::ringbuffer_ext(uint8_t *bptr, size_type bsize)
|
||||||
: m_buffer(bptr),
|
: m_buffer(bptr)
|
||||||
m_bsize(bsize)
|
, m_bsize(bsize)
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -10,9 +10,9 @@
|
||||||
namespace f4ll {
|
namespace f4ll {
|
||||||
|
|
||||||
usart_core::usart_core(USART_TypeDef *usart, DMA_TypeDef *dma, uint32_t streamRx, uint32_t streamTx)
|
usart_core::usart_core(USART_TypeDef *usart, DMA_TypeDef *dma, uint32_t streamRx, uint32_t streamTx)
|
||||||
: m_usart(usart),
|
: m_usart(usart)
|
||||||
m_rx_dma(dma, streamRx),
|
, m_rx_dma(dma, streamRx)
|
||||||
m_tx_dma(dma, streamTx)
|
, m_tx_dma(dma, streamTx)
|
||||||
{
|
{
|
||||||
uint32_t status = usart->SR;
|
uint32_t status = usart->SR;
|
||||||
volatile uint32_t tmpreg = usart->DR; // clearing some of the error/status bits in the USART
|
volatile uint32_t tmpreg = usart->DR; // clearing some of the error/status bits in the USART
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue