From eafaca379e4ca08267a6ef4fafee3920b3e020c7 Mon Sep 17 00:00:00 2001 From: jeromecoutant Date: Mon, 18 Jan 2021 17:18:06 +0100 Subject: [PATCH] [STD-PIN] STM32L5: standardized pins --- .../TARGET_NUCLEO_L552ZE_Q/PinNames.h | 85 ++++++++----------- .../TARGET_DISCO_L562QE/PinNames.h | 82 +++++++----------- targets/targets.json | 5 +- 3 files changed, 70 insertions(+), 102 deletions(-) diff --git a/targets/TARGET_STM/TARGET_STM32L5/TARGET_STM32L552xE/TARGET_NUCLEO_L552ZE_Q/PinNames.h b/targets/TARGET_STM/TARGET_STM32L5/TARGET_STM32L552xE/TARGET_NUCLEO_L552ZE_Q/PinNames.h index b2abd59704..eacd4616ca 100644 --- a/targets/TARGET_STM/TARGET_STM32L5/TARGET_STM32L552xE/TARGET_NUCLEO_L552ZE_Q/PinNames.h +++ b/targets/TARGET_STM/TARGET_STM32L5/TARGET_STM32L552xE/TARGET_NUCLEO_L552ZE_Q/PinNames.h @@ -194,65 +194,43 @@ typedef enum { ADC_VREF = 0xF1, // Internal pin virtual value ADC_VBAT = 0xF2, // Internal pin virtual value - // Arduino Uno(Rev3) Header pin connection naming - A0 = PA_3, - A1 = PA_2, - A2 = PC_3, - A3 = PB_0, - A4 = PC_1, - A5 = PC_0, - D0 = PD_9, - D1 = PD_8, - D2 = PF_15, - D3 = PE_13, - D4 = PF_14, - D5 = PE_11, - D6 = PE_9, - D7 = PF_13, - D8 = PF_12, - D9 = PD_15, - D10 = PD_14, - D11 = PA_7, - D12 = PA_6, - D13 = PA_5, - D14 = PB_9, - D15 = PB_8, +#ifdef TARGET_FF_ARDUINO_UNO + ARDUINO_UNO_A0 = PA_3, + ARDUINO_UNO_A1 = PA_2, + ARDUINO_UNO_A2 = PC_3, + ARDUINO_UNO_A3 = PB_0, + ARDUINO_UNO_A4 = PC_1, + ARDUINO_UNO_A5 = PC_0, + ARDUINO_UNO_D0 = PD_9, + ARDUINO_UNO_D1 = PD_8, + ARDUINO_UNO_D2 = PF_15, + ARDUINO_UNO_D3 = PE_13, + ARDUINO_UNO_D4 = PF_14, + ARDUINO_UNO_D5 = PE_11, + ARDUINO_UNO_D6 = PE_9, + ARDUINO_UNO_D7 = PF_13, + ARDUINO_UNO_D8 = PF_12, + ARDUINO_UNO_D9 = PD_15, + ARDUINO_UNO_D10 = PD_14, + ARDUINO_UNO_D11 = PA_7, + ARDUINO_UNO_D12 = PA_6, + ARDUINO_UNO_D13 = PA_5, + ARDUINO_UNO_D14 = PB_9, + ARDUINO_UNO_D15 = PB_8, +#endif // STDIO for console print #ifdef MBED_CONF_TARGET_STDIO_UART_TX - STDIO_UART_TX = MBED_CONF_TARGET_STDIO_UART_TX, + USBTX = MBED_CONF_TARGET_STDIO_UART_TX, #else - STDIO_UART_TX = PG_7, + USBTX = PG_7, #endif #ifdef MBED_CONF_TARGET_STDIO_UART_RX - STDIO_UART_RX = MBED_CONF_TARGET_STDIO_UART_RX, + USBRX = MBED_CONF_TARGET_STDIO_UART_RX, #else - STDIO_UART_RX = PG_8, + USBRX = PG_8, #endif - USBTX = STDIO_UART_TX, // used for greentea tests - USBRX = STDIO_UART_RX, // used for greentea tests - - // I2C signals aliases - I2C_SDA = D14, - I2C_SCL = D15, - - // SPI signals aliases - SPI_CS = D10, - SPI_MOSI = D11, - SPI_MISO = D12, - SPI_SCK = D13, - - // Standardized LED and button names - LED1 = PC_7, // LD1 LED_GREEN - LED2 = PB_7, // LD2 LED_BLUE - LED3 = PA_9, // LD3 LED_RED - BUTTON1 = PC_13, // USER_BUTTON - - // Backward legacy names - USER_BUTTON = BUTTON1, - PWM_OUT = D9, - /**** USB pins ****/ USB_DM = PA_11, USB_DP = PA_12, @@ -291,6 +269,13 @@ typedef enum { NC = (int)0xFFFFFFFF } PinName; +// Standardized LED and button names +#define LED1 PC_7 // LD1 Green +#define LED2 PB_7 // LD2 Blue +#define LED3 PA_9 // LD3 Red +#define BUTTON1 PC_13 + + #ifdef __cplusplus } #endif diff --git a/targets/TARGET_STM/TARGET_STM32L5/TARGET_STM32L562xE/TARGET_DISCO_L562QE/PinNames.h b/targets/TARGET_STM/TARGET_STM32L5/TARGET_STM32L562xE/TARGET_DISCO_L562QE/PinNames.h index 2c4b23045b..1e1a019e87 100644 --- a/targets/TARGET_STM/TARGET_STM32L5/TARGET_STM32L562xE/TARGET_DISCO_L562QE/PinNames.h +++ b/targets/TARGET_STM/TARGET_STM32L5/TARGET_STM32L562xE/TARGET_DISCO_L562QE/PinNames.h @@ -191,64 +191,43 @@ typedef enum { ADC_VREF = 0xF1, // Internal pin virtual value ADC_VBAT = 0xF2, // Internal pin virtual value - // Arduino Uno(Rev3) Header pin connection naming - A0 = PA_0, - A1 = PA_1, - A2 = PA_4, - A3 = PA_5, - A4 = PC_4, - A5 = PC_5, - D0 = PB_10, - D1 = PB_11, - D2 = PD_11, - D3 = PD_12, - D4 = PF_4, - D5 = PD_13, - D6 = PB_8, - D7 = PC_6, - D8 = PG_0, - D9 = PB_9, - D10 = PE_0, - D11 = PB_5, - D12 = PB_4, - D13 = PG_9, - D14 = PB_7, - D15 = PB_6, +#ifdef TARGET_FF_ARDUINO_UNO + ARDUINO_UNO_A0 = PA_0, + ARDUINO_UNO_A1 = PA_1, + ARDUINO_UNO_A2 = PA_4, + ARDUINO_UNO_A3 = PA_5, + ARDUINO_UNO_A4 = PC_4, + ARDUINO_UNO_A5 = PC_5, + ARDUINO_UNO_D0 = PB_10, + ARDUINO_UNO_D1 = PB_11, + ARDUINO_UNO_D2 = PD_11, + ARDUINO_UNO_D3 = PD_12, + ARDUINO_UNO_D4 = PF_4, + ARDUINO_UNO_D5 = PD_13, + ARDUINO_UNO_D6 = PB_8, + ARDUINO_UNO_D7 = PC_6, + ARDUINO_UNO_D8 = PG_0, + ARDUINO_UNO_D9 = PB_9, + ARDUINO_UNO_D10 = PE_0, + ARDUINO_UNO_D11 = PB_5, + ARDUINO_UNO_D12 = PB_4, + ARDUINO_UNO_D13 = PG_9, + ARDUINO_UNO_D14 = PB_7, + ARDUINO_UNO_D15 = PB_6, +#endif // STDIO for console print #ifdef MBED_CONF_TARGET_STDIO_UART_TX - STDIO_UART_TX = MBED_CONF_TARGET_STDIO_UART_TX, + USBTX = MBED_CONF_TARGET_STDIO_UART_TX, #else - STDIO_UART_TX = PA_9, + USBTX = PA_9, #endif #ifdef MBED_CONF_TARGET_STDIO_UART_RX - STDIO_UART_RX = MBED_CONF_TARGET_STDIO_UART_RX, + USBRX = MBED_CONF_TARGET_STDIO_UART_RX, #else - STDIO_UART_RX = PA_10, + USBRX = PA_10, #endif - USBTX = STDIO_UART_TX, // used for greentea tests - USBRX = STDIO_UART_RX, // used for greentea tests - - // I2C signals aliases - I2C_SDA = D14, - I2C_SCL = D15, - - // SPI signals aliases - SPI_CS = D10, - SPI_MOSI = D11, - SPI_MISO = D12, - SPI_SCK = D13, - - // Standardized LED and button names - LED1 = PD_3, // LD9 LED_RED - LED2 = PG_12, // LD10 LED_GREEN - BUTTON1 = PC_13, // USER_BUTTON - - // Backward legacy names - USER_BUTTON = BUTTON1, - PWM_OUT = D9, - /**** USB pins ****/ USB_DM = PA_11, USB_DP = PA_12, @@ -350,6 +329,11 @@ typedef enum { NC = (int)0xFFFFFFFF } PinName; +// Standardized LED and button names +#define LED1 PG_12 // LD7 Green +#define LED2 PE_1 // LD9 Red +#define BUTTON1 PC_13 + #ifdef __cplusplus } #endif diff --git a/targets/targets.json b/targets/targets.json index 0658344342..0a18186bbc 100644 --- a/targets/targets.json +++ b/targets/targets.json @@ -4088,8 +4088,7 @@ "MCU_STM32L552xE" ], "supported_form_factors": [ - "ARDUINO", - "MORPHO" + "ARDUINO_UNO" ], "detect_code": [ "0854" @@ -4121,7 +4120,7 @@ "MX25LM51245G" ], "supported_form_factors": [ - "ARDUINO", + "ARDUINO_UNO", "STMOD", "PMOD" ],