Skip to content

Commit b1749af

Browse files
feat(autonomous_emergency_braking): prefix package and namespace with autoware_ (autowarefoundation#7294)
* change package name Signed-off-by: Daniel Sanchez <danielsanchezaran@gmail.com> * add the prefix Signed-off-by: Daniel Sanchez <danielsanchezaran@gmail.com> * change option Signed-off-by: Daniel Sanchez <danielsanchezaran@gmail.com> * change back node name Signed-off-by: Daniel Sanchez <danielsanchezaran@gmail.com> * eliminate some prefixes that are not required Signed-off-by: Daniel Sanchez <danielsanchezaran@gmail.com> * fix node name Signed-off-by: Daniel Sanchez <danielsanchezaran@gmail.com> --------- Signed-off-by: Daniel Sanchez <danielsanchezaran@gmail.com>
1 parent ed038d8 commit b1749af

File tree

16 files changed

+15
-15
lines changed

16 files changed

+15
-15
lines changed

.github/CODEOWNERS

+1-1
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ common/time_utils/** christopherj.ho@gmail.com shumpei.wakabayashi@tier4.jp tomo
4444
common/traffic_light_recognition_marker_publisher/** shumpei.wakabayashi@tier4.jp takeshi.miura@tier4.jp tomoya.kimura@tier4.jp
4545
common/traffic_light_utils/** kotaro.uetake@tier4.jp satoshi.ota@tier4.jp shunsuke.miura@tier4.jp
4646
common/tvm_utility/** ambroise.vincent@arm.com xinyu.wang@tier4.jp
47-
control/autonomous_emergency_braking/** daniel.sanchez@tier4.jp mamoru.sobue@tier4.jp takamasa.horibe@tier4.jp tomoya.kimura@tier4.jp
47+
control/autoware_autonomous_emergency_braking/** daniel.sanchez@tier4.jp mamoru.sobue@tier4.jp takamasa.horibe@tier4.jp tomoya.kimura@tier4.jp
4848
control/control_performance_analysis/** berkay@leodrive.ai fumiya.watanabe@tier4.jp satoshi.ota@tier4.jp shumpei.wakabayashi@tier4.jp taiki.tanaka@tier4.jp takamasa.horibe@tier4.jp takayuki.murooka@tier4.jp tomoya.kimura@tier4.jp
4949
control/control_validator/** kyoichi.sugahara@tier4.jp makoto.kurihara@tier4.jp mamoru.sobue@tier4.jp takamasa.horibe@tier4.jp takayuki.murooka@tier4.jp
5050
control/external_cmd_selector/** fumiya.watanabe@tier4.jp satoshi.ota@tier4.jp shumpei.wakabayashi@tier4.jp taiki.tanaka@tier4.jp takamasa.horibe@tier4.jp takayuki.murooka@tier4.jp tomoya.kimura@tier4.jp

control/autonomous_emergency_braking/CMakeLists.txt control/autoware_autonomous_emergency_braking/CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
cmake_minimum_required(VERSION 3.14)
2-
project(autonomous_emergency_braking)
2+
project(autoware_autonomous_emergency_braking)
33

44
find_package(autoware_cmake REQUIRED)
55
autoware_package()

control/autonomous_emergency_braking/include/autonomous_emergency_braking/node.hpp control/autoware_autonomous_emergency_braking/include/autoware_autonomous_emergency_braking/node.hpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212
// See the License for the specific language governing permissions and
1313
// limitations under the License.
1414

15-
#ifndef AUTONOMOUS_EMERGENCY_BRAKING__NODE_HPP_
16-
#define AUTONOMOUS_EMERGENCY_BRAKING__NODE_HPP_
15+
#ifndef AUTOWARE_AUTONOMOUS_EMERGENCY_BRAKING__NODE_HPP_
16+
#define AUTOWARE_AUTONOMOUS_EMERGENCY_BRAKING__NODE_HPP_
1717

1818
#include <diagnostic_updater/diagnostic_updater.hpp>
1919
#include <motion_utils/trajectory/trajectory.hpp>
@@ -340,4 +340,4 @@ class AEB : public rclcpp::Node
340340
};
341341
} // namespace autoware::motion::control::autonomous_emergency_braking
342342

343-
#endif // AUTONOMOUS_EMERGENCY_BRAKING__NODE_HPP_
343+
#endif // AUTOWARE_AUTONOMOUS_EMERGENCY_BRAKING__NODE_HPP_

control/autonomous_emergency_braking/launch/autonomous_emergency_braking.launch.xml control/autoware_autonomous_emergency_braking/launch/autoware_autonomous_emergency_braking.launch.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
<launch>
2-
<arg name="param_path" default="$(find-pkg-share autonomous_emergency_braking)/config/autonomous_emergency_braking.param.yaml"/>
2+
<arg name="param_path" default="$(find-pkg-share autoware_autonomous_emergency_braking)/config/autonomous_emergency_braking.param.yaml"/>
33
<arg name="input_pointcloud" default="/perception/obstacle_segmentation/pointcloud"/>
44
<arg name="input_velocity" default="/vehicle/status/velocity_status"/>
55
<arg name="input_imu" default="/sensing/imu/imu_data"/>
66
<arg name="input_odometry" default="/localization/kinematic_state"/>
77
<arg name="input_predicted_trajectory" default="/control/trajectory_follower/lateral/predicted_trajectory"/>
88

9-
<node pkg="autonomous_emergency_braking" exec="autonomous_emergency_braking" name="autonomous_emergency_braking" output="screen">
9+
<node pkg="autoware_autonomous_emergency_braking" exec="autoware_autonomous_emergency_braking" name="autonomous_emergency_braking" output="screen">
1010
<!-- load config files -->
1111
<param from="$(var param_path)"/>
1212
<!-- remap topic name -->

control/autonomous_emergency_braking/package.xml control/autoware_autonomous_emergency_braking/package.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0"?>
22
<?xml-model href="http://download.ros.org/schema/package_format3.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
33
<package format="3">
4-
<name>autonomous_emergency_braking</name>
4+
<name>autoware_autonomous_emergency_braking</name>
55
<version>0.1.0</version>
66
<description>Autonomous Emergency Braking package as a ROS 2 node</description>
77
<maintainer email="takamasa.horibe@tier4.jp">Takamasa Horibe</maintainer>

control/autonomous_emergency_braking/src/node.cpp control/autoware_autonomous_emergency_braking/src/node.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
// See the License for the specific language governing permissions and
1313
// limitations under the License.
1414

15-
#include "autonomous_emergency_braking/node.hpp"
15+
#include "autoware_autonomous_emergency_braking/node.hpp"
1616

1717
#include <pcl_ros/transforms.hpp>
1818
#include <tier4_autoware_utils/geometry/boost_geometry.hpp>

launch/tier4_control_launch/launch/control.launch.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ def launch_setup(context, *args, **kwargs):
139139

140140
# autonomous emergency braking
141141
autonomous_emergency_braking = ComposableNode(
142-
package="autonomous_emergency_braking",
142+
package="autoware_autonomous_emergency_braking",
143143
plugin="autoware::motion::control::autonomous_emergency_braking::AEB",
144144
name="autonomous_emergency_braking",
145145
remappings=[

system/system_error_monitor/config/diagnostic_aggregator/control.param.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
analyzers:
77
autonomous_emergency_braking:
88
type: diagnostic_aggregator/AnalyzerGroup
9-
path: autonomous_emergency_braking
9+
path: autoware_autonomous_emergency_braking
1010
analyzers:
1111
performance_monitoring:
1212
type: diagnostic_aggregator/AnalyzerGroup

system/system_error_monitor/config/system_error_monitor.param.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
/autoware/control/autonomous_driving/node_alive_monitoring: default
2121
/autoware/control/autonomous_driving/performance_monitoring/lane_departure: default
2222
/autoware/control/control_command_gate/node_alive_monitoring: default
23-
/autoware/control/autonomous_emergency_braking/performance_monitoring/emergency_stop: { sf_at: "none", lf_at: "warn", spf_at: "error", auto_recovery: "false"}
23+
/autoware/control/autoware_autonomous_emergency_braking/performance_monitoring/emergency_stop: { sf_at: "none", lf_at: "warn", spf_at: "error", auto_recovery: "false"}
2424

2525
/autoware/localization/node_alive_monitoring: default
2626
/autoware/localization/performance_monitoring/scan_matching_status: { sf_at: "warn", lf_at: "none", spf_at: "none" }
@@ -45,7 +45,7 @@
4545

4646
external_control:
4747
/autoware/control/control_command_gate/node_alive_monitoring: default
48-
/autoware/control/autonomous_emergency_braking/performance_monitoring/emergency_stop: { sf_at: "none", lf_at: "warn", spf_at: "error", auto_recovery: "false"}
48+
/autoware/control/autoware_autonomous_emergency_braking/performance_monitoring/emergency_stop: { sf_at: "none", lf_at: "warn", spf_at: "error", auto_recovery: "false"}
4949
/autoware/control/external_control/external_command_selector/node_alive_monitoring: default
5050

5151
/autoware/system/node_alive_monitoring: default

system/system_error_monitor/config/system_error_monitor.planning_simulation.param.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
/autoware/control/autonomous_driving/node_alive_monitoring: default
2121
/autoware/control/autonomous_driving/performance_monitoring/lane_departure: default
2222
/autoware/control/control_command_gate/node_alive_monitoring: default
23-
/autoware/control/autonomous_emergency_braking/performance_monitoring/emergency_stop: { sf_at: "none", lf_at: "warn", spf_at: "error", auto_recovery: "false"}
23+
/autoware/control/autoware_autonomous_emergency_braking/performance_monitoring/emergency_stop: { sf_at: "none", lf_at: "warn", spf_at: "error", auto_recovery: "false"}
2424

2525
/autoware/localization/node_alive_monitoring: default
2626
# /autoware/localization/performance_monitoring/scan_matching_status: { sf_at: "warn", lf_at: "none", spf_at: "none" }
@@ -46,7 +46,7 @@
4646

4747
external_control:
4848
/autoware/control/control_command_gate/node_alive_monitoring: default
49-
/autoware/control/autonomous_emergency_braking/performance_monitoring/emergency_stop: { sf_at: "none", lf_at: "warn", spf_at: "error", auto_recovery: "false"}
49+
/autoware/control/autoware_autonomous_emergency_braking/performance_monitoring/emergency_stop: { sf_at: "none", lf_at: "warn", spf_at: "error", auto_recovery: "false"}
5050
/autoware/control/external_control/external_command_selector/node_alive_monitoring: default
5151

5252
/autoware/system/node_alive_monitoring: default

0 commit comments

Comments
 (0)