From de6c911d2756731b905ca6313a84851f48ecfe6b Mon Sep 17 00:00:00 2001 From: Pablo Garrido Date: Mon, 3 Apr 2023 10:32:56 +0200 Subject: [PATCH] Update to new RCL fork --- colcon.meta | 3 +-- libmicroros.mk | 4 ++-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/colcon.meta b/colcon.meta index 592f1195..ce2992a2 100644 --- a/colcon.meta +++ b/colcon.meta @@ -8,8 +8,7 @@ }, "rcl":{ "cmake-args":[ - "-DRCL_COMMAND_LINE_ENABLED=OFF", - "-DRCL_LOGGING_ENABLED=OFF" + "-DRCL_MICROROS=ON" ] }, "rcutils": { diff --git a/libmicroros.mk b/libmicroros.mk index 4dde7e54..ed0c40eb 100644 --- a/libmicroros.mk +++ b/libmicroros.mk @@ -55,7 +55,7 @@ $(EXTENSIONS_DIR)/micro_ros_src/src: git clone -b ros2 https://github.com/eProsima/Micro-XRCE-DDS-Client src/Micro-XRCE-DDS-Client; \ git clone -b main https://github.com/micro-ROS/rmw_microxrcedds src/rmw_microxrcedds; \ fi; \ - git clone -b foxy https://github.com/eProsima/micro-CDR src/micro-CDR; \ + git clone -b ros2 https://github.com/eProsima/micro-CDR src/micro-CDR; \ git clone -b master https://github.com/micro-ROS/rcl src/rcl; \ git clone -b master https://github.com/ros2/rclc src/rclc; \ git clone -b master https://github.com/micro-ROS/rcutils src/rcutils; \ @@ -72,7 +72,7 @@ $(EXTENSIONS_DIR)/micro_ros_src/src: git clone -b master https://github.com/ros2/test_interface_files src/test_interface_files; \ git clone -b master https://github.com/ros2/rmw_implementation src/rmw_implementation; \ git clone -b master https://github.com/ros2/rcl_logging src/rcl_logging; \ - git clone -b master https://gitlab.com/micro-ROS/ros_tracing/ros2_tracing src/ros2_tracing; \ + git clone -b master https://github.com/ros2/ros2_tracing src/ros2_tracing; \ git clone -b main https://github.com/micro-ROS/micro_ros_utilities src/micro_ros_utilities; \ git clone -b rolling https://github.com/ros2/rosidl_core src/rosidl_core; \ touch src/rosidl/rosidl_typesupport_introspection_cpp/COLCON_IGNORE; \