Skip to content

Commit 778ed13

Browse files
committed
Update to use class.
1 parent d77b4b6 commit 778ed13

File tree

5 files changed

+10
-10
lines changed

5 files changed

+10
-10
lines changed

forward_command_controller/forward_command_plugin.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,14 +48,14 @@
4848

4949
<class name="forward_command_controller/ChainableForwardCommandController"
5050
type="forward_command_controller::ChainableForwardCommandController"
51-
base_class_type="controller_interface::ControllerInterface">
51+
base_class_type="controller_interface::ChainableControllerInterface">
5252
<description>
5353
The forward command controller commands a group of joints in a given interface
5454
</description>
5555
</class>
5656
<class name="forward_command_controller/ChainableMultiInterfaceForwardCommandController"
5757
type="forward_command_controller::ChainableMultiInterfaceForwardCommandController"
58-
base_class_type="controller_interface::ControllerInterface">
58+
base_class_type="controller_interface::ChainableControllerInterface">
5959
<description>
6060
MultiInterfaceForwardController ros2_control controller.
6161
</description>

forward_command_controller/include/forward_command_controller/forward_command_controller.hpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ template <
4343
std::is_convertible<T *, forward_command_controller::ForwardControllersBase *>::value,
4444
T>::type * = nullptr,
4545
typename std::enable_if<
46-
std::is_convertible<T *, controller_interface::ControllerInterface *>::value, T>::type * =
46+
std::is_convertible<T *, controller_interface::ControllerInterfaceBase *>::value, T>::type * =
4747
nullptr>
4848
class BaseForwardCommandController : public T
4949
{
@@ -54,9 +54,9 @@ class BaseForwardCommandController : public T
5454
protected:
5555
void declare_parameters() override
5656
{
57-
controller_interface::ControllerInterface::auto_declare<std::vector<std::string>>(
57+
controller_interface::ControllerInterfaceBase::auto_declare<std::vector<std::string>>(
5858
"joints", std::vector<std::string>());
59-
controller_interface::ControllerInterface::auto_declare<std::string>("interface_name", "");
59+
controller_interface::ControllerInterfaceBase::auto_declare<std::string>("interface_name", "");
6060
};
6161

6262
controller_interface::CallbackReturn read_parameters() override

forward_command_controller/include/forward_command_controller/multi_interface_forward_command_controller.hpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ template <
4343
std::is_convertible<T *, forward_command_controller::ForwardControllersBase *>::value,
4444
T>::type * = nullptr,
4545
typename std::enable_if<
46-
std::is_convertible<T *, controller_interface::ControllerInterface *>::value, T>::type * =
46+
std::is_convertible<T *, controller_interface::ControllerInterfaceBase *>::value, T>::type * =
4747
nullptr>
4848
class BaseMultiInterfaceForwardCommandController : public T
4949
{
@@ -54,8 +54,8 @@ class BaseMultiInterfaceForwardCommandController : public T
5454
protected:
5555
void declare_parameters() override
5656
{
57-
controller_interface::ControllerInterface::auto_declare<std::string>("joint", joint_name_);
58-
controller_interface::ControllerInterface::auto_declare<std::vector<std::string>>(
57+
controller_interface::ControllerInterfaceBase::auto_declare<std::string>("joint", joint_name_);
58+
controller_interface::ControllerInterfaceBase::auto_declare<std::vector<std::string>>(
5959
"interface_names", interface_names_);
6060
};
6161

forward_command_controller/src/forward_command_controller.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,4 +23,4 @@ PLUGINLIB_EXPORT_CLASS(
2323
forward_command_controller::ForwardCommandController, controller_interface::ControllerInterface)
2424
PLUGINLIB_EXPORT_CLASS(
2525
forward_command_controller::ChainableForwardCommandController,
26-
controller_interface::ControllerInterface)
26+
controller_interface::ChainableControllerInterface)

forward_command_controller/src/multi_interface_forward_command_controller.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,4 +24,4 @@ PLUGINLIB_EXPORT_CLASS(
2424
controller_interface::ControllerInterface)
2525
PLUGINLIB_EXPORT_CLASS(
2626
forward_command_controller::ChainableMultiInterfaceForwardCommandController,
27-
controller_interface::ControllerInterface)
27+
controller_interface::ChainableControllerInterface)

0 commit comments

Comments
 (0)