Skip to content

Commit

Permalink
Modify simple joint limiting plugin (same as changes to moveit2 filte…
Browse files Browse the repository at this point in the history
…r) (#6)

* Merge error handling possilibity on read and write.

* Ros2 control extensions rolling joint limits plugins (#5)

* Added initial structures for joint-limit plugins.

* Move Ruckig limiter to package joint_limits_enforcement_plugins and make it working.

Co-authored-by: AndyZe <zelenak@picknik.ai>

* Add option to automatically update parameters after getting them from parameter server.

* Modify simple joint limiting plugin (same as changes to moveit2 filter)

* Add backward_ros dependency for crash stack trace

* Check for required inputs in simple joint limiter

* Change services history QOS to 'keep all' so client req are not dropped

* Add missing on 'pluginlib' dependency explicitly.

* Update ControllerParameters structure to support custom prefix and use in filters.

* Update messge.

* Change controller param changed msg log level to info instead of error

---------

Co-authored-by: Denis Štogl <destogl@users.noreply.github.com>
Co-authored-by: AndyZe <zelenak@picknik.ai>
Co-authored-by: bijoua <bijou.abraham@technipfmc.com>
Co-authored-by: bijoua29 <73511637+bijoua29@users.noreply.github.com>
  • Loading branch information
5 people committed Mar 16, 2023
1 parent bbd9d59 commit ee7faf2
Show file tree
Hide file tree
Showing 15 changed files with 128 additions and 402 deletions.
1 change: 1 addition & 0 deletions controller_interface/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ set(THIS_PACKAGE_INCLUDE_DEPENDS
)

find_package(ament_cmake REQUIRED)
find_package(backward_ros REQUIRED)
foreach(Dependency IN ITEMS ${THIS_PACKAGE_INCLUDE_DEPENDS})
find_package(${Dependency} REQUIRED)
endforeach()
Expand Down

This file was deleted.

1 change: 1 addition & 0 deletions controller_interface/package.xml
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@

<buildtool_depend>ament_cmake</buildtool_depend>

<build_depend>backward_ros</build_depend>
<build_depend>hardware_interface</build_depend>
<build_depend>rclcpp_lifecycle</build_depend>
<build_depend>sensor_msgs</build_depend>
Expand Down
119 changes: 0 additions & 119 deletions controller_interface/src/controller_parameters.cpp

This file was deleted.

1 change: 1 addition & 0 deletions hardware_interface/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ set(THIS_PACKAGE_INCLUDE_DEPENDS
)

find_package(ament_cmake REQUIRED)
find_package(backward_ros REQUIRED)
foreach(Dependency IN ITEMS ${THIS_PACKAGE_INCLUDE_DEPENDS})
find_package(${Dependency} REQUIRED)
endforeach()
Expand Down
1 change: 1 addition & 0 deletions hardware_interface/package.xml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@

<buildtool_depend>ament_cmake</buildtool_depend>

<depend>backward_ros</depend>
<depend>control_msgs</depend>
<depend>lifecycle_msgs</depend>
<depend>pluginlib</depend>
Expand Down
1 change: 1 addition & 0 deletions joint_limits/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ set(THIS_PACKAGE_INCLUDE_DEPENDS
)

find_package(ament_cmake REQUIRED)
find_package(backward_ros REQUIRED)
foreach(Dependency IN ITEMS ${THIS_PACKAGE_INCLUDE_DEPENDS})
find_package(${Dependency} REQUIRED)
endforeach()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,7 @@ class JointLimiterInterface

protected:
size_t number_of_joints_;
std::vector<std::string> joint_names_;
std::vector<LimitsType> joint_limits_;
rclcpp::Node::SharedPtr node_;
};
Expand Down
1 change: 1 addition & 0 deletions joint_limits/package.xml
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@

<buildtool_depend>ament_cmake</buildtool_depend>

<depend>backward_ros</depend>
<depend>pluginlib</depend>
<depend>rclcpp</depend>
<depend>rclcpp_lifecycle</depend>
Expand Down
1 change: 1 addition & 0 deletions joint_limits/src/joint_limiter_interface.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ bool JointLimiterInterface<JointLimits>::init(
const std::string & /*robot_description_topic*/)
{
number_of_joints_ = joint_names.size();
joint_names_ = joint_names;
joint_limits_.resize(number_of_joints_);
node_ = node;

Expand Down
Loading

0 comments on commit ee7faf2

Please sign in to comment.