@@ -225,12 +225,21 @@ controller_interface::CallbackReturn BatteryStateBroadcaster::on_activate(
225
225
return controller_interface::CallbackReturn::FAILURE;
226
226
}
227
227
228
- param_listener_->refresh_dynamic_parameters ();
229
-
230
228
// get parameters from the listener in case they were updated
229
+ param_listener_->refresh_dynamic_parameters ();
231
230
params_ = param_listener_->get_params ();
232
- auto combined_power_supply_technology = static_cast <uint8_t >(
233
- params_.state_joints_map .at (params_.state_joints .at (0 )).power_supply_technology );
231
+
232
+ uint8_t combined_power_supply_technology;
233
+ if (!params_.sensor_name .empty ())
234
+ {
235
+ sums_.design_capacity_sum = static_cast <float >(params_.design_capacity );
236
+ combined_power_supply_technology = static_cast <uint8_t >(params_.power_supply_technology );
237
+ }
238
+ else
239
+ {
240
+ combined_power_supply_technology = static_cast <uint8_t >(
241
+ params_.state_joints_map .at (params_.state_joints .at (0 )).power_supply_technology );
242
+ }
234
243
std::string combined_location = " " ;
235
244
std::string combined_serial_number = " " ;
236
245
@@ -268,12 +277,6 @@ controller_interface::CallbackReturn BatteryStateBroadcaster::on_activate(
268
277
combined_serial_number += battery_state.serial_number + " , " ;
269
278
}
270
279
271
- if (!params_.sensor_name .empty ())
272
- {
273
- sums_.design_capacity_sum = static_cast <float >(params_.design_capacity );
274
- combined_power_supply_technology = static_cast <uint8_t >(params_.power_supply_technology );
275
- }
276
-
277
280
// handle aggregate battery state initialization
278
281
auto & battery_state_msg = battery_state_realtime_publisher_->msg_ ;
279
282
0 commit comments