STM32G0: standard pin names

targets/TARGET_STM/TARGET_STM32G0/TARGET_STM32G031xx/TARGET_NUCLEO_G031K8/PeripheralPins.c

@@ -104,9 +104,7 @@ MBED_WEAK const PinMap PinMap_PWM[] = {
     {PA_7_ALT2,  PWM_17, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF5_TIM17, 1, 0)}, // TIM17_CH1
     {PA_8,       PWM_1,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF2_TIM1, 1, 0)}, // TIM1_CH1
     {PA_9,       PWM_1,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF2_TIM1, 2, 0)}, // TIM1_CH2
-    {PA_9_ALT0,  PWM_1,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF2_TIM1, 2, 0)}, // TIM1_CH2
     {PA_10,      PWM_1,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF2_TIM1, 3, 0)}, // TIM1_CH3
-    {PA_10_ALT0, PWM_1,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF2_TIM1, 3, 0)}, // TIM1_CH3
     {PA_11,      PWM_1,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF2_TIM1, 4, 0)}, // TIM1_CH4
 //  {PA_15,      PWM_2,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF2_TIM2, 1, 0)}, // TIM2_CH1
     {PB_0,       PWM_1,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF2_TIM1, 2, 1)}, // TIM1_CH2N
@@ -134,7 +132,6 @@ MBED_WEAK const PinMap PinMap_UART_TX[] = {
     {PA_2,       UART_2,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_USART2)}, // Connected to STDIO_UART_TX
 //  {PA_2_ALT0,  LPUART_1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF6_LPUART1)}, // Connected to STDIO_UART_TX
     {PA_9,       UART_1,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_USART1)},
-    {PA_9_ALT0,  UART_1,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_USART1)},
 //  {PA_14,      UART_2,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_USART2)}, // Connected to T_JTCK
     {PB_6,       UART_1,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF0_USART1)},
     {NC, NC, 0}
@@ -144,7 +141,6 @@ MBED_WEAK const PinMap PinMap_UART_RX[] = {
     {PA_3,       UART_2,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_USART2)}, // Connected to STDIO_UART_RX
 //  {PA_3_ALT0,  LPUART_1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF6_LPUART1)}, // Connected to STDIO_UART_RX
     {PA_10,      UART_1,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_USART1)},
-    {PA_10_ALT0, UART_1,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_USART1)},
 //  {PA_15,      UART_2,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_USART2)},
     {PB_7,       UART_1,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF0_USART1)},
     {NC, NC, 0}
@@ -173,7 +169,6 @@ MBED_WEAK const PinMap PinMap_SPI_MOSI[] = {
     {PA_4,       SPI_2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF1_SPI2)},
     {PA_7,       SPI_1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF0_SPI1)},
     {PA_10,      SPI_2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF0_SPI2)},
-    {PA_10_ALT0, SPI_2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF0_SPI2)},
     {PA_12,      SPI_1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF0_SPI1)},
     {PB_5,       SPI_1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF0_SPI1)},
     {PB_7,       SPI_2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF1_SPI2)},
@@ -184,7 +179,6 @@ MBED_WEAK const PinMap PinMap_SPI_MISO[] = {
 //  {PA_3,       SPI_2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF0_SPI2)}, // Connected to STDIO_UART_RX
     {PA_6,       SPI_1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF0_SPI1)},
     {PA_9,       SPI_2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF4_SPI2)},
-    {PA_9_ALT0,  SPI_2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF4_SPI2)},
     {PA_11,      SPI_1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF0_SPI1)},
     {PB_2,       SPI_2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF1_SPI2)},
     {PB_4,       SPI_1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF0_SPI1)},

targets/TARGET_STM/TARGET_STM32G0/TARGET_STM32G031xx/TARGET_NUCLEO_G031K8/PinNames.h

@@ -2,7 +2,7 @@
  * SPDX-License-Identifier: BSD-3-Clause
  ******************************************************************************
  *
