Skip to content

Commit 687ead9

Browse files
refactor(shift_decider): prefix package and namespace with autoware_ (#7310)
* RT1-6684 add autoware prefix and namespace Signed-off-by: Muhammad Zulfaqar Azmi <zulfaqar.azmi@tier4.jp> * RT1-6684 Revert svg This reverts commit 4e0569e. Signed-off-by: Muhammad Zulfaqar Azmi <zulfaqar.azmi@tier4.jp> --------- Signed-off-by: Muhammad Zulfaqar Azmi <zulfaqar.azmi@tier4.jp> Co-authored-by: Takayuki Murooka <takayuki5168@gmail.com>
1 parent 822519d commit 687ead9

File tree

11 files changed

+42
-34
lines changed

11 files changed

+42
-34
lines changed
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
cmake_minimum_required(VERSION 3.14)
2+
project(autoware_shift_decider)
3+
4+
find_package(autoware_cmake REQUIRED)
5+
autoware_package()
6+
7+
ament_auto_add_library(${PROJECT_NAME}_node SHARED
8+
src/${PROJECT_NAME}.cpp
9+
)
10+
11+
rclcpp_components_register_node(${PROJECT_NAME}_node
12+
PLUGIN "autoware::shift_decider::ShiftDecider"
13+
EXECUTABLE ${PROJECT_NAME}
14+
)
15+
16+
ament_auto_package(
17+
INSTALL_TO_SHARE
18+
launch
19+
config
20+
)

control/shift_decider/README.md control/autoware_shift_decider/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
## Purpose
44

5-
`shift_decider` is a module to decide shift from ackermann control command.
5+
`autoware_shift_decider` is a module to decide shift from ackermann control command.
66

77
## Inner-workings / Algorithms
88

control/shift_decider/include/shift_decider/shift_decider.hpp control/autoware_shift_decider/include/autoware_shift_decider/autoware_shift_decider.hpp

+7-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 SHIFT_DECIDER__SHIFT_DECIDER_HPP_
16-
#define SHIFT_DECIDER__SHIFT_DECIDER_HPP_
15+
#ifndef AUTOWARE_SHIFT_DECIDER__AUTOWARE_SHIFT_DECIDER_HPP_
16+
#define AUTOWARE_SHIFT_DECIDER__AUTOWARE_SHIFT_DECIDER_HPP_
1717

1818
#include <rclcpp/rclcpp.hpp>
1919

@@ -24,6 +24,9 @@
2424

2525
#include <memory>
2626

27+
namespace autoware::shift_decider
28+
{
29+
2730
class ShiftDecider : public rclcpp::Node
2831
{
2932
public:
@@ -52,5 +55,6 @@ class ShiftDecider : public rclcpp::Node
5255

5356
bool park_on_goal_;
5457
};
58+
} // namespace autoware::shift_decider
5559

56-
#endif // SHIFT_DECIDER__SHIFT_DECIDER_HPP_
60+
#endif // AUTOWARE_SHIFT_DECIDER__AUTOWARE_SHIFT_DECIDER_HPP_

control/shift_decider/launch/shift_decider.launch.xml control/autoware_shift_decider/launch/shift_decider.launch.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<launch>
2-
<arg name="config_file" default="$(find-pkg-share shift_decider)/config/shift_decider.param.yaml"/>
2+
<arg name="config_file" default="$(find-pkg-share autoware_shift_decider)/config/shift_decider.param.yaml"/>
33

4-
<node pkg="shift_decider" exec="shift_decider" name="shift_decider" output="screen">
4+
<node pkg="autoware_shift_decider" exec="autoware_shift_decider" name="autoware_shift_decider" output="screen">
55
<remap from="input/control_cmd" to="/control/trajectory_follower/control_cmd"/>
66
<remap from="input/state" to="/autoware/state"/>
77
<remap from="output/gear_cmd" to="/control/shift_decider/gear_cmd"/>

control/shift_decider/package.xml control/autoware_shift_decider/package.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
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>shift_decider</name>
4+
<name>autoware_shift_decider</name>
55
<version>0.1.0</version>
6-
<description>The shift_decider package</description>
6+
<description>The autoware_shift_decider package</description>
77
<maintainer email="takamasa.horibe@tier4.jp">Takamasa Horibe</maintainer>
88
<maintainer email="takayuki.murooka@tier4.jp">Takayuki Murooka</maintainer>
99
<license>Apache License 2.0</license>

control/shift_decider/src/shift_decider.cpp control/autoware_shift_decider/src/autoware_shift_decider.cpp

+6-2
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 "shift_decider/shift_decider.hpp"
15+
#include "autoware_shift_decider/autoware_shift_decider.hpp"
1616

1717
#include <rclcpp/timer.hpp>
1818

@@ -21,6 +21,9 @@
2121
#include <memory>
2222
#include <utility>
2323

24+
namespace autoware::shift_decider
25+
{
26+
2427
ShiftDecider::ShiftDecider(const rclcpp::NodeOptions & node_options)
2528
: Node("shift_decider", node_options)
2629
{
@@ -104,6 +107,7 @@ void ShiftDecider::initTimer(double period_s)
104107
timer_ =
105108
rclcpp::create_timer(this, get_clock(), period_ns, std::bind(&ShiftDecider::onTimer, this));
106109
}
110+
} // namespace autoware::shift_decider
107111

108112
#include <rclcpp_components/register_node_macro.hpp>
109-
RCLCPP_COMPONENTS_REGISTER_NODE(ShiftDecider)
113+
RCLCPP_COMPONENTS_REGISTER_NODE(autoware::shift_decider::ShiftDecider)

control/shift_decider/CMakeLists.txt

-20
This file was deleted.

launch/tier4_control_launch/launch/control.launch.py

+3-3
Original file line numberDiff line numberDiff line change
@@ -122,9 +122,9 @@ def launch_setup(context, *args, **kwargs):
122122

123123
# shift decider
124124
shift_decider_component = ComposableNode(
125-
package="shift_decider",
126-
plugin="ShiftDecider",
127-
name="shift_decider",
125+
package="autoware_shift_decider",
126+
plugin="autoware::shift_decider::ShiftDecider",
127+
name="autoware_shift_decider",
128128
remappings=[
129129
("input/control_cmd", "/control/trajectory_follower/control_cmd"),
130130
("input/state", "/autoware/state"),

launch/tier4_control_launch/package.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@
1414
<exec_depend>autoware_external_cmd_converter</exec_depend>
1515
<exec_depend>autoware_external_cmd_selector</exec_depend>
1616
<exec_depend>autoware_lane_departure_checker</exec_depend>
17+
<exec_depend>autoware_shift_decider</exec_depend>
1718
<exec_depend>autoware_vehicle_cmd_gate</exec_depend>
1819
<exec_depend>control_evaluator</exec_depend>
19-
<exec_depend>shift_decider</exec_depend>
2020
<exec_depend>trajectory_follower_node</exec_depend>
2121

2222
<test_depend>ament_lint_auto</test_depend>

0 commit comments

Comments
 (0)