Skip to content

Commit 6134c08

Browse files
destoglAndyZebijoua29
authored andcommitted
Modify simple joint limiting plugin (same as changes to moveit2 filter) (#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 <[email protected]> * 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 <[email protected]> Co-authored-by: AndyZe <[email protected]> Co-authored-by: bijoua <[email protected]> Co-authored-by: bijoua29 <[email protected]>
1 parent 33668e7 commit 6134c08

File tree

15 files changed

+126
-402
lines changed

15 files changed

+126
-402
lines changed

controller_interface/CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ set(THIS_PACKAGE_INCLUDE_DEPENDS
1212
)
1313

1414
find_package(ament_cmake REQUIRED)
15+
find_package(backward_ros REQUIRED)
1516
foreach(Dependency IN ITEMS ${THIS_PACKAGE_INCLUDE_DEPENDS})
1617
find_package(${Dependency} REQUIRED)
1718
endforeach()

controller_interface/include/controller_interface/controller_parameters.hpp

Lines changed: 0 additions & 212 deletions
This file was deleted.

controller_interface/package.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
<buildtool_depend>ament_cmake</buildtool_depend>
1212
<buildtool_depend>ament_cmake_gen_version_h</buildtool_depend>
1313

14+
<build_depend>backward_ros</build_depend>
1415
<build_depend>hardware_interface</build_depend>
1516
<build_depend>rclcpp_lifecycle</build_depend>
1617
<build_depend>sensor_msgs</build_depend>

controller_interface/src/controller_parameters.cpp

Lines changed: 0 additions & 119 deletions
This file was deleted.

hardware_interface/CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ set(THIS_PACKAGE_INCLUDE_DEPENDS
1919
)
2020

2121
find_package(ament_cmake REQUIRED)
22+
find_package(backward_ros REQUIRED)
2223
foreach(Dependency IN ITEMS ${THIS_PACKAGE_INCLUDE_DEPENDS})
2324
find_package(${Dependency} REQUIRED)
2425
endforeach()

hardware_interface/package.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
<buildtool_depend>ament_cmake</buildtool_depend>
1111
<buildtool_depend>ament_cmake_gen_version_h</buildtool_depend>
1212

13+
<depend>backward_ros</depend>
1314
<depend>control_msgs</depend>
1415
<depend>lifecycle_msgs</depend>
1516
<depend>pluginlib</depend>

joint_limits/CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ set(THIS_PACKAGE_INCLUDE_DEPENDS
1515
)
1616

1717
find_package(ament_cmake REQUIRED)
18+
find_package(backward_ros REQUIRED)
1819
foreach(Dependency IN ITEMS ${THIS_PACKAGE_INCLUDE_DEPENDS})
1920
find_package(${Dependency} REQUIRED)
2021
endforeach()

joint_limits/include/joint_limits/joint_limiter_interface.hpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,7 @@ class JointLimiterInterface
8484

8585
protected:
8686
size_t number_of_joints_;
87+
std::vector<std::string> joint_names_;
8788
std::vector<LimitsType> joint_limits_;
8889
rclcpp::Node::SharedPtr node_;
8990
};

joint_limits/package.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
<buildtool_depend>ament_cmake</buildtool_depend>
1616
<buildtool_depend>ament_cmake_gen_version_h</buildtool_depend>
1717

18+
<depend>backward_ros</depend>
1819
<depend>pluginlib</depend>
1920
<depend>rclcpp</depend>
2021
<depend>rclcpp_lifecycle</depend>

joint_limits/src/joint_limiter_interface.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ bool JointLimiterInterface<JointLimits>::init(
3030
const std::string & /*robot_description_topic*/)
3131
{
3232
number_of_joints_ = joint_names.size();
33+
joint_names_ = joint_names;
3334
joint_limits_.resize(number_of_joints_);
3435
node_ = node;
3536

0 commit comments

Comments
 (0)