ARMmbed
/
mbed-os
mirror of https://github.com/ARMmbed/mbed-os.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

STM32L4: STDIO_UART_TX and STDIO_UART_RX can be now user defined

pull/5954/head
jeromecoutant 2017-12-07 14:16:17 +01:00 committed by Cruz Monrreal II‰
parent 346d4cd986
commit cd3a35e79c
13 changed files with 99 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
targets/TARGET_STM/TARGET_STM32L4/TARGET_STM32L432xC/TARGET_NUCLEO_L432KC/PeripheralNames.h
View File

@ -50,10 +50,6 @@ typedef enum {
LPUART_1 = (int)LPUART1_BASE LPUART_1 = (int)LPUART1_BASE
} UARTName; } UARTName;
#define STDIO_UART_TX PA_2
#define STDIO_UART_RX PA_15
#define STDIO_UART UART_2
typedef enum { typedef enum {
SPI_1 = (int)SPI1_BASE, SPI_1 = (int)SPI1_BASE,
SPI_3 = (int)SPI3_BASE SPI_3 = (int)SPI3_BASE

20
targets/TARGET_STM/TARGET_STM32L4/TARGET_STM32L432xC/TARGET_NUCLEO_L432KC/PinNames.h
View File

@ -109,15 +109,27 @@ typedef enum {
D12 = PB_4, D12 = PB_4,
D13 = PB_3, D13 = PB_3,
// STDIO for console print
#ifdef MBED_CONF_TARGET_STDIO_UART_TX
STDIO_UART_TX = MBED_CONF_TARGET_STDIO_UART_TX,
#else
STDIO_UART_TX = PA_2,
#endif
#ifdef MBED_CONF_TARGET_STDIO_UART_RX
STDIO_UART_RX = MBED_CONF_TARGET_STDIO_UART_RX,
#else
STDIO_UART_RX = PA_15,
#endif
// Generic signals namings // Generic signals namings
LED1 = PB_3, LED1 = PB_3,
LED2 = PB_3, LED2 = PB_3,
LED3 = PB_3, LED3 = PB_3,
LED4 = PB_3, LED4 = PB_3,
SERIAL_TX = PA_2, SERIAL_TX = STDIO_UART_TX,
SERIAL_RX = PA_15, SERIAL_RX = STDIO_UART_RX,
USBTX = PA_2, USBTX = STDIO_UART_TX,
USBRX = PA_15, USBRX = STDIO_UART_RX,
I2C_SCL = PB_6, I2C_SCL = PB_6,
I2C_SDA = PB_7, I2C_SDA = PB_7,
SPI_MOSI = PB_5, SPI_MOSI = PB_5,

4
targets/TARGET_STM/TARGET_STM32L4/TARGET_STM32L475xG/TARGET_DISCO_L475VG_IOT01A/PeripheralNames.h
View File

@ -55,10 +55,6 @@ typedef enum {
LPUART_1 = (int)LPUART1_BASE LPUART_1 = (int)LPUART1_BASE
} UARTName; } UARTName;
#define STDIO_UART_TX PB_6
#define STDIO_UART_RX PB_7
#define STDIO_UART UART_1
typedef enum { typedef enum {
SPI_1 = (int)SPI1_BASE, SPI_1 = (int)SPI1_BASE,
SPI_2 = (int)SPI2_BASE, SPI_2 = (int)SPI2_BASE,

20
targets/TARGET_STM/TARGET_STM32L4/TARGET_STM32L475xG/TARGET_DISCO_L475VG_IOT01A/PinNames.h
View File

@ -205,6 +205,18 @@ typedef enum {
D14 = PB_9, D14 = PB_9,
D15 = PB_8, D15 = PB_8,
// STDIO for console print
#ifdef MBED_CONF_TARGET_STDIO_UART_TX
STDIO_UART_TX = MBED_CONF_TARGET_STDIO_UART_TX,
#else
STDIO_UART_TX = PB_6,
#endif
#ifdef MBED_CONF_TARGET_STDIO_UART_RX
STDIO_UART_RX = MBED_CONF_TARGET_STDIO_UART_RX,
#else
STDIO_UART_RX = PB_7,
#endif
// Generic signals namings // Generic signals namings
LED1 = D13, // Green LED (LD1) LED1 = D13, // Green LED (LD1)
LED2 = PB_14, // Green LED (LD2) LED2 = PB_14, // Green LED (LD2)
@ -216,10 +228,10 @@ typedef enum {
BUTTON3 = USER_BUTTON, BUTTON3 = USER_BUTTON,
BUTTON4 = USER_BUTTON, BUTTON4 = USER_BUTTON,
BUTTON5 = USER_BUTTON, BUTTON5 = USER_BUTTON,
SERIAL_TX = PB_6, SERIAL_TX = STDIO_UART_TX,
SERIAL_RX = PB_7, SERIAL_RX = STDIO_UART_RX,
USBTX = SERIAL_TX, USBTX = STDIO_UART_TX,
USBRX = SERIAL_RX, USBRX = STDIO_UART_RX,
I2C_SCL = D15, I2C_SCL = D15,
I2C_SDA = D14, I2C_SDA = D14,
SPI_MOSI = D11, SPI_MOSI = D11,

4
targets/TARGET_STM/TARGET_STM32L4/TARGET_STM32L476xG/TARGET_DISCO_L476VG/PeripheralNames.h
View File

@ -55,10 +55,6 @@ typedef enum {
LPUART_1 = (int)LPUART1_BASE LPUART_1 = (int)LPUART1_BASE
} UARTName; } UARTName;
#define STDIO_UART_TX PD_5
#define STDIO_UART_RX PD_6
#define STDIO_UART UART_2
typedef enum { typedef enum {
SPI_1 = (int)SPI1_BASE, SPI_1 = (int)SPI1_BASE,
SPI_2 = (int)SPI2_BASE, SPI_2 = (int)SPI2_BASE,

20
targets/TARGET_STM/TARGET_STM32L4/TARGET_STM32L476xG/TARGET_DISCO_L476VG/PinNames.h
View File

@ -131,6 +131,18 @@ typedef enum {
ADC_VREF = 0xF1, ADC_VREF = 0xF1,
ADC_VBAT = 0xF2, ADC_VBAT = 0xF2,
// STDIO for console print
#ifdef MBED_CONF_TARGET_STDIO_UART_TX
STDIO_UART_TX = MBED_CONF_TARGET_STDIO_UART_TX,
#else
STDIO_UART_TX = PD_5,
#endif
#ifdef MBED_CONF_TARGET_STDIO_UART_RX
STDIO_UART_RX = MBED_CONF_TARGET_STDIO_UART_RX,
#else
STDIO_UART_RX = PD_6,
#endif
// Generic signals namings // Generic signals namings
LED1 = PE_8, // LD5 Green LED1 = PE_8, // LD5 Green
LED2 = PB_2, // LD4 Red LED2 = PB_2, // LD4 Red
@ -149,10 +161,10 @@ typedef enum {
BUTTON4 = JOYSTICK_UP, BUTTON4 = JOYSTICK_UP,
BUTTON5 = JOYSTICK_DOWN, BUTTON5 = JOYSTICK_DOWN,
SERIAL_TX = PD_5, SERIAL_TX = STDIO_UART_TX,
SERIAL_RX = PD_6, SERIAL_RX = STDIO_UART_RX,
USBTX = PD_5, USBTX = STDIO_UART_TX,
USBRX = PD_6, USBRX = STDIO_UART_RX,
I2C_SCL = PB_8, I2C_SCL = PB_8,
I2C_SDA = PB_9, I2C_SDA = PB_9,

4
targets/TARGET_STM/TARGET_STM32L4/TARGET_STM32L476xG/TARGET_NUCLEO_L476RG/PeripheralNames.h
View File

@ -55,10 +55,6 @@ typedef enum {
LPUART_1 = (int)LPUART1_BASE LPUART_1 = (int)LPUART1_BASE
} UARTName; } UARTName;
#define STDIO_UART_TX PA_2
#define STDIO_UART_RX PA_3
#define STDIO_UART UART_2
typedef enum { typedef enum {
SPI_1 = (int)SPI1_BASE, SPI_1 = (int)SPI1_BASE,
SPI_2 = (int)SPI2_BASE, SPI_2 = (int)SPI2_BASE,

20
targets/TARGET_STM/TARGET_STM32L4/TARGET_STM32L476xG/TARGET_NUCLEO_L476RG/PinNames.h
View File

@ -123,6 +123,18 @@ typedef enum {
D14 = PB_9, D14 = PB_9,
D15 = PB_8, D15 = PB_8,
// STDIO for console print
#ifdef MBED_CONF_TARGET_STDIO_UART_TX
STDIO_UART_TX = MBED_CONF_TARGET_STDIO_UART_TX,
#else
STDIO_UART_TX = PA_2,
#endif
#ifdef MBED_CONF_TARGET_STDIO_UART_RX
STDIO_UART_RX = MBED_CONF_TARGET_STDIO_UART_RX,
#else
STDIO_UART_RX = PA_3,
#endif
// Generic signals namings // Generic signals namings
LED1 = PA_5, LED1 = PA_5,
LED2 = PA_5, LED2 = PA_5,
@ -131,10 +143,10 @@ typedef enum {
USER_BUTTON = PC_13, USER_BUTTON = PC_13,
// Standardized button names // Standardized button names
BUTTON1 = USER_BUTTON, BUTTON1 = USER_BUTTON,
SERIAL_TX = PA_2, SERIAL_TX = STDIO_UART_TX,
SERIAL_RX = PA_3, SERIAL_RX = STDIO_UART_RX,
USBTX = PA_2, USBTX = STDIO_UART_TX,
USBRX = PA_3, USBRX = STDIO_UART_RX,
I2C_SCL = PB_8, I2C_SCL = PB_8,
I2C_SDA = PB_9, I2C_SDA = PB_9,
SPI_MOSI = PA_7, SPI_MOSI = PA_7,

4
targets/TARGET_STM/TARGET_STM32L4/TARGET_STM32L486xG/TARGET_NUCLEO_L486RG/PeripheralNames.h
View File

@ -55,10 +55,6 @@ typedef enum {
LPUART_1 = (int)LPUART1_BASE LPUART_1 = (int)LPUART1_BASE
} UARTName; } UARTName;
#define STDIO_UART_TX PA_2
#define STDIO_UART_RX PA_3
#define STDIO_UART UART_2
typedef enum { typedef enum {
SPI_1 = (int)SPI1_BASE, SPI_1 = (int)SPI1_BASE,
SPI_2 = (int)SPI2_BASE, SPI_2 = (int)SPI2_BASE,

20
targets/TARGET_STM/TARGET_STM32L4/TARGET_STM32L486xG/TARGET_NUCLEO_L486RG/PinNames.h
View File

@ -123,6 +123,18 @@ typedef enum {
D14 = PB_9, D14 = PB_9,
D15 = PB_8, D15 = PB_8,
// STDIO for console print
#ifdef MBED_CONF_TARGET_STDIO_UART_TX
STDIO_UART_TX = MBED_CONF_TARGET_STDIO_UART_TX,
#else
STDIO_UART_TX = PA_2,
#endif
#ifdef MBED_CONF_TARGET_STDIO_UART_RX
STDIO_UART_RX = MBED_CONF_TARGET_STDIO_UART_RX,
#else
STDIO_UART_RX = PA_3,
#endif
// Generic signals namings // Generic signals namings
LED1 = PA_5, LED1 = PA_5,
LED2 = PA_5, LED2 = PA_5,
@ -131,10 +143,10 @@ typedef enum {
USER_BUTTON = PC_13, USER_BUTTON = PC_13,
// Standardized button names // Standardized button names
BUTTON1 = USER_BUTTON, BUTTON1 = USER_BUTTON,
SERIAL_TX = PA_2, SERIAL_TX = STDIO_UART_TX,
SERIAL_RX = PA_3, SERIAL_RX = STDIO_UART_RX,
USBTX = PA_2, USBTX = STDIO_UART_TX,
USBRX = PA_3, USBRX = STDIO_UART_RX,
I2C_SCL = PB_8, I2C_SCL = PB_8,
I2C_SDA = PB_9, I2C_SDA = PB_9,
SPI_MOSI = PA_7, SPI_MOSI = PA_7,

4
targets/TARGET_STM/TARGET_STM32L4/TARGET_STM32L496xG/TARGET_NUCLEO_L496ZG/PeripheralNames.h
View File

@ -55,10 +55,6 @@ typedef enum {
LPUART_1 = (int)LPUART1_BASE LPUART_1 = (int)LPUART1_BASE
} UARTName; } UARTName;
#define STDIO_UART_TX SERIAL_TX
#define STDIO_UART_RX SERIAL_RX
#define STDIO_UART LPUART_1
typedef enum { typedef enum {
SPI_1 = (int)SPI1_BASE, SPI_1 = (int)SPI1_BASE,
SPI_2 = (int)SPI2_BASE, SPI_2 = (int)SPI2_BASE,

20
targets/TARGET_STM/TARGET_STM32L4/TARGET_STM32L496xG/TARGET_NUCLEO_L496ZG/PinNames.h
View File

@ -245,6 +245,18 @@ typedef enum {
D14 = PB_9, D14 = PB_9,
D15 = PB_8, D15 = PB_8,
// STDIO for console print
#ifdef MBED_CONF_TARGET_STDIO_UART_TX
STDIO_UART_TX = MBED_CONF_TARGET_STDIO_UART_TX,
#else
STDIO_UART_TX = PG_7,
#endif
#ifdef MBED_CONF_TARGET_STDIO_UART_RX
STDIO_UART_RX = MBED_CONF_TARGET_STDIO_UART_RX,
#else
STDIO_UART_RX = PG_8,
#endif
// Generic signals namings // Generic signals namings
LED1 = PC_7, LED1 = PC_7,
LED2 = PB_7, LED2 = PB_7,
@ -254,10 +266,10 @@ typedef enum {
// Standardized button names // Standardized button names
BUTTON1 = USER_BUTTON, BUTTON1 = USER_BUTTON,
SERIAL_TX = PG_7, // Virtual Com Port SERIAL_TX = STDIO_UART_TX, // Virtual Com Port
SERIAL_RX = PG_8, // Virtual Com Port SERIAL_RX = STDIO_UART_RX, // Virtual Com Port
USBTX = PG_7, // Virtual Com Port USBTX = STDIO_UART_TX, // Virtual Com Port
USBRX = PG_8, // Virtual Com Port USBRX = STDIO_UART_RX, // Virtual Com Port
I2C_SCL = D15, I2C_SCL = D15,
I2C_SDA = D14, I2C_SDA = D14,
SPI_MOSI = D11, SPI_MOSI = D11,

4
targets/TARGET_STM/TARGET_STM32L4/serial_device.c
View File

@ -34,8 +34,10 @@
#if defined (TARGET_STM32L432xC) #if defined (TARGET_STM32L432xC)
#define UART_NUM (3) #define UART_NUM (3)
#elif defined (TARGET_STM32L433xC)
#define UART_NUM (4)
#else #else
#define UART_NUM (6) // max value #define UART_NUM (6) // max value (TARGET_STM32L475xG / TARGET_STM32L476xG / TARGET_STM32L486xG / TARGET_STM32L496xG)
#endif #endif
uint32_t serial_irq_ids[UART_NUM] = {0}; uint32_t serial_irq_ids[UART_NUM] = {0};