From 7cc1488531e297986cac458f92a628f829de98a0 Mon Sep 17 00:00:00 2001 From: h-ohta Date: Thu, 7 Dec 2023 14:35:27 +0900 Subject: [PATCH 1/7] fix: comment out unused --- .../pose_twist_estimator.launch.xml | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/launch/tier4_localization_launch/launch/pose_twist_estimator/pose_twist_estimator.launch.xml b/launch/tier4_localization_launch/launch/pose_twist_estimator/pose_twist_estimator.launch.xml index 02c6da20e17da..ac6302fecc80e 100644 --- a/launch/tier4_localization_launch/launch/pose_twist_estimator/pose_twist_estimator.launch.xml +++ b/launch/tier4_localization_launch/launch/pose_twist_estimator/pose_twist_estimator.launch.xml @@ -30,7 +30,7 @@ - + @@ -59,7 +59,7 @@ - + - + - + - + From b2c73668e06dc62909c85845573d8829fc52683c Mon Sep 17 00:00:00 2001 From: h-ohta Date: Thu, 7 Dec 2023 16:21:01 +0900 Subject: [PATCH 2/7] comment out traffic light --- launch/tier4_perception_launch/launch/perception.launch.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/launch/tier4_perception_launch/launch/perception.launch.xml b/launch/tier4_perception_launch/launch/perception.launch.xml index 528038c5158b2..47c66c8f8a947 100644 --- a/launch/tier4_perception_launch/launch/perception.launch.xml +++ b/launch/tier4_perception_launch/launch/perception.launch.xml @@ -231,7 +231,7 @@ - + From b59feb43345e5c797237f7c2ba801ff43c59fb1c Mon Sep 17 00:00:00 2001 From: h-ohta Date: Fri, 9 Feb 2024 15:35:15 +0900 Subject: [PATCH 3/7] comment out unused perception --- .../detection/detection.launch.xml | 60 +++++++++---------- 1 file changed, 30 insertions(+), 30 deletions(-) diff --git a/launch/tier4_perception_launch/launch/object_recognition/detection/detection.launch.xml b/launch/tier4_perception_launch/launch/object_recognition/detection/detection.launch.xml index ab9ed65999048..c47e3fd786a22 100644 --- a/launch/tier4_perception_launch/launch/object_recognition/detection/detection.launch.xml +++ b/launch/tier4_perception_launch/launch/object_recognition/detection/detection.launch.xml @@ -35,9 +35,9 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -231,13 +231,13 @@ - + - + From dbf56301630aced239a71943b9c804af5da2da07 Mon Sep 17 00:00:00 2001 From: h-ohta Date: Mon, 11 Dec 2023 14:43:59 +0900 Subject: [PATCH 4/7] comment out unused for tier4_localization_launch --- launch/tier4_localization_launch/package.xml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/launch/tier4_localization_launch/package.xml b/launch/tier4_localization_launch/package.xml index c4de9c04dcaf2..d0e5c9a07d1ac 100644 --- a/launch/tier4_localization_launch/package.xml +++ b/launch/tier4_localization_launch/package.xml @@ -14,11 +14,11 @@ ament_cmake_auto autoware_cmake - ar_tag_based_localizer + automatic_pose_initializer - eagleye_geo_pose_fusion - eagleye_gnss_converter - eagleye_rt + + + ekf_localizer geo_pose_projector gyro_odometer @@ -27,11 +27,11 @@ pose_initializer pose_instability_detector topic_tools - yabloc_common - yabloc_image_processing - yabloc_monitor - yabloc_particle_filter - yabloc_pose_initializer + + + + + ament_lint_auto autoware_lint_common From 0173edd0f0359d3efa98c660f2a9b8902b0dabf9 Mon Sep 17 00:00:00 2001 From: zymouse Date: Mon, 25 Dec 2023 11:24:05 +0800 Subject: [PATCH 5/7] Revert "feat(map_based_prediction): use glog (#5721)" This reverts commit 05e9c89e1a6b9f5096d56680f1d7eb1e68482aa1. --- perception/map_based_prediction/CMakeLists.txt | 4 ---- perception/map_based_prediction/package.xml | 1 - .../map_based_prediction/src/map_based_prediction_node.cpp | 4 ---- 3 files changed, 9 deletions(-) diff --git a/perception/map_based_prediction/CMakeLists.txt b/perception/map_based_prediction/CMakeLists.txt index 9378e09f099cc..53c78b54bc2ab 100644 --- a/perception/map_based_prediction/CMakeLists.txt +++ b/perception/map_based_prediction/CMakeLists.txt @@ -6,8 +6,6 @@ autoware_package() find_package(Eigen3 REQUIRED) -find_package(glog REQUIRED) - include_directories( SYSTEM ${EIGEN3_INCLUDE_DIR} @@ -19,8 +17,6 @@ ament_auto_add_library(map_based_prediction_node SHARED src/debug.cpp ) -target_link_libraries(map_based_prediction_node glog::glog) - rclcpp_components_register_node(map_based_prediction_node PLUGIN "map_based_prediction::MapBasedPredictionNode" EXECUTABLE map_based_prediction diff --git a/perception/map_based_prediction/package.xml b/perception/map_based_prediction/package.xml index b07d9855f9821..6a1354b37928f 100644 --- a/perception/map_based_prediction/package.xml +++ b/perception/map_based_prediction/package.xml @@ -18,7 +18,6 @@ autoware_auto_perception_msgs interpolation lanelet2_extension - libgoogle-glog-dev motion_utils rclcpp rclcpp_components diff --git a/perception/map_based_prediction/src/map_based_prediction_node.cpp b/perception/map_based_prediction/src/map_based_prediction_node.cpp index 75c1d61e0a19c..1b00325cda8ea 100644 --- a/perception/map_based_prediction/src/map_based_prediction_node.cpp +++ b/perception/map_based_prediction/src/map_based_prediction_node.cpp @@ -43,8 +43,6 @@ #include #endif -#include - #include #include #include @@ -728,8 +726,6 @@ void replaceObjectYawWithLaneletsYaw( MapBasedPredictionNode::MapBasedPredictionNode(const rclcpp::NodeOptions & node_options) : Node("map_based_prediction", node_options), debug_accumulated_time_(0.0) { - google::InitGoogleLogging("map_based_prediction_node"); - google::InstallFailureSignalHandler(); enable_delay_compensation_ = declare_parameter("enable_delay_compensation"); prediction_time_horizon_ = declare_parameter("prediction_time_horizon"); lateral_control_time_horizon_ = From 150e173febb07c53ee596dbc4ec25e7cd6c0d284 Mon Sep 17 00:00:00 2001 From: zymouse Date: Wed, 27 Dec 2023 11:39:10 +0800 Subject: [PATCH 6/7] fix: disable gnss --- .../launch/pose_twist_estimator/pose_twist_estimator.launch.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/launch/tier4_localization_launch/launch/pose_twist_estimator/pose_twist_estimator.launch.xml b/launch/tier4_localization_launch/launch/pose_twist_estimator/pose_twist_estimator.launch.xml index ac6302fecc80e..1ba5bc9ecdb26 100644 --- a/launch/tier4_localization_launch/launch/pose_twist_estimator/pose_twist_estimator.launch.xml +++ b/launch/tier4_localization_launch/launch/pose_twist_estimator/pose_twist_estimator.launch.xml @@ -13,7 +13,7 @@ - + From 34d0ca3f6aa80e1fc567a50ceb1f7c0cbc077a30 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Fri, 9 Feb 2024 06:39:07 +0000 Subject: [PATCH 7/7] style(pre-commit): autofix --- launch/tier4_localization_launch/package.xml | 6 +-- .../detection/detection.launch.xml | 52 +++++++++---------- 2 files changed, 29 insertions(+), 29 deletions(-) diff --git a/launch/tier4_localization_launch/package.xml b/launch/tier4_localization_launch/package.xml index d0e5c9a07d1ac..d91ef7a6de52b 100644 --- a/launch/tier4_localization_launch/package.xml +++ b/launch/tier4_localization_launch/package.xml @@ -16,9 +16,6 @@ automatic_pose_initializer - - - ekf_localizer geo_pose_projector gyro_odometer @@ -27,6 +24,9 @@ pose_initializer pose_instability_detector topic_tools + + + diff --git a/launch/tier4_perception_launch/launch/object_recognition/detection/detection.launch.xml b/launch/tier4_perception_launch/launch/object_recognition/detection/detection.launch.xml index c47e3fd786a22..094a611ea7778 100644 --- a/launch/tier4_perception_launch/launch/object_recognition/detection/detection.launch.xml +++ b/launch/tier4_perception_launch/launch/object_recognition/detection/detection.launch.xml @@ -36,8 +36,8 @@ - - + - - + - - + - - + - - + - - + - - + - - + - - + - - + - - + - - + - - +