[DISCO_F100RB] Avoid duplicated analog pins

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

Author: fpistm

variants/DISCO_F100RB/variant.cpp

@@ -73,24 +73,27 @@ const PinName digitalPin[] = {
   PB_12, //D43 - SPI SS
   PB_13, //D44 - SPI SCLK
   PB_14, //D45 - SPI MISO
-  PB_15, //D46 - SPI MOSI
-  // Duplicated pins in order to be aligned with PinMap_ADC
-  PC_0,  //D47/A0 = D0
-  PC_1,  //D48/A1 = D1
-  PC_2,  //D49/A2 = D2
-  PC_3,  //D50/A3 = D3
-  PA_0,  //D51/A4 = D4
-  PA_1,  //D52/A5 = D5
-  PA_2,  //D53/A6 = D6
-  PA_3,  //D54/A7 = D7
-  PA_4,  //D55/A8 = D8
-  PA_5,  //D56/A9 = D9
-  PA_6,  //D57/A10 = D10
-  PA_7,  //D58/A11 = D11
-  PC_4,  //D59/A12 = D12
-  PC_5,  //D60/A13 = D13
-  PB_0,  //D61/A14 = D14
-  PB_1   //D62/A15 = D15
+  PB_15  //D46 - SPI MOSI
+};
+
+// Analog (Ax) pin number array
+const uint32_t analogInPin[] = {
+  1,  //A0
+  2,  //A1
+  3,  //A2
+  4,  //A3
+  5,  //A4
+  6,  //A5
+  7,  //A6
+  8,  //A7
+  9,  //A8
+  10, //A9
+  11, //A10
+  12, //A11
+  13, //A12
+  14, //A13
+  15, //A14
+  16  //A15
 };
 
 #ifdef __cplusplus

variants/DISCO_F100RB/variant.h

@@ -29,22 +29,22 @@ extern "C" {
 
 // P1 connector
 #define PC13 0
-#define PC0  1  // A0
-#define PC1  2  // A1
-#define PC2  3  // A2
-#define PC3  4  // A3
-#define PA0  5  // A4/User button
-#define PA1  6  // A5
-#define PA2  7  // A6
-#define PA3  8  // A7
-#define PA4  9  // A8
-#define PA5  10 // A9
-#define PA6  11 // A10
-#define PA7  12 // A11
-#define PC4  13 // A12
-#define PC5  14 // A13
-#define PB0  15 // A14
-#define PB1  16 // A15
+#define PC0  A0
+#define PC1  A1
+#define PC2  A2
+#define PC3  A3
+#define PA0  A4 // User button
+#define PA1  A5
+#define PA2  A6
+#define PA3  A7
+#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  17
 // P2 connector
 #define PC6  18
@@ -79,10 +79,9 @@ extern "C" {
 #define PB15 46 // SPI MOSI
 
 // This must be a literal
-#define NUM_DIGITAL_PINS        63
+#define NUM_DIGITAL_PINS        47
 // 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        47
 
 // On-board LED pin number
 #define LED_BUILTIN             PC9