[VAKE_F446VE] Avoid duplicated analog pins

Signed-off-by: Frederic Pillon <[email protected]>

Author: fpistm

Diff for: variants/VAKE_F446VE/variant.cpp

@@ -107,14 +107,17 @@ const PinName digitalPin[] = {
   PA_4,
   PB_0,
   PC_1,
-  PC_0,
-  // Duplicated pins in order to be aligned with PinMap_ADC
-  PA_3,
-  PA_2,
-  PC_1,
-  PC_0,
-  PC_2,
-  PC_3,
+  PC_0
+};
+
+// Analog (Ax) pin number array
+const uint32_t analogInPin[] = {
+  0,  //A0
+  1,  //A1
+  82, //A2
+  83, //A3
+  28, //A4
+  29  //A5
 };
 
 #ifdef __cplusplus

Diff for: variants/VAKE_F446VE/variant.h

@@ -27,8 +27,8 @@ extern "C" {
  *        Pins
  *----------------------------------------------------------------------------*/
 
-#define PA3   0 // Z_PROBE_A    ADC
-#define PA2   1 // PWRMON ADC   ADC
+#define PA3   A0 // Z_PROBE_A    ADC
+#define PA2   A1 // PWRMON ADC   ADC
 #define PA10  2 // USART1_RX
 #define PB3   3 // E1_DIAG
 #define PB5   4 // N.C.
@@ -55,8 +55,8 @@ extern "C" {
 #define PC15  25 // E2_CS
 #define PH0   26 // OSC_IN
 #define PH1   27 // OSC_OUT
-#define PC2   28 // THERM2_ADC  ADC
-#define PC3   29 // THERM3_ADC  ADC
+#define PC2   A4 // THERM2_ADC  ADC
+#define PC3   A5 // THERM3_ADC  ADC
 #define PC11  30 // LCD_RS
 #define PD2   31 // LCD_D6
 #define PC9   32 // BEEPER
@@ -109,14 +109,13 @@ extern "C" {
 #define PA1   79 // F2_PWM  or serial
 #define PA4   80 // Z_PROBE_D
 #define PB0   81 // E1_CS
-#define PC1   82 // THERM1_ADC  ADC
-#define PC0   83 // THERM0_ADC  ADC
+#define PC1   A2 // THERM1_ADC  ADC
+#define PC0   A3 // THERM0_ADC  ADC
 
 // This must be a literal
-#define NUM_DIGITAL_PINS        98
+#define NUM_DIGITAL_PINS        84
 // This must be a literal with a value less than or equal to to MAX_ANALOG_INPUTS
 #define NUM_ANALOG_INPUTS       6
-#define NUM_ANALOG_FIRST        84
 
 // On-board LED pin number
 #define LED_BUILTIN             PB14