[NUCLEO_L4R5ZI] Avoid duplicated analog pins

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

Author: fpistm

variants/NUCLEO_L4R5ZI/variant.cpp

@@ -159,20 +159,32 @@ const PinName digitalPin[] = {
   PC_5,  //D112/A5
   PB_1,  //D113/A6
   PC_2,  //D114/A7
-  PA_1,  //D115/A8
-  // Duplicated pins in order to be aligned with PinMapADC
-  PA_7,  //D116/A9 = D11
-  PA_6,  //D117/A10 = D12
-  PA_5,  //D118/A11 = D13
-  PA_4,  //D119/A12 = D20
-  PA_2,  //D120/A13 = D26
-  PB_0,  //D121/A14 = D29
-  PA_0,  //D122/A15 = D32
+  PA_1   //D115/A8
 #ifdef ARDUINO_NUCLEO_L4R5ZI
-  PG_15  //D123
+  , PG_15 //D116
 #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
+  11, //A9
+  12, //A10
+  13, //A11
+  20, //A12
+  26, //A13
+  29, //A14
+  32  //A15
+};
+
 #ifdef __cplusplus
 }
 #endif

variants/NUCLEO_L4R5ZI/variant.h

@@ -52,28 +52,28 @@ extern "C" {
 #define PF12 8
 #define PD15 9
 #define PD14 10
-#define PA7  11 // A9
-#define PA6  12 // A10
-#define PA5  13 // A11
+#define PA7  A9
+#define PA6  A10
+#define PA5  A11
 #define PB9  14
 #define PB8  15
 #define PC6  16
 #define PB15 17
 #define PB13 18
 #define PB12 19
-#define PA4  20 // A12
+#define PA4  A12
 #define PB4  21
 #define PB5  22
 #define PB3  23
 // 24 is PA4 (20)
 // 25 is PB4 (21)
-#define PA2  26 // A13
+#define PA2  A13
 #define PB10 27
 #define PE15 28
-#define PB0  29 // A14
+#define PB0  A14
 #define PE12 30
 #define PE14 31
-#define PA0  32 // A15
+#define PA0  A15
 // 32 is PB0 (29)
 #define PE0  34
 #ifdef ARDUINO_NUCLEO_L4R5ZI
@@ -153,18 +153,18 @@ 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 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
 // 116 to 122 reserved fot A9 to A15
 #ifdef ARDUINO_NUCLEO_L4R5ZI
-#define PG15 123
+#define PG15 116
 #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.
@@ -173,13 +173,12 @@ extern "C" {
 
 // This must be a literal
 #ifdef ARDUINO_NUCLEO_L4R5ZI
-#define NUM_DIGITAL_PINS        124
+#define NUM_DIGITAL_PINS        117
 #else
-#define NUM_DIGITAL_PINS        123
+#define NUM_DIGITAL_PINS        116
 #endif
 // This must be a literal with a value less than or equal to to MAX_ANALOG_INPUTS
 #define NUM_ANALOG_INPUTS       16
-#define NUM_ANALOG_FIRST        107
 
 // On-board LED pin number
 #define LED_BUILTIN             PC7