From 65baa02f5439b47bf5e784cc015615f0977dbf58 Mon Sep 17 00:00:00 2001
From: Thomason Zhou <thomason.zhou@uwaterloo.ca>
Date: Tue, 15 Apr 2025 15:32:09 +0900
Subject: [PATCH] Resolve merge conflict

---
 openarm_description/urdf/openarm.xacro | 8 +++++++-
 openarm_hardware/CMakeLists.txt        | 2 --
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/openarm_description/urdf/openarm.xacro b/openarm_description/urdf/openarm.xacro
index e75179f..0ba2eb6 100644
--- a/openarm_description/urdf/openarm.xacro
+++ b/openarm_description/urdf/openarm.xacro
@@ -188,6 +188,7 @@
                 <inertia ixx="0.00023465661366788053" ixy="7.609048882006294e-05" ixz="3.088694121124684e-07" iyy="0.0005065459365215377" iyz="1.9022818028658623e-07" izz="0.0003737029250058136"/>
             </inertial>
         </link>
+        <link name="${prefix}gripper_center"/>
         <link name="${prefix}link_left_jaw">
             <visual>
                 <origin rpy="0 -0.008758182894469432 0" xyz="0.665265 -0.00286677 -0.0209282"/>
@@ -234,7 +235,7 @@
             <origin rpy="0 0 0" xyz="0.0 0.0 0.05325"/>
             <axis xyz="0 0 1"/>
             <limit effort="0.0" lower="-2.0943951023931953" upper="2.0943951023931953" velocity="0.0"/>
-        </joint> 
+        </joint>
         <joint name="${prefix}rev2" type="revolute">
             <parent link="${prefix}link2"/>
             <child link="${prefix}link3"/>
@@ -292,5 +293,10 @@
             <limit effort="0.0" lower="-0.0451" upper="0.0" velocity="0.0"/>
             <mimic joint="${prefix}left_pris1" multiplier="-1.0" offset="0.0"/>
         </joint>
+        <joint name="${prefix}virtual_gripper_center" type="fixed">
+            <parent link="${prefix}link8"/>
+            <child link="${prefix}gripper_center"/>
+            <origin rpy="0 0 0" xyz="-0.13 0.00 0.0132053"/>
+        </joint>
     </xacro:macro>
 </robot>
diff --git a/openarm_hardware/CMakeLists.txt b/openarm_hardware/CMakeLists.txt
index 190e46c..3faea9e 100644
--- a/openarm_hardware/CMakeLists.txt
+++ b/openarm_hardware/CMakeLists.txt
@@ -7,8 +7,6 @@ endif()
 
 # find dependencies
 find_package(ament_cmake REQUIRED)
-# uncomment the following section in order to fill in
-# further dependencies manually.
 find_package(hardware_interface REQUIRED)
 find_package(pluginlib REQUIRED)
 find_package(rclcpp REQUIRED)