[FK407M1] Avoid duplicated analog pins

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

Author: fpistm

variants/FK407M1/variant.cpp

@@ -80,24 +80,27 @@ const PinName digitalPin[] = {
   PD_6,   PD_7,
   PC_7,   PC_8,
   PD_15,  PC_6,
-  PC_13,  PA_15, // LED and Button pins - not broken out on the board
-  // Analog pins
-  PA_0,
-  PA_1,
-  PA_2,
-  PA_3,
-  PA_4,
-  PA_5,
-  PA_6,
-  PA_7,
-  PB_0,
-  PB_1,
-  PC_0,
-  PC_1,
-  PC_2,
-  PC_3,
-  PC_4,
-  PC_5
+  PC_13,  PA_15 // LED and Button pins - not broken out on the board
+};
+
+// Analog (Ax) pin number array
+const uint32_t analogInPin[] = {
+  30, //A0
+  32, //A1
+  31, //A2
+  27, //A3
+  28, //A4
+  26, //A5
+  25, //A6
+  23, //A7
+  22, //A8
+  19, //A9
+  35, //A10
+  36, //A11
+  37, //A12
+  29, //A13
+  24, //A14
+  21  //A15
 };
 
 #ifdef __cplusplus

variants/FK407M1/variant.h

@@ -58,25 +58,25 @@ extern "C" {
 #define PE11 16
 #define PE10 17
 #define PE9  18
-#define PB1  19
+#define PB1  A9
 #define PB2  20
-#define PC5  21
-#define PB0  22
-#define PA7  23
-#define PC4  24
-#define PA6  25
-#define PA5  26
-#define PA3  27
-#define PA4  28
-#define PC3  29
-#define PA0  30
-#define PA2  31
-#define PA1  32
+#define PC5  A15
+#define PB0  A8
+#define PA7  A7
+#define PC4  A14
+#define PA6  A6
+#define PA5  A5
+#define PA3  A3
+#define PA4  A4
+#define PC3  A13
+#define PA0  A0
+#define PA2  A2
+#define PA1  A1
 #define PD13 33
 #define PD14 34
-#define PC0  35
-#define PC1  36
-#define PC2  37
+#define PC0  A10
+#define PC1  A11
+#define PC2  A12
 // Right Side
 #define PA12 38
 #define PA11 39
@@ -118,10 +118,9 @@ extern "C" {
 #define PA15 75
 
 // This must be a literal
-#define NUM_DIGITAL_PINS        92
+#define NUM_DIGITAL_PINS        76
 // 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        76
 
 // On-board LED pin number
 #define LED_D1                  PC13