[DISCO_L475VG] Avoid duplicated analog pins

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

Author: fpistm

variants/DISCO_L475VG_IOT/variant.cpp

@@ -106,18 +106,27 @@ const PinName digitalPin[] = {
   PC_3,  //D71/A2
   PC_2,  //D72/A3
   PC_1,  //D73/A4
-  PC_0,  //D74/A5
-  // Duplicated pins in order to be aligned with PinMap_ADC
-  PA_1,  //D75/A6
-  PA_0,  //D76/A7
-  PB_0,  //D77/A8
-  PA_3,  //D78/A9
-  PB_1,  //D79/A10
-  PA_4,  //D80/A11
-  PA_2,  //D81/A12
-  PA_7,  //D82/A13
-  PA_6,  //D83/A14
-  PA_5   //D84/A15
+  PC_0   //D74/A5
+};
+
+// Analog (Ax) pin number array
+const uint32_t analogInPin[] = {
+  69, //A0
+  70, //A1
+  71, //A2
+  72, //A3
+  73, //A4
+  74, //A5
+  0,  //A6
+  1,  //A7
+  3,  //A8
+  4,  //A9
+  6,  //A10
+  7,  //A11
+  10, //A12
+  11, //A13
+  12, //A14
+  13, //A15
 };
 
 #ifdef __cplusplus

variants/DISCO_L475VG_IOT/variant.h

@@ -28,21 +28,21 @@ extern "C" {
  *----------------------------------------------------------------------------*/
 
 // CN3 connector
-#define PA1  0  // A6/UART4_RX
-#define PA0  1  // A7/UART4_TX
+#define PA1  A6 //UART4_RX
+#define PA0  A7 //UART4_TX
 #define PD14 2
-#define PB0  3  // A8/PWM
-#define PA3  4  // A9
+#define PB0  A8 //PWM
+#define PA3  A9
 #define PB4  5  // PWM
-#define PB1  6  // A10/PWM
-#define PA4  7  // A11
+#define PB1  A10//PWM
+#define PA4  A11
 // CN1 connector
 #define PB2  8
 #define PA15 9  // PWM
-#define PA2  10 // A12/SPI_SSN/PWM
-#define PA7  11 // A13/SPI1_MOSI/PWM
-#define PA6  12 // A14/SPI1_MISO
-#define PA5  13 // A15/SPI1_SCK/LED1
+#define PA2  A12//SPI_SSN/PWM
+#define PA7  A13//SPI1_MOSI/PWM
+#define PA6  A14//SPI1_MISO
+#define PA5  A15//SPI1_SCK/LED1
 #define PB9  14 // I2C1_SDA
 #define PB8  15 // I2C1_SCL
 // Not on connector
@@ -104,18 +104,17 @@ extern "C" {
 #define PE14 67 // QUADSPI_BK1_IO2
 #define PE15 68 // QUADSPI_BK1_IO3
 // CN4 connector
-#define PC5  69 // A0
-#define PC4  70 // A1
-#define PC3  71 // A2
-#define PC2  72 // A3
-#define PC1  73 // A4
-#define PC0  74 // A5
+#define PC5  A0
+#define PC4  A1
+#define PC3  A2
+#define PC2  A3
+#define PC1  A4
+#define PC0  A5
 
 // This must be a literal
-#define NUM_DIGITAL_PINS        85
+#define NUM_DIGITAL_PINS        75
 // This must be a literal with a value less than or equal to to MAX_ANALOG_INPUTS
 #define NUM_ANALOG_INPUTS       16
-#define NUM_ANALOG_FIRST        69
 
 // On-board LED pin number
 #define LED_BUILTIN             13