[Nucleo_F103RB] Avoid duplicated analog pins

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

Author: fpistm

variants/NUCLEO_F103RB/variant.cpp

@@ -80,16 +80,25 @@ const PinName digitalPin[] = {
   PA_4,  //D48/A2
   PB_0,  //D49/A3
   PC_1,  //D50/A4
-  PC_0,  //D51/A5
-  // Duplicated pins in order to be aligned with PinMap_ADC
-  PA_7,  //D52/A6 = D11
-  PA_6,  //D53/A7 = D12
-  PA_5,  //D54/A8 = D13
-  PC_2,  //D55/A9 = D28
-  PC_3,  //D56/A10 = D29
-  PB_1,  //D57/A11 = D41
-  PC_4,  //D58/A12 = D45
-  PC_5   //D59/A13 = D35
+  PC_0  //D51/A5
+};
+
+// Analog (Ax) pin number array
+const uint32_t analogInPin[] = {
+  46, //A0
+  47, //A1
+  48, //A2
+  49, //A3
+  50, //A4
+  51, //A5
+  11, //A6
+  12, //A7
+  13, //A8
+  28, //A9
+  29, //A10
+  41, //A11
+  45, //A12
+  35  //A13
 };
 
 #ifdef __cplusplus

variants/NUCLEO_F103RB/variant.h

@@ -38,9 +38,9 @@ extern "C" {
 #define PA9  8
 #define PC7  9
 #define PB6  10
-#define PA7  11 // A6
-#define PA6  12 // A7
-#define PA5  13 // A8 - LED
+#define PA7  A6
+#define PA6  A7
+#define PA5  A8 // LED
 #define PB9  14
 #define PB8  15
 // ST Morpho
@@ -57,8 +57,8 @@ extern "C" {
 #define PC15 25
 #define PD0  26
 #define PD1  27
-#define PC2  28 // A9
-#define PC3  29 // A10
+#define PC2  A9
+#define PC3  A10
 // CN7 Right Side
 #define PC11 30
 #define PD2  31
@@ -67,29 +67,28 @@ extern "C" {
 // CN10 Right side
 #define PC8  33
 #define PC6  34
-#define PC5  35 // A13
+#define PC5  A13
 #define PA12 36
 #define PA11 37
 #define PB12 38
 #define PB11 39
 #define PB2  40
-#define PB1  41 // A11
+#define PB1  A11
 #define PB15 42
 #define PB14 43
 #define PB13 44
-#define PC4  45 // A12
-#define PA0  46 // A0
-#define PA1  47 // A1
-#define PA4  48 // A2
-#define PB0  49 // A3
-#define PC1  50 // A4
-#define PC0  51 // A5
+#define PC4  A12
+#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        60
+#define NUM_DIGITAL_PINS        52
 // This must be a literal with a value less than or equal to to MAX_ANALOG_INPUTS
 #define NUM_ANALOG_INPUTS       14
-#define NUM_ANALOG_FIRST        46
 
 // On-board LED pin number
 #define LED_BUILTIN             13