- * Copyright (c) 2016-2020 STMicroelectronics.
+ * Copyright (c) 2016-2021 STMicroelectronics.
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -31,11 +31,9 @@ typedef enum {
     ALT0  = 0x100,
     ALT1  = 0x200,
     ALT2  = 0x300,
-    ALT3  = 0x400
 } ALTx;
 
 typedef enum {
-
     PA_0       = 0x00,
     PA_1       = 0x01,
     PA_2       = 0x02,
@@ -52,9 +50,7 @@ typedef enum {
     PA_7_ALT2  = PA_7  | ALT2, // same pin used for alternate HW
     PA_8       = 0x08,
     PA_9       = 0x09,
-    PA_9_ALT0  = PA_9  | ALT0, // same pin used for alternate HW
     PA_10      = 0x0A,
-    PA_10_ALT0 = PA_10 | ALT0, // same pin used for alternate HW
     PA_11      = 0x0B,
     PA_12      = 0x0C,
     PA_13      = 0x0D,
@@ -77,6 +73,7 @@ typedef enum {
     PC_6       = 0x26,
     PC_14      = 0x2E,
     PC_15      = 0x2F,
+    PF_2       = 0x52,
 
     /**** ADC internal channels ****/
 
@@ -84,7 +81,7 @@ typedef enum {
     ADC_VREF = 0xF1, // Internal pin virtual value
     ADC_VBAT = 0xF2, // Internal pin virtual value
 
-    // Arduino Nano Header pin connection naming
+    // Arduino Nano pins
     A0  = PA_0,
     A1  = PA_1,
     A2  = PA_4,
@@ -93,6 +90,7 @@ typedef enum {
     A5  = PA_11,
     A6  = PA_6,
     A7  = PA_7,
+
     D0  = PB_7,
     D1  = PB_6,
     D2  = PA_15,
@@ -110,31 +108,16 @@ typedef enum {
 
     // STDIO for console print
 #ifdef MBED_CONF_TARGET_STDIO_UART_TX
-    STDIO_UART_TX = MBED_CONF_TARGET_STDIO_UART_TX,
+    CONSOLE_TX = MBED_CONF_TARGET_STDIO_UART_TX,
 #else
-    STDIO_UART_TX = PA_2,
+    CONSOLE_TX = PA_2,
 #endif
 #ifdef MBED_CONF_TARGET_STDIO_UART_RX
-    STDIO_UART_RX = MBED_CONF_TARGET_STDIO_UART_RX,
+    CONSOLE_RX = MBED_CONF_TARGET_STDIO_UART_RX,
 #else
-    STDIO_UART_RX = PA_3,
+    CONSOLE_RX = PA_3,
 #endif
 
-    // Generic signals namings
-    LED1        = PC_6,  // LD3 [Green]
-
-    SERIAL_TX   = STDIO_UART_TX,
-    SERIAL_RX   = STDIO_UART_RX,
-    CONSOLE_TX       = STDIO_UART_TX,
-    CONSOLE_RX       = 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_0,
-    PWM_OUT     = PB_3,
-
     /**** OSCILLATOR pins ****/
     RCC_OSC32_EN = PC_15,
     RCC_OSC32_IN = PC_14,
@@ -155,6 +138,10 @@ typedef enum {
     NC = (int)0xFFFFFFFF
 } PinName;
 
+// Standardized LED and button names
+#define LED1     PC_6   // LD3 [Green]
+
+
 #ifdef __cplusplus
 }
 #endif

targets/TARGET_STM/TARGET_STM32G0/TARGET_STM32G071xx/TARGET_NUCLEO_G071RB/PeripheralPins.c

@@ -77,7 +77,6 @@ MBED_WEAK const PinMap PinMap_DAC[] = {
 
 MBED_WEAK const PinMap PinMap_I2C_SDA[] = {
     {PA_10,      I2C_1, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF6_I2C1)},
-    {PA_10_ALT0, I2C_1, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF6_I2C1)},
     {PA_12,      I2C_2, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF6_I2C2)},
     {PB_7,       I2C_1, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF6_I2C1)},
     {PB_9,       I2C_1, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF6_I2C1)},
@@ -88,7 +87,6 @@ MBED_WEAK const PinMap PinMap_I2C_SDA[] = {
 
 MBED_WEAK const PinMap PinMap_I2C_SCL[] = {
     {PA_9,       I2C_1, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF6_I2C1)},
-    {PA_9_ALT0,  I2C_1, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF6_I2C1)},
     {PA_11,      I2C_2, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF6_I2C2)},
     {PB_6,       I2C_1, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF6_I2C1)},
     {PB_8,       I2C_1, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF6_I2C1)},
