Skip to content

Commit

Permalink
docs: Added description for new ROS 2 action 'error_recovery'
Browse files Browse the repository at this point in the history
  • Loading branch information
AndreasKuhner authored and BarisYazici committed Jun 27, 2024
1 parent d82ae14 commit 145bd14
Show file tree
Hide file tree
Showing 4 changed files with 16 additions and 3 deletions.
2 changes: 1 addition & 1 deletion franka_ros
Submodule franka_ros updated 119 files
2 changes: 1 addition & 1 deletion franka_ros2
Submodule franka_ros2 updated 99 files
+6 −2 .devcontainer/Dockerfile
+3 −2 .devcontainer/docker-compose.yml
+14 −0 CHANGELOG.md
+4 −5 Dockerfile
+1 −1 README.md
+1 −1 franka_bringup/launch/cartesian_elbow_example_controller.launch.py
+1 −1 franka_bringup/launch/cartesian_orientation_example_controller.launch.py
+1 −1 franka_bringup/launch/cartesian_pose_example_controller.launch.py
+1 −1 franka_bringup/launch/cartesian_velocity_example_controller.launch.py
+1 −1 franka_bringup/launch/elbow_example_controller.launch.py
+1 −1 franka_bringup/launch/franka.launch.py
+1 −1 franka_bringup/launch/gravity_compensation_example_controller.launch.py
+1 −1 franka_bringup/launch/joint_impedance_example_controller.launch.py
+1 −1 franka_bringup/launch/joint_position_example_controller.launch.py
+1 −1 franka_bringup/launch/joint_velocity_example_controller.launch.py
+1 −1 franka_bringup/launch/model_example_controller.launch.py
+1 −1 franka_bringup/launch/move_to_start_example_controller.launch.py
+3 −3 franka_bringup/package.xml
+1 −1 franka_description/launch/visualize_franka.launch.py
+4 −4 franka_description/package.xml
+1 −1 franka_description/test/urdf_tests.py
+2 −2 franka_example_controllers/franka_example_controllers.xml
+2 −2 franka_example_controllers/include/franka_example_controllers/cartesian_elbow_example_controller.hpp
+2 −2 franka_example_controllers/include/franka_example_controllers/cartesian_orientation_example_controller.hpp
+2 −2 franka_example_controllers/include/franka_example_controllers/cartesian_pose_example_controller.hpp
+2 −2 franka_example_controllers/include/franka_example_controllers/cartesian_velocity_example_controller.hpp
+2 −2 franka_example_controllers/include/franka_example_controllers/default_robot_behavior_utils.hpp
+2 −2 franka_example_controllers/include/franka_example_controllers/elbow_example_controller.hpp
+1 −1 franka_example_controllers/include/franka_example_controllers/gravity_compensation_example_controller.hpp
+2 −2 franka_example_controllers/include/franka_example_controllers/joint_impedance_example_controller.hpp
+2 −2 franka_example_controllers/include/franka_example_controllers/joint_position_example_controller.hpp
+2 −2 franka_example_controllers/include/franka_example_controllers/joint_velocity_example_controller.hpp
+1 −1 franka_example_controllers/include/franka_example_controllers/model_example_controller.hpp
+1 −1 franka_example_controllers/include/franka_example_controllers/motion_generator.hpp
+1 −1 franka_example_controllers/include/franka_example_controllers/move_to_start_example_controller.hpp
+2 −2 franka_example_controllers/include/franka_example_controllers/visibility_control.h
+4 −4 franka_example_controllers/package.xml
+2 −2 franka_example_controllers/src/cartesian_elbow_example_controller.cpp
+2 −2 franka_example_controllers/src/cartesian_orientation_example_controller.cpp
+2 −2 franka_example_controllers/src/cartesian_pose_example_controller.cpp
+1 −1 franka_example_controllers/src/cartesian_velocity_example_controller.cpp
+1 −1 franka_example_controllers/src/elbow_example_controller.cpp
+1 −1 franka_example_controllers/src/gravity_compensation_example_controller.cpp
+2 −2 franka_example_controllers/src/joint_impedance_example_controller.cpp
+2 −2 franka_example_controllers/src/joint_position_example_controller.cpp
+2 −2 franka_example_controllers/src/joint_velocity_example_controller.cpp
+1 −1 franka_example_controllers/src/model_example_controller.cpp
+2 −2 franka_example_controllers/src/motion_generator.cpp
+2 −2 franka_example_controllers/src/move_to_start_example_controller.cpp
+1 −1 franka_example_controllers/test/test_gravity_compensation_example.cpp
+1 −1 franka_example_controllers/test/test_load_gravity_compensation_controller.cpp
+1 −1 franka_example_controllers/test/test_load_move_to_start_example_controller.cpp
+1 −1 franka_example_controllers/test/test_move_to_start_example_controller.cpp
+1 −1 franka_example_controllers/test/test_move_to_start_example_controller.hpp
+1 −1 franka_gripper/CMakeLists.txt
+1 −1 franka_gripper/franka_gripper/__init__.py
+1 −1 franka_gripper/include/franka_gripper/gripper_action_server.hpp
+1 −1 franka_gripper/launch/gripper.launch.py
+2 −2 franka_gripper/package.xml
+1 −1 franka_gripper/scripts/fake_gripper_state_publisher.py
+2 −2 franka_gripper/src/gripper_action_server.cpp
+1 −1 franka_hardware/CMakeLists.txt
+2 −2 franka_hardware/franka_hardware.xml
+1 −1 franka_hardware/include/franka_hardware/franka_executor.hpp
+2 −2 franka_hardware/include/franka_hardware/franka_hardware_interface.hpp
+1 −1 franka_hardware/include/franka_hardware/franka_param_service_server.hpp
+1 −1 franka_hardware/include/franka_hardware/model.hpp
+1 −1 franka_hardware/include/franka_hardware/robot.hpp
+3 −3 franka_hardware/package.xml
+1 −1 franka_hardware/src/franka_executor.cpp
+2 −2 franka_hardware/src/franka_hardware_interface.cpp
+1 −1 franka_hardware/src/franka_param_service_server.cpp
+1 −1 franka_hardware/src/robot.cpp
+1 −1 franka_hardware/test/franka_hardware_cartesian_command_interface_test.hpp
+2 −2 franka_hardware/test/franka_hardware_interface_test.cpp
+1 −1 franka_hardware/test/test_utils.hpp
+1 −1 franka_moveit_config/launch/moveit.launch.py
+3 −3 franka_moveit_config/package.xml
+1 −1 franka_moveit_config/test/srdf_tests.py
+4 −4 franka_msgs/package.xml
+2 −1 franka_robot_state_broadcaster/CMakeLists.txt
+31 −1 franka_robot_state_broadcaster/include/franka_robot_state_broadcaster/franka_robot_state_broadcaster.hpp
+2 −2 franka_robot_state_broadcaster/package.xml
+51 −5 franka_robot_state_broadcaster/src/franka_robot_state_broadcaster.cpp
+18 −6 franka_robot_state_broadcaster/test/test_franka_robot_state_broadcaster.cpp
+1 −1 franka_robot_state_broadcaster/test/test_load_franka_robot_state_broadcaster.cpp
+28 −18 franka_semantic_components/CMakeLists.txt
+1 −1 franka_semantic_components/include/franka_semantic_components/franka_cartesian_pose_interface.hpp
+58 −4 franka_semantic_components/include/franka_semantic_components/franka_robot_state.hpp
+2 −2 franka_semantic_components/src/franka_cartesian_pose_interface.cpp
+97 −40 franka_semantic_components/src/franka_robot_state.cpp
+2 −2 franka_semantic_components/test/franka_cartesian_pose_interface_test.cpp
+1 −1 franka_semantic_components/test/franka_cartesian_pose_interface_test.hpp
+6 −2 franka_semantic_components/test/franka_robot_state_test.cpp
+22 −1 franka_semantic_components/test/franka_robot_state_test.hpp
+456 −0 franka_semantic_components/test/robot_description_test.txt
+5 −5 integration_launch_testing/package.xml
+1 −1 integration_launch_testing/test/test_franka_gripper_position.py
+1 −1 integration_launch_testing/test/test_move_to_start_example_controller.py
2 changes: 1 addition & 1 deletion libfranka
Submodule libfranka updated 114 files
13 changes: 13 additions & 0 deletions source/franka_ros2.rst
Original file line number Diff line number Diff line change
Expand Up @@ -677,7 +677,20 @@ Here is a minimal example:

Overview of the end-effector frames.

Non-realtime ROS 2 actions
--------------------------

Non-realtime ROS 2 actions can be done via the `ActionServer`. Following actions are available:

* ``/action_server/error_recovery`` - Recovers automatically from a robot error.

The used messages are:

* ``franka_msgs::action::ErrorRecovery`` - no parameters.

Example usage:::

ros2 action send_goal /action_server/error_recovery franka_msgs/action/ErrorRecovery {}

Known Issues
------------
Expand Down

0 comments on commit 145bd14

Please sign in to comment.