[NUCLEO_L452RE] Avoid duplicated analog pins

Signed-off-by: Frederic Pillon <frederic.pillon@st.com>

Author: fpistm

variants/NUCLEO_L452RE/variant.cpp

@@ -80,13 +80,7 @@ const PinName digitalPin[] = {
   PA_4,  //D47/A2
   PB_0,  //D48/A3
   PC_1,  //D49/A4
-  PC_0,  //D50/A5
-  // Duplicated pins in order to be aligned with PinMap_ADC
-  PA_7,  //D51/A6  = D11
-  PA_6,  //D52/A7  = D12
-  PC_2,  //D53/A8  = D27
-  PC_3,  //D54/A9  = D28
-  PC_4   //D55/A10 = D44
+  PC_0   //D50/A5
 #else
   PA_10, //D0
   PA_9,  //D1
@@ -143,15 +137,32 @@ const PinName digitalPin[] = {
   PC_3,  //D47 // A2
   PC_2,  //D48 // A3
   PC_1,  //D49 // A4
-  PC_0,  //D50 // A5
-  // Duplicated pins in order to be aligned with PinMap_ADC
-  PA_4,  //D51 // A6  = D41
-  PA_5,  //D52 // A7  = D40
-  PA_6,  //D53 // A8  = D39
-  PA_7,  //D54 // A9  = D38
-  PB_0,  //D55 // A10 = D34
-  PB_1,  //D56 // A11 = D37
-  PC_4   //D57 // A12 = D42
+  PC_0   //D50 // A5
+#endif
+};
+
+// Analog (Ax) pin number array
+const uint32_t analogInPin[] = {
+  45, //A0
+  46, //A1
+  47, //A2
+  48, //A3
+  49, //A4
+  50, //A5
+#ifdef ARDUINO_NUCLEO_L452RE
+  11, //A6
+  12, //A7
+  27, //A8
+  28, //A9
+  44  //A10
+#else
+  41, //A6
+  40, //A7
+  39, //A8
+  38, //A9
+  34, //A10
+  37, //A11
+  42  //A12
 #endif
 };
 

variants/NUCLEO_L452RE/variant.h

@@ -38,8 +38,8 @@ extern "C" {
 #define PA9  8
 #define PC7  9
 #define PB6  10
-#define PA7  11 // A6
-#define PA6  12 // A7
+#define PA7  A6
+#define PA6  A7
 #define PA5  13 // LED
 #define PB9  14
 #define PB8  15
@@ -56,8 +56,8 @@ extern "C" {
 #define PC15 24
 #define PH0  25
 #define PH1  26
-#define PC2  27 // A8
-#define PC3  28 // A9
+#define PC2  A8
+#define PC3  A9
 // CN7 Right Side
 #define PC11 29
 #define PD2  30
@@ -66,23 +66,23 @@ extern "C" {
 // CN10 Right side
 #define PC8  32
 #define PC6  33
-#define PC5  34 // A12
+#define PC5  34
 #define PA12 35
 #define PA11 36
 #define PB12 37
 #define PB11 38
 #define PB2  39
-#define PB1  40 // A11
+#define PB1  40
 #define PB15 41
 #define PB14 42
 #define PB13 43
-#define PC4  44 // A10
-#define PA0  45 // A0
-#define PA1  46 // A1
-#define PA4  47 // A2
-#define PB0  48 // A3
-#define PC1  49 // A4
-#define PC0  50 // A5
+#define PC4  A10
+#define PA0  A0
+#define PA1  A1
+#define PA4  A2
+#define PB0  A3
+#define PC1  A4
+#define PC0  A5
 #else
 #define PA10 0
 #define PA9  1
@@ -123,40 +123,35 @@ extern "C" {
 #define PC8  31
 #define PC6  32
 #define PC5  33
-#define PB0  34 // A10
+#define PB0  A10
 #define PB11 35
 #define PB2  36
-#define PB1  37 // A11
-#define PA7  38 // A9
-#define PA6  39 // A8
-#define PA5  40 // A7
-#define PA4  41 // A6
-#define PC4  42 // A12
+#define PB1  A11
+#define PA7  A9
+#define PA6  A8
+#define PA5  A7
+#define PA4  A6
+#define PC4  A12
 #define PA3  43
 #define PA2  44
-#define PA0  45 // A0
-#define PA1  46 // A1
-#define PC3  47 // A2
-#define PC2  48 // A3
-#define PC1  49 // A4
-#define PC0  50 // A5
+#define PA0  A0
+#define PA1  A1
+#define PC3  A2
+#define PC2  A3
+#define PC1  A4
+#define PC0  A5
 #endif
 
 // This must be a literal
+#define NUM_DIGITAL_PINS        51
 #ifdef ARDUINO_NUCLEO_L452RE
-// This must be a literal
-#define NUM_DIGITAL_PINS        56
 // This must be a literal with a value less than or equal to to MAX_ANALOG_INPUTS
 #define NUM_ANALOG_INPUTS       11
 #else
-// This must be a literal
-#define NUM_DIGITAL_PINS        58
 // This must be a literal with a value less than or equal to to MAX_ANALOG_INPUTS
 #define NUM_ANALOG_INPUTS       13
 #endif
 
-#define NUM_ANALOG_FIRST        45
-
 // On-board LED pin number
 #define LED_BUILTIN             13
 #define LED_GREEN               LED_BUILTIN