Update Serial menu and defined generic Serial instance

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

Author: fpistm

boards.txt

@@ -2,7 +2,7 @@
 
 menu.pnum=Board part number
 
-menu.xserial=Extra serial instance
+menu.xserial=Serial interface
 menu.usb=USB interface
 
 menu.opt=Optimize
@@ -328,37 +328,37 @@ Disco.menu.upload_method.STLink.upload.tool=stlink_upload
 
 ################################################################################
 # Serialx activation
-Nucleo_144.menu.xserial.none=None
-Nucleo_144.menu.xserial.SerialAll=All
-Nucleo_144.menu.xserial.SerialAll.build.xSerial=-DENABLE_SERIAL1 -DENABLE_SERIAL2
-Nucleo_144.menu.xserial.Serial1=Serial1 (if available)
-Nucleo_144.menu.xserial.Serial1.build.xSerial=-DENABLE_SERIAL1
-Nucleo_144.menu.xserial.Serial2=Serial2 (if available)
-Nucleo_144.menu.xserial.Serial2.build.xSerial=-DENABLE_SERIAL2
-
-Nucleo_64.menu.xserial.none=None
-Nucleo_64.menu.xserial.SerialAll=All
-Nucleo_64.menu.xserial.SerialAll.build.xSerial=-DENABLE_SERIAL1 -DENABLE_SERIAL2
-Nucleo_64.menu.xserial.Serial1=Serial1 (if available)
-Nucleo_64.menu.xserial.Serial1.build.xSerial=-DENABLE_SERIAL1
-Nucleo_64.menu.xserial.Serial2=Serial2 (if available)
-Nucleo_64.menu.xserial.Serial2.build.xSerial=-DENABLE_SERIAL2
-
-Nucleo_32.menu.xserial.none=None
-Nucleo_32.menu.xserial.SerialAll=All
-Nucleo_32.menu.xserial.SerialAll.build.xSerial=-DENABLE_SERIAL1 -DENABLE_SERIAL2
-Nucleo_32.menu.xserial.Serial1=Serial1 (if available)
-Nucleo_32.menu.xserial.Serial1.build.xSerial=-DENABLE_SERIAL1
-Nucleo_32.menu.xserial.Serial2=Serial2 (if available)
-Nucleo_32.menu.xserial.Serial2.build.xSerial=-DENABLE_SERIAL2
-
-Disco.menu.xserial.none=None
-Disco.menu.xserial.SerialAll=All
-Disco.menu.xserial.SerialAll.build.xSerial=-DENABLE_SERIAL1 -DENABLE_SERIAL2
-Disco.menu.xserial.Serial1=Serial1 (if available)
-Disco.menu.xserial.Serial1.build.xSerial=-DENABLE_SERIAL1
-Disco.menu.xserial.Serial2=Serial2 (if available)
-Disco.menu.xserial.Serial2.build.xSerial=-DENABLE_SERIAL2
+Nucleo_144.menu.xserial.generic=Generic Serial
+Nucleo_144.menu.xserial.none=No Serial
+Nucleo_144.menu.xserial.none.build.xSerial=-DNO_HWSERIAL
+Nucleo_144.menu.xserial.all=All (up to 10)
+Nucleo_144.menu.xserial.all.build.xSerial=-DALL_HWSERIAL
+Nucleo_144.menu.xserial.third=Enable first third (USART1 to 3 if available)
+Nucleo_144.menu.xserial.third.build.xSerial=-DFIRST_THIRD_HWSERIAL
+
+Nucleo_64.menu.xserial.generic=Generic Serial
+Nucleo_64.menu.xserial.none=No Serial
+Nucleo_64.menu.xserial.none.build.xSerial=-DNO_HWSERIAL
+Nucleo_64.menu.xserial.all=All (up to 10)
+Nucleo_64.menu.xserial.all.build.xSerial=-DALL_HWSERIAL
+Nucleo_64.menu.xserial.third=Enable first third (USART1 to 3 if available)
+Nucleo_64.menu.xserial.third.build.xSerial=-DFIRST_THIRD_HWSERIAL
+
+Nucleo_32.menu.xserial.generic=Generic Serial
+Nucleo_32.menu.xserial.none=No Serial
+Nucleo_32.menu.xserial.none.build.xSerial=-DNO_HWSERIAL
+Nucleo_32.menu.xserial.all=All (up to 10)
+Nucleo_32.menu.xserial.all.build.xSerial=-DALL_HWSERIAL
+Nucleo_32.menu.xserial.third=Enable first third (USART1 to 3 if available)
+Nucleo_32.menu.xserial.third.build.xSerial=-DFIRST_THIRD_HWSERIAL
+
+Disco.menu.xserial.generic=Generic Serial
+Disco.menu.xserial.none=No Serial
+Disco.menu.xserial.none.build.xSerial=-DNO_HWSERIAL
+Disco.menu.xserial.all=All (up to 10)
+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
 
 # USB connectivity
 Nucleo_144.menu.usb.none=None

