diff --git a/targets/TARGET_STM/TARGET_STM32L4/TARGET_STM32L432xC/TARGET_NUCLEO_L432KC/PinNames.h b/targets/TARGET_STM/TARGET_STM32L4/TARGET_STM32L432xC/TARGET_NUCLEO_L432KC/PinNames.h index 518e7e09c7..e3a7c1bb7d 100644 --- a/targets/TARGET_STM/TARGET_STM32L4/TARGET_STM32L432xC/TARGET_NUCLEO_L432KC/PinNames.h +++ b/targets/TARGET_STM/TARGET_STM32L4/TARGET_STM32L432xC/TARGET_NUCLEO_L432KC/PinNames.h @@ -89,7 +89,7 @@ typedef enum { ADC_VREF = 0xF1, ADC_VBAT = 0xF2, - // Arduino connector namings + // Arduino Nano connector namings A0 = PA_0, A1 = PA_1, A2 = PA_3, @@ -115,25 +115,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 = PA_2, + USBTX = PA_2, #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_15, + USBRX = PA_15, #endif - // Generic signals namings - LED1 = PB_3, - LED2 = PB_3, - LED3 = PB_3, - LED4 = PB_3, - SERIAL_TX = STDIO_UART_TX, - SERIAL_RX = STDIO_UART_RX, - USBTX = STDIO_UART_TX, - USBRX = STDIO_UART_RX, I2C_SCL = PB_6, I2C_SDA = PB_7, SPI_MOSI = PB_5, @@ -165,6 +156,10 @@ typedef enum { NC = (int)0xFFFFFFFF } PinName; +// Standardized LED and button names +#define LED1 PB_3 + + #ifdef __cplusplus } #endif diff --git a/targets/TARGET_STM/TARGET_STM32L4/TARGET_STM32L433xC/TARGET_NUCLEO_L433RC_P/PinNames.h b/targets/TARGET_STM/TARGET_STM32L4/TARGET_STM32L433xC/TARGET_NUCLEO_L433RC_P/PinNames.h index fd6c376252..02c12e5b6d 100644 --- a/targets/TARGET_STM/TARGET_STM32L4/TARGET_STM32L433xC/TARGET_NUCLEO_L433RC_P/PinNames.h +++ b/targets/TARGET_STM/TARGET_STM32L4/TARGET_STM32L433xC/TARGET_NUCLEO_L433RC_P/PinNames.h @@ -160,61 +160,43 @@ typedef enum { ADC_VREF = 0xF1, ADC_VBAT = 0xF2, - // Arduino connector namings - A0 = PA_0, - A1 = PA_1, - A2 = PC_3, - A3 = PC_2, - A4 = PC_1, - A5 = PC_0, - D0 = PA_10, - D1 = PA_9, - D2 = PA_12, - D3 = PB_3, - D4 = PB_5, - D5 = PA_15, - D6 = PB_10, - D7 = PC_7, - D8 = PB_6, - D9 = PA_8, - D10 = PA_11, - D11 = PB_15, - D12 = PB_14, - D13 = PB_13, - D14 = PB_7, - D15 = PB_8, +#ifdef TARGET_FF_ARDUINO_UNO + ARDUINO_UNO_A0 = PA_0, + ARDUINO_UNO_A1 = PA_1, + ARDUINO_UNO_A2 = PC_3, + ARDUINO_UNO_A3 = PC_2, + ARDUINO_UNO_A4 = PC_1, + ARDUINO_UNO_A5 = PC_0, + ARDUINO_UNO_D0 = PA_10, + ARDUINO_UNO_D1 = PA_9, + ARDUINO_UNO_D2 = PA_12, + ARDUINO_UNO_D3 = PB_3, + ARDUINO_UNO_D4 = PB_5, + ARDUINO_UNO_D5 = PA_15, + ARDUINO_UNO_D6 = PB_10, + ARDUINO_UNO_D7 = PC_7, + ARDUINO_UNO_D8 = PB_6, + ARDUINO_UNO_D9 = PA_8, + ARDUINO_UNO_D10 = PA_11, + ARDUINO_UNO_D11 = PB_15, + ARDUINO_UNO_D12 = PB_14, + ARDUINO_UNO_D13 = PB_13, + ARDUINO_UNO_D14 = PB_7, + 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 = PA_2, + USBTX = PA_2, #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_3, + USBRX = PA_3, #endif - // Generic signals namings - LED1 = PB_13, - LED2 = PB_13, - LED3 = PB_13, - LED4 = PB_13, - USER_BUTTON = PC_13, - BUTTON1 = USER_BUTTON, - SERIAL_TX = STDIO_UART_TX, - SERIAL_RX = STDIO_UART_RX, - USBTX = STDIO_UART_TX, - USBRX = STDIO_UART_RX, - I2C_SCL = PB_8, - I2C_SDA = PB_7, - SPI_MOSI = D11, - SPI_MISO = D12, - SPI_SCK = D13, - SPI_CS = D10, - PWM_OUT = D9, - /**** USB pins ****/ USB_DM = PA_11, USB_DP = PA_12, @@ -242,6 +224,11 @@ typedef enum { NC = (int)0xFFFFFFFF } PinName; +// Standardized LED and button names +#define LED1 PB_13 +#define BUTTON1 PC_13 + + #ifdef __cplusplus } #endif diff --git a/targets/TARGET_STM/TARGET_STM32L4/TARGET_STM32L443xC/TARGET_ADV_WISE_1510/PinNames.h b/targets/TARGET_STM/TARGET_STM32L4/TARGET_STM32L443xC/TARGET_ADV_WISE_1510/PinNames.h index 96e0165081..48912b7bde 100644 --- a/targets/TARGET_STM/TARGET_STM32L4/TARGET_STM32L443xC/TARGET_ADV_WISE_1510/PinNames.h +++ b/targets/TARGET_STM/TARGET_STM32L4/TARGET_STM32L443xC/TARGET_ADV_WISE_1510/PinNames.h @@ -156,12 +156,7 @@ typedef enum { W_DISABLE = PC_2, WAKE = PC_3, - I2C_SCL = PC_0, - I2C_SDA = PC_1, - SPI_MOSI = PB_15, - SPI_MISO = PB_14, - SPI_SCK = PB_10, SPI_CS0 = PB_12, SPI_CS1 = PB_9, @@ -184,27 +179,18 @@ typedef enum { ANT_SWITCH = PC_15, - // Generic signals namings - LED1 = PWM0, - LED2 = GPIO2, - LED3 = GPIO4, #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 = UART3_TX, + USBTX = UART3_TX, #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 = UART3_RX, + USBRX = UART3_RX, #endif - SERIAL_TX = STDIO_UART_TX, - SERIAL_RX = STDIO_UART_RX, - USBTX = SERIAL_TX, - USBRX = SERIAL_RX, - UART_TXD = UART1_TX, UART_RXD = UART1_RX, @@ -212,6 +198,12 @@ typedef enum { NC = (int)0xFFFFFFFF } PinName; +// Standardized LED and button names +#define LED1 PA_5 +#define LED2 PC_7 +#define LED3 PB_0 + + #ifdef __cplusplus } #endif diff --git a/targets/TARGET_STM/TARGET_STM32L4/TARGET_STM32L452xE/TARGET_NUCLEO_L452RE_P/PinNames.h b/targets/TARGET_STM/TARGET_STM32L4/TARGET_STM32L452xE/TARGET_NUCLEO_L452RE_P/PinNames.h index cfaeb9c867..d35c657c56 100644 --- a/targets/TARGET_STM/TARGET_STM32L4/TARGET_STM32L452xE/TARGET_NUCLEO_L452RE_P/PinNames.h +++ b/targets/TARGET_STM/TARGET_STM32L4/TARGET_STM32L452xE/TARGET_NUCLEO_L452RE_P/PinNames.h @@ -134,61 +134,43 @@ typedef enum { ADC_VREF = 0xF1, ADC_VBAT = 0xF2, - // Arduino connector namings - A0 = PA_0, - A1 = PA_1, - A2 = PC_3, - A3 = PC_2, - A4 = PC_1, - A5 = PC_0, - D0 = PA_3, - D1 = PA_2, - D2 = PA_10, - D3 = PB_3, - D4 = PB_5, - D5 = PA_15, - D6 = PB_10, - D7 = PC_7, - D8 = PB_6, - D9 = PA_8, - D10 = PA_11, - D11 = PB_15, - D12 = PB_14, - D13 = PB_13, - D14 = PB_7, - D15 = PB_8, +#ifdef TARGET_FF_ARDUINO_UNO + ARDUINO_UNO_A0 = PA_0, + ARDUINO_UNO_A1 = PA_1, + ARDUINO_UNO_A2 = PC_3, + ARDUINO_UNO_A3 = PC_2, + ARDUINO_UNO_A4 = PC_1, + ARDUINO_UNO_A5 = PC_0, + ARDUINO_UNO_D0 = PA_3, + ARDUINO_UNO_D1 = PA_2, + ARDUINO_UNO_D2 = PA_10, + ARDUINO_UNO_D3 = PB_3, + ARDUINO_UNO_D4 = PB_5, + ARDUINO_UNO_D5 = PA_15, + ARDUINO_UNO_D6 = PB_10, + ARDUINO_UNO_D7 = PC_7, + ARDUINO_UNO_D8 = PB_6, + ARDUINO_UNO_D9 = PA_8, + ARDUINO_UNO_D10 = PA_11, + ARDUINO_UNO_D11 = PB_15, + ARDUINO_UNO_D12 = PB_14, + ARDUINO_UNO_D13 = PB_13, + ARDUINO_UNO_D14 = PB_7, + 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 = PA_2, + USBTX = PA_2, #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_3, + USBRX = PA_3, #endif - // Generic signals namings - LED1 = PB_13, - LED2 = PB_13, - LED3 = PB_13, - LED4 = PB_13, - USER_BUTTON = PC_13, - BUTTON1 = USER_BUTTON, - SERIAL_TX = STDIO_UART_TX, - SERIAL_RX = STDIO_UART_RX, - USBTX = STDIO_UART_TX, - USBRX = STDIO_UART_RX, - I2C_SCL = PB_8, - I2C_SDA = PB_7, - SPI_MOSI = D11, - SPI_MISO = D12, - SPI_SCK = D13, - SPI_CS = D10, - PWM_OUT = D9, - /**** USB pins ****/ USB_DM = PA_11, USB_DP = PA_12, @@ -219,6 +201,11 @@ typedef enum { NC = (int)0xFFFFFFFF } PinName; +// Standardized LED and button names +#define LED1 PB_13 +#define BUTTON1 PC_13 + + #ifdef __cplusplus } #endif diff --git a/targets/TARGET_STM/TARGET_STM32L4/TARGET_STM32L471xG/TARGET_MTS_DRAGONFLY_L471QG/PinNames.h b/targets/TARGET_STM/TARGET_STM32L4/TARGET_STM32L471xG/TARGET_MTS_DRAGONFLY_L471QG/PinNames.h index 948be13f29..1499457457 100644 --- a/targets/TARGET_STM/TARGET_STM32L4/TARGET_STM32L471xG/TARGET_MTS_DRAGONFLY_L471QG/PinNames.h +++ b/targets/TARGET_STM/TARGET_STM32L4/TARGET_STM32L471xG/TARGET_MTS_DRAGONFLY_L471QG/PinNames.h @@ -169,59 +169,58 @@ typedef enum { ADC_VREF = 0xF1, ADC_VBAT = 0xF2, - // Arduino connector namings - A0 = PC_2, - A1 = PC_13, //rev b PC_0; rev c PC_13 - A2 = PC_4, - A3 = PE_6, //reb b PB_1; rev c PE_6 - A4 = PA_6, - A5 = PG_8, - D0 = PA_3, - D1 = PA_2, - D2 = PB_15, - D3 = PA_0, - D4 = PA_7, - D5 = PA_9, - D6 = PA_1, - D7 = PG_7, - D8 = PB_0, - D9 = PB_10, - D10 = PC_8, - D11 = PB_5, - D12 = PG_3, - D13 = PG_2, - D14 = PB_9, - D15 = PB_8, +#ifdef TARGET_FF_ARDUINO_UNO + ARDUINO_UNO_A0 = PC_2, + ARDUINO_UNO_A1 = PC_13, // rev b PC_0; rev c PC_13 + ARDUINO_UNO_A2 = PC_4, + ARDUINO_UNO_A3 = PE_6, // reb b PB_1; rev c PE_6 + ARDUINO_UNO_A4 = PA_6, + ARDUINO_UNO_A5 = PG_8, + ARDUINO_UNO_D0 = PA_3, + ARDUINO_UNO_D1 = PA_2, + ARDUINO_UNO_D2 = PB_15, + ARDUINO_UNO_D3 = PA_0, + ARDUINO_UNO_D4 = PA_7, + ARDUINO_UNO_D5 = PA_9, + ARDUINO_UNO_D6 = PA_1, + ARDUINO_UNO_D7 = PG_7, + ARDUINO_UNO_D8 = PB_0, + ARDUINO_UNO_D9 = PB_10, + ARDUINO_UNO_D10 = PC_8, + ARDUINO_UNO_D11 = PB_5, + ARDUINO_UNO_D12 = PG_3, + ARDUINO_UNO_D13 = PG_2, + ARDUINO_UNO_D14 = PB_9, + ARDUINO_UNO_D15 = PB_8, +#endif // 40 pin - IO_00 = D1, - IO_01 = D4, - IO_02 = D8, - IO_03 = D6, - IO_04 = D11, - IO_05 = D13, - IO_06 = D15, - IO_07 = D2, - IO_08 = A0, - IO_09 = A3, - IO_10 = A1, - IO_11 = A4, - IO_12 = A2, - IO_13 = D9, - IO_14 = A5, - IO_15 = D14, - IO_16 = D12, - IO_17 = D10, - IO_18 = D3, - IO_19 = D5, - IO_20 = D7, - IO_21 = D0, + IO_00 = ARDUINO_UNO_D1, + IO_01 = ARDUINO_UNO_D4, + IO_02 = ARDUINO_UNO_D8, + IO_03 = ARDUINO_UNO_D6, + IO_04 = ARDUINO_UNO_D11, + IO_05 = ARDUINO_UNO_D13, + IO_06 = ARDUINO_UNO_D15, + IO_07 = ARDUINO_UNO_D2, + IO_08 = ARDUINO_UNO_A0, + IO_09 = ARDUINO_UNO_A3, + IO_10 = ARDUINO_UNO_A1, + IO_11 = ARDUINO_UNO_A4, + IO_12 = ARDUINO_UNO_A2, + IO_13 = ARDUINO_UNO_D9, + IO_14 = ARDUINO_UNO_A5, + IO_15 = ARDUINO_UNO_D14, + IO_16 = ARDUINO_UNO_D12, + IO_17 = ARDUINO_UNO_D10, + IO_18 = ARDUINO_UNO_D3, + IO_19 = ARDUINO_UNO_D5, + IO_20 = ARDUINO_UNO_D7, + IO_21 = ARDUINO_UNO_D0, // 40 pin USB debug port USBTX = PB_6, USBRX = PB_7, - STDIO_UART_TX = PB_6, - STDIO_UART_RX = PB_7, //UARTS UART3_TX = PD_2, @@ -250,29 +249,24 @@ typedef enum { J_TDO = PB_3, // a.k.a. SWO J_TMS = PA_13, // a.k.a. SWDIO - // Generic signals namings - LED1 = D3, - LED2 = D3, - LED3 = D3, - LED4 = D3, // SERIAL PORT - SERIAL_TX = D1, - SERIAL_RX = D0, - SERIAL_RTS = D6, - SERIAL_CTS = D3, - SERIAL_DCD = D4, - SERIAL_DSR = D5, - SERIAL_DTR = D7, - SERIAL_RI = D8, + SERIAL_TX = ARDUINO_UNO_D1, + SERIAL_RX = ARDUINO_UNO_D0, + SERIAL_RTS = ARDUINO_UNO_D6, + SERIAL_CTS = ARDUINO_UNO_D3, + SERIAL_DCD = ARDUINO_UNO_D4, + SERIAL_DSR = ARDUINO_UNO_D5, + SERIAL_DTR = ARDUINO_UNO_D7, + SERIAL_RI = ARDUINO_UNO_D8, // SPI1 and SPI2 are available on Arduino pins - SPI1_MOSI = D11, - SPI1_MISO = D12, - SPI1_SCK = D13, - SPI2_MOSI = D2, - SPI2_MISO = A0, - SPI2_SCK = D9, + SPI1_MOSI = ARDUINO_UNO_D11, + SPI1_MISO = ARDUINO_UNO_D12, + SPI1_SCK = ARDUINO_UNO_D13, + SPI2_MOSI = ARDUINO_UNO_D2, + SPI2_MISO = ARDUINO_UNO_A0, + SPI2_SCK = ARDUINO_UNO_D9, // SPI3 connects to flash part SPI3_MOSI = PC_12, @@ -281,10 +275,10 @@ typedef enum { SPI3_SSEL = PG_12, // I2C1 and I2C3 are available on Arduino pins - I2C1_SCL = D15, - I2C1_SDA = D14, - I2C3_SCL = D7, - I2C3_SDA = A5, + I2C1_SCL = ARDUINO_UNO_D15, + I2C1_SDA = ARDUINO_UNO_D14, + I2C3_SCL = ARDUINO_UNO_D7, + I2C3_SDA = ARDUINO_UNO_A5, // Modem RADIO_PWR = PC_3, @@ -335,7 +329,7 @@ typedef enum { GNSSRXD = (int) 0xFFFFFFFF, PWR3V3 = (int) 0xFFFFFFFF, - WAKEUP = D3, + WAKEUP = ARDUINO_UNO_D3, // TIMERS TIM2_1 = PA_15, @@ -395,6 +389,9 @@ typedef enum { NC = (int) 0xFFFFFFFF } PinName; +// Standardized LED and button names +#define LED1 PA_0 + #ifdef __cplusplus } diff --git a/targets/TARGET_STM/TARGET_STM32L4/TARGET_STM32L475xG/TARGET_DISCO_L475VG_IOT01A/PeripheralPins.c b/targets/TARGET_STM/TARGET_STM32L4/TARGET_STM32L475xG/TARGET_DISCO_L475VG_IOT01A/PeripheralPins.c index 9b53dda8ff..8c9a6d06d5 100644 --- a/targets/TARGET_STM/TARGET_STM32L4/TARGET_STM32L475xG/TARGET_DISCO_L475VG_IOT01A/PeripheralPins.c +++ b/targets/TARGET_STM/TARGET_STM32L4/TARGET_STM32L475xG/TARGET_DISCO_L475VG_IOT01A/PeripheralPins.c @@ -36,8 +36,8 @@ const PinList *pinmap_gpio_restricted_pins() { static const PinName pins[] = { - D15, // fixed pull-up (for I2C) - D14, // fixed pull-up (for I2C) + PB_8, // fixed pull-up (for I2C) + PB_9, // fixed pull-up (for I2C) PB_10, // fixed pull-up (for I2C) PB_11, // fixed pull-up (for I2C) RCC_OSC32_IN, // OSC32_IN diff --git a/targets/TARGET_STM/TARGET_STM32L4/TARGET_STM32L475xG/TARGET_DISCO_L475VG_IOT01A/PinNames.h b/targets/TARGET_STM/TARGET_STM32L4/TARGET_STM32L475xG/TARGET_DISCO_L475VG_IOT01A/PinNames.h index bbf3a43624..5411627919 100644 --- a/targets/TARGET_STM/TARGET_STM32L4/TARGET_STM32L475xG/TARGET_DISCO_L475VG_IOT01A/PinNames.h +++ b/targets/TARGET_STM/TARGET_STM32L4/TARGET_STM32L475xG/TARGET_DISCO_L475VG_IOT01A/PinNames.h @@ -187,65 +187,43 @@ typedef enum { ADC_VREF = 0xF1, ADC_VBAT = 0xF2, - // Arduino connector namings - A0 = PC_5, - A1 = PC_4, - A2 = PC_3, - A3 = PC_2, - A4 = PC_1, - A5 = PC_0, - D0 = PA_1, - D1 = PA_0, - D2 = PD_14, - D3 = PB_0, - D4 = PA_3, - D5 = PB_4, - D6 = PB_1, - D7 = PA_4, - D8 = PB_2, - D9 = PA_15, - D10 = PA_2, - D11 = PA_7, - D12 = PA_6, - D13 = PA_5, - D14 = PB_9, - D15 = PB_8, +#ifdef TARGET_FF_ARDUINO_UNO + ARDUINO_UNO_A0 = PC_5, + ARDUINO_UNO_A1 = PC_4, + ARDUINO_UNO_A2 = PC_3, + ARDUINO_UNO_A3 = PC_2, + ARDUINO_UNO_A4 = PC_1, + ARDUINO_UNO_A5 = PC_0, + ARDUINO_UNO_D0 = PA_1, + ARDUINO_UNO_D1 = PA_0, + ARDUINO_UNO_D2 = PD_14, + ARDUINO_UNO_D3 = PB_0, + ARDUINO_UNO_D4 = PA_3, + ARDUINO_UNO_D5 = PB_4, + ARDUINO_UNO_D6 = PB_1, + ARDUINO_UNO_D7 = PA_4, + ARDUINO_UNO_D8 = PB_2, + ARDUINO_UNO_D9 = PA_15, + ARDUINO_UNO_D10 = PA_2, + 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 = PB_6, + USBTX = PB_6, #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 = PB_7, + USBRX = PB_7, #endif - // Generic signals namings - LED1 = D13, // Green LED (LD1) - LED2 = PB_14, // Green LED (LD2) - LED3 = PC_9, // Yellow LED (LD3 WIFI) / Blue LED (LD4 BLE) - LED4 = LED3, - USER_BUTTON = PC_13, - BUTTON1 = USER_BUTTON, - BUTTON2 = USER_BUTTON, - BUTTON3 = USER_BUTTON, - BUTTON4 = USER_BUTTON, - BUTTON5 = USER_BUTTON, - SERIAL_TX = STDIO_UART_TX, - SERIAL_RX = STDIO_UART_RX, - USBTX = STDIO_UART_TX, - USBRX = STDIO_UART_RX, - 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, @@ -291,6 +269,13 @@ typedef enum { NC = (int)0xFFFFFFFF } PinName; +// Standardized LED and button names +#define LED1 PA_5 // Green LED +#define LED2 PB_14 // Green LED +#define LED3 PC_9 // Yellow LED +#define BUTTON1 PC_13 + + #ifdef __cplusplus } #endif diff --git a/targets/TARGET_STM/TARGET_STM32L4/TARGET_STM32L476xG/TARGET_DISCO_L476VG/PinNames.h b/targets/TARGET_STM/TARGET_STM32L4/TARGET_STM32L476xG/TARGET_DISCO_L476VG/PinNames.h index 43862de6c8..0cfbc31139 100644 --- a/targets/TARGET_STM/TARGET_STM32L4/TARGET_STM32L476xG/TARGET_DISCO_L476VG/PinNames.h +++ b/targets/TARGET_STM/TARGET_STM32L4/TARGET_STM32L476xG/TARGET_DISCO_L476VG/PinNames.h @@ -186,46 +186,23 @@ 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_5, + USBTX = PD_5, #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_6, + USBRX = PD_6, #endif - // Generic signals namings - LED1 = PE_8, // LD5 Green - LED2 = PB_2, // LD4 Red - LED3 = LED1, - LED4 = LED2, JOYSTICK_CENTER = PA_0, JOYSTICK_LEFT = PA_1, JOYSTICK_RIGHT = PA_2, JOYSTICK_UP = PA_3, JOYSTICK_DOWN = PA_5, - USER_BUTTON = JOYSTICK_CENTER, - // Standardized button names - BUTTON1 = USER_BUTTON, - BUTTON2 = JOYSTICK_LEFT, - BUTTON3 = JOYSTICK_RIGHT, - BUTTON4 = JOYSTICK_UP, - BUTTON5 = JOYSTICK_DOWN, - SERIAL_TX = STDIO_UART_TX, - SERIAL_RX = STDIO_UART_RX, - USBTX = STDIO_UART_TX, - USBRX = STDIO_UART_RX, - I2C_SCL = PB_8, - I2C_SDA = PB_9, - SPI_MOSI = PA_7, - SPI_MISO = PA_6, - SPI_SCK = PA_5, - SPI_CS = PA_4, - PWM_OUT = PB_3, /**** USB FS pins ****/ USB_OTG_FS_DM = PA_11, @@ -272,6 +249,16 @@ typedef enum { NC = (int)0xFFFFFFFF } PinName; +// Standardized LED and button names +#define LED1 PE_8 // LD5 Green +#define LED2 PB_2 // LD4 Red +#define BUTTON1 JOYSTICK_CENTER +#define BUTTON2 JOYSTICK_LEFT +#define BUTTON3 JOYSTICK_RIGHT +#define BUTTON4 JOYSTICK_UP +#define BUTTON5 JOYSTICK_DOWN + + #ifdef __cplusplus } #endif diff --git a/targets/TARGET_STM/TARGET_STM32L4/TARGET_STM32L476xG/TARGET_NUCLEO_L476RG/PinNames.h b/targets/TARGET_STM/TARGET_STM32L4/TARGET_STM32L476xG/TARGET_NUCLEO_L476RG/PinNames.h index 7873657014..74b3472d09 100644 --- a/targets/TARGET_STM/TARGET_STM32L4/TARGET_STM32L476xG/TARGET_NUCLEO_L476RG/PinNames.h +++ b/targets/TARGET_STM/TARGET_STM32L4/TARGET_STM32L476xG/TARGET_NUCLEO_L476RG/PinNames.h @@ -156,62 +156,43 @@ typedef enum { ADC_VREF = 0xF1, ADC_VBAT = 0xF2, - // Arduino connector namings - A0 = PA_0, - A1 = PA_1, - A2 = PA_4, - A3 = PB_0, - A4 = PC_1, - A5 = PC_0, - D0 = PA_3, - D1 = PA_2, - D2 = PA_10, - D3 = PB_3, - D4 = PB_5, - D5 = PB_4, - D6 = PB_10, - D7 = PA_8, - D8 = PA_9, - D9 = PC_7, - D10 = PB_6, - D11 = PA_7, - D12 = PA_6, - D13 = PA_5, - D14 = PB_9, - D15 = PB_8, +#ifdef TARGET_FF_ARDUINO_UNO + ARDUINO_UNO_A0 = PA_0, + ARDUINO_UNO_A1 = PA_1, + ARDUINO_UNO_A2 = PA_4, + ARDUINO_UNO_A3 = PB_0, + ARDUINO_UNO_A4 = PC_1, + ARDUINO_UNO_A5 = PC_0, + ARDUINO_UNO_D0 = PA_3, + ARDUINO_UNO_D1 = PA_2, + ARDUINO_UNO_D2 = PA_10, + ARDUINO_UNO_D3 = PB_3, + ARDUINO_UNO_D4 = PB_5, + ARDUINO_UNO_D5 = PB_4, + ARDUINO_UNO_D6 = PB_10, + ARDUINO_UNO_D7 = PA_8, + ARDUINO_UNO_D8 = PA_9, + ARDUINO_UNO_D9 = PC_7, + ARDUINO_UNO_D10 = PB_6, + 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 = PA_2, + USBTX = PA_2, #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_3, + USBRX = PA_3, #endif - // Generic signals namings - LED1 = PA_5, - LED2 = PA_5, - LED3 = PA_5, - LED4 = PA_5, - USER_BUTTON = PC_13, - // Standardized button names - BUTTON1 = USER_BUTTON, - SERIAL_TX = STDIO_UART_TX, - SERIAL_RX = STDIO_UART_RX, - USBTX = STDIO_UART_TX, - USBRX = STDIO_UART_RX, - I2C_SCL = PB_8, - I2C_SDA = PB_9, - SPI_MOSI = PA_7, - SPI_MISO = PA_6, - SPI_SCK = PA_5, - SPI_CS = PB_6, - PWM_OUT = PB_3, - /**** USB FS pins ****/ USB_OTG_FS_DM = PA_11, USB_OTG_FS_DP = PA_12, @@ -243,6 +224,11 @@ typedef enum { NC = (int)0xFFFFFFFF } PinName; +// Standardized LED and button names +#define LED1 PA_5 +#define BUTTON1 PC_13 + + #ifdef __cplusplus } #endif diff --git a/targets/TARGET_STM/TARGET_STM32L4/TARGET_STM32L476xG/TARGET_RHOMBIO_L476DMW1K/PinNames.h b/targets/TARGET_STM/TARGET_STM32L4/TARGET_STM32L476xG/TARGET_RHOMBIO_L476DMW1K/PinNames.h index 4af64e21da..078ec03242 100644 --- a/targets/TARGET_STM/TARGET_STM32L4/TARGET_STM32L476xG/TARGET_RHOMBIO_L476DMW1K/PinNames.h +++ b/targets/TARGET_STM/TARGET_STM32L4/TARGET_STM32L476xG/TARGET_RHOMBIO_L476DMW1K/PinNames.h @@ -187,21 +187,8 @@ typedef enum { ADC_VBAT = 0xF2, // STDIO for console print - STDIO_UART_TX = PC_4, - STDIO_UART_RX = PC_5, - - // Generic signals namings - LED1 = PC_7, // LED Green - LED2 = PC_7, // LED Green - - USER_BUTTON = PB_1, - // Standardized button names - BUTTON1 = USER_BUTTON, - - SERIAL_TX = STDIO_UART_TX, - SERIAL_RX = STDIO_UART_RX, - USBTX = STDIO_UART_TX, - USBRX = STDIO_UART_RX, + USBTX = PC_4, + USBRX = PC_5, I2C_SCL = PB_8, I2C_SDA = PB_9, @@ -346,6 +333,10 @@ typedef enum { } PinName; +// Standardized LED and button names +#define LED1 PC_7 // LED Green +#define BUTTON1 PB_1 + #ifdef __cplusplus } #endif diff --git a/targets/TARGET_STM/TARGET_STM32L4/TARGET_STM32L486xG/TARGET_ADV_WISE_1570/PinNames.h b/targets/TARGET_STM/TARGET_STM32L4/TARGET_STM32L486xG/TARGET_ADV_WISE_1570/PinNames.h index e0e7389367..520839fde7 100644 --- a/targets/TARGET_STM/TARGET_STM32L4/TARGET_STM32L486xG/TARGET_ADV_WISE_1570/PinNames.h +++ b/targets/TARGET_STM/TARGET_STM32L4/TARGET_STM32L486xG/TARGET_ADV_WISE_1570/PinNames.h @@ -163,29 +163,20 @@ typedef enum { UART_CTS = UART3_CTS, UART_RTS = UART3_RTS, - LED1 = GPIO2, // Green - LED2 = PWM1_OUT, // Blue - LED3 = PWM0_OUT, // Red - ADC_BC95 = PC_5, MDMTXD = LPUART1_TX, MDMRXD = LPUART1_RX, - USBTX = UART3_TX, - USBRX = UART3_RX, - - USER_BUTTON = GPIO5, - // 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 = UART3_TX, + USBTX = UART3_TX, #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 = UART3_RX, + USBRX = UART3_RX, #endif // Module external pins @@ -269,6 +260,13 @@ typedef enum { } PinName; +// Standardized LED and button names +#define LED1 PB_15 // Green +#define LED2 PB_1 // Blue +#define LED3 PB_0 // Red +#define BUTTON1 PC_13 + + #ifdef __cplusplus } #endif diff --git a/targets/TARGET_STM/TARGET_STM32L4/TARGET_STM32L486xG/TARGET_NUCLEO_L486RG/PinNames.h b/targets/TARGET_STM/TARGET_STM32L4/TARGET_STM32L486xG/TARGET_NUCLEO_L486RG/PinNames.h index 94163fc361..e705739fe4 100644 --- a/targets/TARGET_STM/TARGET_STM32L4/TARGET_STM32L486xG/TARGET_NUCLEO_L486RG/PinNames.h +++ b/targets/TARGET_STM/TARGET_STM32L4/TARGET_STM32L486xG/TARGET_NUCLEO_L486RG/PinNames.h @@ -156,62 +156,43 @@ typedef enum { ADC_VREF = 0xF1, ADC_VBAT = 0xF2, - // Arduino connector namings - A0 = PA_0, - A1 = PA_1, - A2 = PA_4, - A3 = PB_0, - A4 = PC_1, - A5 = PC_0, - D0 = PA_3, - D1 = PA_2, - D2 = PA_10, - D3 = PB_3, - D4 = PB_5, - D5 = PB_4, - D6 = PB_10, - D7 = PA_8, - D8 = PA_9, - D9 = PC_7, - D10 = PB_6, - D11 = PA_7, - D12 = PA_6, - D13 = PA_5, - D14 = PB_9, - D15 = PB_8, +#ifdef TARGET_FF_ARDUINO_UNO + ARDUINO_UNO_A0 = PA_0, + ARDUINO_UNO_A1 = PA_1, + ARDUINO_UNO_A2 = PA_4, + ARDUINO_UNO_A3 = PB_0, + ARDUINO_UNO_A4 = PC_1, + ARDUINO_UNO_A5 = PC_0, + ARDUINO_UNO_D0 = PA_3, + ARDUINO_UNO_D1 = PA_2, + ARDUINO_UNO_D2 = PA_10, + ARDUINO_UNO_D3 = PB_3, + ARDUINO_UNO_D4 = PB_5, + ARDUINO_UNO_D5 = PB_4, + ARDUINO_UNO_D6 = PB_10, + ARDUINO_UNO_D7 = PA_8, + ARDUINO_UNO_D8 = PA_9, + ARDUINO_UNO_D9 = PC_7, + ARDUINO_UNO_D10 = PB_6, + 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 = PA_2, + USBTX = PA_2, #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_3, + USBRX = PA_3, #endif - // Generic signals namings - LED1 = PA_5, - LED2 = PA_5, - LED3 = PA_5, - LED4 = PA_5, - USER_BUTTON = PC_13, - // Standardized button names - BUTTON1 = USER_BUTTON, - SERIAL_TX = STDIO_UART_TX, - SERIAL_RX = STDIO_UART_RX, - USBTX = STDIO_UART_TX, - USBRX = STDIO_UART_RX, - I2C_SCL = PB_8, - I2C_SDA = PB_9, - SPI_MOSI = PA_7, - SPI_MISO = PA_6, - SPI_SCK = PA_5, - SPI_CS = PB_6, - PWM_OUT = PB_3, - /**** USB FS pins ****/ USB_OTG_FS_DM = PA_11, USB_OTG_FS_DP = PA_12, @@ -243,6 +224,11 @@ typedef enum { NC = (int)0xFFFFFFFF } PinName; +// Standardized LED and button names +#define LED1 PA_5 +#define BUTTON1 PC_13 + + #ifdef __cplusplus } #endif diff --git a/targets/TARGET_STM/TARGET_STM32L4/TARGET_STM32L496xG/TARGET_DISCO_L496AG/PinNames.h b/targets/TARGET_STM/TARGET_STM32L4/TARGET_STM32L496xG/TARGET_DISCO_L496AG/PinNames.h index 87c3343745..207d08877f 100644 --- a/targets/TARGET_STM/TARGET_STM32L4/TARGET_STM32L496xG/TARGET_DISCO_L496AG/PinNames.h +++ b/targets/TARGET_STM/TARGET_STM32L4/TARGET_STM32L496xG/TARGET_DISCO_L496AG/PinNames.h @@ -251,60 +251,43 @@ typedef enum { ADC_VBAT = 0xF2, // Arduino connector - A0 = PC_4, - A1 = PC_1, - A2 = PC_3, - A3 = PF_10, - A4 = PA_1, - A5 = PC_0, - D0 = PG_8, - D1 = PG_7, - D2 = PG_13, - D3 = PH_15, - D4 = PI_11, - D5 = PB_9, - D6 = PI_6, - D7 = PG_6, - D8 = PG_15, - D9 = PH_13, - D10 = PA_15, - D11 = PB_5, - D12 = PB_4, - D13 = PA_5, - D14 = PB_7, - D15 = PB_8, +#ifdef TARGET_FF_ARDUINO_UNO + ARDUINO_UNO_A0 = PC_4, + ARDUINO_UNO_A1 = PC_1, + ARDUINO_UNO_A2 = PC_3, + ARDUINO_UNO_A3 = PF_10, + ARDUINO_UNO_A4 = PA_1, + ARDUINO_UNO_A5 = PC_0, + ARDUINO_UNO_D0 = PG_8, + ARDUINO_UNO_D1 = PG_7, + ARDUINO_UNO_D2 = PG_13, + ARDUINO_UNO_D3 = PH_15, + ARDUINO_UNO_D4 = PI_11, + ARDUINO_UNO_D5 = PB_9, + ARDUINO_UNO_D6 = PI_6, + ARDUINO_UNO_D7 = PG_6, + ARDUINO_UNO_D8 = PG_15, + ARDUINO_UNO_D9 = PH_13, + ARDUINO_UNO_D10 = PA_15, + ARDUINO_UNO_D11 = PB_5, + ARDUINO_UNO_D12 = PB_4, + ARDUINO_UNO_D13 = PA_5, + ARDUINO_UNO_D14 = PB_7, + 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 = PA_2, + USBTX = PA_2, #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_6, + USBRX = PD_6, #endif - // Generic signals - LED1 = PA_5, // Green LD3 on board - LED2 = PB_13, // Green LD2 on board --> Warning: the state is reverted (1=OFF and 0=ON) - LED3 = LED1, - LED4 = LED1, - USER_BUTTON = PC_13, // Joystick Center - 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, @@ -391,6 +374,12 @@ typedef enum { NC = (int)0xFFFFFFFF } PinName; +// Standardized LED and button names +#define LED1 PA_5 // Green LD3 on board +#define LED2 PB_13 // Green LD2 on board +#define BUTTON1 PC_13 + + #ifdef __cplusplus } #endif diff --git a/targets/TARGET_STM/TARGET_STM32L4/TARGET_STM32L496xG/TARGET_NUCLEO_L496ZG/PinNames.h b/targets/TARGET_STM/TARGET_STM32L4/TARGET_STM32L496xG/TARGET_NUCLEO_L496ZG/PinNames.h index c49506d216..7bda16c312 100644 --- a/targets/TARGET_STM/TARGET_STM32L4/TARGET_STM32L496xG/TARGET_NUCLEO_L496ZG/PinNames.h +++ b/targets/TARGET_STM/TARGET_STM32L4/TARGET_STM32L496xG/TARGET_NUCLEO_L496ZG/PinNames.h @@ -224,63 +224,43 @@ typedef enum { ADC_VREF = 0xF1, ADC_VBAT = 0xF2, - // Arduino J3 connector namings - A0 = PA_3, - A1 = PC_0, - A2 = PC_3, - A3 = PC_1, - A4 = PC_4, - A5 = PC_5, - 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 = PC_0, + ARDUINO_UNO_A2 = PC_3, + ARDUINO_UNO_A3 = PC_1, + ARDUINO_UNO_A4 = PC_4, + ARDUINO_UNO_A5 = PC_5, + 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 - // Generic signals namings - LED1 = PC_7, - LED2 = PB_7, - LED3 = PB_14, - LED4 = LED1, - USER_BUTTON = PC_13, - - // Standardized button names - 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, @@ -323,6 +303,13 @@ typedef enum { NC = (int)0xFFFFFFFF } PinName; +// Standardized LED and button names +#define LED1 PC_7 +#define LED2 PB_7 +#define LED3 PB_14 +#define BUTTON1 PC_13 + + #ifdef __cplusplus } #endif diff --git a/targets/TARGET_STM/TARGET_STM32L4/TARGET_STM32L4R5xI/TARGET_NUCLEO_L4R5ZI/PinNames.h b/targets/TARGET_STM/TARGET_STM32L4/TARGET_STM32L4R5xI/TARGET_NUCLEO_L4R5ZI/PinNames.h index 97f2986809..3e5da37400 100644 --- a/targets/TARGET_STM/TARGET_STM32L4/TARGET_STM32L4R5xI/TARGET_NUCLEO_L4R5ZI/PinNames.h +++ b/targets/TARGET_STM/TARGET_STM32L4/TARGET_STM32L4R5xI/TARGET_NUCLEO_L4R5ZI/PinNames.h @@ -193,65 +193,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 = PC_0, - A2 = PC_3, - A3 = PC_1, - A4 = PC_4, - A5 = PC_5, - 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 = PC_0, + ARDUINO_UNO_A2 = PC_3, + ARDUINO_UNO_A3 = PC_1, + ARDUINO_UNO_A4 = PC_4, + ARDUINO_UNO_A5 = PC_5, + 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 [Green] - LED2 = PB_7, // LD2 [Blue] - LED3 = PB_14, // LD3 [Red] - BUTTON1 = PC_13, - - // Backward legacy names - USER_BUTTON = BUTTON1, - PWM_OUT = D9, - /**** USB FS pins ****/ USB_OTG_FS_DM = PA_11, USB_OTG_FS_DP = PA_12, @@ -295,6 +273,13 @@ typedef enum { NC = (int)0xFFFFFFFF } PinName; +// Standardized LED and button names +#define LED1 PC_7 // Green +#define LED2 PB_7 // Blue +#define LED3 PB_14 // Red +#define BUTTON1 PC_13 + + #ifdef __cplusplus } #endif diff --git a/targets/TARGET_STM/TARGET_STM32L4/TARGET_STM32L4R9xI/TARGET_DISCO_L4R9I/PinNames.h b/targets/TARGET_STM/TARGET_STM32L4/TARGET_STM32L4R9xI/TARGET_DISCO_L4R9I/PinNames.h index 18eeb134a8..6a279dbe64 100644 --- a/targets/TARGET_STM/TARGET_STM32L4/TARGET_STM32L4R9xI/TARGET_DISCO_L4R9I/PinNames.h +++ b/targets/TARGET_STM/TARGET_STM32L4/TARGET_STM32L4R9xI/TARGET_DISCO_L4R9I/PinNames.h @@ -209,64 +209,43 @@ typedef enum { ADC_VREF = 0xF1, // Internal pin virtual value ADC_VBAT = 0xF2, // Internal pin virtual value - // Arduino J3 connector namings - A0 = PA_7, - A1 = PC_4, - A2 = PC_3, - A3 = PB_0, - A4 = PA_0, - A5 = PA_5, - D0 = PC_0, - D1 = PC_1, - D2 = PG_11, - D3 = PF_10, - D4 = PG_6, - D5 = PA_1, - D6 = PB_4, - D7 = PA_4, - D8 = PH_15, - D9 = PH_13, - D10 = PI_0, - D11 = PB_15, - D12 = PB_14, - D13 = PB_13, - D14 = PG_8, - D15 = PG_7, +#ifdef TARGET_FF_ARDUINO_UNO + ARDUINO_UNO_A0 = PA_7, + ARDUINO_UNO_A1 = PC_4, + ARDUINO_UNO_A2 = PC_3, + ARDUINO_UNO_A3 = PB_0, + ARDUINO_UNO_A4 = PA_0, + ARDUINO_UNO_A5 = PA_5, + ARDUINO_UNO_D0 = PC_0, + ARDUINO_UNO_D1 = PC_1, + ARDUINO_UNO_D2 = PG_11, + ARDUINO_UNO_D3 = PF_10, + ARDUINO_UNO_D4 = PG_6, + ARDUINO_UNO_D5 = PA_1, + ARDUINO_UNO_D6 = PB_4, + ARDUINO_UNO_D7 = PA_4, + ARDUINO_UNO_D8 = PH_15, + ARDUINO_UNO_D9 = PH_13, + ARDUINO_UNO_D10 = PI_0, + ARDUINO_UNO_D11 = PB_15, + ARDUINO_UNO_D12 = PB_14, + ARDUINO_UNO_D13 = PB_13, + ARDUINO_UNO_D14 = PG_8, + ARDUINO_UNO_D15 = PG_7, +#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_2, + USBTX = PA_2, #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_3, + USBRX = PA_3, #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 = PH_4, // LED_GREEN LD2 - LED2 = PB_13, // LED_GREEN LD3 - BUTTON1 = PC_13, - - // Backward legacy names - USER_BUTTON = BUTTON1, - PWM_OUT = D3, - /**** USB FS pins ****/ USB_OTG_FS_DM = PA_11, USB_OTG_FS_DP = PA_12, @@ -366,6 +345,12 @@ typedef enum { NC = (int)0xFFFFFFFF } PinName; +// Standardized LED and button names +#define LED1 PH_4 // LD2 Green +#define LED2 PB_13 // LD3 Green +#define BUTTON1 PC_13 + + #ifdef __cplusplus } #endif diff --git a/targets/targets.json b/targets/targets.json index 160ecd7d1e..0658344342 100644 --- a/targets/targets.json +++ b/targets/targets.json @@ -3580,8 +3580,7 @@ "MCU_STM32L433xC" ], "supported_form_factors": [ - "ARDUINO", - "MORPHO" + "ARDUINO_UNO" ], "detect_code": [ "0779" @@ -3636,8 +3635,7 @@ "MCU_STM32L452xE" ], "supported_form_factors": [ - "ARDUINO", - "MORPHO" + "ARDUINO_UNO" ], "detect_code": [ "0829" @@ -3662,7 +3660,7 @@ "MCU_STM32L471xG" ], "supported_form_factors": [ - "ARDUINO" + "ARDUINO_UNO" ], "detect_code": [ "0312" @@ -3701,7 +3699,7 @@ "MX25R6435F" ], "supported_form_factors": [ - "ARDUINO" + "ARDUINO_UNO" ], "detect_code": [ "0764" @@ -3739,8 +3737,7 @@ "MCU_STM32L476xG" ], "supported_form_factors": [ - "ARDUINO", - "MORPHO" + "ARDUINO_UNO" ], "detect_code": [ "0765" @@ -3806,8 +3803,7 @@ "MCU_STM32L486xG" ], "supported_form_factors": [ - "ARDUINO", - "MORPHO" + "ARDUINO_UNO" ], "detect_code": [ "0827" @@ -3853,7 +3849,7 @@ "MCU_STM32L496xG" ], "supported_form_factors": [ - "ARDUINO", + "ARDUINO_UNO", "STMOD", "PMOD" ], @@ -3877,8 +3873,7 @@ "MCU_STM32L496xG" ], "supported_form_factors": [ - "ARDUINO", - "MORPHO" + "ARDUINO_UNO" ], "detect_code": [ "0823" @@ -3916,8 +3911,7 @@ "MCU_STM32L4R5xI" ], "supported_form_factors": [ - "ARDUINO", - "MORPHO" + "ARDUINO_UNO" ], "extra_labels_add": [ "STM32L4R5ZI", @@ -3960,7 +3954,7 @@ ], "device_name": "STM32L4R9AIIx", "supported_form_factors": [ - "ARDUINO", + "ARDUINO_UNO", "STMOD", "PMOD" ],