From 6832afa087c86bf5e1dadd2cca4c307d18d8ea9d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mario=20H=C3=BCttel?= Date: Sun, 23 Feb 2020 20:58:13 +0100 Subject: [PATCH 1/3] Add all qtcreator files to ignore list --- stm-firmware/.gitignore | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/stm-firmware/.gitignore b/stm-firmware/.gitignore index 105a1db..cfdd888 100644 --- a/stm-firmware/.gitignore +++ b/stm-firmware/.gitignore @@ -8,3 +8,9 @@ reflow-controller.cxxflags reflow-controller.files reflow-controller.includes *.creator.user +*.cflags +*.creator +*.cxxflags +*.includes +*.config +*.files From c3ff199a09cda06a394f970db2981434b30ea643 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mario=20H=C3=BCttel?= Date: Sun, 23 Feb 2020 20:58:35 +0100 Subject: [PATCH 2/3] remove TODO from makefile --- stm-firmware/Makefile | 2 -- 1 file changed, 2 deletions(-) diff --git a/stm-firmware/Makefile b/stm-firmware/Makefile index b3c78d4..940227c 100644 --- a/stm-firmware/Makefile +++ b/stm-firmware/Makefile @@ -48,8 +48,6 @@ CFILES += temp-converter.c CFILES += rotary-encoder.c DEFINES += -DDEBUGBUILD -#TODO - ################################################################################### CC=arm-none-eabi-gcc OBJCOPY=arm-none-eabi-objcopy From e85a26d90bc0f46bbc4690e7373da4c74cb5b55b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mario=20H=C3=BCttel?= Date: Sun, 23 Feb 2020 20:58:56 +0100 Subject: [PATCH 3/3] Fix bug in uart, when compiled in release mode --- stm-firmware/stm-periph/uart.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/stm-firmware/stm-periph/uart.c b/stm-firmware/stm-periph/uart.c index 90ed9e5..9e0568c 100644 --- a/stm-firmware/stm-periph/uart.c +++ b/stm-firmware/stm-periph/uart.c @@ -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)); }