mhu/reflow-oven-control-sw
2
0
Fork 0
Code Issues 4 Pull Requests Releases 4 Wiki Activity

Merge branch 'master' into dev

Browse Source
This commit is contained in:
Mario Hüttel 2020-02-23 21:00:17 +01:00
commit 37e2c78b0b
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
stm-firmware/.gitignore vendored
View File

@ -8,3 +8,9 @@ reflow-controller.cxxflags
reflow-controller.files reflow-controller.files
reflow-controller.includes reflow-controller.includes
*.creator.user *.creator.user
*.cflags
*.creator
*.cxxflags
*.includes
*.config
*.files

2
stm-firmware/stm-periph/uart.c
View File

@ -66,7 +66,9 @@ void uart_disable()
UART_PERIPH->CR3 = 0; UART_PERIPH->CR3 = 0;
dma_ring_buffer_periph_to_mem_stop(&ring_buff_rx); dma_ring_buffer_periph_to_mem_stop(&ring_buff_rx);
dma_ring_buffer_mem_to_periph_stop(&ring_buff_tx); dma_ring_buffer_mem_to_periph_stop(&ring_buff_tx);
#ifdef DEBUGBUILD
rcc_manager_disable_clock(&RCC->AHB1ENR, BITMASK_TO_BITNO(UART_PORT_RCC_MASK)); 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)); rcc_manager_disable_clock(&RCC->APB2ENR, BITMASK_TO_BITNO(UART_RCC_MASK));
} }