[DISCO_F407VG] Avoid duplicated analog pins

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

Author: fpistm

variants/DISCO_F407VG/variant.cpp

@@ -106,17 +106,19 @@ const PinName digitalPin[] = {
   PA_13, //D75
   PA_9,  //D76
   PC_9,  //D77
-  PC_7,  //D78
-  //Duplicated to have A0-A5 as F407 do not have Uno like connector
-  // and to be aligned with PinMap_ADC
-  PC_2,  //D79/A0 = D1
-  PC_4,  //D80/A1 = D6
-  PB_0,  //D81/A2 = D7
-  PC_1,  //D82/A3 = D39
-  PC_3,  //D83/A4 = D40
-  PA_1,  //D84/A5 = D41
-  PC_5,  //D85/A6 = D45
-  PB_1   //D86/A7 = D46
+  PC_7   //D78
+};
+
+// Analog (Ax) pin number array
+const uint32_t analogInPin[] = {
+  1,  //A0
+  6,  //A1
+  7,  //A2
+  39, //A3
+  40, //A4
+  41, //A5
+  45, //A6
+  46  //A7
 };
 
 #ifdef __cplusplus

variants/DISCO_F407VG/variant.h

@@ -29,13 +29,13 @@ extern "C" {
 
 //P1 connector Right side
 #define PC0  0
-#define PC2  1  // A0
+#define PC2  A0
 #define PA0  2
 #define PA2  3
 #define PA4  4
 #define PA6  5
-#define PC4  6  // A1
-#define PB0  7  // A2
+#define PC4  A1
+#define PB0  A2
 #define PB2  8
 #define PE8  9
 #define PE10 10
@@ -69,14 +69,14 @@ extern "C" {
 #define PC8  37
 #define PC6  38
 //P1 Connector Left Side
-#define PC1  39 // A3
-#define PC3  40 // A4
-#define PA1  41 // A5
+#define PC1  A3
+#define PC3  A4
+#define PA1  A5
 #define PA3  42
 #define PA5  43
 #define PA7  44
-#define PC5  45 // A6
-#define PB1  46 // A7
+#define PC5  A6
+#define PB1  A7
 #define PE7  47
 #define PE9  48
 #define PE11 49
@@ -112,10 +112,9 @@ extern "C" {
 #define PC7  78
 
 // This must be a literal
-#define NUM_DIGITAL_PINS        87
+#define NUM_DIGITAL_PINS        79
 // This must be a literal with a value less than or equal to to MAX_ANALOG_INPUTS
 #define NUM_ANALOG_INPUTS       8
-#define NUM_ANALOG_FIRST        79
 
 // On-board LED pin number
 #define LED_BUILTIN             PD12