[MAPLEMINI_F103CB] Avoid duplicated analog pins

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

Author: fpistm

variants/MAPLEMINI_F103CB/variant.cpp

@@ -72,18 +72,20 @@ const PinName digitalPin[] = {
   // Other
   PB_8,  //D32 - BOOT0 - User buttons
   PB_1,  //D33 - LED
-  PB_9,  //D34 - USB DISC
-  // Duplicated pins to avoid issue with analogRead
-  // A0 have to be greater than NUM_ANALOG_INPUTS
-  PB_0,  //D35/A0 = D3
-  PA_7,  //D36/A1 = D4
-  PA_6,  //D37/A2 = D5
-  PA_5,  //D38/A3 = D6
-  PA_4,  //D39/A4 = D7
-  PA_3,  //D40/A5 = D8
-  PA_2,  //D41/A6 = D9
-  PA_1,  //D42/A7 = D10
-  PA_0   //D43/A8 = D11
+  PB_9   //D34 - USB DISC
+};
+
+// Analog (Ax) pin number array
+const uint32_t analogInPin[] = {
+  3,  //A0
+  4,  //A1
+  5,  //A2
+  6,  //A3
+  7,  //A4
+  8,  //A5
+  9,  //A6
+  10, //A7
+  11  //A8
 };
 
 #ifdef __cplusplus

variants/MAPLEMINI_F103CB/variant.h

@@ -42,15 +42,15 @@ extern "C" {
 #define PB11 0
 #define PB10 1
 #define PB2  2
-#define PB0  3  // A0
-#define PA7  4  // A1
-#define PA6  5  // A2
-#define PA5  6  // A3
-#define PA4  7  // A4
-#define PA3  8  // A5
-#define PA2  9  // A6
-#define PA1  10 // A7
-#define PA0  11 // A8
+#define PB0  A0
+#define PA7  A1
+#define PA6  A2
+#define PA5  A3
+#define PA4  A4
+#define PA3  A5
+#define PA2  A6
+#define PA1  A7
+#define PA0  A8
 #define PC15 12
 #define PC14 13
 #define PC13 14
@@ -78,10 +78,9 @@ extern "C" {
 #define PB9  34 // USB DISC
 
 // This must be a literal
-#define NUM_DIGITAL_PINS        44
+#define NUM_DIGITAL_PINS        35
 // This must be a literal with a value less than or equal to to MAX_ANALOG_INPUTS
 #define NUM_ANALOG_INPUTS       9
-#define NUM_ANALOG_FIRST        35
 
 // On-board LED pin number
 #define LED_BUILTIN             PB1