add some changes

tier4 · Jul 8, 2022 · 5696ada · 5696ada
1 parent 65a5552
commit 5696ada
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 8 deletions.
diff --git a/perception/multi_object_tracker/src/tracker/model/big_vehicle_tracker.cpp b/perception/multi_object_tracker/src/tracker/model/big_vehicle_tracker.cpp
@@ -78,6 +78,7 @@ BigVehicleTracker::BigVehicleTracker(
   X(IDX::Y) = object.kinematics.pose_with_covariance.pose.position.y;
   X(IDX::YAW) = tf2::getYaw(object.kinematics.pose_with_covariance.pose.orientation);
   if (object.kinematics.has_twist) {
+    std::cerr << "Big Vehicle Radar Included" << std::endl;
     X(IDX::VX) = object.kinematics.twist_with_covariance.twist.linear.x;
     X(IDX::WZ) = object.kinematics.twist_with_covariance.twist.angular.z;
   } else {

diff --git a/perception/multi_object_tracker/src/tracker/model/normal_vehicle_tracker.cpp b/perception/multi_object_tracker/src/tracker/model/normal_vehicle_tracker.cpp
@@ -78,6 +78,7 @@ NormalVehicleTracker::NormalVehicleTracker(
   X(IDX::Y) = object.kinematics.pose_with_covariance.pose.position.y;
   X(IDX::YAW) = tf2::getYaw(object.kinematics.pose_with_covariance.pose.orientation);
   if (object.kinematics.has_twist) {
+    std::cerr << "Radar Data Is Included" << std::endl;
     X(IDX::VX) = object.kinematics.twist_with_covariance.twist.linear.x;
     X(IDX::WZ) = object.kinematics.twist_with_covariance.twist.angular.z;
   } else {

diff --git a/perception/radar_fusion_to_detected_object/CMakeLists.txt b/perception/radar_fusion_to_detected_object/CMakeLists.txt
@@ -13,8 +13,8 @@ if(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID MATCHES "Clang")
 endif()
 
 ## Dependencies
-find_package(autoware_cmake REQUIRED)
-autoware_package()
+find_package(ament_cmake_auto REQUIRED)
+ament_auto_find_build_dependencies()
 
 ## Targets
 ament_auto_add_library(radar_object_fusion_to_detected_object_node_component SHARED

diff --git a/perception/radar_tracks_msgs_converter/CMakeLists.txt b/perception/radar_tracks_msgs_converter/CMakeLists.txt
@@ -1,8 +1,8 @@
 cmake_minimum_required(VERSION 3.5)
 project(radar_tracks_msgs_converter)
 
-find_package(autoware_cmake REQUIRED)
-autoware_package()
+find_package(ament_cmake_auto REQUIRED)
+ament_auto_find_build_dependencies()
 
 ## Compile options
 if(NOT CMAKE_CXX_STANDARD)

diff --git a/..._msgs_converter/src/radar_tracks_msgs_converter_node/radar_tracks_msgs_converter_node.cpp b/..._msgs_converter/src/radar_tracks_msgs_converter_node/radar_tracks_msgs_converter_node.cpp
@@ -16,11 +16,7 @@
 
 #include <tf2/utils.h>
 
-#ifdef ROS_DISTRO_GALACTIC
 #include <tf2_geometry_msgs/tf2_geometry_msgs.h>
-#else
-#include <tf2_geometry_msgs/tf2_geometry_msgs.hpp>
-#endif
 
 #include <memory>
 #include <string>