Skip to content

Commit 9625702

Browse files
Remove manual angle-wraparound parameter (#1152)
1 parent 0b8a196 commit 9625702

File tree

3 files changed

+1
-18
lines changed

3 files changed

+1
-18
lines changed

doc/release_notes/Jazzy.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ joint_trajectory_controller
3232
* Empty trajectory messages are discarded (`#902 <https://github.com/ros-controls/ros2_controllers/pull/902>`_).
3333
* Action field ``error_string`` is now filled with meaningful strings (`#887 <https://github.com/ros-controls/ros2_controllers/pull/887>`_).
3434
* Angle wraparound behavior (continuous joints) was added from the current state to the first segment of the incoming trajectory (`#796 <https://github.com/ros-controls/ros2_controllers/pull/796>`_).
35-
* The URDF is now parsed for continuous joints and angle wraparound is automatically activated now (`#949 <https://github.com/ros-controls/ros2_controllers/pull/949>`_).
35+
* The URDF is now parsed for continuous joints and angle wraparound is automatically activated now (`#949 <https://github.com/ros-controls/ros2_controllers/pull/949>`_). ``angle_wraparound`` parameter was completely removed.
3636

3737
pid_controller
3838
************************

joint_trajectory_controller/src/joint_trajectory_controller.cpp

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -703,17 +703,6 @@ controller_interface::CallbackReturn JointTrajectoryController::on_configure(
703703
joints_angle_wraparound_.resize(dof_);
704704
for (size_t i = 0; i < dof_; ++i)
705705
{
706-
const auto & gains = params_.gains.joints_map.at(params_.joints[i]);
707-
if (gains.angle_wraparound)
708-
{
709-
// TODO(christophfroehlich): remove this warning in a future release (ROS-J)
710-
RCLCPP_WARN(
711-
logger,
712-
"[Deprecated] Parameter 'gains.<joint>.angle_wraparound' is deprecated. The "
713-
"angle_wraparound is now used if a continuous joint is configured in the URDF.");
714-
joints_angle_wraparound_[i] = true;
715-
}
716-
717706
if (!urdf_.empty())
718707
{
719708
auto urdf_joint = model_.getJoint(params_.joints[i]);

joint_trajectory_controller/src/joint_trajectory_controller_parameters.yaml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -122,12 +122,6 @@ joint_trajectory_controller:
122122
default_value: 0.0,
123123
description: "Feed-forward scaling :math:`k_{ff}` of velocity"
124124
}
125-
angle_wraparound: {
126-
type: bool,
127-
default_value: false,
128-
description: "[deprecated] For joints that wrap around (ie. are continuous).
129-
Normalizes position-error to -pi to pi."
130-
}
131125
constraints:
132126
stopped_velocity_tolerance: {
133127
type: double,

0 commit comments

Comments
 (0)