Merge branch 'main' into feature/warn_missing_pcd

anhnv3991 · Jun 10, 2024 · 1572515 · 1572515
2 parents 605d176 + 5d579ba
commit 1572515
Show file tree

Hide file tree

Showing 18 changed files with 11 additions and 9 deletions.
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
@@ -171,7 +171,7 @@ planning/autoware_behavior_path_side_shift_module/** [email protected] ky
 planning/autoware_behavior_path_start_planner_module/** [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected]
 planning/autoware_behavior_path_side_shift_module/** [email protected] [email protected] [email protected] [email protected] [email protected] [email protected]
 planning/behavior_path_start_planner_module/** [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected]
-planning/behavior_velocity_blind_spot_module/** [email protected] [email protected] [email protected]
+planning/autoware_behavior_velocity_blind_spot_module/** [email protected] [email protected] [email protected]
 planning/behavior_velocity_crosswalk_module/** [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected]
 planning/behavior_velocity_detection_area_module/** [email protected] [email protected] [email protected]
 planning/behavior_velocity_dynamic_obstacle_stop_module/** [email protected] [email protected]

diff --git a/planning/.pages b/planning/.pages
@@ -21,7 +21,7 @@ nav:
     - 'About Behavior Velocity': planning/autoware_behavior_velocity_planner
     - 'Template for Custom Module': planning/autoware_behavior_velocity_template_module
     - 'Available Module':
-        - 'Blind Spot': planning/behavior_velocity_blind_spot_module
+        - 'Blind Spot': planning/autoware_behavior_velocity_blind_spot_module
         - 'Crosswalk': planning/behavior_velocity_crosswalk_module
         - 'Detection Area': planning/behavior_velocity_detection_area_module
         - 'Dynamic Obstacle Stop': planning/behavior_velocity_dynamic_obstacle_stop_module

diff --git a/...velocity_blind_spot_module/CMakeLists.txt → ...velocity_blind_spot_module/CMakeLists.txt b/...velocity_blind_spot_module/CMakeLists.txt → ...velocity_blind_spot_module/CMakeLists.txt
@@ -1,5 +1,5 @@
 cmake_minimum_required(VERSION 3.14)
-project(behavior_velocity_blind_spot_module)
+project(autoware_behavior_velocity_blind_spot_module)
 
 find_package(autoware_cmake REQUIRED)
 autoware_package()

diff --git a/...vior_velocity_blind_spot_module/README.md → ...vior_velocity_blind_spot_module/README.md b/...vior_velocity_blind_spot_module/README.md → ...vior_velocity_blind_spot_module/README.md
diff --git a/..._spot_module/config/blind_spot.param.yaml → ..._spot_module/config/blind_spot.param.yaml b/..._spot_module/config/blind_spot.param.yaml → ..._spot_module/config/blind_spot.param.yaml
diff --git a/...nd_spot_module/docs/blind-spot.drawio.svg → ...nd_spot_module/docs/blind-spot.drawio.svg b/...nd_spot_module/docs/blind-spot.drawio.svg → ...nd_spot_module/docs/blind-spot.drawio.svg
diff --git a/...ity_blind_spot_module/docs/blind-spot.svg → ...ity_blind_spot_module/docs/blind-spot.svg b/...ity_blind_spot_module/docs/blind-spot.svg → ...ity_blind_spot_module/docs/blind-spot.svg
diff --git a/...or_velocity_blind_spot_module/package.xml → ...or_velocity_blind_spot_module/package.xml b/...or_velocity_blind_spot_module/package.xml → ...or_velocity_blind_spot_module/package.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0"?>
 <?xml-model href="http://download.ros.org/schema/package_format3.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
 <package format="3">
-  <name>behavior_velocity_blind_spot_module</name>
+  <name>autoware_behavior_velocity_blind_spot_module</name>
   <version>0.1.0</version>
-  <description>The behavior_velocity_blind_spot_module package</description>
+  <description>The autoware_behavior_velocity_blind_spot_module package</description>
 
   <maintainer email="[email protected]">Mamoru Sobue</maintainer>
   <maintainer email="[email protected]">Tomoya Kimura</maintainer>

diff --git a/...or_velocity_blind_spot_module/plugins.xml → ...or_velocity_blind_spot_module/plugins.xml b/...or_velocity_blind_spot_module/plugins.xml → ...or_velocity_blind_spot_module/plugins.xml
@@ -1,3 +1,3 @@
-<library path="behavior_velocity_blind_spot_module">
+<library path="autoware_behavior_velocity_blind_spot_module">
   <class type="autoware::behavior_velocity_planner::BlindSpotModulePlugin" base_class_type="autoware::behavior_velocity_planner::PluginInterface"/>
 </library>
diff --git a/..._velocity_blind_spot_module/src/debug.cpp → ..._velocity_blind_spot_module/src/debug.cpp b/..._velocity_blind_spot_module/src/debug.cpp → ..._velocity_blind_spot_module/src/debug.cpp
diff --git a/...ocity_blind_spot_module/src/decisions.cpp → ...ocity_blind_spot_module/src/decisions.cpp b/...ocity_blind_spot_module/src/decisions.cpp → ...ocity_blind_spot_module/src/decisions.cpp
diff --git a/...elocity_blind_spot_module/src/manager.cpp → ...elocity_blind_spot_module/src/manager.cpp b/...elocity_blind_spot_module/src/manager.cpp → ...elocity_blind_spot_module/src/manager.cpp
diff --git a/...elocity_blind_spot_module/src/manager.hpp → ...elocity_blind_spot_module/src/manager.hpp b/...elocity_blind_spot_module/src/manager.hpp → ...elocity_blind_spot_module/src/manager.hpp
@@ -29,6 +29,7 @@
 
 namespace autoware::behavior_velocity_planner
 {
+
 class BlindSpotModuleManager : public SceneModuleManagerInterfaceWithRTC
 {
 public:

diff --git a/..._velocity_blind_spot_module/src/scene.cpp → ..._velocity_blind_spot_module/src/scene.cpp b/..._velocity_blind_spot_module/src/scene.cpp → ..._velocity_blind_spot_module/src/scene.cpp
diff --git a/..._velocity_blind_spot_module/src/scene.hpp → ..._velocity_blind_spot_module/src/scene.hpp b/..._velocity_blind_spot_module/src/scene.hpp → ..._velocity_blind_spot_module/src/scene.hpp
@@ -36,6 +36,7 @@
 
 namespace autoware::behavior_velocity_planner
 {
+
 /**
  * @brief  wrapper class of interpolated path with lane id
  */

