BluePill pin mapping reordered

Signed-off-by: fpr <[email protected]>

Author: fpr

Diff for: variants/BLUEPILL_F103C8/variant.cpp

@@ -22,9 +22,8 @@
 extern "C" {
 #endif
 
-// Pin number
+// Pin number following https://github.com/stm32duino/Arduino_Core_STM32F1/blob/master/variants/STM32F103C_BluePill/variant.h
 const PinName digitalPin[] = {
-  // Right side
   PA0,  //D0
   PA1,  //D1
   PA2,  //D2
@@ -33,40 +32,44 @@ const PinName digitalPin[] = {
   PA5,  //D5
   PA6,  //D6
   PA7,  //D7
-  PB0,  //D8
-  PB1,  //D9
-  PB10, //D10
-  PB11, //D11
-  // Left side
-  PB12, //D12
-  PB13, //D13
-  PB14, //D14
-  PB15, //D15
-  PA8,  //D16
-  PA9,  //D17
-  PA10, //D18
-  PA11, //D19
-  PA12, //D20
-  PA15, //D21
-  PB3,  //D22
-  PB4,  //D23
-  PB5,  //D24
-  PB6,  //D25
-  PB7,  //D26
-  PB8,  //D27
-  PB9,  //D28
-  PC13, //D29 - LED
+  PA8,  //D8
+  PA9,  //D9
+  PA10, //D10
+  PA11, //D11
+  PA12, //D12
+  PA13, //D13
+  PA14, //D14
+  PA15, //D15
+  PB0,  //D16
+  PB1,  //D17
+  PB2,  //D18
+  PB3,  //D19
+  PB4,  //D20
+  PB5,  //D21
+  PB6,  //D22
+  PB7,  //D23
+  PB8,  //D24
+  PB9,  //D25
+  PB10, //D26
+  PB11, //D27
+  PB12, //D28
+  PB13, //D29
+  PB14, //D30
+  PB15, //D31
+  PC13, //D32 - LED
+  PC14, //D33
+  PC15, //D34
   // Duplicated pins in order to be aligned with PinMap_ADC
-  PA0,  //D30/A0 = D0
-  PA1,  //D31/A1 = D1
-  PA2,  //D32/A2 = D2
-  PA3,  //D33/A3 = D3
-  PA4,  //D34/A4 = D4
-  PA5,  //D35/A5 = D5
-  PA6,  //D36/A6 = D6
-  PA7,  //D37/A7 = D7
-  PB0,  //D38/A8 = D8
-  PB1   //D39/A9 = D9
+  PA0,  //D35/A0 = D0
+  PA1,  //D36/A1 = D1
+  PA2,  //D37/A2 = D2
+  PA3,  //D38/A3 = D3
+  PA4,  //D39/A4 = D4
+  PA5,  //D40/A5 = D5
+  PA6,  //D41/A6 = D6
+  PA7,  //D42/A7 = D7
+  PB0,  //D43/A8 = D8
+  PB1   //D44/A9 = D9
 };
 
 #ifdef __cplusplus

Diff for: variants/BLUEPILL_F103C8/variant.h

@@ -41,11 +41,12 @@ enum {
  D10, D11, D12, D13, D14, D15, D16, D17, D18, D19,
  D20, D21, D22, D23, D24, D25, D26, D27, D28, D29,
  D30, D31, D32, D33, D34, D35, D36, D37, D38, D39,
+ D40, D41, D42, D43, D44,
  DEND
 };
 
 enum {
- A_START_AFTER = D29,
+ A_START_AFTER = D34,
  A0,  A1,  A2,  A3,  A4,  A5,  A6,  A7,  A8,  A9,
  AEND
 };
@@ -60,8 +61,8 @@ enum {
 #define PWM_MAX_DUTY_CYCLE            255
 
 //On-board LED pin number
-#define LED_BUILTIN             29
-#define LED_GREEN               LED_BUILTIN
+#define LED_BUILTIN                   32
+#define LED_GREEN                     LED_BUILTIN
 
 //SPI definitions
 //define 16 channels. As many channel as digital IOs
@@ -83,8 +84,8 @@ enum {
 #define SCK                     SCLK
 
 //I2C Definitions
-#define SDA                     26
-#define SCL                     25
+#define SDA                     23
+#define SCL                     22
 
 //Timer Definitions
 //Do not use timer used by PWM pins when possible. See PinMap_PWM.
@@ -97,15 +98,15 @@ enum {
 #define DEBUG_UART              ((USART_TypeDef *) USART1)
 
 // Serial Pin Firmata
-#define PIN_SERIAL_RX           18
-#define PIN_SERIAL_TX           17
+#define PIN_SERIAL_RX           10
+#define PIN_SERIAL_TX           9
 #define PIN_SERIAL1_RX          3
 #define PIN_SERIAL1_TX          2
-#define PIN_SERIAL2_RX          11
-#define PIN_SERIAL2_TX          10
+#define PIN_SERIAL2_RX          27
+#define PIN_SERIAL2_TX          26
 
 #if defined(SERIAL_USB) && defined(USBCON)
-#define USB_DISC_PIN 20 //PA12 = USB Plus (+) pin number. That pin is normally pulled up to 3.3v by a 1.5k resistor
+#define USB_DISC_PIN 12 //PA12 = USB Plus (+) pin number. That pin is normally pulled up to 3.3v by a 1.5k resistor
 #endif
 
 #ifdef __cplusplus