[DISCO_F030R8] Avoid duplicated analog pins

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

Author: fpistm

variants/DISCO_F030R8/variant.cpp

@@ -34,7 +34,7 @@
 extern "C" {
 #endif
 
-// Pin number
+// Digital PinName array
 const PinName digitalPin[] = {
   //P1 connector Right side (bottom view)
   PC_13, //D0
@@ -92,24 +92,27 @@ const PinName digitalPin[] = {
   PC_6,  //D51
   PB_15, //D52
   PB_14, //D53
-  PB_13, //D54
-  // Duplicated pins in order to be aligned with PinMap_ADC
-  PC_0,  //D55/A0 = D5
-  PC_1,  //D56/A1 = D6
-  PC_2,  //D57/A2 = D7
-  PC_3,  //D58/A3 = D8
-  PA_0,  //D59/A4 = D9
-  PA_1,  //D60/A5 = D10
-  PA_2,  //D61/A6 = D11
-  PA_3,  //D62/A7 = D12
-  PA_4,  //D63/A8 = D15
-  PA_5,  //D64/A9 = D16
-  PA_6,  //D65/A10= D17
-  PA_7,  //D66/A11= D18
-  PC_4,  //D67/A12 = D19
-  PC_5,  //D68/A13 = D20
-  PB_0,  //D69/A14 = D21
-  PB_1   //D70/A15 = D22
+  PB_13  //D54
+};
+
+// Analog (Ax) pin number array
+const uint32_t analogInPin[] = {
+  5,  //A0  = D5
+  6,  //A1  = D6
+  7,  //A2  = D7
+  8,  //A3  = D8
+  9,  //A4  = D9
+  10, //A5  = D10
+  11, //A6  = D11
+  12, //A7  = D12
+  15, //A8  = D15
+  16, //A9  = D16
+  17, //A10 = D17
+  18, //A11 = D18
+  19, //A12 = D19
+  20, //A13 = D20
+  21, //A14 = D21
+  22  //A15 = D22
 };
 
 #ifdef __cplusplus

variants/DISCO_F030R8/variant.h

@@ -45,24 +45,24 @@ extern "C" {
 #define PC15 2
 #define PF0  3
 #define PF1  4
-#define PC0  5  // A0
-#define PC1  6  // A1
-#define PC2  7  // A2
-#define PC3  8  // A3
-#define PA0  9  // A4/USER_BTN
-#define PA1  10 // A5
-#define PA2  11 // A6
-#define PA3  12 // A7
+#define PC0  A0
+#define PC1  A1
+#define PC2  A2
+#define PC3  A3
+#define PA0  A4 // USER_BTN
+#define PA1  A5
+#define PA2  A6
+#define PA3  A7
 #define PF4  13
 #define PF5  14
-#define PA4  15 // A8
-#define PA5  16 // A9
-#define PA6  17 // A10
-#define PA7  18 // A11
-#define PC4  19 // A12
-#define PC5  20 // A13
-#define PB0  21 // A14
-#define PB1  22 // A15
+#define PA4  A8
+#define PA5  A9
+#define PA6  A10
+#define PA7  A11
+#define PC4  A12
+#define PC5  A13
+#define PB0  A14
+#define PB1  A15
 #define PB2  23
 #define PB10 24
 #define PB11 25
@@ -101,7 +101,6 @@ extern "C" {
 #define NUM_DIGITAL_PINS        71
 // 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        55
 
 //On-board LED pin number
 #define LED_BUILTIN             PC9 // LD3