Serial1 fixes.

Former-commit-id: bf45df7

Author: h2zero

cores/nRF5/HardwareSerial.h

@@ -81,4 +81,6 @@ class HardwareSerial : public Stream
 
 extern void serialEventRun(void) __attribute__((weak));
 
+extern void serialEvent() __attribute__((weak));
+extern void serialEvent1() __attribute__((weak));
 #endif

cores/nRF5/Uart.cpp

@@ -21,6 +21,16 @@
 #include "Arduino.h"
 #include "wiring_private.h"
 
+
+void serialEventRun(void)
+{
+  if (serialEvent && Serial.available() ) serialEvent();
+
+#if defined(PIN_SERIAL1_RX) && defined(PIN_SERIAL1_TX)
+  if (serialEvent1 && Serial1.available() ) serialEvent1();
+#endif
+}
+
 Uart::Uart(NRF_UART_Type *_nrfUart, IRQn_Type _IRQn, uint8_t _pinRX, uint8_t _pinTX)
 {
   nrfUart = _nrfUart;

cores/nRF5/Uart.h

@@ -78,21 +78,19 @@ class Uart : public HardwareSerial
 //
 // SERIAL_PORT_HARDWARE_OPEN  Hardware serial ports which are open for use.  Their RX & TX
 //                            pins are NOT connected to anything by default.
-#if !defined(USB_CDC_DEFAULT_SERIAL)
-  #define SERIAL_PORT_MONITOR         Serial
-  #define SERIAL_PORT_HARDWARE        Serial
-
-#else
+#if defined(USB_CDC_DEFAULT_SERIAL)
   #define SERIAL_PORT_MONITOR         Serial
   #define SERIAL_PORT_USBVIRTUAL      Serial
 
   #define SERIAL_PORT_HARDWARE        Serial1
   #define SERIAL_PORT_HARDWARE_OPEN   Serial1
-
+#else
+  #define SERIAL_PORT_MONITOR         Serial
+  #define SERIAL_PORT_HARDWARE        Serial
 #endif
 
 extern Uart SERIAL_PORT_HARDWARE;
 
-#if defined(PIN_SERIAL2_RX) && defined(PIN_SERIAL2_TX)
-extern Uart Serial2;
+#if defined(PIN_SERIAL1_RX) && defined(PIN_SERIAL1_TX)
+extern Uart Serial1;
 #endif