@@ -105,7 +103,7 @@ MBED_WEAK const PinMap PinMap_I2C_SCL[] = {
 MBED_WEAK const PinMap PinMap_PWM[] = {
     // {PA_0,       PWM_2,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF2_TIM2, 1, 0)}, // TIM2_CH1
     // {PA_1,       PWM_2,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF2_TIM2, 2, 0)}, // TIM2_CH2
-    {PA_1_ALT0,  PWM_15, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF5_TIM15, 1, 1)}, // TIM15_CH1N
+    {PA_1,       PWM_15, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF5_TIM15, 1, 1)}, // TIM15_CH1N
     // {PA_2,       PWM_2,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF2_TIM2, 3, 0)}, // TIM2_CH3 // Connected to LPUART1_TX
     {PA_2_ALT0,  PWM_15, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF5_TIM15, 1, 0)}, // TIM15_CH1 // Connected to LPUART1_TX
     // {PA_3,       PWM_2,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF2_TIM2, 4, 0)}, // TIM2_CH4 // Connected to LPUART1_RX
@@ -120,9 +118,7 @@ MBED_WEAK const PinMap PinMap_PWM[] = {
     {PA_7_ALT2,  PWM_17, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF5_TIM17, 1, 0)}, // TIM17_CH1
     {PA_8,       PWM_1,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF2_TIM1, 1, 0)}, // TIM1_CH1
     {PA_9,       PWM_1,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF2_TIM1, 2, 0)}, // TIM1_CH2
-    {PA_9_ALT0,  PWM_1,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF2_TIM1, 2, 0)}, // TIM1_CH2
     {PA_10,      PWM_1,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF2_TIM1, 3, 0)}, // TIM1_CH3
-    {PA_10_ALT0, PWM_1,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF2_TIM1, 3, 0)}, // TIM1_CH3
     {PA_11,      PWM_1,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF2_TIM1, 4, 0)}, // TIM1_CH4
     // {PA_15,      PWM_2,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF2_TIM2, 1, 0)}, // TIM2_CH1
     {PB_0,       PWM_1,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF2_TIM1, 2, 1)}, // TIM1_CH2N
@@ -153,7 +149,7 @@ MBED_WEAK const PinMap PinMap_PWM[] = {
     // {PC_4,       PWM_2,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF2_TIM2, 1, 0)}, // TIM2_CH1
     // {PC_5,       PWM_2,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF2_TIM2, 2, 0)}, // TIM2_CH2
     // {PC_6,       PWM_2,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF2_TIM2, 3, 0)}, // TIM2_CH3
-    {PC_6_ALT0,  PWM_3,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF1_TIM3, 1, 0)}, // TIM3_CH1
+    {PC_6,       PWM_3,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF1_TIM3, 1, 0)}, // TIM3_CH1
     {PC_7,       PWM_3,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF1_TIM3, 2, 0)}, // TIM3_CH2
     // {PC_7_ALT0,       PWM_2,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF2_TIM2, 4, 0)}, // TIM2_CH4
     {PC_8,       PWM_1,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF2_TIM1, 1, 0)}, // TIM1_CH1
@@ -181,7 +177,6 @@ MBED_WEAK const PinMap PinMap_UART_TX[] = {
     {PA_2_ALT0,  LPUART_1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF6_LPUART1)}, // Connected to LPUART1_TX
     {PA_5,       UART_3,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF4_USART3)},
     {PA_9,       UART_1,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_USART1)},
-    {PA_9_ALT0,  UART_1,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_USART1)},
     {PA_14,      UART_2,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_USART2)}, // Connected to TCK
     {PB_2,       UART_3,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF4_USART3)},
     {PB_6,       UART_1,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF0_USART1)},
