[NUCLEO_F030R8] Avoid duplicated analog pins

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

Author: fpistm

Diff for: variants/NUCLEO_F030R8/variant.cpp

@@ -83,14 +83,23 @@ const PinName digitalPin[] = {
   PA_4,  //D51/A2
   PB_0,  //D52/A3
   PC_1,  //D53/A4
-  PC_0,  //D54/A5
-  // Duplicated pins in order to be aligned with PinMap_ADC
-  PA_7,  //D55/A6  = D11
-  PA_6,  //D56/A7  = D12
-  PC_2,  //D57/A8  = D29
-  PC_3,  //D58/A9  = D30
-  PC_5,  //D59/A10 = D36
-  PC_4   //D60/A11 = D46
+  PC_0   //D54/A5
+};
+
+// Analog (Ax) pin number array
+const uint32_t analogInPin[] = {
+  49, //A0
+  50, //A1
+  51, //A2
+  52, //A3
+  53, //A4
+  54, //A5
+  11, //A6
+  12, //A7
+  29, //A8
+  30, //A9
+  36, //A10
+  46  //A11
 };
 
 #ifdef __cplusplus

Diff for: variants/NUCLEO_F030R8/variant.h

@@ -38,8 +38,8 @@ extern "C" {
 #define PA9  8
 #define PC7  9
 #define PB6  10
-#define PA7  11 // A6
-#define PA6  12 // A7
+#define PA7  A6
+#define PA6  A7
 #define PA5  13
 #define PB9  14
 #define PB8  15
@@ -58,8 +58,8 @@ extern "C" {
 #define PC15 26
 #define PF0  27
 #define PF1  28
-#define PC2  29 // A8
-#define PC3  30 // A9
+#define PC2  A8
+#define PC3  A9
 // CN7 Right Side
 #define PC11 31
 #define PD2  32
@@ -68,7 +68,7 @@ extern "C" {
 // CN10 Right side
 #define PC8  34
 #define PC6  35
-#define PC5  36 // A10
+#define PC5  A10
 #define PA12 37
 #define PA11 38
 #define PB12 39
@@ -78,21 +78,20 @@ extern "C" {
 #define PB15 43
 #define PB14 44
 #define PB13 45
-#define PC4  46 // A11
+#define PC4  A11
 #define PF5  47
 #define PF4  48
-#define PA0  49 // A0
-#define PA1  50 // A1
-#define PA4  51 // A2
-#define PB0  52 // A3
-#define PC1  53 // A4
-#define PC0  54 // A5
+#define PA0  A0
+#define PA1  A1
+#define PA4  A2
+#define PB0  A3
+#define PC1  A4
+#define PC0  A5
 
 // This must be a literal
-#define NUM_DIGITAL_PINS        61
+#define NUM_DIGITAL_PINS        55
 // This must be a literal with a value less than or equal to to MAX_ANALOG_INPUTS
 #define NUM_ANALOG_INPUTS       12
-#define NUM_ANALOG_FIRST        49
 
 // On-board LED pin number
 #define LED_BUILTIN             13