From 04485bfefc44718675aa6235d110b0bcdd6270fc Mon Sep 17 00:00:00 2001 From: qlin960618 Date: Sat, 22 Feb 2025 23:26:20 +0900 Subject: [PATCH] rename package to matching repo --- .docker/create_urdf.entrypoint.sh | 4 ++-- .docker/visualize_franka.entrypoint.sh | 4 ++-- CMakeLists.txt | 2 +- README.md | 4 ++-- .../cobot_pump/cobot_pump.urdf.xacro | 8 +++---- .../cobot_pump/cobot_pump_arguments.xacro | 2 +- end_effectors/common/ee_with_one_link.xacro | 2 +- end_effectors/common/franka_hand.xacro | 2 +- end_effectors/common/utils.xacro | 2 +- .../franka_hand/franka_hand.urdf.xacro | 8 +++---- .../franka_hand/franka_hand_arguments.xacro | 2 +- launch/visualize_franka.launch.py | 4 ++-- package.xml | 4 ++-- robots/common/franka_arm.xacro | 12 +++++----- robots/common/franka_robot.xacro | 22 +++++++++---------- robots/common/utils.xacro | 2 +- robots/fer/fer.urdf.xacro | 10 ++++----- robots/fp3/fp3.urdf.xacro | 10 ++++----- robots/fr3/fr3.urdf.xacro | 10 ++++----- .../moonshot_panda/moonshot_panda.urdf.xacro | 10 ++++----- robots/multi_arm/multi_arm.urdf.xacro | 10 ++++----- scripts/create_urdf.py | 6 ++--- scripts/create_urdf.sh | 4 ++-- scripts/visualize_franka.sh | 4 ++-- test/urdf_tests.py | 2 +- 25 files changed, 75 insertions(+), 75 deletions(-) diff --git a/.docker/create_urdf.entrypoint.sh b/.docker/create_urdf.entrypoint.sh index 1b95c03..814a13b 100755 --- a/.docker/create_urdf.entrypoint.sh +++ b/.docker/create_urdf.entrypoint.sh @@ -6,9 +6,9 @@ shift $# source /ros_entrypoint.sh cd /workspaces -colcon build --packages-select franka_description > /dev/null +colcon build --packages-select moonshot_franka_description > /dev/null source install/setup.bash -cd src/franka_description +cd src/moonshot_franka_description python3 scripts/create_urdf.py $args \ No newline at end of file diff --git a/.docker/visualize_franka.entrypoint.sh b/.docker/visualize_franka.entrypoint.sh index 5d7ea27..8f18b92 100755 --- a/.docker/visualize_franka.entrypoint.sh +++ b/.docker/visualize_franka.entrypoint.sh @@ -4,7 +4,7 @@ args=$* shift $# cd /workspaces -colcon build --packages-select franka_description > /dev/null +colcon build --packages-select moonshot_franka_description > /dev/null source install/setup.bash -ros2 launch franka_description visualize_franka.launch.py ${args} \ No newline at end of file +ros2 launch moonshot_franka_description visualize_franka.launch.py ${args} \ No newline at end of file diff --git a/CMakeLists.txt b/CMakeLists.txt index 902771f..1e81e88 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -13,7 +13,7 @@ # limitations under the License. cmake_minimum_required(VERSION 3.5) -project(franka_description) +project(moonshot_franka_description) find_package(ament_cmake REQUIRED) diff --git a/README.md b/README.md index 13e15fc..a9cafa8 100644 --- a/README.md +++ b/README.md @@ -28,7 +28,7 @@ The urdf generation is performed by the create_urdf.py script which offers sever ``` usage: create_urdf.py [-h] [--robot-ee] [--no-ee] [--with-sc] [--abs-path] [--host-dir HOST_DIR] [--only-ee] [--no-prefix] robot_model -Generate franka robots urdf models. Script to be executed from franka_description root folder! +Generate franka robots urdf models. Script to be executed from moonshot_franka_description root folder! positional arguments: robot_model id of the robot model (accepted values are: fr3, fp3, fer, multi_arm, none) @@ -46,7 +46,7 @@ optional arguments: ### Visualize via ROS2 -`franka_description` is offered as a ROS2 package. +`moonshot_franka_description` is offered as a ROS2 package. The urdf file can be visualized via RViz with the following command: ``` diff --git a/end_effectors/cobot_pump/cobot_pump.urdf.xacro b/end_effectors/cobot_pump/cobot_pump.urdf.xacro index c3c1c78..5e84c94 100644 --- a/end_effectors/cobot_pump/cobot_pump.urdf.xacro +++ b/end_effectors/cobot_pump/cobot_pump.urdf.xacro @@ -1,13 +1,13 @@ - - - + + + - + \ No newline at end of file diff --git a/end_effectors/common/ee_with_one_link.xacro b/end_effectors/common/ee_with_one_link.xacro index 6b98037..16e8c40 100644 --- a/end_effectors/common/ee_with_one_link.xacro +++ b/end_effectors/common/ee_with_one_link.xacro @@ -1,7 +1,7 @@ - + diff --git a/end_effectors/common/franka_hand.xacro b/end_effectors/common/franka_hand.xacro index ab7e0c2..d9d0318 100644 --- a/end_effectors/common/franka_hand.xacro +++ b/end_effectors/common/franka_hand.xacro @@ -1,7 +1,7 @@ - + diff --git a/end_effectors/common/utils.xacro b/end_effectors/common/utils.xacro index 5036bc5..6852a72 100644 --- a/end_effectors/common/utils.xacro +++ b/end_effectors/common/utils.xacro @@ -43,7 +43,7 @@ - + diff --git a/end_effectors/franka_hand/franka_hand.urdf.xacro b/end_effectors/franka_hand/franka_hand.urdf.xacro index 165bba4..f7e2e63 100644 --- a/end_effectors/franka_hand/franka_hand.urdf.xacro +++ b/end_effectors/franka_hand/franka_hand.urdf.xacro @@ -1,13 +1,13 @@ - - - + + + - + \ No newline at end of file diff --git a/launch/visualize_franka.launch.py b/launch/visualize_franka.launch.py index e4dc449..d7af992 100644 --- a/launch/visualize_franka.launch.py +++ b/launch/visualize_franka.launch.py @@ -28,7 +28,7 @@ def robot_state_publisher_spawner(context: LaunchContext, arm_id, load_gripper, load_gripper_str = context.perform_substitution(load_gripper) ee_id_str = context.perform_substitution(ee_id) franka_xacro_filepath = os.path.join( - get_package_share_directory("franka_description"), + get_package_share_directory("moonshot_franka_description"), "robots", arm_id_str, arm_id_str + ".urdf.xacro", @@ -59,7 +59,7 @@ def generate_launch_description(): arm_id = LaunchConfiguration(arm_id_parameter_name) rviz_file = os.path.join( - get_package_share_directory("franka_description"), + get_package_share_directory("moonshot_franka_description"), "rviz", "visualize_franka.rviz", ) diff --git a/package.xml b/package.xml index 70c1f57..a5904a6 100644 --- a/package.xml +++ b/package.xml @@ -1,9 +1,9 @@ - franka_description + moonshot_franka_description 0.4.0 - franka_description contains URDF files and meshes of Franka robots + moonshot_franka_description contains URDF files and meshes of Franka robots Franka Robotics GmbH Apache 2.0 Franka Robotics GmbH diff --git a/robots/common/franka_arm.xacro b/robots/common/franka_arm.xacro index 129b903..0cce181 100644 --- a/robots/common/franka_arm.xacro +++ b/robots/common/franka_arm.xacro @@ -1,16 +1,16 @@ - + - - - - + + + + - + diff --git a/robots/common/franka_robot.xacro b/robots/common/franka_robot.xacro index cf17284..3c430c3 100644 --- a/robots/common/franka_robot.xacro +++ b/robots/common/franka_robot.xacro @@ -22,9 +22,9 @@ arm_prefix:='' connected_to:='base' multi_arm:=false"> - + - + - - - + + + @@ -59,7 +59,7 @@ arm_id="${arm_id}" arm_prefix="${arm_prefix_modified}" ee_id="${ee_id}_${ee_color}" - ee_inertials="${xacro.load_yaml('$(find franka_description)/end_effectors/$(arg ee_id)/inertials.yaml')}" + ee_inertials="${xacro.load_yaml('$(find moonshot_franka_description)/end_effectors/$(arg ee_id)/inertials.yaml')}" rpy_ee="$(arg rpy_ee)" xyz_ee="$(arg xyz_ee)" tcp_xyz="$(arg tcp_xyz)" @@ -72,9 +72,9 @@ - - - + + + - + - + diff --git a/robots/fer/fer.urdf.xacro b/robots/fer/fer.urdf.xacro index f311c28..257813f 100644 --- a/robots/fer/fer.urdf.xacro +++ b/robots/fer/fer.urdf.xacro @@ -1,7 +1,7 @@ - +