@@ -203,7 +198,6 @@ MBED_WEAK const PinMap PinMap_UART_RX[] = {
     {PA_3,       UART_2,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_USART2)},
     {PA_3_ALT0,  LPUART_1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF6_LPUART1)}, // Connected to LPUART1_RX
     {PA_10,      UART_1,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_USART1)},
-    {PA_10_ALT0, UART_1,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_USART1)},
     {PA_15,      UART_2,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_USART2)},
     {PB_0,       UART_3,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF4_USART3)},
     {PB_7,       UART_1,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF0_USART1)},
@@ -255,7 +249,6 @@ MBED_WEAK const PinMap PinMap_SPI_MOSI[] = {
     {PA_4,       SPI_2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF1_SPI2)},
     {PA_7,       SPI_1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF0_SPI1)},
     {PA_10,      SPI_2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF0_SPI2)},
-    {PA_10_ALT0, SPI_2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF0_SPI2)},
     {PA_12,      SPI_1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF0_SPI1)},
     {PB_5,       SPI_1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF0_SPI1)},
     {PB_7,       SPI_2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF1_SPI2)},
@@ -271,7 +264,6 @@ MBED_WEAK const PinMap PinMap_SPI_MISO[] = {
     {PA_3,       SPI_2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF0_SPI2)}, // Connected to LPUART1_RX
     {PA_6,       SPI_1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF0_SPI1)},
     {PA_9,       SPI_2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF4_SPI2)},
-    {PA_9_ALT0,  SPI_2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF4_SPI2)},
     {PA_11,      SPI_1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF0_SPI1)},
     {PB_2,       SPI_2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF1_SPI2)},
     {PB_4,       SPI_1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF0_SPI1)},

targets/TARGET_STM/TARGET_STM32G0/TARGET_STM32G071xx/TARGET_NUCLEO_G071RB/PinNames.h

@@ -2,7 +2,7 @@
  * SPDX-License-Identifier: BSD-3-Clause
  ******************************************************************************
  *
- * Copyright (c) 2018 STMicroelectronics.
+ * Copyright (c) 2016-2021 STMicroelectronics.
  * All rights reserved.
  *
  * This software component is licensed by ST under BSD 3-Clause license,
@@ -11,6 +11,8 @@
  *                        opensource.org/licenses/BSD-3-Clause
  *
  ******************************************************************************
+ *
+ * Automatically generated from STM32CubeMX/db/mcu/STM32G071R(6-8-B)Tx.xml
  */
 
 /* MBED TARGET LIST: NUCLEO_G071RB */