cores/arduino/HardwareSerial.cpp

@@ -30,9 +30,13 @@
 #include "Arduino.h"
 #include "HardwareSerial.h"
 
+#if !defined(NO_HWSERIAL)
+#if defined(HAVE_HWSERIAL1) || defined(HAVE_HWSERIAL2) || defined(HAVE_HWSERIAL3) ||\
+    defined(HAVE_HWSERIAL4) || defined(HAVE_HWSERIAL5) || defined(HAVE_HWSERIAL6) ||\
+    defined(HAVE_HWSERIAL7) || defined(HAVE_HWSERIAL8) || defined(HAVE_HWSERIAL8) ||\
+    defined(HAVE_HWSERIAL10)
 // SerialEvent functions are weak, so when the user doesn't define them,
 // the linker just sets their address to 0 (which is checked below).
-
 #if defined(HAVE_HWSERIAL1)
   HardwareSerial Serial1(USART1);
   void serialEvent1() __attribute__((weak));
@@ -367,3 +371,5 @@ void HardwareSerial::setRx(PinName _rx) {
 void HardwareSerial::setTx(PinName _tx){
   _serial.pin_tx = _tx;
 }
+#endif // HAVE_HWSERIALx
+#endif // !NO_HWSERIAL

cores/arduino/stm32/uart.h

@@ -41,42 +41,146 @@
 
 /* Includes ------------------------------------------------------------------*/
 #include "stm32_def.h"
-#include "PeripheralPins.h"
+#include "variant.h"
 
 #ifdef __cplusplus
  extern "C" {
 #endif
 
+#if !defined(NO_HWSERIAL)
+#if defined(ALL_HWSERIAL) || defined(FIRST_THIRD_HWSERIAL)
+#define ENABLE_HWSERIAL1
+#define ENABLE_HWSERIAL2
+#define ENABLE_HWSERIAL3
+#if !defined(FIRST_THIRD_HWSERIAL)
+#define ENABLE_HWSERIAL4
+#define ENABLE_HWSERIAL5
+#define ENABLE_HWSERIAL6
+#define ENABLE_HWSERIAL7
+#define ENABLE_HWSERIAL8
+#define ENABLE_HWSERIAL9
+#define ENABLE_HWSERIAL10
+#endif // FIRST_THIRD_HWSERIAL
+#endif // ALL_HWSERIAL || FIRST_THIRD_HWSERIAL
+#ifdef SERIAL_UART_INSTANCE
+#if SERIAL_UART_INSTANCE == 1
+#define ENABLE_HWSERIAL1
+#if !defined(Serial)
+#define Serial Serial1
+#define serialEvent serialEvent1
+#endif
+#elif SERIAL_UART_INSTANCE == 2
+#define ENABLE_HWSERIAL2
+#if !defined(Serial)
+#define Serial Serial2
+#define serialEvent serialEvent2
+#endif
+#elif SERIAL_UART_INSTANCE == 3
+#define ENABLE_HWSERIAL3
+#if !defined(Serial)
+#define Serial Serial3
+#define serialEvent serialEvent3
+#endif
+#elif SERIAL_UART_INSTANCE == 4
+#define ENABLE_HWSERIAL4
+#if !defined(Serial)
+#define Serial Serial4
+#define serialEvent serialEvent4
+#endif
+#elif SERIAL_UART_INSTANCE == 5
+#define ENABLE_HWSERIAL5
+#if !defined(Serial)
+#define Serial Serial5
+#define serialEvent serialEvent5
+#endif
+#elif SERIAL_UART_INSTANCE == 6
+#define ENABLE_HWSERIAL6
+#if !defined(Serial)
+#define Serial Serial6
+#define serialEvent serialEvent6
+#endif
+#elif SERIAL_UART_INSTANCE == 7
+#define ENABLE_HWSERIAL7
+#if !defined(Serial)
+#define Serial Serial7
+#define serialEvent serialEvent7
+#endif
+#elif SERIAL_UART_INSTANCE == 8
+#define ENABLE_HWSERIAL8
+#if !defined(Serial)
+#define Serial Serial8
+#define serialEvent serialEvent8
+#endif
+#elif SERIAL_UART_INSTANCE == 9
+#define ENABLE_HWSERIAL9
+#if !defined(Serial)
+#define Serial Serial9
+#define serialEvent serialEvent9
+#endif
+#elif SERIAL_UART_INSTANCE == 10
+#define ENABLE_HWSERIAL10
+#if !defined(Serial)
+#define Serial Serial10
+#define serialEvent serialEvent10
+#endif
+#endif // SERIAL_UART_INSTANCE == x
+#else
+#if !defined(Serial)
+#warning "No generic 'Serial' defined!"
+#endif
+#endif // SERIAL_UART_INSTANCE
+#endif // NO_HWSERIAL
+
+#if defined(ENABLE_HWSERIAL1)
 #if defined(USART1_BASE)
 #define HAVE_HWSERIAL1
 #endif
+#endif
+#if defined(ENABLE_HWSERIAL2)
 #if defined(USART2_BASE)
 #define HAVE_HWSERIAL2
 #endif
+#endif
+#if defined(ENABLE_HWSERIAL3)
 #if defined(USART3_BASE)
 #define HAVE_HWSERIAL3
 #endif
+#endif
+#if defined(ENABLE_HWSERIAL4)
 #if defined(USART4_BASE) || defined(UART4_BASE)
 #define HAVE_HWSERIAL4
 #endif
+#endif
+#if defined(ENABLE_HWSERIAL5)
 #if defined(USART5_BASE) || defined(UART5_BASE)
 #define HAVE_HWSERIAL5
 #endif
+#endif
+#if defined(ENABLE_HWSERIAL6)
 #if defined(USART6_BASE)
 #define HAVE_HWSERIAL6
 #endif
+#endif
+#if defined(ENABLE_HWSERIAL7)
 #if defined(USART7_BASE) || defined(UART7_BASE)
 #define HAVE_HWSERIAL7
 #endif
+#endif
+#if defined(ENABLE_HWSERIAL8)
 #if defined(USART8_BASE) || defined(UART8_BASE)
 #define HAVE_HWSERIAL8
 #endif
+#endif
+#if defined(ENABLE_HWSERIAL9)
 #if defined(UART9_BASE)
 #define HAVE_HWSERIAL9
 #endif
+#endif
+#if defined(ENABLE_HWSERIAL10)
 #if defined(UART10_BASE)
 #define HAVE_HWSERIAL10
 #endif
+#endif
 
 /* Exported types ------------------------------------------------------------*/
 typedef struct serial_s serial_t;

variants/DISCO_F100RB/variant.h

@@ -153,6 +153,7 @@ enum {
 #define TIMER_SERVO             TIM17  //TODO: advanced-control timers don't work
 
 // UART Definitions
+#define SERIAL_UART_INSTANCE    2 //Connected to ST-Link
 // Default pin used for 'Serial' instance (ex: ST-Link)
 // Mandatory for Firmata
 #define PIN_SERIAL_RX           8
@@ -166,8 +167,6 @@ enum {
  *----------------------------------------------------------------------------*/
 
 #ifdef __cplusplus
-#define Serial                  Serial2 //Connected to ST-Link
-
 // These serial port names are intended to allow libraries and architecture-neutral
 // sketches to automatically default to the correct port name for a particular type
 // of use.  For example, a GPS module would normally connect to SERIAL_PORT_HARDWARE_OPEN,

variants/DISCO_F407VG/variant.h

@@ -178,6 +178,7 @@ enum {
 #define TIMER_UART_EMULATED     TIM6
 
 // UART Definitions
+#define SERIAL_UART_INSTANCE    2 //Connected to ST-Link
 // UART Emulation
 #define UART_EMUL_RX            PE_9
 #define UART_EMUL_TX            PE_11
@@ -195,8 +196,6 @@ enum {
  *----------------------------------------------------------------------------*/
 
 #ifdef __cplusplus
-#define Serial                  Serial2 // Could be connected to ST-Link
-
 // These serial port names are intended to allow libraries and architecture-neutral
 // sketches to automatically default to the correct port name for a particular type
 // of use.  For example, a GPS module would normally connect to SERIAL_PORT_HARDWARE_OPEN,

variants/DISCO_F746NG/variant.h

@@ -110,6 +110,7 @@ enum {
 #define TIMER_SERVO             TIM2  //TODO: advanced-control timers don't work
 
 // UART Definitions
+#define SERIAL_UART_INSTANCE    1 //Connected to ST-Link
 // Default pin used for 'Serial' instance (ex: ST-Link)
 // Mandatory for Firmata
 #define PIN_SERIAL_RX           PB7
@@ -123,8 +124,6 @@ enum {
  *----------------------------------------------------------------------------*/
 
 #ifdef __cplusplus
-#define Serial                  Serial1 //Connected to ST-Link
-
 // These serial port names are intended to allow libraries and architecture-neutral
 // sketches to automatically default to the correct port name for a particular type
 // of use.  For example, a GPS module would normally connect to SERIAL_PORT_HARDWARE_OPEN,

variants/DISCO_L475VG_IOT/variant.h

@@ -180,6 +180,7 @@ enum {
 #define TIMER_SERVO             TIM2  //TODO: advanced-control timers don't work
 
 // UART Definitions
+#define SERIAL_UART_INSTANCE    1 //Connected to ST-Link
 // Default pin used for 'Serial' instance (ex: ST-Link)
 // Mandatory for Firmata
 #define PIN_SERIAL_RX           0
@@ -193,8 +194,6 @@ enum {
  *----------------------------------------------------------------------------*/
 
 #ifdef __cplusplus
-#define Serial                  Serial1 //Connected to ST-Link
-
 // These serial port names are intended to allow libraries and architecture-neutral
 // sketches to automatically default to the correct port name for a particular type
 // of use.  For example, a GPS module would normally connect to SERIAL_PORT_HARDWARE_OPEN,

variants/NUCLEO_F030R8/variant.h

@@ -151,6 +151,7 @@ enum {
 #define TIMER_SERVO             TIM3  //TODO: advanced-control timers don't work
 
 // UART Definitions
+#define SERIAL_UART_INSTANCE    2 //Connected to ST-Link
 // Default pin used for 'Serial' instance (ex: ST-Link)
 // Mandatory for Firmata
 #define PIN_SERIAL_RX           0
@@ -164,8 +165,6 @@ enum {
  *----------------------------------------------------------------------------*/
 
 #ifdef __cplusplus
-#define Serial                  Serial2 //Connected to ST-Link
-
 // These serial port names are intended to allow libraries and architecture-neutral
 // sketches to automatically default to the correct port name for a particular type
 // of use.  For example, a GPS module would normally connect to SERIAL_PORT_HARDWARE_OPEN,

variants/NUCLEO_F091RC/variant.h

@@ -150,6 +150,7 @@ enum {
 #define TIMER_SERVO             TIM2  //TODO: advanced-control timers don't work
 
 // UART Definitions
+#define SERIAL_UART_INSTANCE    2 //Connected to ST-Link
 // UART Emulation
 #define UART_EMUL_RX            PB_14
 #define UART_EMUL_TX            PB_13
@@ -167,8 +168,6 @@ enum {
  *----------------------------------------------------------------------------*/
 
 #ifdef __cplusplus
-#define Serial                  Serial2 //Connected to ST-Link
-
 // These serial port names are intended to allow libraries and architecture-neutral
 // sketches to automatically default to the correct port name for a particular type
 // of use.  For example, a GPS module would normally connect to SERIAL_PORT_HARDWARE_OPEN,

variants/NUCLEO_F103RB/variant.h

@@ -150,6 +150,7 @@ enum {
 #define TIMER_SERVO             TIM2  //TODO: advanced-control timers don't work
 
 // UART Definitions
+#define SERIAL_UART_INSTANCE    2 //Connected to ST-Link
 // Default pin used for 'Serial' instance (ex: ST-Link)
 // Mandatory for Firmata
 #define PIN_SERIAL_RX           0
@@ -163,8 +164,6 @@ enum {
  *----------------------------------------------------------------------------*/
 
 #ifdef __cplusplus
-#define Serial                  Serial2 //Connected to ST-Link
-
 // These serial port names are intended to allow libraries and architecture-neutral
 // sketches to automatically default to the correct port name for a particular type
 // of use.  For example, a GPS module would normally connect to SERIAL_PORT_HARDWARE_OPEN,