Skip to content

Commit 88c50b4

Browse files
authored
feat(pose_initializer): componentize PoseInitializer (#7134)
* remove unusing main func file Signed-off-by: a-maumau <maumaumaumaumaumaumaumaumaumau@gmail.com> * mod to componentize and use glog Signed-off-by: a-maumau <maumaumaumaumaumaumaumaumaumau@gmail.com> * add log output both Signed-off-by: a-maumau <maumaumaumaumaumaumaumaumaumau@gmail.com> --------- Signed-off-by: a-maumau <maumaumaumaumaumaumaumaumaumau@gmail.com>
1 parent 0f1ae3e commit 88c50b4

File tree

6 files changed

+17
-35
lines changed

6 files changed

+17
-35
lines changed

localization/pose_initializer/CMakeLists.txt

+9-3
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,7 @@ project(pose_initializer)
44
find_package(autoware_cmake REQUIRED)
55
autoware_package()
66

7-
ament_auto_add_executable(pose_initializer_node
8-
src/pose_initializer/pose_initializer_node.cpp
7+
ament_auto_add_library(${PROJECT_NAME} SHARED
98
src/pose_initializer/pose_initializer_core.cpp
109
src/pose_initializer/gnss_module.cpp
1110
src/pose_initializer/ndt_module.cpp
@@ -15,6 +14,12 @@ ament_auto_add_executable(pose_initializer_node
1514
src/pose_initializer/ndt_localization_trigger_module.cpp
1615
)
1716

17+
rclcpp_components_register_node(${PROJECT_NAME}
18+
PLUGIN "PoseInitializer"
19+
EXECUTABLE ${PROJECT_NAME}_node
20+
EXECUTOR MultiThreadedExecutor
21+
)
22+
1823
if(BUILD_TESTING)
1924
function(add_testcase filepath)
2025
get_filename_component(filename ${filepath} NAME)
@@ -30,7 +35,8 @@ if(BUILD_TESTING)
3035
add_testcase(test/test_copy_vector_to_array.cpp)
3136
endif()
3237

33-
ament_auto_package(INSTALL_TO_SHARE
38+
ament_auto_package(
39+
INSTALL_TO_SHARE
3440
launch
3541
config
3642
)

localization/pose_initializer/launch/pose_initializer.launch.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<arg name="sub_gnss_pose_cov" default="sub_gnss_pose_cov"/>
1010
<arg name="gnss_initial_pose_auto_fix_target" default="pointcloud_map"/>
1111

12-
<node pkg="pose_initializer" exec="pose_initializer_node" name="pose_initializer_node">
12+
<node pkg="pose_initializer" exec="pose_initializer_node" output="both">
1313
<param from="$(var config_file)" allow_substs="true"/>
1414
<remap from="yabloc_align" to="/localization/pose_estimator/yabloc/initializer/yabloc_align_srv"/>
1515
<remap from="ndt_align" to="/localization/pose_estimator/ndt_align_srv"/>

localization/pose_initializer/package.xml

+1
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
<depend>map_height_fitter</depend>
2626
<depend>motion_utils</depend>
2727
<depend>rclcpp</depend>
28+
<depend>rclcpp_components</depend>
2829
<depend>std_srvs</depend>
2930
<depend>tier4_autoware_utils</depend>
3031
<depend>tier4_localization_msgs</depend>

localization/pose_initializer/src/pose_initializer/pose_initializer_core.cpp

+5-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,8 @@
2626
#include <sstream>
2727
#include <vector>
2828

29-
PoseInitializer::PoseInitializer() : Node("pose_initializer")
29+
PoseInitializer::PoseInitializer(const rclcpp::NodeOptions & options)
30+
: rclcpp::Node("pose_initializer", options)
3031
{
3132
const auto node = component_interface_utils::NodeAdaptor(this);
3233
group_srv_ = create_callback_group(rclcpp::CallbackGroupType::MutuallyExclusive);
@@ -209,3 +210,6 @@ geometry_msgs::msg::PoseWithCovarianceStamped PoseInitializer::get_gnss_pose()
209210
throw ServiceException(
210211
Initialize::Service::Response::ERROR_GNSS_SUPPORT, "GNSS is not supported.");
211212
}
213+
214+
#include <rclcpp_components/register_node_macro.hpp>
215+
RCLCPP_COMPONENTS_REGISTER_NODE(PoseInitializer)

localization/pose_initializer/src/pose_initializer/pose_initializer_core.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ class NdtLocalizationTriggerModule;
3434
class PoseInitializer : public rclcpp::Node
3535
{
3636
public:
37-
PoseInitializer();
37+
explicit PoseInitializer(const rclcpp::NodeOptions & options);
3838
~PoseInitializer();
3939

4040
private:

localization/pose_initializer/src/pose_initializer/pose_initializer_node.cpp

-29
This file was deleted.

0 commit comments

Comments
 (0)