diff --git a/planning/autoware_behavior_velocity_planner/README.md b/planning/autoware_behavior_velocity_planner/README.md
@@ -7,7 +7,7 @@ It loads modules as plugins. Please refer to the links listed below for detail o
 
 ![Architecture](./docs/BehaviorVelocityPlanner-Architecture.drawio.svg)
 
-- [Blind Spot](../behavior_velocity_blind_spot_module/README.md)
+- [Blind Spot](../autoware_behavior_velocity_blind_spot_module/README.md)
 - [Crosswalk](../behavior_velocity_crosswalk_module/README.md)
 - [Walkway](../autoware_behavior_velocity_walkway_module/README.md)
 - [Detection Area](../behavior_velocity_detection_area_module/README.md)

diff --git a/planning/autoware_behavior_velocity_planner/package.xml b/planning/autoware_behavior_velocity_planner/package.xml
@@ -65,14 +65,14 @@
 
   <test_depend>ament_cmake_ros</test_depend>
   <test_depend>ament_lint_auto</test_depend>
+  <test_depend>autoware_behavior_velocity_blind_spot_module</test_depend>
   <test_depend>autoware_behavior_velocity_intersection_module</test_depend>
   <test_depend>autoware_behavior_velocity_occlusion_spot_module</test_depend>
   <test_depend>autoware_behavior_velocity_run_out_module</test_depend>
   <test_depend>autoware_behavior_velocity_stop_line_module</test_depend>
   <test_depend>autoware_behavior_velocity_virtual_traffic_light_module</test_depend>
   <test_depend>autoware_behavior_velocity_walkway_module</test_depend>
   <test_depend>autoware_lint_common</test_depend>
-  <test_depend>behavior_velocity_blind_spot_module</test_depend>
   <test_depend>behavior_velocity_crosswalk_module</test_depend>
   <test_depend>behavior_velocity_detection_area_module</test_depend>
   <test_depend>behavior_velocity_no_drivable_lane_module</test_depend>

diff --git a/planning/autoware_behavior_velocity_planner/test/src/test_node_interface.cpp b/planning/autoware_behavior_velocity_planner/test/src/test_node_interface.cpp
@@ -95,7 +95,7 @@ std::shared_ptr<BehaviorVelocityPlannerNode> generateNode()
                    velocity_smoother_dir + "/config/default_velocity_smoother.param.yaml",
                    velocity_smoother_dir + "/config/Analytical.param.yaml",
                    behavior_velocity_planner_dir + "/config/behavior_velocity_planner.param.yaml",
-                   get_behavior_velocity_module_config_no_prefix("blind_spot"),
+                   get_behavior_velocity_module_config("blind_spot"),
                    get_behavior_velocity_module_config_no_prefix("crosswalk"),
                    get_behavior_velocity_module_config("walkway"),
                    get_behavior_velocity_module_config_no_prefix("detection_area"),
-Original file line number
+Diff line change
@@ Expand Up / @@ -29,6 +29,7 @@ @@
     namespace autoware::behavior_velocity_planner
     {
     class BlindSpotModuleManager : public SceneModuleManagerInterfaceWithRTC
     {
     public:
@@ Expand Down @@