Skip to content

Commit 923974f

Browse files
committed
support SerialEvent1/2
1 parent 306b10d commit 923974f

File tree

3 files changed

+19
-4
lines changed

3 files changed

+19
-4
lines changed

cores/nRF5/HardwareSerial.h

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,4 +77,9 @@ class HardwareSerial : public Stream
7777
extern void serialEventRun(void) __attribute__((weak));
7878
extern void serialEvent() __attribute__((weak));
7979

80+
#ifndef NRF52832_XXAA // 832 only has 1 UART for Serial
81+
extern void serialEvent1() __attribute__((weak));
82+
extern void serialEvent2() __attribute__((weak));
83+
#endif
84+
8085
#endif

cores/nRF5/Uart.cpp

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,14 @@
2525
void serialEventRun(void)
2626
{
2727
if (serialEvent && Serial.available() ) serialEvent();
28+
29+
#ifndef NRF52832_XXAA // 832 only has 1 UART for Serial
30+
if (serialEvent1 && Serial1.available() ) serialEvent1();
31+
32+
#if SERIAL_INTERFACES_COUNT >= 2
33+
if (serialEvent2 && Serial2.available() ) serialEvent2();
34+
#endif
35+
#endif
2836
}
2937

3038
Uart::Uart(NRF_UARTE_Type *_nrfUart, IRQn_Type _IRQn, uint8_t _pinRX, uint8_t _pinTX)

cores/nRF5/Uart.h

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -89,15 +89,17 @@ class Uart : public HardwareSerial
8989
//
9090
// SERIAL_PORT_HARDWARE_OPEN Hardware serial ports which are open for use. Their RX & TX
9191
// pins are NOT connected to anything by default.
92-
#ifdef NRF52840_XXAA
92+
#ifdef NRF52832_XXAA
93+
#define SERIAL_PORT_MONITOR Serial
94+
#define SERIAL_PORT_HARDWARE Serial
95+
96+
#else
9397
#define SERIAL_PORT_MONITOR Serial
9498
#define SERIAL_PORT_USBVIRTUAL Serial
9599

96100
#define SERIAL_PORT_HARDWARE Serial1
97101
#define SERIAL_PORT_HARDWARE_OPEN Serial1
98-
#else
99-
#define SERIAL_PORT_MONITOR Serial
100-
#define SERIAL_PORT_HARDWARE Serial
102+
101103
#endif
102104

103105
extern Uart SERIAL_PORT_HARDWARE;

0 commit comments

Comments
 (0)