@@ -1548,8 +1548,8 @@ controller_interface::return_type ControllerManager::switch_controller_cb(
1548
1548
}
1549
1549
else
1550
1550
{
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);
1553
1553
}
1554
1554
1555
1555
if (status != controller_interface::return_type::OK)
@@ -3209,7 +3209,7 @@ controller_interface::return_type ControllerManager::check_following_controllers
3209
3209
return controller_interface::return_type::OK;
3210
3210
};
3211
3211
3212
- controller_interface::return_type ControllerManager::check_preceeding_controllers_for_deactivate (
3212
+ controller_interface::return_type ControllerManager::check_preceding_controllers_for_deactivate (
3213
3213
const std::vector<ControllerSpec> & controllers, int /* strictness*/ ,
3214
3214
const ControllersListIterator controller_it, std::string & message)
3215
3215
{
@@ -3223,40 +3223,40 @@ controller_interface::return_type ControllerManager::check_preceeding_controller
3223
3223
get_logger (), " Checking preceding controller of following controller with name '%s'." ,
3224
3224
controller_it->info .name .c_str ());
3225
3225
3226
- auto preceeding_controllers_list =
3226
+ auto preceding_controllers_list =
3227
3227
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 (),
3230
3230
controller_chained_reference_interfaces_cache_[controller_it->info .name ].cbegin (),
3231
3231
controller_chained_reference_interfaces_cache_[controller_it->info .name ].cend ());
3232
3232
3233
- for (const auto & preceeding_controller : preceeding_controllers_list )
3233
+ for (const auto & preceding_controller : preceding_controllers_list )
3234
3234
{
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 ());
3236
3236
auto found_it = std::find_if (
3237
3237
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 ));
3239
3239
3240
3240
if (found_it != controllers.end ())
3241
3241
{
3242
3242
if (
3243
3243
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 ) !=
3245
3245
activate_request_.end ())
3246
3246
{
3247
3247
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 +
3249
3249
" ' is inactive and will be activated." ;
3250
3250
RCLCPP_WARN (get_logger (), " %s" , message.c_str ());
3251
3251
return controller_interface::return_type::ERROR;
3252
3252
}
3253
3253
if (
3254
3254
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 ) ==
3256
3256
deactivate_request_.end ())
3257
3257
{
3258
3258
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 +
3260
3260
" ' is currently active and will not be deactivated." ;
3261
3261
RCLCPP_WARN (get_logger (), " %s" , message.c_str ());
3262
3262
return controller_interface::return_type::ERROR;
0 commit comments