From 450f62da29a8e5c853aa167e3418177983d50f19 Mon Sep 17 00:00:00 2001 From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com> Date: Mon, 15 Sep 2025 12:32:43 +0200 Subject: [PATCH 1/3] Update maintainers (#785) (#786) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit @EugenioCollado @Carlosespicur (cherry picked from commit 0358231ad14abd6f1c805e914d79ab9fcab79e73) Co-authored-by: Antón Casas --- package.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package.xml b/package.xml index 537da409..97722d50 100644 --- a/package.xml +++ b/package.xml @@ -4,7 +4,8 @@ micro_ros_setup 5.0.0 Tools for setting up micro-ROS workspaces - Pablo Garrido + Eugenio Collado + Carlos Espinoza Apache-2.0 curl From cc2b250fe3fa829a5056fc7618c6d352439a656a Mon Sep 17 00:00:00 2001 From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com> Date: Thu, 16 Oct 2025 12:36:31 +0200 Subject: [PATCH 2/3] Fix ament_cmake dependency (#795) (#796) * Fix ament_cmake dependency * Ignore rmw_test_fixture package * Add ament_lint_auto dependency --------- (cherry picked from commit 1662e44bc968121393a3fefb51447e2444d63844) Signed-off-by: Carlosespicur Co-authored-by: Carlos Espinoza Curto <148376273+Carlosespicur@users.noreply.github.com> --- package.xml | 2 ++ scripts/create_firmware_ws.sh | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/package.xml b/package.xml index 97722d50..112a679a 100644 --- a/package.xml +++ b/package.xml @@ -12,6 +12,8 @@ python3-yaml clang-tidy + ament_cmake + ament_lint_auto flex bison libncurses-dev diff --git a/scripts/create_firmware_ws.sh b/scripts/create_firmware_ws.sh index fc3b6665..a2beb6bc 100755 --- a/scripts/create_firmware_ws.sh +++ b/scripts/create_firmware_ws.sh @@ -104,6 +104,8 @@ if [ $RTOS != "host" ]; then pushd $FW_TARGETDIR/$DEV_WS_DIR >/dev/null # Fix failing build by ignoring rmw_test_fixture_implementation. touch ros2/ament_cmake_ros/rmw_test_fixture_implementation/COLCON_IGNORE + # Fix failing build by ignoring rmw_test_fixture. + touch ros2/ament_cmake_ros/rmw_test_fixture/COLCON_IGNORE colcon build set +o nounset # source dev workspace @@ -116,4 +118,3 @@ rosdep install --os=ubuntu:noble -y --from-paths $PREFIX/config/$RTOS/$TARGET_FO # Creating specific firmware folder . $PREFIX/config/$RTOS/$TARGET_FOLDER/create.sh - From 03aa3c1c49b4e61fc88c4f45bd04e61a1dcd1e0e Mon Sep 17 00:00:00 2001 From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com> Date: Tue, 9 Dec 2025 16:20:16 +0100 Subject: [PATCH 3/3] fix include path (backport #781) (backport #790) (#800) * fix include path (#790) * fix include path (#781) * fix include path * Trigger CI Signed-off-by: Carlosespicur --------- Signed-off-by: Carlosespicur Co-authored-by: Carlosespicur (cherry picked from commit 22cf5e0068cbd2dd28559cc640da614aa5358b6f) * Remove rsync & execute only in non-host scenario Signed-off-by: Eugenio Collado --------- Signed-off-by: Carlosespicur Signed-off-by: Eugenio Collado Co-authored-by: DedSecer Co-authored-by: Carlosespicur Co-authored-by: Eugenio Collado (cherry picked from commit 52d6a34ad0d77b7c586b40f9db94ae3050e21eda) * Compile service_msgs Signed-off-by: Eugenio Collado * Compile unique_identifier_msgs Signed-off-by: Eugenio Collado --------- Signed-off-by: Carlosespicur Signed-off-by: Eugenio Collado Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com> Co-authored-by: DedSecer Co-authored-by: Carlosespicur Co-authored-by: Eugenio Collado --- config/host/generic/build.sh | 6 ++++++ scripts/build_firmware.sh | 14 ++++++++++++++ 2 files changed, 20 insertions(+) diff --git a/config/host/generic/build.sh b/config/host/generic/build.sh index 31d497db..88fa746c 100755 --- a/config/host/generic/build.sh +++ b/config/host/generic/build.sh @@ -6,4 +6,10 @@ set +o nounset . install/local_setup.bash set -o nounset +colcon build --packages-up-to service_msgs unique_identifier_msgs --metas src --cmake-args -DBUILD_TESTING=OFF -DBUILD_SHARED_LIBS=ON $@ + +set +o nounset +. install/local_setup.bash +set -o nounset + colcon build --metas src --cmake-args -DBUILD_TESTING=OFF -DBUILD_SHARED_LIBS=ON $@ diff --git a/scripts/build_firmware.sh b/scripts/build_firmware.sh index 96a2c865..e82cc0fe 100755 --- a/scripts/build_firmware.sh +++ b/scripts/build_firmware.sh @@ -76,3 +76,17 @@ else . $PREFIX/config/$RTOS/$PLATFORM/build.sh fi +######## Fix include paths ######## +if [ "$RTOS" != "host" ]; then + cd "$FW_TARGETDIR/mcu_ws" + INCLUDE_ROS2_PACKAGES=$(colcon list | awk '{print $1}' | awk -v d=" " '{s=(NR==1?s:s d)$0}END{print s}') + + for var in ${INCLUDE_ROS2_PACKAGES}; do + if [ -d "$FW_TARGETDIR/build/include/${var}/${var}" ]; then + mkdir -p "$FW_TARGETDIR/build/include/${var}" + cp -a "$FW_TARGETDIR/build/include/${var}/${var}/". "$FW_TARGETDIR/build/include/${var}/" + rm -rf "$FW_TARGETDIR/build/include/${var}/${var}" + fi + done +fi +