Skip to content

Commit 09d89c6

Browse files
authored
Fix HardwareSerial config (#11007)
1 parent 1467d87 commit 09d89c6

File tree

2 files changed

+12
-12
lines changed

2 files changed

+12
-12
lines changed

cores/esp32/HardwareSerial.cpp

-12
Original file line numberDiff line numberDiff line change
@@ -11,18 +11,6 @@
1111
#include "driver/uart.h"
1212
#include "freertos/queue.h"
1313

14-
#ifndef ARDUINO_SERIAL_EVENT_TASK_STACK_SIZE
15-
#define ARDUINO_SERIAL_EVENT_TASK_STACK_SIZE 2048
16-
#endif
17-
18-
#ifndef ARDUINO_SERIAL_EVENT_TASK_PRIORITY
19-
#define ARDUINO_SERIAL_EVENT_TASK_PRIORITY (configMAX_PRIORITIES - 1)
20-
#endif
21-
22-
#ifndef ARDUINO_SERIAL_EVENT_TASK_RUNNING_CORE
23-
#define ARDUINO_SERIAL_EVENT_TASK_RUNNING_CORE -1
24-
#endif
25-
2614
#if (SOC_UART_LP_NUM >= 1)
2715
#define UART_HW_FIFO_LEN(uart_num) ((uart_num < SOC_UART_HP_NUM) ? SOC_UART_FIFO_LEN : SOC_LP_UART_FIFO_LEN)
2816
#else

cores/esp32/HardwareSerial.h

+12
Original file line numberDiff line numberDiff line change
@@ -97,15 +97,27 @@ typedef enum {
9797
} hardwareSerial_error_t;
9898

9999
#ifndef ARDUINO_SERIAL_EVENT_TASK_STACK_SIZE
100+
#ifndef CONFIG_ARDUINO_SERIAL_EVENT_TASK_STACK_SIZE
100101
#define ARDUINO_SERIAL_EVENT_TASK_STACK_SIZE 2048
102+
#else
103+
#define ARDUINO_SERIAL_EVENT_TASK_STACK_SIZE CONFIG_ARDUINO_SERIAL_EVENT_TASK_STACK_SIZE
104+
#endif
101105
#endif
102106

103107
#ifndef ARDUINO_SERIAL_EVENT_TASK_PRIORITY
108+
#ifndef CONFIG_ARDUINO_SERIAL_EVENT_TASK_PRIORITY
104109
#define ARDUINO_SERIAL_EVENT_TASK_PRIORITY (configMAX_PRIORITIES - 1)
110+
#else
111+
#define ARDUINO_SERIAL_EVENT_TASK_PRIORITY CONFIG_ARDUINO_SERIAL_EVENT_TASK_PRIORITY
112+
#endif
105113
#endif
106114

107115
#ifndef ARDUINO_SERIAL_EVENT_TASK_RUNNING_CORE
116+
#ifndef CONFIG_ARDUINO_SERIAL_EVENT_TASK_RUNNING_CORE
108117
#define ARDUINO_SERIAL_EVENT_TASK_RUNNING_CORE -1
118+
#else
119+
#define ARDUINO_SERIAL_EVENT_TASK_RUNNING_CORE CONFIG_ARDUINO_SERIAL_EVENT_TASK_RUNNING_CORE
120+
#endif
109121
#endif
110122

111123
// UART0 pins are defined by default by the bootloader.

0 commit comments

Comments
 (0)