Merge branch 'master' into dev
This commit is contained in:
commit
37e2c78b0b
6
stm-firmware/.gitignore
vendored
6
stm-firmware/.gitignore
vendored
@ -8,3 +8,9 @@ reflow-controller.cxxflags
|
||||
reflow-controller.files
|
||||
reflow-controller.includes
|
||||
*.creator.user
|
||||
*.cflags
|
||||
*.creator
|
||||
*.cxxflags
|
||||
*.includes
|
||||
*.config
|
||||
*.files
|
||||
|
@ -66,7 +66,9 @@ void uart_disable()
|
||||
UART_PERIPH->CR3 = 0;
|
||||
dma_ring_buffer_periph_to_mem_stop(&ring_buff_rx);
|
||||
dma_ring_buffer_mem_to_periph_stop(&ring_buff_tx);
|
||||
rcc_manager_disable_clock(&RCC->AHB1ENR, BITMASK_TO_BITNO(UART_PORT_RCC_MASK));
|
||||
#ifdef DEBUGBUILD
|
||||
rcc_manager_disable_clock(&RCC->AHB1ENR, BITMASK_TO_BITNO(UART_PORT_RCC_MASK));
|
||||
#endif
|
||||
rcc_manager_disable_clock(&RCC->APB2ENR, BITMASK_TO_BITNO(UART_RCC_MASK));
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user