From f3a56d8bd7d9c00f94132a643fd49ccfe3a206dd Mon Sep 17 00:00:00 2001 From: Dave Coleman Date: Wed, 2 Sep 2026 13:56:29 -0600 Subject: [PATCH] fix: Declare BSD-3-Clause in package.xml to match the repo LICENSE Also apply the repo's own pre-commit hooks, which had never been run against the tree: end-of-file-fixer, prettier (XML), and codespell. Co-Authored-By: Claude Opus 5 (1M context) Claude-Session: https://claude.ai/code/session_01EyWXfyZBDBJ61sSuumJKY4 --- Dockerfile | 2 +- docker-compose.yaml | 2 +- .../launch/additional_driver_nodes.launch.py | 2 +- .../launch/agent_bridge.launch.xml | 2 +- .../launch/camera_driver.launch.xml | 2 +- .../launch/rs_cameras.launch.xml | 2 +- src/example_robot_hw/package.xml | 6 +- .../config/moveit/joint_jog.yaml | 2 +- .../config/moveit/joint_limits.yaml | 6 +- .../objectives/close_gripper.xml | 2 +- .../objectives/open_gripper.xml | 2 +- src/example_robot_mock/package.xml | 2 +- src/example_robot_sim/config/config.yaml | 2 +- src/example_robot_sim/mjcf/assets/2f85.xml | 316 ++++++--- .../mjcf/assets/MUJOCO_LOG.TXT | 1 - .../mjcf/assets/arm_description.urdf | 1 - .../mjcf/assets/arm_description.xml | 249 +++++-- .../assets/arm_with_gripper_description.xml | 260 ++++++-- .../mjcf/assets/robot_description.urdf | 1 - .../mjcf/assets/robot_description.xml | 616 +++++++++++++++--- src/example_robot_sim/mjcf/assets/scene.xml | 66 +- src/example_robot_sim/package.xml | 7 +- .../r6bot_mujoco_ros2_control_macro.xacro | 2 +- 23 files changed, 1216 insertions(+), 337 deletions(-) diff --git a/Dockerfile b/Dockerfile index 9738b9d..5355ec6 100644 --- a/Dockerfile +++ b/Dockerfile @@ -117,4 +117,4 @@ ENV USER_WS=${USER_WS} WORKDIR $USER_WS # Set up the user's .bashrc file and shell. -CMD ["/usr/bin/bash"] \ No newline at end of file +CMD ["/usr/bin/bash"] diff --git a/docker-compose.yaml b/docker-compose.yaml index 32b5ccd..ce6e089 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -25,4 +25,4 @@ services: dev: volumes: # Allow access to host hardware e.g. RealSense cameras - - /dev:/dev \ No newline at end of file + - /dev:/dev diff --git a/src/example_robot_hw/launch/additional_driver_nodes.launch.py b/src/example_robot_hw/launch/additional_driver_nodes.launch.py index 44dd936..e304c8a 100644 --- a/src/example_robot_hw/launch/additional_driver_nodes.launch.py +++ b/src/example_robot_hw/launch/additional_driver_nodes.launch.py @@ -82,4 +82,4 @@ def generate_launch_description(): protective_stop_manager_node, ] - return LaunchDescription(nodes_to_launch) \ No newline at end of file + return LaunchDescription(nodes_to_launch) diff --git a/src/example_robot_hw/launch/agent_bridge.launch.xml b/src/example_robot_hw/launch/agent_bridge.launch.xml index 9fa71a0..c922d0a 100644 --- a/src/example_robot_hw/launch/agent_bridge.launch.xml +++ b/src/example_robot_hw/launch/agent_bridge.launch.xml @@ -6,4 +6,4 @@ - \ No newline at end of file + diff --git a/src/example_robot_hw/launch/camera_driver.launch.xml b/src/example_robot_hw/launch/camera_driver.launch.xml index b74c578..a67e762 100644 --- a/src/example_robot_hw/launch/camera_driver.launch.xml +++ b/src/example_robot_hw/launch/camera_driver.launch.xml @@ -6,4 +6,4 @@ - \ No newline at end of file + diff --git a/src/example_robot_hw/launch/rs_cameras.launch.xml b/src/example_robot_hw/launch/rs_cameras.launch.xml index a31b1a6..285ff31 100644 --- a/src/example_robot_hw/launch/rs_cameras.launch.xml +++ b/src/example_robot_hw/launch/rs_cameras.launch.xml @@ -71,4 +71,4 @@ value="/wrist_mounted_camera/depth_registered/image_rect" /> - \ No newline at end of file + diff --git a/src/example_robot_hw/package.xml b/src/example_robot_hw/package.xml index bb864b1..508fd98 100644 --- a/src/example_robot_hw/package.xml +++ b/src/example_robot_hw/package.xml @@ -4,10 +4,8 @@ 0.0.1 My robot configuration package - - MoveIt Pro User - - Apache-2.0 + MoveIt Pro User + BSD-3-Clause ament_cmake example_robot_sim diff --git a/src/example_robot_mock/config/moveit/joint_jog.yaml b/src/example_robot_mock/config/moveit/joint_jog.yaml index 12ab500..6d80c7e 100644 --- a/src/example_robot_mock/config/moveit/joint_jog.yaml +++ b/src/example_robot_mock/config/moveit/joint_jog.yaml @@ -1,4 +1,4 @@ # Planning groups to use in JointJog, and their corresponding JVC controllers. # The number of elements in `planning_groups` and `controllers` must match. planning_groups: ['manipulator'] -controllers: ['joint_velocity_controller'] \ No newline at end of file +controllers: ['joint_velocity_controller'] diff --git a/src/example_robot_mock/config/moveit/joint_limits.yaml b/src/example_robot_mock/config/moveit/joint_limits.yaml index 21e94f0..4b011f4 100644 --- a/src/example_robot_mock/config/moveit/joint_limits.yaml +++ b/src/example_robot_mock/config/moveit/joint_limits.yaml @@ -1,6 +1,6 @@ -# joint_limits.yaml allows overriding per-joint URDF values used for motion planning and speicyfing additional dynamic limits. -# - Positions limits can be overriden `has_position_limits`, `min_position` and `max_position`. -# - Velocity limits can be overriden with `has_velocity_limits` and `max_velocity`. +# joint_limits.yaml allows overriding per-joint URDF values used for motion planning and specifying additional dynamic limits. +# - Positions limits can be overridden `has_position_limits`, `min_position` and `max_position`. +# - Velocity limits can be overridden with `has_velocity_limits` and `max_velocity`. # - Acceleration limits can be set with `has_acceleration_limits` and `max_acceleration`. # - Jerk limits can be set with `has_jerk_limits` and `max_jerk`. joint_limits: diff --git a/src/example_robot_mock/objectives/close_gripper.xml b/src/example_robot_mock/objectives/close_gripper.xml index 3271f4e..6960f3d 100644 --- a/src/example_robot_mock/objectives/close_gripper.xml +++ b/src/example_robot_mock/objectives/close_gripper.xml @@ -25,4 +25,4 @@ - \ No newline at end of file + diff --git a/src/example_robot_mock/objectives/open_gripper.xml b/src/example_robot_mock/objectives/open_gripper.xml index 92a9c1e..a0509e5 100644 --- a/src/example_robot_mock/objectives/open_gripper.xml +++ b/src/example_robot_mock/objectives/open_gripper.xml @@ -22,4 +22,4 @@ - \ No newline at end of file + diff --git a/src/example_robot_mock/package.xml b/src/example_robot_mock/package.xml index a488d40..4360e94 100644 --- a/src/example_robot_mock/package.xml +++ b/src/example_robot_mock/package.xml @@ -5,7 +5,7 @@ Example of a mock robot MoveIt Pro User - Apache-2.0 + BSD-3-Clause ament_cmake diff --git a/src/example_robot_sim/config/config.yaml b/src/example_robot_sim/config/config.yaml index 64c6d86..7411268 100644 --- a/src/example_robot_sim/config/config.yaml +++ b/src/example_robot_sim/config/config.yaml @@ -25,4 +25,4 @@ ros2_control: - "joint_state_broadcaster" - "force_torque_sensor_broadcaster" - "joint_trajectory_admittance_controller" - - "robotiq_gripper_controller" \ No newline at end of file + - "robotiq_gripper_controller" diff --git a/src/example_robot_sim/mjcf/assets/2f85.xml b/src/example_robot_sim/mjcf/assets/2f85.xml index 6449be5..211609b 100644 --- a/src/example_robot_sim/mjcf/assets/2f85.xml +++ b/src/example_robot_sim/mjcf/assets/2f85.xml @@ -1,55 +1,96 @@ - + - diff --git a/src/example_robot_sim/mjcf/assets/MUJOCO_LOG.TXT b/src/example_robot_sim/mjcf/assets/MUJOCO_LOG.TXT index 1232613..3ea7395 100644 --- a/src/example_robot_sim/mjcf/assets/MUJOCO_LOG.TXT +++ b/src/example_robot_sim/mjcf/assets/MUJOCO_LOG.TXT @@ -3,4 +3,3 @@ WARNING: Nan, Inf or huge value in QACC at DOF 8. The simulation is unstable. Ti Wed Feb 11 03:26:47 2026 WARNING: Nan, Inf or huge value in QACC at DOF 8. The simulation is unstable. Time = 0.2240. - diff --git a/src/example_robot_sim/mjcf/assets/arm_description.urdf b/src/example_robot_sim/mjcf/assets/arm_description.urdf index 476e066..0dce77d 100644 --- a/src/example_robot_sim/mjcf/assets/arm_description.urdf +++ b/src/example_robot_sim/mjcf/assets/arm_description.urdf @@ -264,4 +264,3 @@ - diff --git a/src/example_robot_sim/mjcf/assets/arm_description.xml b/src/example_robot_sim/mjcf/assets/arm_description.xml index 328f43e..f672fb3 100644 --- a/src/example_robot_sim/mjcf/assets/arm_description.xml +++ b/src/example_robot_sim/mjcf/assets/arm_description.xml @@ -1,57 +1,218 @@ - - + + + - - - - - - - + + + + + + + - - - - - - - + + + + + + + + - - + + - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + - + @@ -64,4 +225,4 @@ - \ No newline at end of file + diff --git a/src/example_robot_sim/mjcf/assets/arm_with_gripper_description.xml b/src/example_robot_sim/mjcf/assets/arm_with_gripper_description.xml index 07970c3..bd6d386 100644 --- a/src/example_robot_sim/mjcf/assets/arm_with_gripper_description.xml +++ b/src/example_robot_sim/mjcf/assets/arm_with_gripper_description.xml @@ -1,28 +1,71 @@ - - + + + - - - - - - - - + + + + + + + + - - - - - - + + + + + + @@ -66,41 +109,162 @@ - - + + - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + - + @@ -118,4 +282,4 @@ - \ No newline at end of file + diff --git a/src/example_robot_sim/mjcf/assets/robot_description.urdf b/src/example_robot_sim/mjcf/assets/robot_description.urdf index 6e881f2..9b0d9b5 100644 --- a/src/example_robot_sim/mjcf/assets/robot_description.urdf +++ b/src/example_robot_sim/mjcf/assets/robot_description.urdf @@ -517,4 +517,3 @@ - diff --git a/src/example_robot_sim/mjcf/assets/robot_description.xml b/src/example_robot_sim/mjcf/assets/robot_description.xml index d3e6f93..1d76570 100644 --- a/src/example_robot_sim/mjcf/assets/robot_description.xml +++ b/src/example_robot_sim/mjcf/assets/robot_description.xml @@ -1,123 +1,539 @@ - - + + + - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + - - - - - - - - - - - - - + + + + + + + + + + + + + + - - + + - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - + + + + + + + + + + + + + + - - - - - + + + + + - - - - - + + + + + - + @@ -129,4 +545,4 @@ - \ No newline at end of file + diff --git a/src/example_robot_sim/mjcf/assets/scene.xml b/src/example_robot_sim/mjcf/assets/scene.xml index 5694b27..2bb5a60 100644 --- a/src/example_robot_sim/mjcf/assets/scene.xml +++ b/src/example_robot_sim/mjcf/assets/scene.xml @@ -1,40 +1,68 @@ - + - diff --git a/src/example_robot_sim/package.xml b/src/example_robot_sim/package.xml index 071bd37..e7a0823 100644 --- a/src/example_robot_sim/package.xml +++ b/src/example_robot_sim/package.xml @@ -4,10 +4,9 @@ 0.0.1 My robot configuration package - - MoveIt Pro User - - Apache-2.0 + MoveIt Pro User + BSD-3-Clause + BSD-2-Clause ament_cmake example_robot_mock diff --git a/src/example_robot_sim/urdf/r6bot_mujoco_ros2_control_macro.xacro b/src/example_robot_sim/urdf/r6bot_mujoco_ros2_control_macro.xacro index 35e0605..4b11124 100644 --- a/src/example_robot_sim/urdf/r6bot_mujoco_ros2_control_macro.xacro +++ b/src/example_robot_sim/urdf/r6bot_mujoco_ros2_control_macro.xacro @@ -25,4 +25,4 @@ - \ No newline at end of file +