Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update filename to match new 2f_85 xacro #20

Merged
merged 2 commits into from
Jun 8, 2023
Merged

Update filename to match new 2f_85 xacro #20

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
24fc94b
Update filename to match new 2f_85 xacro
Jun 7, 2023
ab6a561
Rename the urdf file, as well
Jun 7, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion robotiq_description/launch/view_gripper.launch.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ def generate_launch_description():
pkg_share = launch_ros.substitutions.FindPackageShare(
package="robotiq_description"
).find("robotiq_description")
default_model_path = os.path.join(pkg_share, "urdf", "robotiq_gripper.urdf.xacro")
default_model_path = os.path.join(pkg_share, "urdf", "robotiq_2f_85_gripper.urdf.xacro")
default_rviz_config_path = os.path.join(pkg_share, "rviz", "view_urdf.rviz")

args = []
Expand Down
2 changes: 1 addition & 1 deletion ...scription/urdf/robotiq_gripper.urdf.xacro → ...ion/urdf/robotiq_2f_85_gripper.urdf.xacro
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<xacro:arg name="use_fake_hardware" default="true" />

<!-- Import macros -->
<xacro:include filename="$(find robotiq_description)/urdf/robotiq_gripper_macro.urdf.xacro" />
<xacro:include filename="$(find robotiq_description)/urdf/robotiq_2f_85_macro.urdf.xacro" />

<link name="world" />
<xacro:robotiq_gripper name="RobotiqGripperHardwareInterface" prefix="" parent="world" use_fake_hardware="$(arg use_fake_hardware)">
Expand Down
2 changes: 1 addition & 1 deletion robotiq_driver/launch/robotiq_control.launch.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ def generate_launch_description():
package="robotiq_description"
).find("robotiq_description")
default_model_path = os.path.join(
description_pkg_share, "urdf", "robotiq_gripper.urdf.xacro"
description_pkg_share, "urdf", "robotiq_2f_85_gripper.urdf.xacro"
)
default_rviz_config_path = os.path.join(
description_pkg_share, "rviz", "view_urdf.rviz"
Expand Down