[NUCLEO_G071RB] Avoid duplicated analog pins

Signed-off-by: Frederic Pillon <[email protected]>

Author: fpistm

variants/NUCLEO_G071RB/variant.cpp

@@ -87,12 +87,21 @@ const PinName digitalPin[] = {
   PA_4,  //D55/A2
   PB_1,  //D56/A3
   PB_11, //D57/A4
-  PB_12, //D58/A5
-  // Duplicated pins in order to be aligned with PinMap_ADC
-  PA_7,  //D59/A6 = D11
-  PA_6,  //D60/A7 = D12
-  PB_2,  //D61/A8 = D45
-  PB_10  //D62/A9 = D48
+  PB_12  //D58/A5
+};
+
+// Analog (Ax) pin number array
+const uint32_t analogInPin[] = {
+  53, //A0
+  54, //A1
+  55, //A2
+  56, //A3
+  57, //A4
+  58, //A5
+  11, //A6
+  12, //A7
+  45, //A8
+  48  //A9
 };
 
 #ifdef __cplusplus

variants/NUCLEO_G071RB/variant.h

@@ -38,8 +38,8 @@ extern "C" {
 #define PA9  8
 #define PC7  9
 #define PB0  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
@@ -77,26 +77,25 @@ extern "C" {
 #define PA12 42
 #define PC1  43
 #define PC0  44
-#define PB2  45 // A8
+#define PB2  A8
 #define PB6  46
 #define PB15 47
-#define PB10 48 // A9
+#define PB10 A9
 #define PB13 49
 #define PA2  50
 #define PD8  51
 #define PD9  52
-#define PA0  53 // A0
-#define PA1  54 // A1
-#define PA4  55 // A2
-#define PB1  56 // A3
-#define PB11 57 // A4
-#define PB12 58 // A5
+#define PA0  A0
+#define PA1  A1
+#define PA4  A2
+#define PB1  A3
+#define PB11 A4
+#define PB12 A5
 
 // This must be a literal
-#define NUM_DIGITAL_PINS        63
+#define NUM_DIGITAL_PINS        59
 // This must be a literal with a value less than or equal to to MAX_ANALOG_INPUTS
 #define NUM_ANALOG_INPUTS       10
-#define NUM_ANALOG_FIRST        53
 
 // On-board LED pin number
 #define LED_BUILTIN             13