@@ -29,55 +31,43 @@ typedef enum {
     ALT0  = 0x100,
     ALT1  = 0x200,
     ALT2  = 0x300,
-    ALT3  = 0x400
 } ALTx;
 
 typedef enum {
     PA_0       = 0x00,
     PA_1       = 0x01,
-    PA_1_ALT0 = PA_1 | ALT0,
     PA_2       = 0x02,
-    PA_2_ALT0 = PA_2 | ALT0,
+    PA_2_ALT0  = PA_2  | ALT0, // same pin used for alternate HW
-    PA_2_ALT1 = PA_2 | ALT1,
     PA_3       = 0x03,
-    PA_3_ALT0 = PA_3 | ALT0,
+    PA_3_ALT0  = PA_3  | ALT0, // same pin used for alternate HW
-    PA_3_ALT1 = PA_3 | ALT1,
     PA_4       = 0x04,
     PA_5       = 0x05,
     PA_6       = 0x06,
-    PA_6_ALT0 = PA_6 | ALT0,
+    PA_6_ALT0  = PA_6  | ALT0, // same pin used for alternate HW
     PA_7       = 0x07,
-    PA_7_ALT0 = PA_7 | ALT0,
+    PA_7_ALT0  = PA_7  | ALT0, // same pin used for alternate HW
-    PA_7_ALT1 = PA_7 | ALT1,
+    PA_7_ALT1  = PA_7  | ALT1, // same pin used for alternate HW
-    PA_7_ALT2 = PA_7 | ALT2,
+    PA_7_ALT2  = PA_7  | ALT2, // same pin used for alternate HW
     PA_8       = 0x08,
     PA_9       = 0x09,
-    PA_9_ALT0 = PA_9 | ALT0,
     PA_10      = 0x0A,
-    PA_10_ALT0 = PA_10 | ALT0,
     PA_11      = 0x0B,
     PA_12      = 0x0C,
     PA_13      = 0x0D,
     PA_14      = 0x0E,
-    PA_14_ALT0 = PA_14 | ALT0,
     PA_15      = 0x0F,
-    PA_15_ALT0 = PA_15 | ALT0,
+    PA_15_ALT0 = PA_15 | ALT0, // same pin used for alternate HW
-
     PB_0       = 0x10,
-    PB_0_ALT0 = PB_0 | ALT0,
+    PB_0_ALT0  = PB_0  | ALT0, // same pin used for alternate HW
     PB_1       = 0x11,
-    PB_1_ALT0 = PB_1 | ALT0,
+    PB_1_ALT0  = PB_1  | ALT0, // same pin used for alternate HW
-    PB_1_ALT1 = PB_1 | ALT1,
+    PB_1_ALT1  = PB_1  | ALT1, // same pin used for alternate HW
     PB_2       = 0x12,
     PB_3       = 0x13,
     PB_4       = 0x14,
-    PB_4_ALT0 = PB_4 | ALT0,
-    PB_4_ALT1 = PB_4 | ALT1,
     PB_5       = 0x15,
-    PB_5_ALT0 = PB_5 | ALT0,
-    PB_5_ALT1 = PB_5 | ALT1,
     PB_6       = 0x16,
-    PB_6_ALT0 = PB_6 | ALT0,
+    PB_6_ALT0  = PB_6  | ALT0, // same pin used for alternate HW
     PB_7       = 0x17,
     PB_8       = 0x18,
     PB_9       = 0x19,
@@ -85,38 +75,34 @@ typedef enum {
     PB_11      = 0x1B,
     PB_12      = 0x1C,
     PB_13      = 0x1D,
-    PB_13_ALT0 = PB_13 | ALT0,
+    PB_13_ALT0 = PB_13 | ALT0, // same pin used for alternate HW
     PB_14      = 0x1E,
-    PB_14_ALT0 = PB_14 | ALT0,
+    PB_14_ALT0 = PB_14 | ALT0, // same pin used for alternate HW
     PB_15      = 0x1F,
-    PB_15_ALT0 = PB_15 | ALT0,
+    PB_15_ALT0 = PB_15 | ALT0, // same pin used for alternate HW
-    PB_15_ALT1 = PB_15 | ALT1,
+    PB_15_ALT1 = PB_15 | ALT1, // same pin used for alternate HW
-
     PC_0       = 0x20,
     PC_1       = 0x21,
     PC_2       = 0x22,
     PC_3       = 0x23,
     PC_4       = 0x24,
-    PC_4_ALT0 = PC_4 | ALT0,
+    PC_4_ALT0  = PC_4  | ALT0, // same pin used for alternate HW
     PC_5       = 0x25,
-    PC_5_ALT0 = PC_5 | ALT0,
+    PC_5_ALT0  = PC_5  | ALT0, // same pin used for alternate HW
     PC_6       = 0x26,
-    PC_6_ALT0 = PC_6 | ALT0,
     PC_7       = 0x27,
-    PC_7_ALT0 = PC_7 | ALT0,
     PC_8       = 0x28,
-    PC_8_ALT0 = PC_8 | ALT0,
+    PC_8_ALT0  = PC_8  | ALT0, // same pin used for alternate HW
     PC_9       = 0x29,
-    PC_9_ALT0 = PC_9 | ALT0,
+    PC_9_ALT0  = PC_9  | ALT0, // same pin used for alternate HW
     PC_10      = 0x2A,
-    PC_10_ALT0 = PC_10 | ALT0,
+    PC_10_ALT0 = PC_10 | ALT0, // same pin used for alternate HW
     PC_11      = 0x2B,
-    PC_11_ALT0 = PC_11 | ALT0,
+    PC_11_ALT0 = PC_11 | ALT0, // same pin used for alternate HW
     PC_12      = 0x2C,
     PC_13      = 0x2D,
     PC_14      = 0x2E,
     PC_15      = 0x2F,
-
     PD_0       = 0x30,
     PD_1       = 0x31,
     PD_2       = 0x32,
@@ -126,73 +112,55 @@ typedef enum {
     PD_6       = 0x36,
     PD_8       = 0x38,
     PD_9       = 0x39,
-
     PF_0       = 0x50,
     PF_1       = 0x51,
+    PF_2       = 0x52,
 
-    // ADC internal channels
+    /**** ADC internal channels ****/
-    ADC_TEMP = 0xF0,
-    ADC_VREF = 0xF1,
-    ADC_VBAT = 0xF2,
 
-    // Arduino connector namings
+    ADC_TEMP = 0xF0, // Internal pin virtual value
-    A0          = PA_0,
+    ADC_VREF = 0xF1, // Internal pin virtual value
-    A1          = PA_1,
+    ADC_VBAT = 0xF2, // Internal pin virtual value
-    A2          = PA_4,
+
-    A3          = PB_1,
+#ifdef TARGET_FF_ARDUINO_UNO
-    A4          = PB_11,
+    // Arduino Uno (Rev3) pins
-    A5          = PB_12,
+    ARDUINO_UNO_A0  = PA_0,
-    D0          = PC_5,
+    ARDUINO_UNO_A1  = PA_1,
-    D1          = PC_4,
+    ARDUINO_UNO_A2  = PA_4,
-    D2          = PA_10,
+    ARDUINO_UNO_A3  = PB_1,
-    D3          = PB_3,
+    ARDUINO_UNO_A4  = PB_11,
-    D4          = PB_5,
+    ARDUINO_UNO_A5  = PB_12,
-    D5          = PB_4,
+
-    D6          = PB_14,
+    ARDUINO_UNO_D0  = PC_5,
-    D7          = PA_8,
+    ARDUINO_UNO_D1  = PC_4,
-    D8          = PA_9,
+    ARDUINO_UNO_D2  = PA_10,
-    D9          = PC_7,
+    ARDUINO_UNO_D3  = PB_3,
-    D10         = PB_0,
+    ARDUINO_UNO_D4  = PB_5,
-    D11         = PA_7,
+    ARDUINO_UNO_D5  = PB_4,
-    D12         = PA_6,
+    ARDUINO_UNO_D6  = PB_14,
-    D13         = PA_5,
+    ARDUINO_UNO_D7  = PA_8,
-    D14         = PB_9,
+    ARDUINO_UNO_D8  = PA_9,
-    D15         = PB_8,
+    ARDUINO_UNO_D9  = PC_7,
+    ARDUINO_UNO_D10 = PB_0,
+    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,
+    CONSOLE_TX = MBED_CONF_TARGET_STDIO_UART_TX,
 #else
-    STDIO_UART_TX = PA_2,
+    CONSOLE_TX = PA_2,
 #endif
 #ifdef MBED_CONF_TARGET_STDIO_UART_RX
-    STDIO_UART_RX = MBED_CONF_TARGET_STDIO_UART_RX,
+    CONSOLE_RX = MBED_CONF_TARGET_STDIO_UART_RX,
 #else
-    STDIO_UART_RX = PA_3,
+    CONSOLE_RX = 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,
-    CONSOLE_TX       = STDIO_UART_TX,
-    CONSOLE_RX       = 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_0,
-    PWM_OUT     = PB_3,
-
-
-
     /**** OSCILLATOR pins ****/
     RCC_OSC32_EN = PC_15,
     RCC_OSC32_IN = PC_14,
@@ -206,8 +174,6 @@ typedef enum {
     SYS_PVD_IN = PB_7,
     SYS_SWCLK = PA_14,
     SYS_SWDIO = PA_13,
-
-
     SYS_WKUP1 = PA_0,
     SYS_WKUP2 = PC_13,
     SYS_WKUP4 = PA_2,
@@ -218,6 +184,11 @@ typedef enum {
     NC = (int)0xFFFFFFFF
 } PinName;
 
+// Standardized LED and button names
+#define LED1     PA_5   // LED_GREEN
+#define BUTTON1  PC_13
+
+
 #ifdef __cplusplus
 }
 #endif