From 9be6dfe235266aaa4ec96d6f637ed66921675fc6 Mon Sep 17 00:00:00 2001 From: Felipe Gomes de Melo Date: Fri, 8 Dec 2023 13:20:18 -0300 Subject: [PATCH 1/5] Fix fromMsg missing symbol rviz plugin error A detailed discussion may be found here https://github.com/ros2/geometry2/issues/639 --- rviz_carla_plugin/CMakeLists.txt | 4 +++- rviz_carla_plugin/src/carla_control_panel_ROS2.cpp | 1 + 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/rviz_carla_plugin/CMakeLists.txt b/rviz_carla_plugin/CMakeLists.txt index 83904edb..e90018ef 100644 --- a/rviz_carla_plugin/CMakeLists.txt +++ b/rviz_carla_plugin/CMakeLists.txt @@ -52,6 +52,7 @@ elseif(${ROS_VERSION} EQUAL 2) find_package(carla_ros_scenario_runner_types COMPONENTS) find_package(pluginlib REQUIRED) find_package(rviz_ogre_vendor REQUIRED) + find_package(tf2_geometry_msgs REQUIRED) set(CMAKE_AUTOMOC ON) @@ -74,7 +75,8 @@ elseif(${ROS_VERSION} EQUAL 2) plugin_description_ros2.xml) ament_target_dependencies(rviz_carla_plugin rclcpp carla_msgs nav_msgs - carla_ros_scenario_runner_types rviz_common) + carla_ros_scenario_runner_types rviz_common + tf2_geometry_msgs) ament_export_libraries(${PROJECT_NAME}) diff --git a/rviz_carla_plugin/src/carla_control_panel_ROS2.cpp b/rviz_carla_plugin/src/carla_control_panel_ROS2.cpp index a9dc0b98..1b7f0383 100644 --- a/rviz_carla_plugin/src/carla_control_panel_ROS2.cpp +++ b/rviz_carla_plugin/src/carla_control_panel_ROS2.cpp @@ -22,6 +22,7 @@ #include #include +#include #include #include From d688bc7b80aed0cf9b35538f11e442c3d9a49d49 Mon Sep 17 00:00:00 2001 From: Felipe Gomes de Melo Date: Fri, 8 Dec 2023 13:36:43 -0300 Subject: [PATCH 2/5] Format code --- rviz_carla_plugin/CMakeLists.txt | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/rviz_carla_plugin/CMakeLists.txt b/rviz_carla_plugin/CMakeLists.txt index e90018ef..eac31da5 100644 --- a/rviz_carla_plugin/CMakeLists.txt +++ b/rviz_carla_plugin/CMakeLists.txt @@ -74,9 +74,14 @@ elseif(${ROS_VERSION} EQUAL 2) pluginlib_export_plugin_description_file(rviz_common plugin_description_ros2.xml) - ament_target_dependencies(rviz_carla_plugin rclcpp carla_msgs nav_msgs - carla_ros_scenario_runner_types rviz_common - tf2_geometry_msgs) + ament_target_dependencies( + rviz_carla_plugin + rclcpp + carla_msgs + nav_msgs + carla_ros_scenario_runner_types + rviz_common + tf2_geometry_msgs) ament_export_libraries(${PROJECT_NAME}) From 4fe46fc7fef8af362bbb198269e6eb79aef65694 Mon Sep 17 00:00:00 2001 From: Felipe Gomes de Melo Date: Mon, 20 Nov 2023 21:50:51 -0300 Subject: [PATCH 3/5] Apply fix for GPG key expired error for CI run More info at https://github.com/osrf/docker_images/issues/697#issuecomment-1819626877 --- install_dependencies.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/install_dependencies.sh b/install_dependencies.sh index e96914b7..369f9505 100755 --- a/install_dependencies.sh +++ b/install_dependencies.sh @@ -23,6 +23,10 @@ fi echo ADDITIONAL PACKAGES $ADDITIONAL_PACKAGES +# Apply fix for GPG key expired error +# Link: https://github.com/osrf/docker_images/issues/697#issuecomment-1819626877 +apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 4B63CF8FDE49746E98FA01DDAD19BAB3CBF125EA + sudo apt update sudo apt-get install --no-install-recommends -y \ python$PYTHON_SUFFIX-pip \ From ab9664da92f24f234145aa78761fbda5011ca39f Mon Sep 17 00:00:00 2001 From: Felipe Gomes de Melo Date: Fri, 8 Dec 2023 13:50:13 -0300 Subject: [PATCH 4/5] Add tf2_geometry_msgs as rviz plugin dependency --- install_dependencies.sh | 1 + rviz_carla_plugin/package.xml | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/install_dependencies.sh b/install_dependencies.sh index 369f9505..41fa2d43 100755 --- a/install_dependencies.sh +++ b/install_dependencies.sh @@ -46,6 +46,7 @@ sudo apt-get install --no-install-recommends -y \ wget \ qt5-default \ ros-$ROS_DISTRO-pcl-conversions \ + ros-$ROS_DISTRO-tf2-geometry-msgs \ $ADDITIONAL_PACKAGES pip$PYTHON_SUFFIX install --upgrade pip$PYTHON_SUFFIX diff --git a/rviz_carla_plugin/package.xml b/rviz_carla_plugin/package.xml index 32f993ac..678dcda9 100644 --- a/rviz_carla_plugin/package.xml +++ b/rviz_carla_plugin/package.xml @@ -18,6 +18,7 @@ qtbase5-dev carla_msgs + tf2_geometry_msgs nav_msgs geometry_msgs carla_ros_scenario_runner_types @@ -27,7 +28,7 @@ libqt5-core libqt5-gui libqt5-widgets - + --> catkin From c022e0483e502c342c4a1f236c042c3a0a8a5395 Mon Sep 17 00:00:00 2001 From: Felipe Gomes de Melo Date: Fri, 8 Dec 2023 18:08:19 -0300 Subject: [PATCH 5/5] Change .hpp to .h for foxy compatibility --- rviz_carla_plugin/src/carla_control_panel_ROS2.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rviz_carla_plugin/src/carla_control_panel_ROS2.cpp b/rviz_carla_plugin/src/carla_control_panel_ROS2.cpp index 1b7f0383..86af2db3 100644 --- a/rviz_carla_plugin/src/carla_control_panel_ROS2.cpp +++ b/rviz_carla_plugin/src/carla_control_panel_ROS2.cpp @@ -22,7 +22,7 @@ #include #include -#include +#include #include #include