Skip to content

Commit 2ed7de2

Browse files
Update API to snake_case
1 parent 0ab8da8 commit 2ed7de2

File tree

2 files changed

+7
-8
lines changed

2 files changed

+7
-8
lines changed

joint_trajectory_controller_plugins/include/joint_trajectory_controller_plugins/pid_trajectory_plugin.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ class PidTrajectoryPlugin : public TrajectoryControllerBase
7373
/**
7474
* @brief parse PID gains from parameter struct
7575
*/
76-
void parseGains();
76+
void parse_gains();
7777

7878
// number of command joints
7979
size_t num_cmd_joints_;

joint_trajectory_controller_plugins/src/pid_trajectory_plugin.cpp

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ bool PidTrajectoryPlugin::configure()
7777
bool PidTrajectoryPlugin::activate()
7878
{
7979
params_ = param_listener_->get_params();
80-
parseGains();
80+
parse_gains();
8181
return true;
8282
}
8383

@@ -86,13 +86,13 @@ bool PidTrajectoryPlugin::update_gains_rt()
8686
if (param_listener_->is_old(params_))
8787
{
8888
params_ = param_listener_->get_params();
89-
parseGains();
89+
parse_gains();
9090
}
9191

9292
return true;
9393
}
9494

95-
void PidTrajectoryPlugin::parseGains()
95+
void PidTrajectoryPlugin::parse_gains()
9696
{
9797
for (size_t i = 0; i < num_cmd_joints_; ++i)
9898
{
@@ -101,7 +101,7 @@ void PidTrajectoryPlugin::parseGains()
101101
params_.command_joints[i].c_str());
102102

103103
const auto & gains = params_.gains.command_joints_map.at(params_.command_joints[i]);
104-
pids_[i]->setGains(gains.p, gains.i, gains.d, gains.i_clamp, -gains.i_clamp, true);
104+
pids_[i]->set_gains(gains.p, gains.i, gains.d, gains.i_clamp, -gains.i_clamp, true);
105105
ff_velocity_scale_[i] = gains.ff_velocity_scale;
106106

107107
RCLCPP_DEBUG(node_->get_logger(), "[PidTrajectoryPlugin] gains.p: %f", gains.p);
@@ -126,9 +126,8 @@ void PidTrajectoryPlugin::compute_commands(
126126
{
127127
tmp_command[map_cmd_to_joints_[i]] =
128128
(desired.velocities[map_cmd_to_joints_[i]] * ff_velocity_scale_[i]) +
129-
pids_[i]->computeCommand(
130-
error.positions[map_cmd_to_joints_[i]], error.velocities[map_cmd_to_joints_[i]],
131-
(uint64_t)period.nanoseconds());
129+
pids_[i]->compute_command(
130+
error.positions[map_cmd_to_joints_[i]], error.velocities[map_cmd_to_joints_[i]], period);
132131
}
133132
}
134133

0 commit comments

Comments
 (0)