[NUCLEO_F207ZG] Avoid duplicated analog pins

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

Author: fpistm

variants/NUCLEO_F207ZG/variant.cpp

@@ -132,16 +132,29 @@ const PinName digitalPin[] = {
   PB_1,  //D84/A6
   PC_2,  //D85/A7
   PF_4,  //D86/A8
-  PF_6,  //D87/A9
-  // Duplicated pins in order to be aligned with PinMap_ADC
-  PA_7,  //D88/A10 = D11/D71
-  PA_6,  //D89/A11 = D12
-  PA_5,  //D90/A12 = D13
-  PA_4,  //D91/A13 = D24
-  PA_0,  //D92/A14 = D32
-  PF_8,  //D93/A15 = D61
-  PF_7,  //D94/A16 = D62
-  PF_9   //D95/A17 = D63
+  PF_6   //D87/A9
+};
+
+// Analog (Ax) pin number array
+const uint32_t analogInPin[] = {
+  78, //A0
+  79, //A1
+  80, //A2
+  81, //A3
+  82, //A4
+  83, //A5
+  84, //A6
+  85, //A7
+  86, //A8
+  87, //A9
+  11, //A10
+  12, //A11
+  13, //A12
+  24, //A13
+  32, //A14
+  61, //A15
+  62, //A16
+  63  //A17
 };
 
 #ifdef __cplusplus

variants/NUCLEO_F207ZG/variant.h

@@ -50,9 +50,9 @@ extern "C" {
 #define PF12 8
 #define PD15 9
 #define PD14 10
-#define PA7  11 // A10
-#define PA6  12 // A11
-#define PA5  13 // A12
+#define PA7  A10
+#define PA6  A11
+#define PA5  A12
 #define PB9  14
 #define PB8  15
 #define PC6  16
@@ -63,15 +63,15 @@ extern "C" {
 #define PC7  21
 #define PB5  22
 #define PB3  23
-#define PA4  24 // A13
+#define PA4  A13
 #define PB4  25
 #define PB6  26
 #define PB2  27
 #define PD13 28
 #define PD12 29
 #define PD11 30
 #define PE2  31
-#define PA0  32 // A14
+#define PA0  A14
 #define PB0  33 // LED1
 #define PE0  34
 #define PB11 35
@@ -100,9 +100,9 @@ extern "C" {
 #define PE5  58
 #define PE6  59
 #define PE3  60
-#define PF8  61 // A15
-#define PF7  62 // A16
-#define PF9  63 // A17
+#define PF8  A15
+#define PF7  A16
+#define PF9  A17
 #define PG1  64
 #define PG0  65
 #define PD1  66
@@ -117,22 +117,21 @@ extern "C" {
 #define PC13 75 // USER_BTN
 #define PD9  76 // Serial Rx
 #define PD8  77 // Serial Tx
-#define PA3  78 // A0
-#define PC0  79 // A1
-#define PC3  80 // A2
-#define PF3  81 // A3
-#define PF5  82 // A4
-#define PF10 83 // A5
-#define PB1  84 // A6
-#define PC2  85 // A7
-#define PF4  86 // A8
-#define PF6  87 // A9
+#define PA3  A0
+#define PC0  A1
+#define PC3  A2
+#define PF3  A3
+#define PF5  A4
+#define PF10 A5
+#define PB1  A6
+#define PC2  A7
+#define PF4  A8
+#define PF6  A9
 
 // This must be a literal
-#define NUM_DIGITAL_PINS        96
+#define NUM_DIGITAL_PINS        88
 // This must be a literal with a value less than or equal to to MAX_ANALOG_INPUTS
 #define NUM_ANALOG_INPUTS       18
-#define NUM_ANALOG_FIRST        78
 
 // On-board LED pin number
 #define LED_BUILTIN             PB0