From 32c8e2e937f19de4ac2ea5629b43469d8695ff8a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mario=20H=C3=BCttel?= Date: Sun, 1 Nov 2020 21:22:28 +0100 Subject: [PATCH] Add define to move uart on debug header even when compiled in release mode --- stm-firmware/Makefile | 2 +- stm-firmware/include/reflow-controller/digio.h | 10 +++++----- .../include/reflow-controller/shell-uart-config.h | 2 +- stm-firmware/main.c | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/stm-firmware/Makefile b/stm-firmware/Makefile index 55ab973..b1f31d8 100644 --- a/stm-firmware/Makefile +++ b/stm-firmware/Makefile @@ -58,7 +58,7 @@ DEFINES += -DBASE64_LOOKUP_TABLE_SECTION="\".ccm.bss\"" DEBUG_DEFINES = -DDEBUGBUILD -RELEASE_DEFINES = +RELEASE_DEFINES = -DUART_ON_DEBUG_HEADER ################################################################################### ifeq ($(CROSS_COMPILE),) diff --git a/stm-firmware/include/reflow-controller/digio.h b/stm-firmware/include/reflow-controller/digio.h index 3fb7671..6d65df6 100644 --- a/stm-firmware/include/reflow-controller/digio.h +++ b/stm-firmware/include/reflow-controller/digio.h @@ -29,7 +29,7 @@ #define DIGIO_RCC_MASK RCC_AHB1ENR_GPIOBEN #define DIGIO_PINS 4,5,6,7 -#ifdef DEBUGBUILD +#if defined(DEBUGBUILD) || defined(UART_ON_DEBUG_HEADER) #define DIGIO_INOUT_DEFAULT 0,0,0,0 #define DIGIO_ALTFUNC_DEFAULT 0,0,0,0 #else @@ -41,7 +41,7 @@ #define BEEPER_RCC_MASK RCC_AHB1ENR_GPIOBEN -void digio_setup_default_all(); +void digio_setup_default_all(void); void digio_setup_pin(uint8_t num, uint8_t in_out, uint8_t alt_func); void digio_set(uint8_t num, int val); @@ -51,7 +51,7 @@ int digio_get(uint8_t num); #define LED_RCC_MASK RCC_AHB1ENR_GPIOBEN #define LED_PINS 2,3 -void led_setup(); +void led_setup(void); void led_set(uint8_t num, int val); int led_get(uint8_t num); @@ -60,9 +60,9 @@ int led_get(uint8_t num); #define LOUDSPEAKER_PIN 1 #define LOUDSPEAKER_MULTIFREQ 1 -void loudspeaker_setup(); +void loudspeaker_setup(void); void loudspeaker_set(uint16_t val); -uint16_t loudspeaker_get(); +uint16_t loudspeaker_get(void); #endif /* __DIGIO_H__ */ diff --git a/stm-firmware/include/reflow-controller/shell-uart-config.h b/stm-firmware/include/reflow-controller/shell-uart-config.h index b9141c4..64d6775 100644 --- a/stm-firmware/include/reflow-controller/shell-uart-config.h +++ b/stm-firmware/include/reflow-controller/shell-uart-config.h @@ -12,7 +12,7 @@ #define SHELL_UART_RX_DMA_TRIGGER 4U #define SHELL_UART_TX_DMA_TRIGGER 4U -#ifdef DEBUGBUILD +#if defined(DEBUGBUILD) || defined(UART_ON_DEBUG_HEADER) #define SHELL_UART_PORT GPIOA #define SHELL_UART_PORT_RCC_MASK RCC_AHB1ENR_GPIOAEN diff --git a/stm-firmware/main.c b/stm-firmware/main.c index aebd5cc..8929d7f 100644 --- a/stm-firmware/main.c +++ b/stm-firmware/main.c @@ -67,7 +67,7 @@ static inline void uart_gpio_config(void) * else the Pins on the DIGIO header are configured in the digio module */ -#ifdef DEBUGBUILD +#if defined(DEBUGBUILD) || defined(UART_ON_DEBUG_HEADER) rcc_manager_enable_clock(&RCC->AHB1ENR, BITMASK_TO_BITNO(SHELL_UART_PORT_RCC_MASK)); SHELL_UART_PORT->MODER &= MODER_DELETE(SHELL_UART_TX_PIN) & MODER_DELETE(SHELL_UART_RX_PIN); SHELL_UART_PORT->MODER |= ALTFUNC(SHELL_UART_RX_PIN) | ALTFUNC(SHELL_UART_TX_PIN);