Skip to content

Commit 1ce56ea

Browse files
Fix deprecated hardware_interface API (#386)
1 parent 1c6d70c commit 1ce56ea

6 files changed

Lines changed: 9 additions & 9 deletions

File tree

canopen_ros2_control/include/canopen_ros2_control/canopen_system.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -424,7 +424,7 @@ class CanopenSystem : public hardware_interface::SystemInterface
424424
~CanopenSystem();
425425
CANOPEN_ROS2_CONTROL__VISIBILITY_PUBLIC
426426
hardware_interface::CallbackReturn on_init(
427-
const hardware_interface::HardwareInfo & info) override;
427+
const hardware_interface::HardwareComponentInterfaceParams & params) override;
428428

429429
CANOPEN_ROS2_CONTROL__VISIBILITY_PUBLIC
430430
std::vector<hardware_interface::StateInterface> export_state_interfaces() override;

canopen_ros2_control/include/canopen_ros2_control/cia402_system.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ class Cia402System : public CanopenSystem
8888
CANOPEN_ROS2_CONTROL__VISIBILITY_PUBLIC
8989
~Cia402System() = default;
9090
CANOPEN_ROS2_CONTROL__VISIBILITY_PUBLIC
91-
hardware_interface::CallbackReturn on_init(const hardware_interface::HardwareInfo & info);
91+
hardware_interface::CallbackReturn on_init(const hardware_interface::HardwareComponentInterfaceParams & params);
9292

9393
CANOPEN_ROS2_CONTROL__VISIBILITY_PUBLIC
9494
hardware_interface::CallbackReturn on_configure(const rclcpp_lifecycle::State & previous_state);

canopen_ros2_control/include/canopen_ros2_control/robot_system.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ class RobotSystem : public hardware_interface::SystemInterface
5353
*/
5454
CANOPEN_ROS2_CONTROL__VISIBILITY_PUBLIC
5555
hardware_interface::CallbackReturn on_init(
56-
const hardware_interface::HardwareInfo & info) override;
56+
const hardware_interface::HardwareComponentInterfaceParams & params) override;
5757

5858
/**
5959
* @brief Configure the hardware interface

canopen_ros2_control/src/canopen_system.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,9 +58,9 @@ void CanopenSystem::clean()
5858
CanopenSystem::~CanopenSystem() { clean(); }
5959

6060
hardware_interface::CallbackReturn CanopenSystem::on_init(
61-
const hardware_interface::HardwareInfo & info)
61+
const hardware_interface::HardwareComponentInterfaceParams & params)
6262
{
63-
if (hardware_interface::SystemInterface::on_init(info) != CallbackReturn::SUCCESS)
63+
if (hardware_interface::SystemInterface::on_init(params) != CallbackReturn::SUCCESS)
6464
{
6565
return CallbackReturn::ERROR;
6666
}

canopen_ros2_control/src/cia402_system.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,9 @@ namespace canopen_ros2_control
3636
Cia402System::Cia402System() : CanopenSystem() {}
3737

3838
hardware_interface::CallbackReturn Cia402System::on_init(
39-
const hardware_interface::HardwareInfo & info)
39+
const hardware_interface::HardwareComponentInterfaceParams & params)
4040
{
41-
auto ret_val = CanopenSystem::on_init(info);
41+
auto ret_val = CanopenSystem::on_init(params);
4242
if (ret_val != hardware_interface::CallbackReturn::SUCCESS)
4343
{
4444
return ret_val;

canopen_ros2_control/src/robot_system.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,9 @@ using namespace canopen_ros2_control;
2222
// auto robot_system_logger = rclcpp::get_logger("robot_system_interface");
2323

2424
hardware_interface::CallbackReturn RobotSystem::on_init(
25-
const hardware_interface::HardwareInfo & info)
25+
const hardware_interface::HardwareComponentInterfaceParams & params)
2626
{
27-
if (hardware_interface::SystemInterface::on_init(info) != CallbackReturn::SUCCESS)
27+
if (hardware_interface::SystemInterface::on_init(params) != CallbackReturn::SUCCESS)
2828
{
2929
return CallbackReturn::ERROR;
3030
}

0 commit comments

Comments
 (0)