diff --git a/src/iiwa_config/config/moveit/iiwa7.srdf b/src/iiwa_config/config/moveit/iiwa7.srdf index 375d3bf..9fba6d1 100644 --- a/src/iiwa_config/config/moveit/iiwa7.srdf +++ b/src/iiwa_config/config/moveit/iiwa7.srdf @@ -40,6 +40,15 @@ + + + + + + + + @@ -68,4 +77,31 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/iiwa_config/config/setting.yaml b/src/iiwa_config/config/setting.yaml index 7d4e295..450ae7c 100644 --- a/src/iiwa_config/config/setting.yaml +++ b/src/iiwa_config/config/setting.yaml @@ -16,7 +16,7 @@ digital_twin: rviz: config: pkg://iiwa_config/config/rviz/rviz_moveit.rviz - description: pkg://iiwa_description/urdf/iiwa7.urdf.xacro + description: pkg://iiwa_description/urdf/iiwa7_digital.urdf.xacro controller: controller_path: pkg://iiwa_config/config/moveit/iiwa_controller.yaml diff --git a/src/iiwa_description/resource/meshes/gripper/base_frame.stl b/src/iiwa_description/resource/meshes/gripper/base_frame.stl index ad87404..ba22aa7 100644 Binary files a/src/iiwa_description/resource/meshes/gripper/base_frame.stl and b/src/iiwa_description/resource/meshes/gripper/base_frame.stl differ diff --git a/src/iiwa_description/resource/meshes/gripper/craving.stl b/src/iiwa_description/resource/meshes/gripper/craving.stl index fa27edb..9b0a1b8 100644 Binary files a/src/iiwa_description/resource/meshes/gripper/craving.stl and b/src/iiwa_description/resource/meshes/gripper/craving.stl differ diff --git a/src/iiwa_description/resource/meshes/gripper/finger.stl b/src/iiwa_description/resource/meshes/gripper/finger.stl deleted file mode 100644 index f0332d8..0000000 Binary files a/src/iiwa_description/resource/meshes/gripper/finger.stl and /dev/null differ diff --git a/src/iiwa_description/resource/meshes/gripper/finger_plates.stl b/src/iiwa_description/resource/meshes/gripper/finger_plates.stl new file mode 100644 index 0000000..bc30f3f Binary files /dev/null and b/src/iiwa_description/resource/meshes/gripper/finger_plates.stl differ diff --git a/src/iiwa_description/resource/meshes/gripper/plate.stl b/src/iiwa_description/resource/meshes/gripper/plate.stl index bf3af7b..57f8afb 100644 Binary files a/src/iiwa_description/resource/meshes/gripper/plate.stl and b/src/iiwa_description/resource/meshes/gripper/plate.stl differ diff --git a/src/iiwa_description/resource/meshes/gripper/screw.stl b/src/iiwa_description/resource/meshes/gripper/screw.stl index 8145007..82c1962 100644 Binary files a/src/iiwa_description/resource/meshes/gripper/screw.stl and b/src/iiwa_description/resource/meshes/gripper/screw.stl differ diff --git a/src/iiwa_description/urdf/gripper.urdf b/src/iiwa_description/urdf/gripper.urdf deleted file mode 100644 index 6a4bee9..0000000 --- a/src/iiwa_description/urdf/gripper.urdf +++ /dev/null @@ -1,167 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/iiwa_description/urdf/gripper/___gripper.urdf b/src/iiwa_description/urdf/gripper/___gripper.urdf new file mode 100644 index 0000000..9726af4 --- /dev/null +++ b/src/iiwa_description/urdf/gripper/___gripper.urdf @@ -0,0 +1,280 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/iiwa_description/urdf/gripper/gripper.xacro b/src/iiwa_description/urdf/gripper/gripper.xacro new file mode 100644 index 0000000..7c70a9e --- /dev/null +++ b/src/iiwa_description/urdf/gripper/gripper.xacro @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + + diff --git a/src/iiwa_description/urdf/gripper/gripper_joints.xacro b/src/iiwa_description/urdf/gripper/gripper_joints.xacro new file mode 100644 index 0000000..855facb --- /dev/null +++ b/src/iiwa_description/urdf/gripper/gripper_joints.xacro @@ -0,0 +1,62 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/iiwa_description/urdf/gripper/gripper_links.xacro b/src/iiwa_description/urdf/gripper/gripper_links.xacro new file mode 100644 index 0000000..8c78431 --- /dev/null +++ b/src/iiwa_description/urdf/gripper/gripper_links.xacro @@ -0,0 +1,108 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/iiwa_description/urdf/gripper/gripper_macros.xacro b/src/iiwa_description/urdf/gripper/gripper_macros.xacro new file mode 100644 index 0000000..30feb9c --- /dev/null +++ b/src/iiwa_description/urdf/gripper/gripper_macros.xacro @@ -0,0 +1,70 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/iiwa_description/urdf/gripper/gripper_meshes.xacro b/src/iiwa_description/urdf/gripper/gripper_meshes.xacro new file mode 100644 index 0000000..2033b16 --- /dev/null +++ b/src/iiwa_description/urdf/gripper/gripper_meshes.xacro @@ -0,0 +1,13 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/src/iiwa_description/urdf/iiwa7.urdf.xacro b/src/iiwa_description/urdf/iiwa7_digital.urdf.xacro similarity index 93% rename from src/iiwa_description/urdf/iiwa7.urdf.xacro rename to src/iiwa_description/urdf/iiwa7_digital.urdf.xacro index fa45086..41654a3 100644 --- a/src/iiwa_description/urdf/iiwa7.urdf.xacro +++ b/src/iiwa_description/urdf/iiwa7_digital.urdf.xacro @@ -13,6 +13,8 @@ + + @@ -134,6 +136,15 @@ + + + diff --git a/src/iiwa_description/urdf/iiwa7_fri.urdf.xacro b/src/iiwa_description/urdf/iiwa7_fri.urdf.xacro index 11f0375..f9b8096 100644 --- a/src/iiwa_description/urdf/iiwa7_fri.urdf.xacro +++ b/src/iiwa_description/urdf/iiwa7_fri.urdf.xacro @@ -17,6 +17,7 @@ +