File tree Expand file tree Collapse file tree 7 files changed +9
-26
lines changed
admittance_controller/include/admittance_controller
diff_drive_controller/src
force_torque_sensor_broadcaster/src
joint_trajectory_controller/src Expand file tree Collapse file tree 7 files changed +9
-26
lines changed Original file line number Diff line number Diff line change @@ -120,10 +120,8 @@ controller_interface::return_type AdmittanceRule::reset(const size_t num_joints)
120
120
121
121
void AdmittanceRule::apply_parameters_update ()
122
122
{
123
- if (parameter_handler_->is_old (parameters_))
124
- {
125
- parameters_ = parameter_handler_->get_params ();
126
- }
123
+ parameter_handler_->try_get_params (parameters_);
124
+
127
125
// update param values
128
126
end_effector_weight_[2 ] = -parameters_.gravity_compensation .CoG .force ;
129
127
vec_to_eigen (parameters_.gravity_compensation .CoG .pos , cog_pos_);
Original file line number Diff line number Diff line change @@ -311,9 +311,8 @@ controller_interface::CallbackReturn DiffDriveController::on_configure(
311
311
auto logger = get_node ()->get_logger ();
312
312
313
313
// update parameters if they have changed
314
- if (param_listener_->is_old (params_))
314
+ if (param_listener_->try_update_params (params_))
315
315
{
316
- params_ = param_listener_->get_params ();
317
316
RCLCPP_INFO (logger, " Parameters were updated" );
318
317
}
319
318
Original file line number Diff line number Diff line change @@ -144,10 +144,8 @@ controller_interface::CallbackReturn ForceTorqueSensorBroadcaster::on_deactivate
144
144
controller_interface::return_type ForceTorqueSensorBroadcaster::update_and_write_commands (
145
145
const rclcpp::Time & time, const rclcpp::Duration & /* period*/ )
146
146
{
147
- if (param_listener_->is_old (params_))
148
- {
149
- params_ = param_listener_->get_params ();
150
- }
147
+ param_listener_->try_get_params (params_);
148
+
151
149
if (realtime_publisher_ && realtime_publisher_->trylock ())
152
150
{
153
151
realtime_publisher_->msg_ .header .stamp = time;
Original file line number Diff line number Diff line change @@ -159,9 +159,8 @@ controller_interface::return_type JointTrajectoryController::update(
159
159
160
160
auto logger = this ->get_node ()->get_logger ();
161
161
// update dynamic parameters
162
- if (param_listener_->is_old (params_))
162
+ if (param_listener_->try_update_params (params_))
163
163
{
164
- params_ = param_listener_->get_params ();
165
164
default_tolerances_ = get_segment_tolerances (logger, params_);
166
165
// update the PID gains
167
166
// variable use_closed_loop_pid_adapter_ is updated in on_configure only
Original file line number Diff line number Diff line change @@ -101,7 +101,6 @@ class PidController : public controller_interface::ChainableControllerInterface
101
101
bool on_set_chained_mode (bool chained_mode) override ;
102
102
103
103
// internal methods
104
- void update_parameters ();
105
104
controller_interface::CallbackReturn configure_parameters ();
106
105
107
106
private:
Original file line number Diff line number Diff line change @@ -87,18 +87,9 @@ controller_interface::CallbackReturn PidController::on_init()
87
87
return controller_interface::CallbackReturn::SUCCESS;
88
88
}
89
89
90
- void PidController::update_parameters ()
91
- {
92
- if (!param_listener_->is_old (params_))
93
- {
94
- return ;
95
- }
96
- params_ = param_listener_->get_params ();
97
- }
98
-
99
90
controller_interface::CallbackReturn PidController::configure_parameters ()
100
91
{
101
- update_parameters ();
92
+ params_ = param_listener_-> get_params ();
102
93
103
94
if (!params_.reference_and_state_dof_names .empty ())
104
95
{
@@ -466,7 +457,7 @@ controller_interface::return_type PidController::update_and_write_commands(
466
457
const rclcpp::Time & time, const rclcpp::Duration & period)
467
458
{
468
459
// check for any parameter updates
469
- update_parameters ( );
460
+ param_listener_-> try_get_params (params_ );
470
461
471
462
// Update feedback either from external measured state or from state interfaces
472
463
if (params_.use_external_measured_states )
Original file line number Diff line number Diff line change @@ -221,9 +221,8 @@ CallbackReturn TricycleController::on_configure(const rclcpp_lifecycle::State &
221
221
auto logger = get_node ()->get_logger ();
222
222
223
223
// update parameters if they have changed
224
- if (param_listener_->is_old (params_))
224
+ if (param_listener_->try_update_params (params_))
225
225
{
226
- params_ = param_listener_->get_params ();
227
226
RCLCPP_INFO (logger, " Parameters were updated" );
228
227
}
229
228
You can’t perform that action at this time.
0 commit comments