feat: Enhance iiwa_description and iiwa_sunrise functionality

- Added a new link "tcp" and a fixed joint "patron_tcp" in patron.xacro for better tool control.
- Updated ServerFriRos2.java to improve command mode handling and user configuration steps, including clearer logging and better control mode selection.
- Removed the deprecated iiwa_ros2.java file to streamline the codebase.
- Enhanced test_motion_sequence.py to allow dynamic topic recording based on user input, with improved logging for bag file management.
This commit is contained in:
Даниил Грабарь
2026-05-07 17:47:47 +03:00
parent 3c8d157cbe
commit 225ae50f10
7 changed files with 320 additions and 439 deletions
@@ -36,6 +36,13 @@ def _setup_controllers(context, *args, **kwargs):
if simulate:
tmo = ["--controller-manager-timeout", str(controller_timer)]
spawner_urdf = URDFSpawner(
name=robot_name,
robot_description=robot_description,
translation=transform,
rotation=rotation,
)
jsb = Node(
package="controller_manager",
executable="spawner",
@@ -60,14 +67,14 @@ def _setup_controllers(context, *args, **kwargs):
parameters=[{"use_sim_time": True}]
)
spawner_urdf = URDFSpawner(
name=robot_name,
robot_description=robot_description,
translation=transform,
rotation=rotation,
jtc_after_jsb = RegisterEventHandler(
OnProcessExit(
target_action=jsb,
on_exit=[jtc, torque_controller_spawner],
)
)
return [jsb, jtc, torque_controller_spawner, spawner_urdf]
return [spawner_urdf, jsb, jtc_after_jsb]
# FRI
else:
@@ -93,7 +100,7 @@ def _setup_controllers(context, *args, **kwargs):
jtc_args = ["iiwa_arm_controller", "--controller-manager", "/controller_manager"]
torque_args = ["iiwa_arm_torque_controller", "--controller-manager", "/controller_manager"]
if command_mode == "torque":
jtc_args += ["--inactive"]
else:
@@ -113,10 +120,17 @@ def _setup_controllers(context, *args, **kwargs):
arguments=torque_args,
)
state_broadcaster = Node(
package="controller_manager",
executable="spawner",
output="screen",
arguments=["iiwa_state_broadcaster", "--controller-manager", "/controller_manager"],
)
jtc_after_jsb = RegisterEventHandler(
OnProcessExit(
target_action=jsb,
on_exit=[jtc, torque_controller],
on_exit=[jtc, torque_controller, state_broadcaster],
)
)