[Black F407] Update pin mapping

Allow to use pin Number Pxn with analogRead().
Re-order some pins to allow contiguous analogs pins
to avoid to duplicate them.

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

Fix pin mapping

Author: fpistm

variants/BLACK_F407VE/variant.cpp

@@ -39,74 +39,60 @@ extern "C" {
 // This array allows to wrap Arduino pin number(Dx or x)
 // to STM32 PinName (PX_n)
 const PinName digitalPin[] = {
-  // Left Side
-  //Ext   //Int
-  //5V    //5V
-  //5V    //5V
-  //3V3   //3V3
-  //3V3   //3V3
-  //GND   //GND
-  PE_2,   PE_3,   // D0, D1
-  PE_4,   PE_5,   // PE_4: BUT K0, PE_5: BUT K1
-  PE_6,   PC_13,
-  PC_0,   PC_1,
-  PC_2,   PC_3,
-  //VREF- //VREF+
-  PA_0,   PA_1,   // D10, D11 PA_0(WK_UP): BUT K_UP)
-  PA_2,   PA_3,
-  PA_4,   PA_5,
-  PA_6,   PA_7,   // PA_6: LED D2, PA_7: LED D3 (active LOW)
-  PC_4,   PC_5,
-  PB_0,   PB_1,   // D20, D21
-  PE_7,   PE_8,
-  PE_9,   PE_10,
-  PE_11,  PE_12,
-  PE_13,  PE_14,
-  PE_15,  PB_10,  // D30, D31
-  PB_11,  PB_12,
-  PB_13,  PB_14,
   // Right Side
   //Int   //Ext
   //3V3   //3V3
   //3V3   //3V3
   //BOOT0 //BOOT1
   //GND   //GND
   //GND   //GND
-  PE_1,   PE_0,
+  PE_1,   PE_0,   // D0, D1
   PB_9,   PB_8,
-  PB_7,   PB_6,   // D40, D41
+  PB_7,   PB_6,
   PB_5,   PB_3,
   PD_7,   PD_6,
-  PD_5,   PD_4,
+  PD_5,   PD_4,   // D10, D11
   PD_3,   PD_2,
-  PD_1,   PD_0,   // D50, D51
+  PD_1,   PD_0,
   PC_12,  PC_11,
   PC_10,  PA_15,
-  PA_12,  PA_11,  // PA_11: USB_DM, PA_12: USB_DP
+  PA_12,  PA_11,  // D20, D21 PA_11: USB_DM, PA_12: USB_DP
   PA_10,  PA_9,
-  PA_8,   PC_9,   // D60, D61
+  PA_8,   PC_9,
   PC_8,   PC_7,
   PC_6,   PD_15,
-  PD_14,  PD_13,
+  PD_14,  PD_13,  // D30, D31
   PD_12,  PD_11,
-  PD_10,  PD_9,   // D70, D71
+  PD_10,  PD_9,
   PD_8,   PB_15,
+  // Left Side
+  //Ext   //Int
+  //5V    //5V
+  //5V    //5V
+  //3V3   //3V3
+  //3V3   //3V3
+  //GND   //GND
+  PE_2,   PE_3,
+  PE_4,   PE_5,   // D40, D41 PE_4: BUT K0, PE_5: BUT K1
+  PE_6,   PC_13,
+  PC_0,   PC_1,
+  PC_2,   PC_3,
+  //VREF- //VREF+
+  PA_0,   PA_1,   // PA_0(WK_UP): BUT K_UP)
+  PA_2,   PA_3,   // D50, D51
+  PA_4,   PA_5,
+/*PA_6,   PA_7,*/ // PA_6, PA_7: Moved to allow contiguous analog pins
+  PC_4,   PC_5,
+  PB_0,   PB_1,
+  PA_6,   PA_7,   // PA_6: LED D2, PA_7: LED D3 (active LOW)
+  PE_7,   PE_8,   // D60, D61
+  PE_9,   PE_10,
+  PE_11,  PE_12,
+  PE_13,  PE_14,
+  PE_15,  PB_10,
+  PB_11,  PB_12,  // D70, D71
+  PB_13,  PB_14,
   PB_4,
-  // Analog pins
-  PA_0,           // D75
-  PA_1,
-  PA_2,
-  PA_3,
-  PA_4,
-  PA_5,           // D80
-  PB_0,
-  PB_1,
-  PC_0,
-  PC_1,
-  PC_2,
-  PC_3,
-  PC_4,
-  PC_5
   };
 #endif // ARDUINO_BLACK_F407VE
 
@@ -160,45 +146,26 @@ const PinName digitalPin[] = {
   PF_15,  PG_0,
   PF_13,  PF_14,
   PF_11,  PF_12,
-  PB_1,   PB_2,
+          PB_2,   // PB1 PB2 Inverted to allow contiguous analog pins
+  PB_1,
   PC_5,   PB_0,
   PA_7,   PC_4,
   PA_5,   PA_6,
   PA_3,   PA_4,
   PA_1,   PA_2,
   PC_3,   PA_0,   // PA_0(WK_UP): BUT K_UP)
   PC_1,   PC_2,
-  PF_10,  PC_0,   // PF_10: LED D2 (active low)
-  PF_8,   PF_9,   // PF_9: LED D1 (active low)
+/*PF_10,*/PC_0,   // PF_10: Moved to allow contiguous analog pins
+  PF_8, /*PF_9,*/ // PF_9: Moved to allow contiguous analog pins
   PF_6,   PF_7,
+  PF_10,  PF_9,   // PF_10: LED D2, PF_9: LED D1 (active low)
   PF_4,   PF_5,
   PF_2,   PF_3,
   PF_0,   PF_1,
   PE_6,   PC_13,
   PE_4,   PE_5,   // PE_4: BUT K0, PE_5: BUT K1
   PE_2,   PE_3,
   PE_0,   PE_1,
-
-  // 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,
-  PF_6,
-  PF_7,
-  PF_8
 };
 #endif // ARDUINO_BLACK_F407ZE || ARDUINO_BLACK_F407ZG
 

variants/BLACK_F407VE/variant.h

@@ -44,91 +44,90 @@ extern "C"{
  *        Pins
  *----------------------------------------------------------------------------*/
 extern const PinName digitalPin[];
-// Left Side
 #ifdef ARDUINO_BLACK_F407VE
-
-#define PE2  0
-#define PE3  1
-#define PE4  2  // BUT K0
-#define PE5  3  // BUT K1
-#define PE6  4
-#define PC13 5
-#define PC0  6  // A8
-#define PC1  7  // A9
-#define PC2  8  // A10
-#define PC3  9  // A11
-#define PA0  10 // A0/WK_UP: BUT K_UP
-#define PA1  11 // A1
-#define PA2  12 // A2
-#define PA3  13 // A3
-#define PA4  14 // A4
-#define PA5  15 // A5
-#define PA6  16 // LED D2
-#define PA7  17 // LED D3 (active LOW)
-#define PC4  18 // A12
-#define PC5  19 // A13
-#define PB0  20 // A6
-#define PB1  21 // A7
-#define PE7  22
-#define PE8  23
-#define PE9  24
-#define PE10 25
-#define PE11 26
-#define PE12 27
-#define PE13 28
-#define PE14 29
-#define PE15 30
-#define PB10 31
-#define PB11 32
-#define PB12 33
-#define PB13 34
-#define PB14 35
 // Right Side
-#define PE1  36
-#define PE0  37
-#define PB9  38
-#define PB8  39
-#define PB7  40
-#define PB6  41
-#define PB5  42
-#define PB3  43
-#define PD7  44
-#define PD6  45
-#define PD5  46
-#define PD4  47
-#define PD3  48
-#define PD2  49
-#define PD1  50
-#define PD0  51
-#define PC12 52
-#define PC11 53
-#define PC10 54
-#define PA15 55
-#define PA12 56 // USB_DP
-#define PA11 57 // USB_DM
-#define PA10 58
-#define PA9  59
-#define PA8  60
-#define PC9  61
-#define PC8  62
-#define PC7  63
-#define PC6  64
-#define PD15 65
-#define PD14 66
-#define PD13 67
-#define PD12 68
-#define PD11 69
-#define PD10 70
-#define PD9  71
-#define PD8  72
-#define PB15 73
+#define PE1  0
+#define PE0  1
+#define PB9  2
+#define PB8  3
+#define PB7  4
+#define PB6  5
+#define PB5  6
+#define PB3  7
+#define PD7  8
+#define PD6  9
+#define PD5  10
+#define PD4  11
+#define PD3  12
+#define PD2  13
+#define PD1  14
+#define PD0  15
+#define PC12 16
+#define PC11 17
+#define PC10 18
+#define PA15 19
+#define PA12 20 // USB_DP
+#define PA11 21 // USB_DM
+#define PA10 22
+#define PA9  23
+#define PA8  24
+#define PC9  25
+#define PC8  26
+#define PC7  27
+#define PC6  28
+#define PD15 29
+#define PD14 30
+#define PD13 31
+#define PD12 32
+#define PD11 33
+#define PD10 34
+#define PD9  35
+#define PD8  36
+#define PB15 37
+// Left Side
+#define PE2  38
+#define PE3  39
+#define PE4  40 // BUT K0
+#define PE5  41 // BUT K1
+#define PE6  42
+#define PC13 43
+#define PC0  44 // A0
+#define PC1  45 // A1
+#define PC2  46 // A2
+#define PC3  47 // A3
+#define PA0  48 // A4/WK_UP: BUT K_UP
+#define PA1  49 // A5
+#define PA2  50 // A6
+#define PA3  51 // A7
+#define PA4  52 // A8
+#define PA5  53 // A9
+#define PC4  54 // A10
+#define PC5  55 // A11
+#define PB0  56 // A12
+#define PB1  57 // A13
+#define PA6  58 // LED D2
+#define PA7  59 // LED D3 (active LOW)
+#define PE7  60
+#define PE8  61
+#define PE9  62
+#define PE10 63
+#define PE11 64
+#define PE12 65
+#define PE13 66
+#define PE14 67
+#define PE15 68
+#define PB10 69
+#define PB11 70
+#define PB12 71
+#define PB13 72
+#define PB14 73
 #define PB4  74
 
 // This must be a literal
-#define NUM_DIGITAL_PINS        89
+#define NUM_DIGITAL_PINS        75
 // This must be a literal with a value less than or equal to MAX_ANALOG_INPUTS
 #define NUM_ANALOG_INPUTS       14
-#define NUM_ANALOG_FIRST        75
+#define NUM_ANALOG_FIRST        44
 
 // Below ADC, DAC and PWM definitions already done in the core
 // Could be redefined here if needed
@@ -228,28 +227,28 @@ extern const PinName digitalPin[];
 #define PF14 71
 #define PF11 72
 #define PF12 73
-#define PB1  74
-#define PB2  75
-#define PC5  76
-#define PB0  77
-#define PA7  78
-#define PC4  79
-#define PA5  80
-#define PA6  81
-#define PA3  82
-#define PA4  83
-#define PA1  84
-#define PA2  85
-#define PC3  86
-#define PA0  87 // PA_0(WK_UP): BUT K_UP)
-#define PC1  88
-#define PC2  89
-#define PF10 90 // LED D2 (active low)
-#define PC0  91
-#define PF8  92
-#define PF9  93 // LED D1 (active low)
-#define PF6  94
-#define PF7  95
+#define PB2  74
+#define PB1  75 // A0
+#define PC5  76 // A1
+#define PB0  77 // A2
+#define PA7  78 // A3
+#define PC4  79 // A4
+#define PA5  80 // A5
+#define PA6  81 // A6
+#define PA3  82 // A7
+#define PA4  83 // A8
+#define PA1  84 // A9
+#define PA2  85 // A10
+#define PC3  86 // A11
+#define PA0  87 // A12/PA_0(WK_UP): BUT K_UP)
+#define PC1  88 // A13
+#define PC2  89 // A14
+#define PC0  90 // A15
+#define PF8  91 // A16
+#define PF6  92 // A17
+#define PF7  93 // A18
+#define PF9  94 // LED D1 (active low)
+#define PF10 95 // LED D2 (active low)
 #define PF4  96
 #define PF5  97
 #define PF2  98
@@ -266,10 +265,10 @@ extern const PinName digitalPin[];
 #define PE1  109
 
 // This must be a literal
-#define NUM_DIGITAL_PINS        129
+#define NUM_DIGITAL_PINS        110
 // This must be a literal with a value less than or equal to MAX_ANALOG_INPUTS
 #define NUM_ANALOG_INPUTS       19
-#define NUM_ANALOG_FIRST        110
+#define NUM_ANALOG_FIRST        75
 
 // On-board LED pin number
 #define LED_D2                  PF10