Skip to content
This repository was archived by the owner on May 10, 2024. It is now read-only.

Commit 95fa77b

Browse files
authored
Merge branch 'zephyrproject-rtos:next' into next
2 parents bcfd8ba + b715281 commit 95fa77b

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

cores/arduino/zephyrSerial.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,7 @@ arduino::ZephyrSerial Serial(DEVICE_DT_GET(DT_PHANDLE_BY_IDX(DT_PATH(zephyr_user
186186

187187
DT_FOREACH_PROP_ELEM(DT_PATH(zephyr_user), serials, DECLARE_SERIAL_N)
188188
#endif // PROP_LEN(serials) > 1
189-
#elif DT_NODE_EXISTS(DT_NODELABEL(arduino_serial))
189+
#elif DT_NODE_HAS_STATUS(DT_NODELABEL(arduino_serial), okay)
190190
/* If serials node is not defined, tries to use arduino_serial */
191191
arduino::ZephyrSerial Serial(DEVICE_DT_GET(DT_NODELABEL(arduino_serial)));
192192
#else

cores/arduino/zephyrSerial.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ DT_FOREACH_PROP_ELEM(DT_PATH(zephyr_user), serials, DECLARE_EXTERN_SERIAL_N)
9292
#undef EXTERN_SERIAL_N
9393
#undef SERIAL_DEFINED_0
9494
#endif
95-
#elif DT_NODE_EXISTS(DT_NODELABEL(arduino_serial))
95+
#elif DT_NODE_HAS_STATUS(DT_NODELABEL(arduino_serial), okay)
9696
extern arduino::ZephyrSerial Serial;
9797
#else
9898
extern arduino::ZephyrSerialStub Serial;

0 commit comments

Comments
 (0)