From 26ed23187275e986ae29c224245b7a5c8c88e73b Mon Sep 17 00:00:00 2001 From: Daisuke Nishimatsu <42202095+wep21@users.noreply.github.com> Date: Tue, 26 Apr 2022 09:39:27 +0900 Subject: [PATCH 1/7] fix(traffic_light_map_based_detector): modify build error in rolling (#806) Signed-off-by: wep21 --- perception/traffic_light_map_based_detector/package.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/perception/traffic_light_map_based_detector/package.xml b/perception/traffic_light_map_based_detector/package.xml index 087f29b85399f..3b63dee0bb73f 100644 --- a/perception/traffic_light_map_based_detector/package.xml +++ b/perception/traffic_light_map_based_detector/package.xml @@ -16,6 +16,7 @@ image_geometry lanelet2_extension rclcpp + rclcpp_components sensor_msgs tf2 tf2_ros From 87e0b1d016bea0aa23d93ea4d65d8d34e1d22bc8 Mon Sep 17 00:00:00 2001 From: Daisuke Nishimatsu <42202095+wep21@users.noreply.github.com> Date: Tue, 26 Apr 2022 09:39:45 +0900 Subject: [PATCH 2/7] fix(tier4_planning_rviz_plugins): modify build error in rolling (#808) Signed-off-by: wep21 --- .../tier4_planning_rviz_plugin/src/tools/jsk_overlay_utils.hpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/common/tier4_planning_rviz_plugin/src/tools/jsk_overlay_utils.hpp b/common/tier4_planning_rviz_plugin/src/tools/jsk_overlay_utils.hpp index e0e885c9e340d..8a7cd908dd13b 100644 --- a/common/tier4_planning_rviz_plugin/src/tools/jsk_overlay_utils.hpp +++ b/common/tier4_planning_rviz_plugin/src/tools/jsk_overlay_utils.hpp @@ -60,7 +60,9 @@ #endif #include +#include #include +#include #include #include From 7336ba4d79d252fa0da8cc94aa102452cd317177 Mon Sep 17 00:00:00 2001 From: Daisuke Nishimatsu <42202095+wep21@users.noreply.github.com> Date: Tue, 26 Apr 2022 09:40:21 +0900 Subject: [PATCH 3/7] fix(stop_filter): modify build error in rolling (#805) * fix(stop_filter): modify build error in rolling Signed-off-by: wep21 * ci(pre-commit): autofix Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> --- localization/stop_filter/package.xml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/localization/stop_filter/package.xml b/localization/stop_filter/package.xml index 6e6cbf152e385..3ae3aff3e980a 100644 --- a/localization/stop_filter/package.xml +++ b/localization/stop_filter/package.xml @@ -12,7 +12,9 @@ geometry_msgs nav_msgs rclcpp + tf2 tier4_debug_msgs + ament_cmake_gtest ament_lint_auto autoware_lint_common From a999cc4d4446d5733ab9a40ad45892310e000008 Mon Sep 17 00:00:00 2001 From: "awf-autoware-bot[bot]" <94889083+awf-autoware-bot[bot]@users.noreply.github.com> Date: Tue, 26 Apr 2022 10:08:27 +0900 Subject: [PATCH 4/7] chore: sync files (#809) Signed-off-by: GitHub Co-authored-by: kenji-miyake --- .github/workflows/sync-files.yaml | 7 +++++++ setup.cfg | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/.github/workflows/sync-files.yaml b/.github/workflows/sync-files.yaml index 69ef19c684c69..b9dc5907a50c4 100644 --- a/.github/workflows/sync-files.yaml +++ b/.github/workflows/sync-files.yaml @@ -6,7 +6,14 @@ on: workflow_dispatch: jobs: + check-secret: + uses: autowarefoundation/autoware-github-actions/.github/workflows/check-secret.yaml@v1 + secrets: + secret: ${{ secrets.APP_ID }} + sync-files: + needs: check-secret + if: ${{ needs.check-secret.outputs.set == 'true' }} runs-on: ubuntu-latest steps: - name: Generate token diff --git a/setup.cfg b/setup.cfg index fd61ed536ebc4..5214751c7ba6b 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,7 +1,7 @@ [flake8] # Modified from https://github.com/ament/ament_lint/blob/ebd524bb9973d5ec1dc48a670ce54f958a5a0243/ament_flake8/ament_flake8/configuration/ament_flake8.ini extend-ignore = B902,C816,D100,D101,D102,D103,D104,D105,D106,D107,D203,D212,D404,I202,CNL100,E203,E501,Q000 -import-order-style = google +import-order-style = pep8 max-line-length = 100 show-source = true statistics = true From d1cb17e21be5a95377a826391f023b45b73ae5dc Mon Sep 17 00:00:00 2001 From: Daisuke Nishimatsu <42202095+wep21@users.noreply.github.com> Date: Tue, 26 Apr 2022 13:03:07 +0900 Subject: [PATCH 5/7] fix(behavior_velocity_planner): modify build error in rolling (#799) * fix(behavior_velocity_planner): modify build error in rolling Signed-off-by: wep21 * ci(pre-commit): autofix Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> --- .../behavior_velocity_planner/CMakeLists.txt | 108 +++++++++++++++++- .../scene_module/intersection/util.hpp | 4 + .../occlusion_spot/grid_utils.hpp | 8 +- .../occlusion_spot/occlusion_spot_utils.hpp | 5 + .../include/utilization/arc_lane_util.hpp | 6 + .../behavior_velocity_planner/src/node.cpp | 5 + .../src/scene_module/detection_area/debug.cpp | 4 + .../src/scene_module/detection_area/scene.cpp | 4 + .../scene_module/no_stopping_area/debug.cpp | 4 + .../scene_no_stopping_area.cpp | 5 + .../src/scene_module/stop_line/debug.cpp | 4 + .../src/scene_module/traffic_light/debug.cpp | 4 + .../src/scene_module/traffic_light/scene.cpp | 5 + .../src/utilization/path_utilization.cpp | 5 + .../test/src/test_occlusion_spot_utils.cpp | 2 +- .../test/src/utils.hpp | 2 - 16 files changed, 170 insertions(+), 5 deletions(-) diff --git a/planning/behavior_velocity_planner/CMakeLists.txt b/planning/behavior_velocity_planner/CMakeLists.txt index fd52191858be2..f73f643ee6ef7 100644 --- a/planning/behavior_velocity_planner/CMakeLists.txt +++ b/planning/behavior_velocity_planner/CMakeLists.txt @@ -67,11 +67,16 @@ target_include_directories(scene_module_lib $ ) +target_include_directories(scene_module_lib + SYSTEM PUBLIC + ${PCL_INCLUDE_DIRS} +) + ament_target_dependencies(scene_module_lib ${BEHAVIOR_VELOCITY_PLANNER_DEPENDENCIES}) # workaround to allow deprecated header to build on both galactic and rolling if(${tf2_geometry_msgs_VERSION} VERSION_LESS 0.18.0) - target_compile_definitions(scene_module_lib PUBLIC + target_compile_definitions(scene_module_lib PRIVATE USE_TF2_GEOMETRY_MSGS_DEPRECATED_HEADER ) endif() @@ -93,6 +98,13 @@ ament_target_dependencies(scene_module_stop_line ${BEHAVIOR_VELOCITY_PLANNER_DEP target_link_libraries(scene_module_stop_line scene_module_lib) +# workaround to allow deprecated header to build on both galactic and rolling +if(${tf2_geometry_msgs_VERSION} VERSION_LESS 0.18.0) + target_compile_definitions(scene_module_stop_line PRIVATE + USE_TF2_GEOMETRY_MSGS_DEPRECATED_HEADER + ) +endif() + # Scene Module: Crosswalk ament_auto_add_library(scene_module_crosswalk SHARED @@ -113,6 +125,12 @@ ament_target_dependencies(scene_module_crosswalk ${BEHAVIOR_VELOCITY_PLANNER_DEP target_link_libraries(scene_module_crosswalk scene_module_lib) +# workaround to allow deprecated header to build on both galactic and rolling +if(${tf2_geometry_msgs_VERSION} VERSION_LESS 0.18.0) + target_compile_definitions(scene_module_crosswalk PRIVATE + USE_TF2_GEOMETRY_MSGS_DEPRECATED_HEADER + ) +endif() # Scene Module: Intersection ament_auto_add_library(scene_module_intersection SHARED @@ -133,6 +151,13 @@ ament_target_dependencies(scene_module_intersection ${BEHAVIOR_VELOCITY_PLANNER_ target_link_libraries(scene_module_intersection scene_module_lib) +# workaround to allow deprecated header to build on both galactic and rolling +if(${tf2_geometry_msgs_VERSION} VERSION_LESS 0.18.0) + target_compile_definitions(scene_module_intersection PRIVATE + USE_TF2_GEOMETRY_MSGS_DEPRECATED_HEADER + ) +endif() + # Scene Module: Traffic Light ament_auto_add_library(scene_module_traffic_light SHARED @@ -151,6 +176,13 @@ ament_target_dependencies(scene_module_traffic_light ${BEHAVIOR_VELOCITY_PLANNER target_link_libraries(scene_module_traffic_light scene_module_lib) +# workaround to allow deprecated header to build on both galactic and rolling +if(${tf2_geometry_msgs_VERSION} VERSION_LESS 0.18.0) + target_compile_definitions(scene_module_traffic_light PRIVATE + USE_TF2_GEOMETRY_MSGS_DEPRECATED_HEADER + ) +endif() + # Scene Module: Blind Spot ament_auto_add_library(scene_module_blind_spot SHARED @@ -169,6 +201,13 @@ ament_target_dependencies(scene_module_blind_spot ${BEHAVIOR_VELOCITY_PLANNER_DE target_link_libraries(scene_module_blind_spot scene_module_lib) +# workaround to allow deprecated header to build on both galactic and rolling +if(${tf2_geometry_msgs_VERSION} VERSION_LESS 0.18.0) + target_compile_definitions(scene_module_blind_spot PRIVATE + USE_TF2_GEOMETRY_MSGS_DEPRECATED_HEADER + ) +endif() + # Scene Module: Detection Area ament_auto_add_library(scene_module_detection_area SHARED @@ -187,6 +226,13 @@ ament_target_dependencies(scene_module_detection_area ${BEHAVIOR_VELOCITY_PLANNE target_link_libraries(scene_module_detection_area scene_module_lib) +# workaround to allow deprecated header to build on both galactic and rolling +if(${tf2_geometry_msgs_VERSION} VERSION_LESS 0.18.0) + target_compile_definitions(scene_module_detection_area PRIVATE + USE_TF2_GEOMETRY_MSGS_DEPRECATED_HEADER + ) +endif() + # Scene Module: No Stopping Area ament_auto_add_library(scene_module_no_stopping_area SHARED src/scene_module/no_stopping_area/manager.cpp @@ -204,6 +250,13 @@ ament_target_dependencies(scene_module_no_stopping_area ${BEHAVIOR_VELOCITY_PLAN target_link_libraries(scene_module_no_stopping_area scene_module_lib) +# workaround to allow deprecated header to build on both galactic and rolling +if(${tf2_geometry_msgs_VERSION} VERSION_LESS 0.18.0) + target_compile_definitions(scene_module_no_stopping_area PRIVATE + USE_TF2_GEOMETRY_MSGS_DEPRECATED_HEADER + ) +endif() + # Scene Module: Virtual Traffic Light ament_auto_add_library(scene_module_virtual_traffic_light SHARED @@ -222,6 +275,13 @@ ament_target_dependencies(scene_module_virtual_traffic_light ${BEHAVIOR_VELOCITY target_link_libraries(scene_module_virtual_traffic_light scene_module_lib) +# workaround to allow deprecated header to build on both galactic and rolling +if(${tf2_geometry_msgs_VERSION} VERSION_LESS 0.18.0) + target_compile_definitions(scene_module_virtual_traffic_light PRIVATE + USE_TF2_GEOMETRY_MSGS_DEPRECATED_HEADER + ) +endif() + # SceneModule OcclusionSpot # Util @@ -245,6 +305,13 @@ target_include_directories(occlusion_spot_lib ament_target_dependencies(occlusion_spot_lib ${BEHAVIOR_VELOCITY_PLANNER_DEPENDENCIES}) +# workaround to allow deprecated header to build on both galactic and rolling +if(${tf2_geometry_msgs_VERSION} VERSION_LESS 0.18.0) + target_compile_definitions(occlusion_spot_lib PRIVATE + USE_TF2_GEOMETRY_MSGS_DEPRECATED_HEADER + ) +endif() + ament_auto_add_library(scene_module_occlusion_spot SHARED src/scene_module/occlusion_spot/manager.cpp src/scene_module/occlusion_spot/debug.cpp @@ -261,6 +328,13 @@ ament_target_dependencies(scene_module_occlusion_spot ${BEHAVIOR_VELOCITY_PLANNE target_link_libraries(scene_module_occlusion_spot scene_module_lib occlusion_spot_lib) +# workaround to allow deprecated header to build on both galactic and rolling +if(${tf2_geometry_msgs_VERSION} VERSION_LESS 0.18.0) + target_compile_definitions(scene_module_occlusion_spot PRIVATE + USE_TF2_GEOMETRY_MSGS_DEPRECATED_HEADER + ) +endif() + # Scene Module Manager ament_auto_add_library(scene_module_manager SHARED src/planner_manager.cpp @@ -276,6 +350,12 @@ ament_target_dependencies(scene_module_manager ${BEHAVIOR_VELOCITY_PLANNER_DEPEN target_link_libraries(scene_module_manager scene_module_lib) +# workaround to allow deprecated header to build on both galactic and rolling +if(${tf2_geometry_msgs_VERSION} VERSION_LESS 0.18.0) + target_compile_definitions(scene_module_manager PRIVATE + USE_TF2_GEOMETRY_MSGS_DEPRECATED_HEADER + ) +endif() # Node ament_auto_add_library(behavior_velocity_planner SHARED @@ -306,6 +386,13 @@ target_link_libraries(behavior_velocity_planner ament_export_dependencies(${BEHAVIOR_VELOCITY_PLANNER_DEPENDENCIES}) +# workaround to allow deprecated header to build on both galactic and rolling +if(${tf2_geometry_msgs_VERSION} VERSION_LESS 0.18.0) + target_compile_definitions(behavior_velocity_planner PRIVATE + USE_TF2_GEOMETRY_MSGS_DEPRECATED_HEADER + ) +endif() + rclcpp_components_register_node(behavior_velocity_planner PLUGIN "behavior_velocity_planner::BehaviorVelocityPlannerNode" EXECUTABLE behavior_velocity_planner_node @@ -320,6 +407,13 @@ if(BUILD_TESTING) ament_auto_add_library(utilization SHARED src/utilization/util.cpp ) + # workaround to allow deprecated header to build on both galactic and rolling + if(${tf2_geometry_msgs_VERSION} VERSION_LESS 0.18.0) + target_compile_definitions(utilization PRIVATE + USE_TF2_GEOMETRY_MSGS_DEPRECATED_HEADER + ) + endif() + # Gtest for utilization ament_add_gtest(utilization-test test/src/test_state_machine.cpp @@ -330,6 +424,12 @@ if(BUILD_TESTING) gtest_main utilization ) + # workaround to allow deprecated header to build on both galactic and rolling + if(${tf2_geometry_msgs_VERSION} VERSION_LESS 0.18.0) + target_compile_definitions(utilization-test PRIVATE + USE_TF2_GEOMETRY_MSGS_DEPRECATED_HEADER + ) + endif() # Gtest for occlusion spot ament_add_gtest(occlusion_spot-test @@ -341,6 +441,12 @@ if(BUILD_TESTING) gtest_main scene_module_occlusion_spot ) + # workaround to allow deprecated header to build on both galactic and rolling + if(${tf2_geometry_msgs_VERSION} VERSION_LESS 0.18.0) + target_compile_definitions(occlusion_spot-test PRIVATE + USE_TF2_GEOMETRY_MSGS_DEPRECATED_HEADER + ) + endif() endif() diff --git a/planning/behavior_velocity_planner/include/scene_module/intersection/util.hpp b/planning/behavior_velocity_planner/include/scene_module/intersection/util.hpp index dc647df54f533..d0ec57757c92b 100644 --- a/planning/behavior_velocity_planner/include/scene_module/intersection/util.hpp +++ b/planning/behavior_velocity_planner/include/scene_module/intersection/util.hpp @@ -20,7 +20,11 @@ #include +#ifdef USE_TF2_GEOMETRY_MSGS_DEPRECATED_HEADER #include +#else +#include +#endif #include #include diff --git a/planning/behavior_velocity_planner/include/scene_module/occlusion_spot/grid_utils.hpp b/planning/behavior_velocity_planner/include/scene_module/occlusion_spot/grid_utils.hpp index 52594094bf8b9..d7494599d72ff 100644 --- a/planning/behavior_velocity_planner/include/scene_module/occlusion_spot/grid_utils.hpp +++ b/planning/behavior_velocity_planner/include/scene_module/occlusion_spot/grid_utils.hpp @@ -40,7 +40,12 @@ #include #include #include + +#ifdef USE_TF2_GEOMETRY_MSGS_DEPRECATED_HEADER #include +#else +#include +#endif #include @@ -54,7 +59,7 @@ inline void fromMsg(const geometry_msgs::msg::PoseStamped & msg, tf2::Stamped #include #include + +#ifdef USE_TF2_GEOMETRY_MSGS_DEPRECATED_HEADER #include +#else +#include +#endif #include #include diff --git a/planning/behavior_velocity_planner/include/utilization/arc_lane_util.hpp b/planning/behavior_velocity_planner/include/utilization/arc_lane_util.hpp index b03362dd60575..a9992eaa0363d 100644 --- a/planning/behavior_velocity_planner/include/utilization/arc_lane_util.hpp +++ b/planning/behavior_velocity_planner/include/utilization/arc_lane_util.hpp @@ -23,8 +23,14 @@ #include +#ifdef USE_TF2_GEOMETRY_MSGS_DEPRECATED_HEADER #include #include +#else +#include + +#include +#endif #include #include diff --git a/planning/behavior_velocity_planner/src/node.cpp b/planning/behavior_velocity_planner/src/node.cpp index 5d4d36bffa78a..8b50dc1c72fda 100644 --- a/planning/behavior_velocity_planner/src/node.cpp +++ b/planning/behavior_velocity_planner/src/node.cpp @@ -23,7 +23,12 @@ #include #include + +#ifdef USE_TF2_GEOMETRY_MSGS_DEPRECATED_HEADER #include +#else +#include +#endif #include #include diff --git a/planning/behavior_velocity_planner/src/scene_module/detection_area/debug.cpp b/planning/behavior_velocity_planner/src/scene_module/detection_area/debug.cpp index e0f7745ca0407..7c56ec36f8dec 100644 --- a/planning/behavior_velocity_planner/src/scene_module/detection_area/debug.cpp +++ b/planning/behavior_velocity_planner/src/scene_module/detection_area/debug.cpp @@ -16,7 +16,11 @@ #include #include +#ifdef USE_TF2_GEOMETRY_MSGS_DEPRECATED_HEADER #include +#else +#include +#endif #include diff --git a/planning/behavior_velocity_planner/src/scene_module/detection_area/scene.cpp b/planning/behavior_velocity_planner/src/scene_module/detection_area/scene.cpp index b3d89c333144a..f8bba2dfd4226 100644 --- a/planning/behavior_velocity_planner/src/scene_module/detection_area/scene.cpp +++ b/planning/behavior_velocity_planner/src/scene_module/detection_area/scene.cpp @@ -16,7 +16,11 @@ #include #include +#ifdef USE_TF2_GEOMETRY_MSGS_DEPRECATED_HEADER #include +#else +#include +#endif #include #include diff --git a/planning/behavior_velocity_planner/src/scene_module/no_stopping_area/debug.cpp b/planning/behavior_velocity_planner/src/scene_module/no_stopping_area/debug.cpp index a467bedec8aa0..26af5e61c77b6 100644 --- a/planning/behavior_velocity_planner/src/scene_module/no_stopping_area/debug.cpp +++ b/planning/behavior_velocity_planner/src/scene_module/no_stopping_area/debug.cpp @@ -18,7 +18,11 @@ #include +#ifdef USE_TF2_GEOMETRY_MSGS_DEPRECATED_HEADER #include +#else +#include +#endif #include #include diff --git a/planning/behavior_velocity_planner/src/scene_module/no_stopping_area/scene_no_stopping_area.cpp b/planning/behavior_velocity_planner/src/scene_module/no_stopping_area/scene_no_stopping_area.cpp index deea9e26c160c..14f73e08125f7 100644 --- a/planning/behavior_velocity_planner/src/scene_module/no_stopping_area/scene_no_stopping_area.cpp +++ b/planning/behavior_velocity_planner/src/scene_module/no_stopping_area/scene_no_stopping_area.cpp @@ -22,7 +22,12 @@ #include #include + +#ifdef USE_TF2_GEOMETRY_MSGS_DEPRECATED_HEADER #include +#else +#include +#endif #include #include diff --git a/planning/behavior_velocity_planner/src/scene_module/stop_line/debug.cpp b/planning/behavior_velocity_planner/src/scene_module/stop_line/debug.cpp index 56fb110283591..4da8fcf2c7f2e 100644 --- a/planning/behavior_velocity_planner/src/scene_module/stop_line/debug.cpp +++ b/planning/behavior_velocity_planner/src/scene_module/stop_line/debug.cpp @@ -16,7 +16,11 @@ #include #include +#ifdef USE_TF2_GEOMETRY_MSGS_DEPRECATED_HEADER #include +#else +#include +#endif namespace behavior_velocity_planner { diff --git a/planning/behavior_velocity_planner/src/scene_module/traffic_light/debug.cpp b/planning/behavior_velocity_planner/src/scene_module/traffic_light/debug.cpp index 3e6677702b096..a6381543eed5c 100644 --- a/planning/behavior_velocity_planner/src/scene_module/traffic_light/debug.cpp +++ b/planning/behavior_velocity_planner/src/scene_module/traffic_light/debug.cpp @@ -16,7 +16,11 @@ #include #include +#ifdef USE_TF2_GEOMETRY_MSGS_DEPRECATED_HEADER #include +#else +#include +#endif namespace behavior_velocity_planner { diff --git a/planning/behavior_velocity_planner/src/scene_module/traffic_light/scene.cpp b/planning/behavior_velocity_planner/src/scene_module/traffic_light/scene.cpp index ac8bc9729b585..559120ce985f9 100644 --- a/planning/behavior_velocity_planner/src/scene_module/traffic_light/scene.cpp +++ b/planning/behavior_velocity_planner/src/scene_module/traffic_light/scene.cpp @@ -19,7 +19,12 @@ #include // To be replaced by std::optional in C++17 #include + +#ifdef USE_TF2_GEOMETRY_MSGS_DEPRECATED_HEADER #include +#else +#include +#endif #include #include diff --git a/planning/behavior_velocity_planner/src/utilization/path_utilization.cpp b/planning/behavior_velocity_planner/src/utilization/path_utilization.cpp index 4d5d4d23392ca..d238a30eed666 100644 --- a/planning/behavior_velocity_planner/src/utilization/path_utilization.cpp +++ b/planning/behavior_velocity_planner/src/utilization/path_utilization.cpp @@ -17,7 +17,12 @@ #include #include + +#ifdef USE_TF2_GEOMETRY_MSGS_DEPRECATED_HEADER #include +#else +#include +#endif #include #include diff --git a/planning/behavior_velocity_planner/test/src/test_occlusion_spot_utils.cpp b/planning/behavior_velocity_planner/test/src/test_occlusion_spot_utils.cpp index 4540d534350d1..2fc6f2d34b90e 100644 --- a/planning/behavior_velocity_planner/test/src/test_occlusion_spot_utils.cpp +++ b/planning/behavior_velocity_planner/test/src/test_occlusion_spot_utils.cpp @@ -98,7 +98,7 @@ TEST(calcSlowDownPointsForPossibleCollision, ConsiderSignedOffset) std::cout << "v : " << path.points[i].point.longitudinal_velocity_mps << "\t"; } std::cout << std::endl; - for (const auto pc : pcs) { + for (const auto & pc : pcs) { std::cout << "len : " << pc.arc_lane_dist_at_collision.length << "\t"; } std::cout << std::endl; diff --git a/planning/behavior_velocity_planner/test/src/utils.hpp b/planning/behavior_velocity_planner/test/src/utils.hpp index 8054dfcadaca1..91574b02c65e2 100644 --- a/planning/behavior_velocity_planner/test/src/utils.hpp +++ b/planning/behavior_velocity_planner/test/src/utils.hpp @@ -202,8 +202,6 @@ inline autoware_auto_perception_msgs::msg::PredictedObject generatePredictedObje autoware_auto_perception_msgs::msg::PredictedObject obj; obj.shape.dimensions.x = 5.0; obj.shape.dimensions.y = 2.0; - tf2::Quaternion q; - obj.kinematics.initial_pose_with_covariance.pose.orientation = tf2::toMsg(q); obj.kinematics.initial_twist_with_covariance.twist.linear.x = 0; obj.kinematics.initial_pose_with_covariance.pose.position.x = x; obj.kinematics.initial_pose_with_covariance.pose.position.y = 0; From a0a4e75b422e23566886f7c5c955c71ee0418645 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Tue, 26 Apr 2022 08:16:27 +0000 Subject: [PATCH 6/7] ci(pre-commit): autoupdate (#726) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * ci(pre-commit): autoupdate updates: - [github.com/tier4/pre-commit-hooks-ros: v0.6.0 → v0.7.0](https://github.com/tier4/pre-commit-hooks-ros/compare/v0.6.0...v0.7.0) - [github.com/pre-commit/mirrors-clang-format: v13.0.1 → v14.0.1](https://github.com/pre-commit/mirrors-clang-format/compare/v13.0.1...v14.0.1) * Update .pre-commit-config.yaml Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> Co-authored-by: Kenji Miyake <31987104+kenji-miyake@users.noreply.github.com> --- .pre-commit-config.yaml | 23 ++++------------------- 1 file changed, 4 insertions(+), 19 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index f8273cebdd578..1e1a6963bf1f4 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -35,13 +35,14 @@ repos: - id: yamllint - repo: https://github.com/tier4/pre-commit-hooks-ros - rev: v0.6.0 + rev: v0.7.0 hooks: + - id: flake8-ros - id: prettier-xacro - id: prettier-launch-xml - id: prettier-package-xml - - id: sort-package-xml - id: ros-include-guard + - id: sort-package-xml - repo: https://github.com/shellcheck-py/shellcheck-py rev: v0.8.0.4 @@ -65,24 +66,8 @@ repos: - id: black args: [--line-length=100] - - repo: https://github.com/PyCQA/flake8 - rev: 4.0.1 - hooks: - - id: flake8 - additional_dependencies: - [ - flake8-blind-except, - flake8-builtins, - flake8-class-newline, - flake8-comprehensions, - flake8-deprecated, - flake8-docstrings, - flake8-import-order, - flake8-quotes, - ] - - repo: https://github.com/pre-commit/mirrors-clang-format - rev: v13.0.1 + rev: v14.0.1 hooks: - id: clang-format types_or: [c++, c, cuda] From cdbff23aec85d36883025e754cc9e10495fde8bd Mon Sep 17 00:00:00 2001 From: Hiroki OTA Date: Tue, 26 Apr 2022 17:35:18 +0900 Subject: [PATCH 7/7] fix(fault_injection): fix empty hardware_id (#814) Signed-off-by: h-ohta --- .../include/fault_injection/diagnostic_storage.hpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/simulator/fault_injection/include/fault_injection/diagnostic_storage.hpp b/simulator/fault_injection/include/fault_injection/diagnostic_storage.hpp index eb9e1ede3a099..a6c6b816c99f7 100644 --- a/simulator/fault_injection/include/fault_injection/diagnostic_storage.hpp +++ b/simulator/fault_injection/include/fault_injection/diagnostic_storage.hpp @@ -39,7 +39,7 @@ class DiagnosticStorage { DiagnosticStatus status; status.name = diag_config.diag_name; - status.hardware_id = ""; + status.hardware_id = "fault_injection"; status.level = DiagnosticStatus::OK; status.message = "OK"; event_diag_map_[diag_config.sim_name] = status;