[Nucleo_L496ZG] Avoid duplicated analog pins

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

Author: fpistm

variants/NUCLEO_L496ZG/variant.cpp

@@ -162,25 +162,39 @@ const PinName digitalPin[] = {
   PA_1,  //D115/A8
   PF_4,  //D116/A9
   PF_6,  //D117/A10
-  // Duplicated pins in order to be aligned with PinMapADC
-  PA_7, //D118/A11 = D11
-  PA_6, //D119/A12 = D12
-  PA_5, //D120/A13 = D13
-  PA_4, //D121/A14 = D20
-  PA_2, //D122/A15 = D26
-  PB_0, //D123/A16 = D29
-  PA_0, //D124/A17 = D32
-  PF_3, //D125/A18 = D49
-  PF_5, //D126/A19 = D50
-  PF_8, //D127/A20 = D61
-  PF_7, //D128/A21 = D62
-  PF_9, //D129/A22 = D63
-  PF_10,//D130/A23 = D91
 #ifdef ARDUINO_NUCLEO_L496ZG
-  PG_15 //D131
+  PG_15  //D118
 #endif
 };
 
+// Analog (Ax) pin number array
+const uint32_t analogInPin[] = {
+  107, //A0
+  108, //A1
+  109, //A2
+  110, //A3
+  111, //A4
+  112, //A5
+  113, //A6
+  114, //A7
+  115, //A8
+  116, //A9
+  117, //A10
+  11,  //A11
+  12,  //A12
+  13,  //A13
+  20,  //A14
+  26,  //A15
+  29,  //A16
+  32,  //A17
+  49,  //A18
+  50,  //A19
+  61,  //A20
+  62,  //A21
+  63,  //A22
+  90   //A23
+};
+
 #ifdef __cplusplus
 }
 #endif

variants/NUCLEO_L496ZG/variant.h

@@ -52,28 +52,28 @@ extern "C" {
 #define PF12 8
 #define PD15 9
 #define PD14 10
-#define PA7  11 // A11
-#define PA6  12 // A12
-#define PA5  13 // A13
+#define PA7  A11
+#define PA6  A12
+#define PA5  A13
 #define PB9  14
 #define PB8  15
 #define PC6  16
 #define PB15 17
 #define PB13 18
 #define PB12 19
-#define PA4  20 // A14
+#define PA4  A14
 #define PB4  21
 #define PB5  22
 #define PB3  23
 // 24 is PA4 (20)
 // 25 is PB4 (21)
-#define PA2  26 // A15
+#define PA2  A15
 #define PB10 27
 #define PE15 28
-#define PB0  29 // A16
+#define PB0  A16
 #define PE12 30
 #define PE14 31
-#define PA0  32 // A17
+#define PA0  A17
 // 32 is PB0 (29)
 #define PE0  34
 #ifdef ARDUINO_NUCLEO_L496ZG
@@ -93,8 +93,8 @@ extern "C" {
 #define PC11 46
 #define PC12 47
 #define PD2  48
-#define PF3  49 // A18
-#define PF5  50 // A19
+#define PF3  A18
+#define PF5  A19
 #define PD7  51
 #define PD6  52
 #define PD5  53
@@ -105,9 +105,9 @@ extern "C" {
 #define PE5  58
 #define PE6  59
 #define PE3  60
-#define PF8  61 // A20
-#define PF7  62 // A21
-#define PF9  63 // A22
+#define PF8  A20
+#define PF7  A21
+#define PF9  A22
 #define PG1  64
 #define PG0  65
 #define PD1  66
@@ -135,7 +135,7 @@ extern "C" {
 #define PD12 87
 #define PD13 88
 #define PE1  89
-#define PF10 90 // A23
+#define PF10 A23
 #define PF11 91
 #define PG2  92
 #define PG3  93
@@ -153,20 +153,19 @@ extern "C" {
 #define PH0  105
 #define PH1  106
 // Analog pins
-#define PA3  107 // A0
-#define PC0  108 // A1
-#define PC3  109 // A2
-#define PC1  110 // A3
-#define PC4  111 // A4
-#define PC5  112 // A5
-#define PB1  113 // A6
-#define PC2  114 // A7
-#define PA1  115 // A8
-#define PF4  116 // A9
-#define PF6  117 // A10
-// 118 to 130 reserved fot A11 to A23
+#define PA3  A0
+#define PC0  A1
+#define PC3  A2
+#define PC1  A3
+#define PC4  A4
+#define PC5  A5
+#define PB1  A6
+#define PC2  A7
+#define PA1  A8
+#define PF4  A9
+#define PF6  A10
 #ifdef ARDUINO_NUCLEO_L496ZG
-#define PG15 131
+#define PG15 118
 #endif
 // PA13 and PA14 are shared with SWD signals connected to ST-LINK/V2-1.
 // If ST-LINK part is not cut, it is not recommended to use them as I/O pins.
@@ -175,13 +174,12 @@ extern "C" {
 
 // This must be a literal with the same value as PEND
 #ifdef ARDUINO_NUCLEO_L496ZG
-#define NUM_DIGITAL_PINS        132
+#define NUM_DIGITAL_PINS        119
 #else
-#define NUM_DIGITAL_PINS        131
+#define NUM_DIGITAL_PINS        118
 #endif
 // This must be a literal with a value less than or equal to to MAX_ANALOG_INPUTS
 #define NUM_ANALOG_INPUTS       24
-#define NUM_ANALOG_FIRST        107
 
 // On-board LED pin number
 #define LED_BUILTIN             PC7