From e602adb080a7e5e2264495ad7438de1e6de1bad0 Mon Sep 17 00:00:00 2001 From: jeromecoutant Date: Wed, 27 Jan 2021 09:09:08 +0100 Subject: [PATCH] [STD-PIN] STM32H7: standardized pins --- .../TARGET_NUCLEO_H743ZI/PinNames.h | 87 ++++++++----------- .../TARGET_NUCLEO_H743ZI2/PinNames.h | 87 ++++++++----------- .../TARGET_DISCO_H747I/PinNames.h | 87 ++++++++----------- .../TARGET_NUCLEO_H7A3ZI_Q/PinNames.h | 86 ++++++++---------- targets/targets.json | 8 +- 5 files changed, 153 insertions(+), 202 deletions(-) diff --git a/targets/TARGET_STM/TARGET_STM32H7/TARGET_STM32H743xI/TARGET_NUCLEO_H743ZI/PinNames.h b/targets/TARGET_STM/TARGET_STM32H7/TARGET_STM32H743xI/TARGET_NUCLEO_H743ZI/PinNames.h index 6a61e654e2..801338fddb 100644 --- a/targets/TARGET_STM/TARGET_STM32H7/TARGET_STM32H743xI/TARGET_NUCLEO_H743ZI/PinNames.h +++ b/targets/TARGET_STM/TARGET_STM32H7/TARGET_STM32H743xI/TARGET_NUCLEO_H743ZI/PinNames.h @@ -236,32 +236,36 @@ typedef enum { ADC_VREF = 0xF1, ADC_VBAT = 0xF2, - // Arduino connector namings - A0 = PA_3, - A1 = PC_0, - A2 = PC_3, - A3 = PF_3, - A4 = PF_5, - A5 = PF_10, +#ifdef TARGET_FF_ARDUINO_UNO + // Arduino Uno(Rev3) Header pin connection naming + ARDUINO_UNO_A0 = PA_3, + ARDUINO_UNO_A1 = PC_0, + ARDUINO_UNO_A2 = PC_3, + ARDUINO_UNO_A3 = PF_3, + ARDUINO_UNO_A4 = PF_5, + ARDUINO_UNO_A5 = PF_10, + ARDUINO_UNO_D0 = PG_9, + ARDUINO_UNO_D1 = PG_14, + 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 = STM32_D11_SPI_ETHERNET_PIN, /* config in targets.json file */ + ARDUINO_UNO_D12 = PA_6, + ARDUINO_UNO_D13 = PA_5, + ARDUINO_UNO_D14 = PB_9, + ARDUINO_UNO_D15 = PB_8, +#endif + + // ST ZIO connector extending Arduino Uno A6 = PF_4, A7 = PF_5, A8 = PF_6, - D0 = PG_9, - D1 = PG_14, - 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 = STM32_D11_SPI_ETHERNET_PIN, /* config in targets.json file */ - D12 = PA_6, - D13 = PA_5, - D14 = PB_9, - D15 = PB_8, D16 = PC_6, D17 = PB_15, D18 = PB_13, @@ -322,38 +326,16 @@ typedef enum { // 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 = PD_8, + USBTX = PD_8, #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 = PD_9, + USBRX = PD_9, #endif - // Generic signals namings - LED1 = PB_0, // LD1 = GREEN - LED2 = PB_7, // Blue - LED3 = PB_14, // Red - LED4 = PB_0, // LD4 is not user, mapped to LD1 - - // Standardized button names - USER_BUTTON = PC_13, - BUTTON1 = USER_BUTTON, - - SERIAL_TX = STDIO_UART_TX, // Virtual Com Port - SERIAL_RX = STDIO_UART_RX, // Virtual Com Port - USBTX = STDIO_UART_TX, // Virtual Com Port - USBRX = STDIO_UART_RX, // Virtual Com Port - I2C_SCL = D15, - I2C_SDA = D14, - SPI_MOSI = D11, - SPI_MISO = D12, - SPI_SCK = D13, - SPI_CS = D10, - PWM_OUT = D9, - /**** USB FS pins ****/ USB_OTG_FS_DM = PA_11, USB_OTG_FS_DP = PA_12, @@ -442,6 +424,13 @@ typedef enum { NC = (int)0xFFFFFFFF } PinName; +// Standardized LED and button names +#define LED1 PB_0 // LD1 +#define LED2 PB_7 // Blue +#define LED3 PB_14 // Red +#define BUTTON1 PC_13 + + #ifdef __cplusplus } #endif diff --git a/targets/TARGET_STM/TARGET_STM32H7/TARGET_STM32H743xI/TARGET_NUCLEO_H743ZI2/PinNames.h b/targets/TARGET_STM/TARGET_STM32H7/TARGET_STM32H743xI/TARGET_NUCLEO_H743ZI2/PinNames.h index 218768b2a8..085a4e7bc3 100644 --- a/targets/TARGET_STM/TARGET_STM32H7/TARGET_STM32H743xI/TARGET_NUCLEO_H743ZI2/PinNames.h +++ b/targets/TARGET_STM/TARGET_STM32H7/TARGET_STM32H743xI/TARGET_NUCLEO_H743ZI2/PinNames.h @@ -239,32 +239,36 @@ typedef enum { ADC_VREF = 0xF1, ADC_VBAT = 0xF2, - // Arduino connector namings - A0 = PA_3, - A1 = PC_0, - A2 = PC_3, - A3 = PB_1, - A4 = PC_2, - A5 = PF_10, +#ifdef TARGET_FF_ARDUINO_UNO + // Arduino Uno(Rev3) Header pin connection naming + ARDUINO_UNO_A0 = PA_3, + ARDUINO_UNO_A1 = PC_0, + ARDUINO_UNO_A2 = PC_3, + ARDUINO_UNO_A3 = PB_1, + ARDUINO_UNO_A4 = PC_2, + ARDUINO_UNO_A5 = PF_10, + ARDUINO_UNO_D0 = PB_7, + ARDUINO_UNO_D1 = PB_6, + ARDUINO_UNO_D2 = PG_14, + ARDUINO_UNO_D3 = PE_13, + ARDUINO_UNO_D4 = PE_14, + ARDUINO_UNO_D5 = PE_11, + ARDUINO_UNO_D6 = PE_9, + ARDUINO_UNO_D7 = PG_12, + ARDUINO_UNO_D8 = PF_3, + ARDUINO_UNO_D9 = PD_15, + ARDUINO_UNO_D10 = PD_14, + ARDUINO_UNO_D11 = STM32_D11_SPI_ETHERNET_PIN, /* config in targets.json file */ + ARDUINO_UNO_D12 = PA_6, + ARDUINO_UNO_D13 = PA_5, + ARDUINO_UNO_D14 = PB_9, + ARDUINO_UNO_D15 = PB_8, +#endif + + // ST ZIO connector extending Arduino Uno A6 = PF_4, A7 = PF_5, A8 = PF_6, - D0 = PB_7, - D1 = PB_6, - D2 = PG_14, - D3 = PE_13, - D4 = PE_14, - D5 = PE_11, - D6 = PE_9, - D7 = PG_12, - D8 = PF_3, - D9 = PD_15, - D10 = PD_14, - D11 = STM32_D11_SPI_ETHERNET_PIN, /* config in targets.json file */ - D12 = PA_6, - D13 = PA_5, - D14 = PB_9, - D15 = PB_8, D16 = PC_6, D17 = PB_15, D18 = PB_13, @@ -325,38 +329,16 @@ typedef enum { // 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 = PD_8, + USBTX = PD_8, #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 = PD_9, + USBRX = PD_9, #endif - // Generic signals namings - LED1 = PB_0, // LD1 = GREEN - LED2 = PE_1, // Yellow - LED3 = PB_14, // Red - LED4 = PB_0, // LD4 is not user, mapped to LD1 - - // Standardized button names - USER_BUTTON = PC_13, - BUTTON1 = USER_BUTTON, - - SERIAL_TX = STDIO_UART_TX, // Virtual Com Port - SERIAL_RX = STDIO_UART_RX, // Virtual Com Port - USBTX = STDIO_UART_TX, // Virtual Com Port - USBRX = STDIO_UART_RX, // Virtual Com Port - I2C_SCL = D15, - I2C_SDA = D14, - SPI_MOSI = D11, - SPI_MISO = D12, - SPI_SCK = D13, - SPI_CS = D10, - PWM_OUT = D9, - /**** USB FS pins ****/ USB_OTG_FS_DM = PA_11, USB_OTG_FS_DP = PA_12, @@ -445,6 +427,13 @@ typedef enum { NC = (int)0xFFFFFFFF } PinName; +// Standardized LED and button names +#define LED1 PB_0 // LD1 +#define LED2 PE_1 // Yellow +#define LED3 PB_14 // Red +#define BUTTON1 PC_13 + + #ifdef __cplusplus } #endif diff --git a/targets/TARGET_STM/TARGET_STM32H7/TARGET_STM32H747xI/TARGET_DISCO_H747I/PinNames.h b/targets/TARGET_STM/TARGET_STM32H7/TARGET_STM32H747xI/TARGET_DISCO_H747I/PinNames.h index a910eef371..c7f31cd53d 100644 --- a/targets/TARGET_STM/TARGET_STM32H7/TARGET_STM32H747xI/TARGET_DISCO_H747I/PinNames.h +++ b/targets/TARGET_STM/TARGET_STM32H7/TARGET_STM32H747xI/TARGET_DISCO_H747I/PinNames.h @@ -302,66 +302,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_4, - A1 = PF_10, - A2 = PA_0C, - A3 = PA_1C, - A4 = PC_2C, - A5 = PC_3C, - D0 = PJ_9, - D1 = PJ_8, - D2 = PJ_3, - D3 = PF_8, - D4 = PJ_4, - D5 = PA_6, - D6 = PJ_7, - D7 = PJ_0, - D8 = PJ_5, - D9 = PJ_6, - D10 = PK_1, - D11 = PJ_10, - D12 = PJ_11, - D13 = PK_0, - D14 = PD_13, - D15 = PD_12, +#ifdef TARGET_FF_ARDUINO_UNO + ARDUINO_UNO_A0 = PA_4, + ARDUINO_UNO_A1 = PF_10, + ARDUINO_UNO_A2 = PA_0C, + ARDUINO_UNO_A3 = PA_1C, + ARDUINO_UNO_A4 = PC_2C, + ARDUINO_UNO_A5 = PC_3C, + ARDUINO_UNO_D0 = PJ_9, + ARDUINO_UNO_D1 = PJ_8, + ARDUINO_UNO_D2 = PJ_3, + ARDUINO_UNO_D3 = PF_8, + ARDUINO_UNO_D4 = PJ_4, + ARDUINO_UNO_D5 = PA_6, + ARDUINO_UNO_D6 = PJ_7, + ARDUINO_UNO_D7 = PJ_0, + ARDUINO_UNO_D8 = PJ_5, + ARDUINO_UNO_D9 = PJ_6, + ARDUINO_UNO_D10 = PK_1, + ARDUINO_UNO_D11 = PJ_10, + ARDUINO_UNO_D12 = PJ_11, + ARDUINO_UNO_D13 = PK_0, + ARDUINO_UNO_D14 = PD_13, + ARDUINO_UNO_D15 = PD_12, +#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 = PI_12, // LED1 // Green - LED2 = PI_13, // LED2 // Orange - LED3 = PI_14, // LED3 // Red - LED4 = PI_15, // LED4 // Blue - BUTTON1 = PC_13, // B2 [Wakeup Button] - - // Backward legacy names - USER_BUTTON = BUTTON1, - PWM_OUT = D3, - /**** USB FS pins ****/ USB_OTG_FS_DM = PA_11, USB_OTG_FS_DP = PA_12, @@ -512,6 +489,14 @@ typedef enum { NC = (int)0xFFFFFFFF } PinName; +// Standardized LED and button names +#define LED1 PI_12 // LED1 +#define LED2 PI_13 // LED2 +#define LED3 PI_14 // LED3 +#define LED4 PI_15 // LED4 +#define BUTTON1 PC_13 // B2 + + #ifdef __cplusplus } #endif diff --git a/targets/TARGET_STM/TARGET_STM32H7/TARGET_STM32H7A3xIQ/TARGET_NUCLEO_H7A3ZI_Q/PinNames.h b/targets/TARGET_STM/TARGET_STM32H7/TARGET_STM32H7A3xIQ/TARGET_NUCLEO_H7A3ZI_Q/PinNames.h index 000f54b4ce..0daeb004b4 100644 --- a/targets/TARGET_STM/TARGET_STM32H7/TARGET_STM32H7A3xIQ/TARGET_NUCLEO_H7A3ZI_Q/PinNames.h +++ b/targets/TARGET_STM/TARGET_STM32H7/TARGET_STM32H7A3xIQ/TARGET_NUCLEO_H7A3ZI_Q/PinNames.h @@ -204,32 +204,36 @@ typedef enum { ADC_VREF = 0xF1, // Internal pin virtual value ADC_VBAT = 0xF2, // Internal pin virtual value +#ifdef TARGET_FF_ARDUINO_UNO // Arduino Uno(Rev3) Header pin connection naming - A0 = PA_3, - A1 = PC_0, - A2 = PC_3C, - A3 = PB_1, - A4 = PC_2C, - A5 = PF_11, + ARDUINO_UNO_A0 = PA_3, + ARDUINO_UNO_A1 = PC_0, + ARDUINO_UNO_A2 = PC_3C, + ARDUINO_UNO_A3 = PB_1, + ARDUINO_UNO_A4 = PC_2C, + ARDUINO_UNO_A5 = PF_11, + ARDUINO_UNO_D0 = PB_7, + ARDUINO_UNO_D1 = PB_6, + ARDUINO_UNO_D2 = PG_14, + ARDUINO_UNO_D3 = PE_13, + ARDUINO_UNO_D4 = PE_14, + ARDUINO_UNO_D5 = PE_11, + ARDUINO_UNO_D6 = PA_8, + ARDUINO_UNO_D7 = PG_12, + ARDUINO_UNO_D8 = PG_9, + 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 + + // ST ZIO connector extending Arduino Uno A6 = PC_1, A7 = PC_5, A8 = PA_2, - D0 = PB_7, - D1 = PB_6, - D2 = PG_14, - D3 = PE_13, - D4 = PE_14, - D5 = PE_11, - D6 = PA_8, - D7 = PG_12, - D8 = PG_9, - D9 = PD_15, - D10 = PD_14, - D11 = PA_7, - D12 = PA_6, - D13 = PA_5, - D14 = PB_9, - D15 = PB_8, D16 = PC_6, D17 = PB_15, D18 = PB_13, @@ -290,39 +294,16 @@ typedef enum { // 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 = PD_8, + USBTX = PD_8, #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 = PD_9, + USBRX = PD_9, #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 = PB_0, // LD1 (Green Led) - LED2 = PB_14, // LD3 (Red Led) - LED3 = PE_1, // LD2 (Yellow Led) - BUTTON1 = PC_13, // B1 (Blue PushButton) - - // Backward legacy names - USER_BUTTON = BUTTON1, - PWM_OUT = D3, - /**** USB HS pins ****/ USB_OTG_HS_DM = PA_11, USB_OTG_HS_DP = PA_12, @@ -374,6 +355,13 @@ typedef enum { NC = (int)0xFFFFFFFF } PinName; +// Standardized LED and button names +#define LED1 PB_0 // LD1 +#define LED2 PB_14 // LD3 +#define LED3 PE_1 // LD2 +#define BUTTON1 PC_13 // B1 + + #ifdef __cplusplus } #endif diff --git a/targets/targets.json b/targets/targets.json index 0a18186bbc..29a86460b8 100644 --- a/targets/targets.json +++ b/targets/targets.json @@ -2959,7 +2959,7 @@ "network-default-interface-type": "ETHERNET" }, "supported_form_factors": [ - "ARDUINO" + "ARDUINO_UNO" ], "detect_code": [ "0836" @@ -3052,7 +3052,7 @@ "MCU_STM32H747xI_CM7" ], "supported_form_factors": [ - "ARDUINO", + "ARDUINO_UNO", "STMOD", "PMOD" ], @@ -3109,7 +3109,7 @@ "QSPIF" ], "supported_form_factors": [ - "ARDUINO", + "ARDUINO_UNO", "STMOD", "PMOD" ], @@ -3218,7 +3218,7 @@ } }, "supported_form_factors": [ - "ARDUINO" + "ARDUINO_UNO" ], "detect_code": [ "0860"