Skip to content

Commit 05ca67c

Browse files
Cleanup comments and unnecessary checks
1 parent ce28eb3 commit 05ca67c

File tree

2 files changed

+3
-21
lines changed

2 files changed

+3
-21
lines changed

joint_trajectory_controller/include/joint_trajectory_controller/joint_trajectory_controller.hpp

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -71,15 +71,13 @@ class JointTrajectoryController : public controller_interface::ControllerInterfa
7171
JointTrajectoryController();
7272

7373
/**
74-
* @brief command_interface_configuration This controller requires the position command
75-
* interfaces for the controlled joints
74+
* @brief command_interface_configuration
7675
*/
7776
JOINT_TRAJECTORY_CONTROLLER_PUBLIC
7877
controller_interface::InterfaceConfiguration command_interface_configuration() const override;
7978

8079
/**
81-
* @brief command_interface_configuration This controller requires the position and velocity
82-
* state interfaces for the controlled joints
80+
* @brief command_interface_configuration
8381
*/
8482
JOINT_TRAJECTORY_CONTROLLER_PUBLIC
8583
controller_interface::InterfaceConfiguration state_interface_configuration() const override;

joint_trajectory_controller/src/joint_trajectory_controller.cpp

Lines changed: 1 addition & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -652,17 +652,7 @@ controller_interface::CallbackReturn JointTrajectoryController::on_configure(
652652
// get parameters from the listener in case they were updated
653653
params_ = param_listener_->get_params();
654654

655-
// Check if the DoF has changed
656-
if ((dof_ > 0) && (params_.joints.size() != dof_))
657-
{
658-
RCLCPP_ERROR(
659-
logger,
660-
"The JointTrajectoryController does not support restarting with a different number of DOF");
661-
// TODO(andyz): update vector lengths if num. joints did change and re-initialize them so we
662-
// can continue
663-
return CallbackReturn::FAILURE;
664-
}
665-
655+
// get degrees of freedom
666656
dof_ = params_.joints.size();
667657

668658
// TODO(destogl): why is this here? Add comment or move
@@ -692,12 +682,6 @@ controller_interface::CallbackReturn JointTrajectoryController::on_configure(
692682
return CallbackReturn::FAILURE;
693683
}
694684

695-
// // Specialized, child controllers set interfaces before calling configure function.
696-
// if (command_interface_types_.empty())
697-
// {
698-
// command_interface_types_ = get_node()->get_parameter("command_interfaces").as_string_array();
699-
// }
700-
701685
if (params_.command_interfaces.empty())
702686
{
703687
RCLCPP_ERROR(logger, "'command_interfaces' parameter is empty.");

0 commit comments

Comments
 (0)