Fix serial port names macro

Author: ogatatsu

cores/nRF5/Uart.cpp

@@ -234,8 +234,8 @@ size_t Uart::write(const uint8_t *buffer, size_t size)
 
 Uart SERIAL_PORT_HARDWARE( NRF_UARTE0, UARTE0_UART0_IRQn, PIN_SERIAL_RX, PIN_SERIAL_TX );
 
-#ifdef HAVE_HWSERIAL2
-Uart Serial2( NRF_UARTE1, UARTE1_IRQn, PIN_SERIAL2_RX, PIN_SERIAL2_TX );
+#ifdef SERIAL_PORT_HARDWARE1
+Uart SERIAL_PORT_HARDWARE1( NRF_UARTE1, UARTE1_IRQn, PIN_SERIAL2_RX, PIN_SERIAL2_TX );
 #endif
 
 extern "C"
@@ -245,10 +245,10 @@ extern "C"
     SERIAL_PORT_HARDWARE.IrqHandler();
   }
 
-#ifdef HAVE_HWSERIAL2
+#ifdef SERIAL_PORT_HARDWARE1
   void UARTE1_IRQHandler()
   {
-    Serial2.IrqHandler();
+    SERIAL_PORT_HARDWARE1.IrqHandler();
   }
 #endif
 }

cores/nRF5/Uart.h

@@ -24,6 +24,7 @@
 #include "HardwareSerial.h"
 #include "RingBuffer.h"
 #include "rtos.h"
+#include "variant.h"
 
 #include <cstddef>
 
@@ -89,21 +90,23 @@ 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.
 #ifdef NRF52840_XXAA
+  #define SERIAL_PORT_MONITOR         Serial
+  #define SERIAL_PORT_USBVIRTUAL      Serial
 
-#define SERIAL_PORT_MONITOR         Serial
-#define SERIAL_PORT_USBVIRTUAL      Serial
-
-#define SERIAL_PORT_HARDWARE        Serial1
-#define SERIAL_PORT_HARDWARE_OPEN   Serial1
-
-extern Uart Serial2;
-#define HAVE_HWSERIAL2
+  #define SERIAL_PORT_HARDWARE        Serial1
+  #define SERIAL_PORT_HARDWARE_OPEN   Serial1
 
+  #ifdef HAVE_HWSERIAL2
+    #define SERIAL_PORT_HARDWARE1       Serial2
+    #define SERIAL_PORT_HARDWARE_OPEN1  Serial2
+  #endif
 #else
-
-#define SERIAL_PORT_MONITOR         Serial
-#define SERIAL_PORT_HARDWARE        Serial
-
+  #define SERIAL_PORT_MONITOR         Serial
+  #define SERIAL_PORT_HARDWARE        Serial
 #endif
 
 extern Uart SERIAL_PORT_HARDWARE;
+
+#ifdef SERIAL_PORT_HARDWARE1
+extern Uart SERIAL_PORT_HARDWARE1;
+#endif

variants/pca10056/variant.h

@@ -86,6 +86,8 @@ static const uint8_t AREF = PIN_AREF;
 /*
  * Serial interfaces
  */
+#define HAVE_HWSERIAL2
+
 #define PIN_SERIAL_RX       (33)
 #define PIN_SERIAL_TX       (34)