Skip to content

Commit e633ec1

Browse files
committed
Fix alloc error and some bugs
Signed-off-by: methylDragon <methylDragon@gmail.com>
1 parent 355e3e1 commit e633ec1

File tree

4 files changed

+9
-9
lines changed

4 files changed

+9
-9
lines changed

fuse_models/include/fuse_models/parameters/odometry_2d_publisher_params.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -100,8 +100,8 @@ struct Odometry2DPublisherParams : public ParameterBase
100100
map_frame_id = fuse_core::getParam(interfaces, ns + "map_frame_id", map_frame_id);
101101
odom_frame_id = fuse_core::getParam(interfaces, ns + "odom_frame_id", odom_frame_id);
102102
base_link_frame_id = fuse_core::getParam(interfaces, ns + "base_link_frame_id", base_link_frame_id);
103-
base_link_frame_id = fuse_core::getParam(interfaces, ns + "base_link_output_frame_id", base_link_frame_id);
104-
odom_frame_id = fuse_core::getParam(interfaces, ns + "world_frame_id", odom_frame_id);
103+
base_link_output_frame_id = fuse_core::getParam(interfaces, ns + "base_link_output_frame_id", base_link_output_frame_id);
104+
world_frame_id = fuse_core::getParam(interfaces, ns + "world_frame_id", world_frame_id);
105105

106106
const bool frames_valid =
107107
map_frame_id != odom_frame_id &&

fuse_models/include/fuse_models/parameters/parameter_base.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -88,8 +88,8 @@ inline std::vector<size_t> loadSensorConfig(
8888
fuse_core::node_interfaces::NodeInterfaces<fuse_core::node_interfaces::Parameters> interfaces,
8989
const std::string& name)
9090
{
91-
std::vector<std::string> dimensions =
92-
fuse_core::getParam(interfaces, name, dimensions);
91+
std::vector<std::string> dimensions;
92+
dimensions = fuse_core::getParam(interfaces, name, dimensions);
9393
if (!dimensions.empty())
9494
{
9595
return common::getDimensionIndices<T>(dimensions);

fuse_models/src/graph_ignition.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ void GraphIgnition::onInit()
7878
interfaces_.get_node_base_interface(),
7979
interfaces_.get_node_graph_interface(),
8080
interfaces_.get_node_services_interface(),
81-
interfaces_.get_node_services_interface()->resolve_service_name(params_.reset_service),
81+
fuse_core::joinTopicName(interfaces_.get_node_base_interface()->get_name(), params_.reset_service),
8282
rclcpp::ServicesQoS(),
8383
cb_group_
8484
);
@@ -98,7 +98,7 @@ void GraphIgnition::onInit()
9898
set_graph_service_ = rclcpp::create_service<fuse_msgs::srv::SetGraph>(
9999
interfaces_.get_node_base_interface(),
100100
interfaces_.get_node_services_interface(),
101-
interfaces_.get_node_services_interface()->resolve_service_name(params_.set_graph_service),
101+
fuse_core::joinTopicName(interfaces_.get_node_base_interface()->get_name(), params_.set_graph_service),
102102
std::bind(
103103
&GraphIgnition::setGraphServiceCallback, this, std::placeholders::_1, std::placeholders::_2),
104104
rclcpp::ServicesQoS(),

fuse_models/src/unicycle_2d_ignition.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ void Unicycle2DIgnition::onInit()
103103
interfaces_.get_node_base_interface(),
104104
interfaces_.get_node_graph_interface(),
105105
interfaces_.get_node_services_interface(),
106-
interfaces_.get_node_services_interface()->resolve_service_name(params_.reset_service),
106+
fuse_core::joinTopicName(interfaces_.get_node_base_interface()->get_name(), params_.reset_service),
107107
rclcpp::ServicesQoS(),
108108
cb_group_
109109
);
@@ -123,7 +123,7 @@ void Unicycle2DIgnition::onInit()
123123
set_pose_service_ = rclcpp::create_service<fuse_msgs::srv::SetPose>(
124124
interfaces_.get_node_base_interface(),
125125
interfaces_.get_node_services_interface(),
126-
interfaces_.get_node_services_interface()->resolve_service_name(params_.set_pose_service),
126+
fuse_core::joinTopicName(interfaces_.get_node_base_interface()->get_name(), params_.set_pose_service),
127127
std::bind(
128128
&Unicycle2DIgnition::setPoseServiceCallback, this, std::placeholders::_1, std::placeholders::_2),
129129
rclcpp::ServicesQoS(),
@@ -132,7 +132,7 @@ void Unicycle2DIgnition::onInit()
132132
set_pose_deprecated_service_ = rclcpp::create_service<fuse_msgs::srv::SetPoseDeprecated>(
133133
interfaces_.get_node_base_interface(),
134134
interfaces_.get_node_services_interface(),
135-
interfaces_.get_node_services_interface()->resolve_service_name(params_.set_pose_deprecated_service),
135+
fuse_core::joinTopicName(interfaces_.get_node_base_interface()->get_name(), params_.set_pose_deprecated_service),
136136
std::bind(
137137
&Unicycle2DIgnition::setPoseDeprecatedServiceCallback, this, std::placeholders::_1, std::placeholders::_2),
138138
rclcpp::ServicesQoS(),

0 commit comments

Comments
 (0)