Skip to content

Commit 94de0a2

Browse files
Z0rdon4ntn
andauthored
updates project to work with zephyr v4.0.x (micro-ROS#146)
* updates project to work with zephyr v4.0.x * updating workflows for zephyr v4.0.x * adds cmake prefix path, changes to ci image * adds manual trigger to ci workflows * updates CI workflows for all active ROS2 distros * Get uart device with Zephyr 4's Devicetree-centric approach Signed-off-by: Antón Casas <[email protected]> * Tested in v4.1.0 using manual installation on Ubuntu:24.04 base Docker image Signed-off-by: Antón Casas <[email protected]> * Add v4.1.0 to CI and nightly Signed-off-by: Antón Casas <[email protected]> * State SDK used in CI. Restore Z0rdon's info about docker image used. Signed-off-by: Antón Casas <[email protected]> --------- Signed-off-by: Antón Casas <[email protected]> Co-authored-by: Antón Casas <[email protected]>
1 parent 46cac5c commit 94de0a2

File tree

2 files changed

+3
-6
lines changed

2 files changed

+3
-6
lines changed

CMakeLists.txt

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -52,10 +52,9 @@ externalproject_add(libmicroros_project
5252
BUILD_BYPRODUCTS ${MICROROS_DIR}/libmicroros.a
5353
)
5454

55-
zephyr_library_import(libmicroros ${MICROROS_DIR}/libmicroros.a)
55+
zephyr_link_libraries(${MICROROS_DIR}/libmicroros.a)
5656

5757
zephyr_interface_library_named(microros)
58-
add_dependencies(microros libmicroros)
5958
add_dependencies(microros libmicroros_project)
6059
target_include_directories(microros INTERFACE ${MICROROS_DIR}/include)
6160

@@ -96,7 +95,6 @@ zephyr_library_sources(
9695

9796
add_dependencies(microros microros_transports)
9897
add_dependencies(microros_transports libmicroros_project)
99-
add_dependencies(microros_transports libmicroros)
10098

10199
# Cleaning
102100

microros_transports/serial/microros_transports.c

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
#include <stdbool.h>
2525

2626
#define RING_BUF_SIZE 2048
27+
#define UART_NODE DT_NODELABEL(usart1)
2728

2829
char uart_in_buffer[RING_BUF_SIZE];
2930
char uart_out_buffer[RING_BUF_SIZE];
@@ -52,9 +53,7 @@ static void uart_fifo_callback(const struct device * dev, void * args){
5253
bool zephyr_transport_open(struct uxrCustomTransport * transport){
5354
zephyr_transport_params_t * params = (zephyr_transport_params_t*) transport->args;
5455

55-
char uart_descriptor[8];
56-
sprintf(uart_descriptor,"UART_%d", params->fd);
57-
params->uart_dev = device_get_binding(uart_descriptor);
56+
params->uart_dev = DEVICE_DT_GET(UART_NODE);
5857
if (!params->uart_dev) {
5958
printk("Serial device not found\n");
6059
return false;

0 commit comments

Comments
 (0)