Merge branch 'main-ros2' into develop-ros2

MapIV · Apr 3, 2024 · 76f1975 · 76f1975
2 parents dd71067 + 857c67e
commit 76f1975
Show file tree

Hide file tree

Showing 9 changed files with 12 additions and 10 deletions.
diff --git a/eagleye_core/coordinate/package.xml b/eagleye_core/coordinate/package.xml
@@ -7,19 +7,21 @@
   <maintainer email="osamu.sekino@tier4.jp">osamu.sekino</maintainer>
   <license>BSD</license>
 
-  <buildtool_depend>ament_cmake</buildtool_depend>
+  <buildtool_depend>ament_cmake_auto</buildtool_depend>
 
   <build_depend>rclcpp</build_depend>
   <build_depend>geodesy</build_depend>
   <build_export_depend>rclcpp</build_export_depend>
   <build_export_depend>geodesy</build_export_depend>
+  <depend>eigen</depend>
   <depend>geographic_info</depend>
   <depend>geographic_msgs</depend>
+  <depend>geographiclib</depend>
 
   <test_depend>ament_lint_auto</test_depend>
   <test_depend>ament_lint_common</test_depend>
 
   <export>
     <build_type>ament_cmake</build_type>
   </export>
-</package>
+</package>
diff --git a/eagleye_core/navigation/package.xml b/eagleye_core/navigation/package.xml
@@ -7,7 +7,7 @@
   <maintainer email="osamu.sekino@tier4.jp">osamu.sekino</maintainer>
   <license>BSD</license>
 
-  <buildtool_depend>ament_cmake</buildtool_depend>
+  <buildtool_depend>ament_cmake_auto</buildtool_depend>
   <depend>yaml_cpp_vendor</depend>
   <build_depend>rclcpp</build_depend>
   <build_depend>geodesy</build_depend>

diff --git a/eagleye_msgs/package.xml b/eagleye_msgs/package.xml
@@ -7,7 +7,7 @@
   <maintainer email="osamu.sekino@tier4.jp">osamu.sekino</maintainer>
   <license>BSD</license>
 
-  <buildtool_depend>ament_cmake</buildtool_depend>
+  <buildtool_depend>ament_cmake_auto</buildtool_depend>
 
   <build_depend>rosidl_default_generators</build_depend>
   <build_depend>rclcpp</build_depend>

diff --git a/eagleye_rt/package.xml b/eagleye_rt/package.xml
@@ -9,7 +9,7 @@
 
   <license>BSD</license>
 
-  <buildtool_depend>ament_cmake</buildtool_depend>
+  <buildtool_depend>ament_cmake_auto</buildtool_depend>
   <depend>yaml_cpp_vendor</depend>
   <depend>tf2_eigen</depend>
   <depend>rclcpp</depend>

diff --git a/eagleye_util/can_velocity_converter/package.xml b/eagleye_util/can_velocity_converter/package.xml
@@ -9,7 +9,7 @@
 
   <license>BSD</license>
 
-  <buildtool_depend>ament_cmake</buildtool_depend>
+  <buildtool_depend>ament_cmake_auto</buildtool_depend>
   <build_depend>can_msgs</build_depend>
   <build_depend>geometry_msgs</build_depend>
   <build_depend>rclcpp</build_depend>

diff --git a/eagleye_util/fix2kml/package.xml b/eagleye_util/fix2kml/package.xml
@@ -9,7 +9,7 @@
 
   <license>BSD3</license>
 
-  <buildtool_depend>ament_cmake</buildtool_depend>
+  <buildtool_depend>ament_cmake_auto</buildtool_depend>
   <build_depend>rclcpp</build_depend>
   <build_depend>rclpy</build_depend>
   <build_depend>std_msgs</build_depend>

diff --git a/eagleye_util/gnss_converter/package.xml b/eagleye_util/gnss_converter/package.xml
@@ -8,7 +8,7 @@
 
   <license>BSD3</license>
 
-  <buildtool_depend>ament_cmake</buildtool_depend>
+  <buildtool_depend>ament_cmake_auto</buildtool_depend>
   <build_depend>rclcpp</build_depend>
   <build_depend>sensor_msgs</build_depend>
   <build_depend>nmea_msgs</build_depend>

diff --git a/eagleye_util/gnss_converter/src/gnss_converter_node.cpp b/eagleye_util/gnss_converter/src/gnss_converter_node.cpp
@@ -100,7 +100,7 @@ void gnss_velocity_callback(const geometry_msgs::msg::TwistWithCovarianceStamped
   r.header.frame_id = "gps";
   r.header.stamp = msg->header.stamp;
   rclcpp::Time ros_clock(msg->header.stamp);
-  double gnss_velocity_time = ros_clock.seconds();
+  double gnss_velocity_time = ros_clock.seconds() * 1e3;
   r.tow = gnss_velocity_time;
 
   double llh[3];

diff --git a/eagleye_util/tf/package.xml b/eagleye_util/tf/package.xml
@@ -9,7 +9,7 @@
 
   <license>BSD</license>
 
-  <buildtool_depend>ament_cmake</buildtool_depend>
+  <buildtool_depend>ament_cmake_auto</buildtool_depend>
 
   <test_depend>ament_lint_auto</test_depend>
   <test_depend>ament_lint_common</test_depend>