Skip to content

Commit 1116f2d

Browse files
committed
Merge branch 'master' into esp32-s3-support
2 parents fd78585 + ce68d72 commit 1116f2d

File tree

1 file changed

+9
-5
lines changed

1 file changed

+9
-5
lines changed

Diff for: cores/esp32/HardwareSerial.cpp

+9-5
Original file line numberDiff line numberDiff line change
@@ -35,10 +35,12 @@ void serialEvent(void) {}
3535
#ifndef RX1
3636
#if CONFIG_IDF_TARGET_ESP32
3737
#define RX1 9
38-
#elif CONFIG_IDF_TARGET_ESP32S2 || CONFIG_IDF_TARGET_ESP32S3
38+
#elif CONFIG_IDF_TARGET_ESP32S2
3939
#define RX1 18
4040
#elif CONFIG_IDF_TARGET_ESP32C3
4141
#define RX1 18
42+
#elif CONFIG_IDF_TARGET_ESP32S3
43+
#define RX1 15
4244
#endif
4345
#endif
4446

@@ -49,6 +51,8 @@ void serialEvent(void) {}
4951
#define TX1 17
5052
#elif CONFIG_IDF_TARGET_ESP32C3
5153
#define TX1 19
54+
#elif CONFIG_IDF_TARGET_ESP32S3
55+
#define TX1 16
5256
#endif
5357
#endif
5458

@@ -60,16 +64,16 @@ void serialEvent1(void) {}
6064
#ifndef RX2
6165
#if CONFIG_IDF_TARGET_ESP32
6266
#define RX2 16
63-
#else
64-
#define RX2 -1
67+
#elif CONFIG_IDF_TARGET_ESP32S3
68+
#define RX2 19
6569
#endif
6670
#endif
6771

6872
#ifndef TX2
6973
#if CONFIG_IDF_TARGET_ESP32
7074
#define TX2 17
71-
#else
72-
#define TX2 -1
75+
#elif CONFIG_IDF_TARGET_ESP32S3
76+
#define TX2 20
7377
#endif
7478
#endif
7579

0 commit comments

Comments
 (0)