From 3fc81fb8836faef540ae28dcfae5b6010e18d5eb Mon Sep 17 00:00:00 2001 From: Chun-Chieh Li Date: Tue, 18 May 2021 11:47:47 +0800 Subject: [PATCH] M2354: Comply with standard pin naming rule --- .../TARGET_M2354/TARGET_NU_M2354/PinNames.h | 94 ++++++++----------- targets/targets.json | 3 + 2 files changed, 44 insertions(+), 53 deletions(-) diff --git a/targets/TARGET_NUVOTON/TARGET_M2354/TARGET_NU_M2354/PinNames.h b/targets/TARGET_NUVOTON/TARGET_M2354/TARGET_NU_M2354/PinNames.h index d419a2847f0..e24f0814f7e 100644 --- a/targets/TARGET_NUVOTON/TARGET_M2354/TARGET_NU_M2354/PinNames.h +++ b/targets/TARGET_NUVOTON/TARGET_M2354/TARGET_NU_M2354/PinNames.h @@ -33,53 +33,46 @@ typedef enum { NC = (int)0xFFFFFFFF, // Generic naming - PA_0 = NU_PORT_N_PIN_TO_PINNAME(0, 0), PA_1, PA_2, PA_3, PA_4, PA_5, PA_6, PA_7, PA_8, PA_9, PA_10, PA_11, PA_12, PA_13, PA_14, PA_15, - PB_0 = NU_PORT_N_PIN_TO_PINNAME(1, 0), PB_1, PB_2, PB_3, PB_4, PB_5, PB_6, PB_7, PB_8, PB_9, PB_10, PB_11, PB_12, PB_13, PB_14, PB_15, - PC_0 = NU_PORT_N_PIN_TO_PINNAME(2, 0), PC_1, PC_2, PC_3, PC_4, PC_5, PC_6, PC_7, PC_8, PC_9, PC_10, PC_11, PC_12, PC_13, - PD_0 = NU_PORT_N_PIN_TO_PINNAME(3, 0), PD_1, PD_2, PD_3, PD_4, PD_5, PD_6, PD_7, PD_8, PD_9, PD_10, PD_11, PD_12, PD_14 = PD_12 + 2, - PE_0 = NU_PORT_N_PIN_TO_PINNAME(4, 0), PE_1, PE_2, PE_3, PE_4, PE_5, PE_6, PE_7, PE_8, PE_9, PE_10, PE_11, PE_12, PE_13, PE_14, PE_15, - PF_0 = NU_PORT_N_PIN_TO_PINNAME(5, 0), PF_1, PF_2, PF_3, PF_4, PF_5, PF_6, PF_7, PF_8, PF_9, PF_10, PF_11, - PG_2 = NU_PORT_N_PIN_TO_PINNAME(6, 2), PG_3, PG_4, PG_9 = PG_4 + 5, PG_10, PG_11, PG_12, PG_13, PG_14, PG_15, - PH_4 = NU_PORT_N_PIN_TO_PINNAME(7, 4), PH_5, PH_6, PH_7, PH_8, PH_9, PH_10, PH_11, + PA_INIT = NU_PORT_N_PIN_TO_PINNAME(0, 0), PA_0 = PA_INIT, PA_1, PA_2, PA_3, PA_4, PA_5, PA_6, PA_7, PA_8, PA_9, PA_10, PA_11, PA_12, PA_13, PA_14, PA_15, + PB_INIT = NU_PORT_N_PIN_TO_PINNAME(1, 0), PB_0 = PB_INIT, PB_1, PB_2, PB_3, PB_4, PB_5, PB_6, PB_7, PB_8, PB_9, PB_10, PB_11, PB_12, PB_13, PB_14, PB_15, + PC_INIT = NU_PORT_N_PIN_TO_PINNAME(2, 0), PC_0 = PC_INIT, PC_1, PC_2, PC_3, PC_4, PC_5, PC_6, PC_7, PC_8, PC_9, PC_10, PC_11, PC_12, PC_13, + PD_INIT = NU_PORT_N_PIN_TO_PINNAME(3, 0), PD_0 = PD_INIT, PD_1, PD_2, PD_3, PD_4, PD_5, PD_6, PD_7, PD_8, PD_9, PD_10, PD_11, PD_12, PD_14 = PD_12 + 2, + PE_INIT = NU_PORT_N_PIN_TO_PINNAME(4, 0), PE_0 = PE_INIT, PE_1, PE_2, PE_3, PE_4, PE_5, PE_6, PE_7, PE_8, PE_9, PE_10, PE_11, PE_12, PE_13, PE_14, PE_15, + PF_INIT = NU_PORT_N_PIN_TO_PINNAME(5, 0), PF_0 = PF_INIT, PF_1, PF_2, PF_3, PF_4, PF_5, PF_6, PF_7, PF_8, PF_9, PF_10, PF_11, + PG_INIT = NU_PORT_N_PIN_TO_PINNAME(6, 0), PG_2 = PG_INIT + 2, PG_3, PG_4, PG_9 = PG_4 + 5, PG_10, PG_11, PG_12, PG_13, PG_14, PG_15, + PH_INIT = NU_PORT_N_PIN_TO_PINNAME(7, 0), PH_4 = PH_INIT + 4, PH_5, PH_6, PH_7, PH_8, PH_9, PH_10, PH_11, // Arduino UNO naming - A0 = PB_11, - A1 = PB_10, - A2 = PB_9, - A3 = PB_8, - A4 = PB_7, - A5 = PB_6, - - D0 = PA_8, - D1 = PA_9, - D2 = PC_1, - D3 = PC_0, - D4 = PE_7, - D5 = PE_6, - D6 = PC_12, - D7 = PC_11, - D8 = PC_9, - D9 = PC_10, - D10 = PA_3, - D11 = PA_0, - D12 = PA_1, - D13 = PA_2, - D14 = PG_3, - D15 = PG_2, + ARDUINO_UNO_A0 = PB_11, + ARDUINO_UNO_A1 = PB_10, + ARDUINO_UNO_A2 = PB_9, + ARDUINO_UNO_A3 = PB_8, + ARDUINO_UNO_A4 = PB_7, + ARDUINO_UNO_A5 = PB_6, + + ARDUINO_UNO_D0 = PA_8, + ARDUINO_UNO_D1 = PA_9, + ARDUINO_UNO_D2 = PC_1, + ARDUINO_UNO_D3 = PC_0, + ARDUINO_UNO_D4 = PE_7, + ARDUINO_UNO_D5 = PE_6, + ARDUINO_UNO_D6 = PC_12, + ARDUINO_UNO_D7 = PC_11, + ARDUINO_UNO_D8 = PC_9, + ARDUINO_UNO_D9 = PC_10, + ARDUINO_UNO_D10 = PA_3, + ARDUINO_UNO_D11 = PA_0, + ARDUINO_UNO_D12 = PA_1, + ARDUINO_UNO_D13 = PA_2, + ARDUINO_UNO_D14 = PG_3, + ARDUINO_UNO_D15 = PG_2, // Other board-specific naming // UART naming -#if defined(MBED_CONF_TARGET_USB_UART_TX) - CONSOLE_TX = MBED_CONF_TARGET_USB_UART_TX, -#else - CONSOLE_TX = NC, -#endif -#if defined(MBED_CONF_TARGET_USB_UART_RX) - CONSOLE_RX = MBED_CONF_TARGET_USB_UART_RX, -#else - CONSOLE_RX = NC, -#endif + CONSOLE_TX = MBED_CONF_TARGET_USB_UART_TX, + CONSOLE_RX = MBED_CONF_TARGET_USB_UART_RX, + #if defined(MBED_CONF_TARGET_STDIO_UART_TX) STDIO_UART_TX = MBED_CONF_TARGET_STDIO_UART_TX, #else @@ -91,23 +84,18 @@ typedef enum { STDIO_UART_RX = CONSOLE_RX, #endif - // I2C naming - I2C_SCL = D15, - I2C_SDA = D14, - - // LED naming - LED1 = PD_2, - LED2 = PD_3, - - // Button naming - SW2 = PF_11, - BUTTON1 = SW2, - // Force PinName to 32-bit required by NU_PINNAME_BIND(...) FORCE_ENUM_PINNAME_32BIT = 0x7FFFFFFF, } PinName; +// LED naming +#define LED1 PD_2 +#define LED2 PD_3 + +// Button naming +#define BUTTON1 PF_11 // SW2 + #ifdef __cplusplus } #endif diff --git a/targets/targets.json b/targets/targets.json index 77e9ce948b7..a5f2e8fb2ce 100644 --- a/targets/targets.json +++ b/targets/targets.json @@ -6944,6 +6944,9 @@ "inherits": [ "MCU_M2354" ], + "supported_form_factors": [ + "ARDUINO_UNO" + ], "detect_code": [ "1312" ],