[NUCLEO_L152RE] Avoid duplicated analog pins

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

Author: fpistm

variants/NUCLEO_L152RE/variant.cpp

@@ -80,19 +80,28 @@ const PinName digitalPin[] = {
   PA_4,  //D48/A2
   PB_0,  //D49/A3
   PC_1,  //D50/A4
-  PC_0,  //D51/A5
-  // Duplicated pins in order to be aligned with PinMap_ADC
-  PA_7,  //D52/A6  = D11
-  PA_6,  //D53/A7  = D12
-  PC_2,  //D54/A8  = D28
-  PC_3,  //D55/A9  = D29
-  PC_5,  //D56/A10 = D35
-  PB_12, //D57/A11 = D38
-  PB_1,  //D58/A12 = D41
-  PB_15, //D59/A13 = D42
-  PB_14, //D60/A14 = D43
-  PB_13, //D61/A15 = D44
-  PC_4   //D62/A16 = D45
+  PC_0   //D51/A5
+};
+
+// Analog (Ax) pin number array
+const uint32_t analogInPin[] = {
+  46, //A0
+  47, //A1
+  48, //A2
+  49, //A3
+  50, //A4
+  51, //A5
+  11, //A6
+  12, //A7
+  28, //A8
+  29, //A9
+  35, //A10
+  38, //A11
+  41, //A12
+  42, //A13
+  43, //A14
+  44, //A15
+  45  //A16
 };
 
 #ifdef __cplusplus

variants/NUCLEO_L152RE/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
 #define PB9  14
 #define PB8  15
@@ -57,8 +57,8 @@ extern "C" {
 #define PC15 25
 #define PH0  26
 #define PH1  27
-#define PC2  28 // A8
-#define PC3  29 // A9
+#define PC2  A8
+#define PC3  A9
 // CN7 Right Side
 #define PC11 30
 #define PD2  31
@@ -67,29 +67,28 @@ extern "C" {
 // CN10 Right side
 #define PC8  33
 #define PC6  34
-#define PC5  35 // A10
+#define PC5  A10
 #define PA12 36
 #define PA11 37
-#define PB12 38 // A11
+#define PB12 A11
 #define PB11 39
 #define PB2  40
-#define PB1  41 // A12
-#define PB15 42 // A13
-#define PB14 43 // A14
-#define PB13 44 // A15
-#define PC4  45 // A16
-#define PA0  46 // A0
-#define PA1  47 // A1
-#define PA4  48 // A2
-#define PB0  49 // A3
-#define PC1  50 // A4
-#define PC0  51 // A5
+#define PB1  A12
+#define PB15 A13
+#define PB14 A14
+#define PB13 A15
+#define PC4  A16
+#define PA0  A0
+#define PA1  A1
+#define PA4  A2
+#define PB0  A3
+#define PC1  A4
+#define PC0  A5
 
 // This must be a literal
-#define NUM_DIGITAL_PINS        63
+#define NUM_DIGITAL_PINS        52
 // This must be a literal with a value less than or equal to to MAX_ANALOG_INPUTS
 #define NUM_ANALOG_INPUTS       17
-#define NUM_ANALOG_FIRST        46
 
 // On-board LED pin number
 #define LED_BUILTIN             13