Skip to content

Commit af0d776

Browse files
Fix typos: preceeding -> preceding (#2206)
1 parent cf19faf commit af0d776

File tree

2 files changed

+14
-14
lines changed

2 files changed

+14
-14
lines changed

controller_manager/include/controller_manager/controller_manager.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -433,7 +433,7 @@ class ControllerManager : public rclcpp::Node
433433
* \returns return_type::OK if all preceding controllers pass the checks, otherwise
434434
* return_type::ERROR.
435435
*/
436-
controller_interface::return_type check_preceeding_controllers_for_deactivate(
436+
controller_interface::return_type check_preceding_controllers_for_deactivate(
437437
const std::vector<ControllerSpec> & controllers, int strictness,
438438
const ControllersListIterator controller_it, std::string & message);
439439

controller_manager/src/controller_manager.cpp

+13-13
Original file line numberDiff line numberDiff line change
@@ -1548,8 +1548,8 @@ controller_interface::return_type ControllerManager::switch_controller_cb(
15481548
}
15491549
else
15501550
{
1551-
status = check_preceeding_controllers_for_deactivate(
1552-
controllers, strictness, controller_it, message);
1551+
status =
1552+
check_preceding_controllers_for_deactivate(controllers, strictness, controller_it, message);
15531553
}
15541554

15551555
if (status != controller_interface::return_type::OK)
@@ -3209,7 +3209,7 @@ controller_interface::return_type ControllerManager::check_following_controllers
32093209
return controller_interface::return_type::OK;
32103210
};
32113211

3212-
controller_interface::return_type ControllerManager::check_preceeding_controllers_for_deactivate(
3212+
controller_interface::return_type ControllerManager::check_preceding_controllers_for_deactivate(
32133213
const std::vector<ControllerSpec> & controllers, int /*strictness*/,
32143214
const ControllersListIterator controller_it, std::string & message)
32153215
{
@@ -3223,40 +3223,40 @@ controller_interface::return_type ControllerManager::check_preceeding_controller
32233223
get_logger(), "Checking preceding controller of following controller with name '%s'.",
32243224
controller_it->info.name.c_str());
32253225

3226-
auto preceeding_controllers_list =
3226+
auto preceding_controllers_list =
32273227
controller_chained_state_interfaces_cache_[controller_it->info.name];
3228-
preceeding_controllers_list.insert(
3229-
preceeding_controllers_list.end(),
3228+
preceding_controllers_list.insert(
3229+
preceding_controllers_list.end(),
32303230
controller_chained_reference_interfaces_cache_[controller_it->info.name].cbegin(),
32313231
controller_chained_reference_interfaces_cache_[controller_it->info.name].cend());
32323232

3233-
for (const auto & preceeding_controller : preceeding_controllers_list)
3233+
for (const auto & preceding_controller : preceding_controllers_list)
32343234
{
3235-
RCLCPP_DEBUG(get_logger(), "\t Preceding controller : '%s'.", preceeding_controller.c_str());
3235+
RCLCPP_DEBUG(get_logger(), "\t Preceding controller : '%s'.", preceding_controller.c_str());
32363236
auto found_it = std::find_if(
32373237
controllers.begin(), controllers.end(),
3238-
std::bind(controller_name_compare, std::placeholders::_1, preceeding_controller));
3238+
std::bind(controller_name_compare, std::placeholders::_1, preceding_controller));
32393239

32403240
if (found_it != controllers.end())
32413241
{
32423242
if (
32433243
is_controller_inactive(found_it->c) &&
3244-
std::find(activate_request_.begin(), activate_request_.end(), preceeding_controller) !=
3244+
std::find(activate_request_.begin(), activate_request_.end(), preceding_controller) !=
32453245
activate_request_.end())
32463246
{
32473247
message = "Unable to deactivate controller with name '" + controller_it->info.name +
3248-
"' because preceding controller with name '" + preceeding_controller +
3248+
"' because preceding controller with name '" + preceding_controller +
32493249
"' is inactive and will be activated.";
32503250
RCLCPP_WARN(get_logger(), "%s", message.c_str());
32513251
return controller_interface::return_type::ERROR;
32523252
}
32533253
if (
32543254
is_controller_active(found_it->c) &&
3255-
std::find(deactivate_request_.begin(), deactivate_request_.end(), preceeding_controller) ==
3255+
std::find(deactivate_request_.begin(), deactivate_request_.end(), preceding_controller) ==
32563256
deactivate_request_.end())
32573257
{
32583258
message = "Unable to deactivate controller with name '" + controller_it->info.name +
3259-
"' because preceding controller with name '" + preceeding_controller +
3259+
"' because preceding controller with name '" + preceding_controller +
32603260
"' is currently active and will not be deactivated.";
32613261
RCLCPP_WARN(get_logger(), "%s", message.c_str());
32623262
return controller_interface::return_type::ERROR;

0 commit comments

Comments
 (0)