[DIYMORE_F407VGT] Avoid duplicated analog pins

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

Author: fpistm

variants/DIYMORE_F407VGT/variant.cpp

@@ -133,24 +133,27 @@ const PinName digitalPin[] = {
   PB_6,  // 74 Header left, pin 25
   PB_5,  // 75 Header left, pin 26
   PE_0,  // 76 Header left, pin 27 and LED_BUILTIN
-  PB_7,  // 77 Header left, pin 28
-  // Duplicated pins in order to be aligned with PinMap_ADC
-  PA_0,  // 78/A0
-  PA_1,  // 79/A1
-  PA_2,  // 80/A2
-  PA_3,  // 81/A3
-  PA_4,  // 82/A4
-  PA_5,  // 83/A5
-  PA_6,  // 84/A6
-  PA_7,  // 85/A7
-  PB_0,  // 86/A8
-  PB_1,  // 87/A9
-  PC_0,  // 88/A10
-  PC_1,  // 89/A11
-  PC_2,  // 90/A12
-  PC_3,  // 91/A13
-  PC_4,  // 92/A14
-  PC_5   // 93/A15
+  PB_7   // 77 Header left, pin 28
+};
+
+// Analog (Ax) pin number array
+const uint32_t analogInPin[] = {
+  8,  //A0
+  11, //A1
+  10, //A2
+  12, //A3
+  15, //A4
+  14, //A5
+  17, //A6
+  16, //A7
+  21, //A8
+  20, //A9
+  7,  //A10
+  6,  //A11
+  9,  //A12
+  13, //A13
+  19, //A14
+  18  //A15
 };
 
 #ifdef __cplusplus

variants/DIYMORE_F407VGT/variant.h

@@ -57,22 +57,22 @@ extern "C" {
 #define PE6  5  // Header right, pin 6
 // Header right, pin 7 = GND
 // Header right, pin 8 = 3.3V
-#define PC1  6  // Header right, pin 9
-#define PC0  7  // Header right, pin 10
-#define PA0  8  // Header right, pin 11
-#define PC2  9  // Header right, pin 12
-#define PA2  10 // Header right, pin 13
-#define PA1  11 // Header right, pin 14
-#define PA3  12 // Header right, pin 15
-#define PC3  13 // Header right, pin 16
-#define PA5  14 // Header right, pin 17
-#define PA4  15 // Header right, pin 18
-#define PA7  16 // Header right, pin 19
-#define PA6  17 // Header right, pin 20
-#define PC5  18 // Header right, pin 21
-#define PC4  19 // Header right, pin 22
-#define PB1  20 // Header right, pin 23
-#define PB0  21 // Header right, pin 24
+#define PC1  A11  // Header right, pin 9
+#define PC0  A10  // Header right, pin 10
+#define PA0  A0 // Header right, pin 11
+#define PC2  A12 // Header right, pin 12
+#define PA2  A2 // Header right, pin 13
+#define PA1  A1 // Header right, pin 14
+#define PA3  A3 // Header right, pin 15
+#define PC3  A13 // Header right, pin 16
+#define PA5  A5  // Header right, pin 17
+#define PA4  A4 // Header right, pin 18
+#define PA7  A7 // Header right, pin 19
+#define PA6  A6 // Header right, pin 20
+#define PC5  A15 // Header right, pin 21
+#define PC4  A14 // Header right, pin 22
+#define PB1  A9 // Header right, pin 23
+#define PB0  A8 // Header right, pin 24
 #define PB9  22 // Header right, pin 25
 #define PB8  23 // Header right, pin 26
 #define PE7  24 // Header right, pin 27
@@ -139,11 +139,10 @@ extern "C" {
 #define PB7  77 // Header left, pin 28
 
 // This must be a literal
-#define NUM_DIGITAL_PINS        94  // Number of definitions above
+#define NUM_DIGITAL_PINS        78  // Number of definitions above
 
 // This must be a literal with a value less than or equal to MAX_ANALOG_INPUTS
 #define NUM_ANALOG_INPUTS       16
-#define NUM_ANALOG_FIRST        78
 
 // On-board LED pin number
 #define LED_BUILTIN             PE0