Skip to content

Commit 1d0d753

Browse files
destoglbmagyar
andauthored
Cleanup package.xml und clarify tests of JTC. (#889)
* Cleanup package.xml und clarify tests of JTC. * Update joint_trajectory_controller/package.xml Co-authored-by: Bence Magyar <bence.magyar.robotics@gmail.com> --------- Co-authored-by: Bence Magyar <bence.magyar.robotics@gmail.com>
1 parent e8e091d commit 1d0d753

File tree

2 files changed

+9
-14
lines changed

2 files changed

+9
-14
lines changed

joint_trajectory_controller/package.xml

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4,29 +4,24 @@
44
<version>4.1.0</version>
55
<description>Controller for executing joint-space trajectories on a group of joints</description>
66
<maintainer email="bence.magyar.robotics@gmail.com">Bence Magyar</maintainer>
7-
<maintainer email="jordan.palacios@pal-robotics.com">Jordan Palacios</maintainer>
8-
<maintainer email="karsten@openrobotics.org">Karsten Knese</maintainer>
7+
<maintainer email="denis.stogl@stoglrobotics.de">Dr. Denis Štogl</maintainer>
8+
<maintainer email="christoph.froehlich@ait.ac.at">Christoph Froehlich</maintainer>
99

1010
<license>Apache License 2.0</license>
1111

1212
<buildtool_depend>ament_cmake</buildtool_depend>
1313

14-
<build_depend>angles</build_depend>
15-
<build_depend>pluginlib</build_depend>
16-
<build_depend>realtime_tools</build_depend>
17-
18-
<exec_depend>angles</exec_depend>
19-
<exec_depend>pluginlib</exec_depend>
20-
<exec_depend>realtime_tools</exec_depend>
21-
14+
<depend>angles</depend>
2215
<depend>backward_ros</depend>
2316
<depend>controller_interface</depend>
2417
<depend>control_msgs</depend>
2518
<depend>control_toolbox</depend>
2619
<depend>generate_parameter_library</depend>
2720
<depend>hardware_interface</depend>
21+
<depend>pluginlib</depend>
2822
<depend>rclcpp</depend>
2923
<depend>rclcpp_lifecycle</depend>
24+
<depend>realtime_tools</depend>
3025
<depend>rsl</depend>
3126
<depend>tl_expected</depend>
3227
<depend>trajectory_msgs</depend>

joint_trajectory_controller/test/test_trajectory_controller_utils.hpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -215,21 +215,21 @@ class TrajectoryControllerTest : public ::testing::Test
215215
}
216216

217217
void SetPidParameters(
218-
double p_default = 0.0, double ff_default = 1.0, bool angle_wraparound_default = false)
218+
double p_value = 0.0, double ff_value = 1.0, bool angle_wraparound_value = false)
219219
{
220220
traj_controller_->trigger_declare_parameters();
221221
auto node = traj_controller_->get_node();
222222

223223
for (size_t i = 0; i < joint_names_.size(); ++i)
224224
{
225225
const std::string prefix = "gains." + joint_names_[i];
226-
const rclcpp::Parameter k_p(prefix + ".p", p_default);
226+
const rclcpp::Parameter k_p(prefix + ".p", p_value);
227227
const rclcpp::Parameter k_i(prefix + ".i", 0.0);
228228
const rclcpp::Parameter k_d(prefix + ".d", 0.0);
229229
const rclcpp::Parameter i_clamp(prefix + ".i_clamp", 0.0);
230-
const rclcpp::Parameter ff_velocity_scale(prefix + ".ff_velocity_scale", ff_default);
230+
const rclcpp::Parameter ff_velocity_scale(prefix + ".ff_velocity_scale", ff_value);
231231
const rclcpp::Parameter angle_wraparound(
232-
prefix + ".angle_wraparound", angle_wraparound_default);
232+
prefix + ".angle_wraparound", angle_wraparound_value);
233233
node->set_parameters({k_p, k_i, k_d, i_clamp, ff_velocity_scale, angle_wraparound});
234234
}
235235
}

0 commit comments

Comments
 (0)