Skip to content

Commit ee7faf2

Browse files
destoglAndyZebijoua29
committed
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 bbd9d59 commit ee7faf2

File tree

15 files changed

+128
-402
lines changed

15 files changed

+128
-402
lines changed

controller_interface/CMakeLists.txt

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

1313
find_package(ament_cmake REQUIRED)
14+
find_package(backward_ros REQUIRED)
1415
foreach(Dependency IN ITEMS ${THIS_PACKAGE_INCLUDE_DEPENDS})
1516
find_package(${Dependency} REQUIRED)
1617
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
@@ -10,6 +10,7 @@
1010

1111
<buildtool_depend>ament_cmake</buildtool_depend>
1212

13+
<build_depend>backward_ros</build_depend>
1314
<build_depend>hardware_interface</build_depend>
1415
<build_depend>rclcpp_lifecycle</build_depend>
1516
<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
@@ -17,6 +17,7 @@ set(THIS_PACKAGE_INCLUDE_DEPENDS
1717
)
1818

1919
find_package(ament_cmake REQUIRED)
20+
find_package(backward_ros REQUIRED)
2021
foreach(Dependency IN ITEMS ${THIS_PACKAGE_INCLUDE_DEPENDS})
2122
find_package(${Dependency} REQUIRED)
2223
endforeach()

hardware_interface/package.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99

1010
<buildtool_depend>ament_cmake</buildtool_depend>
1111

12+
<depend>backward_ros</depend>
1213
<depend>control_msgs</depend>
1314
<depend>lifecycle_msgs</depend>
1415
<depend>pluginlib</depend>

joint_limits/CMakeLists.txt

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

1515
find_package(ament_cmake REQUIRED)
16+
find_package(backward_ros REQUIRED)
1617
foreach(Dependency IN ITEMS ${THIS_PACKAGE_INCLUDE_DEPENDS})
1718
find_package(${Dependency} REQUIRED)
1819
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
@@ -14,6 +14,7 @@
1414

1515
<buildtool_depend>ament_cmake</buildtool_depend>
1616

17+
<depend>backward_ros</depend>
1718
<depend>pluginlib</depend>
1819
<depend>rclcpp</depend>
1920
<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)