Skip to content

Commit f0097ce

Browse files
committed
FIX-91 No all Serial objects created
1 parent c40c5c8 commit f0097ce

File tree

2 files changed

+17
-33
lines changed

2 files changed

+17
-33
lines changed

cores/arduino/HardwareSerial.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -272,7 +272,7 @@ void HardwareSerial::setHandler(void *handler)
272272
#endif
273273

274274
#if defined(HAVE_HWSERIAL6)
275-
HardwareSerial Serial6(USART6);
275+
HardwareSerial Serial6(UART6);
276276
#endif
277277

278278
#if defined(HAVE_HWSERIAL7)

cores/arduino/WSerial.h

Lines changed: 16 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -67,45 +67,29 @@
6767
#endif /* !HWSERIAL_NONE && SERIAL_UART_INSTANCE */
6868

6969

70-
#if defined(ENABLE_HWSERIAL1)
71-
#if defined(USART1_BASE)
72-
#define HAVE_HWSERIAL1
73-
#endif
70+
#if defined(USART1_BASE)
71+
#define HAVE_HWSERIAL1
7472
#endif
75-
#if defined(ENABLE_HWSERIAL2)
76-
#if defined(USART2_BASE)
77-
#define HAVE_HWSERIAL2
78-
#endif
73+
#if defined(USART2_BASE)
74+
#define HAVE_HWSERIAL2
7975
#endif
80-
#if defined(ENABLE_HWSERIAL3)
81-
#if defined(USART3_BASE)
82-
#define HAVE_HWSERIAL3
83-
#endif
76+
#if defined(USART3_BASE)
77+
#define HAVE_HWSERIAL3
8478
#endif
85-
#if defined(ENABLE_HWSERIAL4)
86-
#if defined(USART4_BASE) || defined(UART4_BASE)
87-
#define HAVE_HWSERIAL4
88-
#endif
79+
#if defined(USART4_BASE) || defined(UART4_BASE)
80+
#define HAVE_HWSERIAL4
8981
#endif
90-
#if defined(ENABLE_HWSERIAL5)
91-
#if defined(UART5_BASE)
92-
#define HAVE_HWSERIAL5
93-
#endif
82+
#if defined(UART5_BASE)
83+
#define HAVE_HWSERIAL5
9484
#endif
95-
#if defined(ENABLE_HWSERIAL6)
96-
#if defined(UART6_BASE)
97-
#define HAVE_HWSERIAL6
98-
#endif
85+
#if defined(UART6_BASE)
86+
#define HAVE_HWSERIAL6
9987
#endif
100-
#if defined(ENABLE_HWSERIAL7)
101-
#if defined(UART7_BASE)
102-
#define HAVE_HWSERIAL7
103-
#endif
88+
#if defined(UART7_BASE)
89+
#define HAVE_HWSERIAL7
10490
#endif
105-
#if defined(ENABLE_HWSERIAL8)
106-
#if defined(UART8_BASE)
107-
#define HAVE_HWSERIAL8
108-
#endif
91+
#if defined(UART8_BASE)
92+
#define HAVE_HWSERIAL8
10993
#endif
11094

11195
#endif

0 commit comments

Comments
 (0)