Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit bf10d17

Browse files
authoredJan 8, 2024
Merge branch 'main' into mrm-comfortable-stop-operator
2 parents d63bd83 + f4ea429 commit bf10d17

File tree

41 files changed

+2346
-2011
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+2346
-2011
lines changed
 

‎common/component_interface_utils/include/component_interface_utils/rclcpp/interface.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ struct NodeInterface
5252
{ServiceLog::CLIENT_RESPONSE, "client exit"},
5353
{ServiceLog::ERROR_UNREADY, "client unready"},
5454
{ServiceLog::ERROR_TIMEOUT, "client timeout"}});
55-
RCLCPP_INFO_STREAM(node->get_logger(), type_text.at(type) << ": " << name);
55+
RCLCPP_DEBUG_STREAM(node->get_logger(), type_text.at(type) << ": " << name);
5656

5757
ServiceLog msg;
5858
msg.stamp = node->now();

‎common/motion_utils/include/motion_utils/trajectory/conversion.hpp

+3-1
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717

1818
#include "autoware_auto_planning_msgs/msg/detail/trajectory__struct.hpp"
1919
#include "autoware_auto_planning_msgs/msg/detail/trajectory_point__struct.hpp"
20+
#include "std_msgs/msg/header.hpp"
2021

2122
#include <vector>
2223

@@ -34,7 +35,8 @@ namespace motion_utils
3435
* points larger than the capacity. (Tier IV)
3536
*/
3637
autoware_auto_planning_msgs::msg::Trajectory convertToTrajectory(
37-
const std::vector<autoware_auto_planning_msgs::msg::TrajectoryPoint> & trajectory);
38+
const std::vector<autoware_auto_planning_msgs::msg::TrajectoryPoint> & trajectory,
39+
const std_msgs::msg::Header & header = std_msgs::msg::Header{});
3840

3941
/**
4042
* @brief Convert autoware_auto_planning_msgs::msg::Trajectory to

0 commit comments

Comments
 (0)
Please sign in to comment.