rebase touchup

Author: lacklustrlabs

Diff for: boards.txt

@@ -390,31 +390,31 @@ Other.build.extra_flags=-D{build.product_line} {build.enable_usb} {build.enable_
 
 # BLUEPILL_F103C8 board
 # Support: USB HID, Serial2 (USART2 on PA3, PA2) and Serial3 (USART3 on PB11, PB10)
-Other.menu.board_part_num.BLUEPILL_F103C8=BluePill F103C8
-Other.menu.board_part_num.BLUEPILL_F103C8.node=NODE_F103C8
-Other.menu.board_part_num.BLUEPILL_F103C8.upload.maximum_size=65536
-Other.menu.board_part_num.BLUEPILL_F103C8.upload.maximum_data_size=20480
-Other.menu.board_part_num.BLUEPILL_F103C8.build.mcu=cortex-m3
-Other.menu.board_part_num.BLUEPILL_F103C8.build.f_cpu=72000000L
-Other.menu.board_part_num.BLUEPILL_F103C8.build.board=BLUEPILL_F103C8
-Other.menu.board_part_num.BLUEPILL_F103C8.build.series=STM32F1xx
-Other.menu.board_part_num.BLUEPILL_F103C8.build.product_line=STM32F103xB
-Other.menu.board_part_num.BLUEPILL_F103C8.build.variant=BLUEPILL_F103C8
-Other.menu.board_part_num.BLUEPILL_F103C8.build.cmsis_lib_gcc=arm_cortexM3l_math
+Other.menu.pnum.BLUEPILL_F103C8=BluePill F103C8
+Other.menu.pnum.BLUEPILL_F103C8.node=NODE_F103C8
+Other.menu.pnum.BLUEPILL_F103C8.upload.maximum_size=65536
+Other.menu.pnum.BLUEPILL_F103C8.upload.maximum_data_size=20480
+Other.menu.pnum.BLUEPILL_F103C8.build.mcu=cortex-m3
+Other.menu.pnum.BLUEPILL_F103C8.build.f_cpu=72000000L
+Other.menu.pnum.BLUEPILL_F103C8.build.board=BLUEPILL_F103C8
+Other.menu.pnum.BLUEPILL_F103C8.build.series=STM32F1xx
+Other.menu.pnum.BLUEPILL_F103C8.build.product_line=STM32F103xB
+Other.menu.pnum.BLUEPILL_F103C8.build.variant=BLUEPILL_F103C8
+Other.menu.pnum.BLUEPILL_F103C8.build.cmsis_lib_gcc=arm_cortexM3l_math
 
 # MAPLEMINI_F103CB board
 # Support: USB HID, Serial2 (USART2 on PA3, PA2) and Serial3 (USART3 on PB11, PB10)
-Other.menu.board_part_num.MAPLEMINI_F103CB=MapleMini F103CB
-Other.menu.board_part_num.MAPLEMINI_F103CB.node=NODE_F103CB
-Other.menu.board_part_num.MAPLEMINI_F103CB.upload.maximum_size=131072
-Other.menu.board_part_num.MAPLEMINI_F103CB.upload.maximum_data_size=20480
-Other.menu.board_part_num.MAPLEMINI_F103CB.build.mcu=cortex-m3
-Other.menu.board_part_num.MAPLEMINI_F103CB.build.f_cpu=72000000L
-Other.menu.board_part_num.MAPLEMINI_F103CB.build.board=MAPLEMINI_F103CB
-Other.menu.board_part_num.MAPLEMINI_F103CB.build.series=STM32F1xx
-Other.menu.board_part_num.MAPLEMINI_F103CB.build.product_line=STM32F103xB
-Other.menu.board_part_num.MAPLEMINI_F103CB.build.variant=MAPLEMINI_F103CB
-Other.menu.board_part_num.MAPLEMINI_F103CB.build.cmsis_lib_gcc=arm_cortexM3l_math
+Other.menu.pnum.MAPLEMINI_F103CB=MapleMini F103CB
+Other.menu.pnum.MAPLEMINI_F103CB.node=NODE_F103CB
+Other.menu.pnum.MAPLEMINI_F103CB.upload.maximum_size=131072
+Other.menu.pnum.MAPLEMINI_F103CB.upload.maximum_data_size=20480
+Other.menu.pnum.MAPLEMINI_F103CB.build.mcu=cortex-m3
+Other.menu.pnum.MAPLEMINI_F103CB.build.f_cpu=72000000L
+Other.menu.pnum.MAPLEMINI_F103CB.build.board=MAPLEMINI_F103CB
+Other.menu.pnum.MAPLEMINI_F103CB.build.series=STM32F1xx
+Other.menu.pnum.MAPLEMINI_F103CB.build.product_line=STM32F103xB
+Other.menu.pnum.MAPLEMINI_F103CB.build.variant=MAPLEMINI_F103CB
+Other.menu.pnum.MAPLEMINI_F103CB.build.cmsis_lib_gcc=arm_cortexM3l_math
 
 # Upload menu
 Other.menu.upload_method.DFUUploadMethod1=Maple bootloader (original version for Maple boards)
@@ -483,13 +483,13 @@ Disco.menu.xserial.all.build.xSerial=-DALL_HWSERIAL
 Disco.menu.xserial.third=Enable first third (USART1 to 3 if available)
 Disco.menu.xserial.third.build.xSerial=-DFIRST_THIRD_HWSERIAL
 
-Other.menu.Other_serial.enable_Serial=None
-Other.menu.Other_serial.enable_SerialAll=All
-Other.menu.Other_serial.enable_SerialAll.build.enable_Serialx=-DENABLE_SERIAL2 -DENABLE_SERIAL3
-Other.menu.Other_serial.enable_Serial2=Serial2 (if available)
-Other.menu.Other_serial.enable_Serial2.build.enable_Serialx=-DENABLE_SERIAL2
-Other.menu.Other_serial.enable_Serial3=Serial3 (if available)
-Other.menu.Other_serial.enable_Serial3.build.enable_Serialx=-DENABLE_SERIAL3
+Other.menu.xserial.enable_Serial=None
+Other.menu.xserial.enable_SerialAll=All
+Other.menu.xserial.enable_SerialAll.build.enable_Serialx=-DSERIAL_UART_INSTANCE=2 -DENABLE_SERIAL3
+Other.menu.xserial.enable_Serial2=Serial2 (if available)
+Other.menu.xserial.enable_Serial2.build.enable_Serialx=-DSERIAL_UART_INSTANCE=2
+Other.menu.xserial.enable_Serial3=Serial3 (if available)
+Other.menu.xserial.enable_Serial3.build.enable_Serialx=-DSERIAL_UART_INSTANCE=3
 
 # USB connectivity
 Nucleo_144.menu.usb.none=None

Diff for: variants/MAPLEMINI_F103CB/variant.h

@@ -23,7 +23,7 @@
  *        Headers
  *----------------------------------------------------------------------------*/
 
-#include "Arduino.h"
+#include "pins_arduino.h"
 
 #ifdef __cplusplus
 extern "C"{
@@ -32,8 +32,6 @@ extern "C"{
 /*----------------------------------------------------------------------------
  *        Pins
  *----------------------------------------------------------------------------*/
-#include "PeripheralPins.h"
-
 extern const PinName digitalPin[];
 
 enum {
@@ -89,7 +87,7 @@ enum {
 };
 
 enum {
- A_START_AFTER = D34,
+ A_START_AFTER = PB9,
  A0,  A1,  A2,  A3,  A4,  A5,  A6,  A7,  A8,
  AEND
 };
@@ -162,14 +160,9 @@ enum {
  *----------------------------------------------------------------------------*/
 
 #ifdef __cplusplus
-extern HardwareSerial Serial1;
-extern HardwareSerial Serial2;
-extern HardwareSerial Serial3;
 
 #if defined(SERIAL_USB) && defined(USBCON)
 extern USBSerial Serial;
-#else
-#define Serial Serial1
 #endif
 
 // These serial port names are intended to allow libraries and architecture-neutral