From a34554144652617307e21e804cf4bcd63b9776b5 Mon Sep 17 00:00:00 2001
From: hello-jesus <jesusrdz@hello-robot.com>
Date: Mon, 13 Nov 2023 15:33:07 -0800
Subject: [PATCH] Include the base imu in the dex decription as well as the
 files in the batches

---
 .../guthrie/urdf/stretch_description_dex.xacro   | 16 ++++++++++++++++
 .../urdf/stretch_description_standard.xacro      | 15 +++++++++++++++
 .../hank/urdf/stretch_description_dex.xacro      | 16 ++++++++++++++++
 .../hank/urdf/stretch_description_standard.xacro | 15 +++++++++++++++
 .../irma/urdf/stretch_description_dex.xacro      | 16 ++++++++++++++++
 .../irma/urdf/stretch_description_standard.xacro | 15 +++++++++++++++
 .../joplin/urdf/stretch_description_dex.xacro    | 16 ++++++++++++++++
 .../urdf/stretch_description_standard.xacro      | 15 +++++++++++++++
 .../kendrick/urdf/stretch_description_dex.xacro  | 16 ++++++++++++++++
 .../urdf/stretch_description_standard.xacro      | 15 +++++++++++++++
 .../louis/urdf/stretch_description_dex.xacro     | 16 ++++++++++++++++
 .../urdf/stretch_description_standard.xacro      | 15 +++++++++++++++
 .../mitski/urdf/stretch_description_dex.xacro    |  1 +
 .../nina/urdf/stretch_description_dex.xacro      |  1 +
 .../otis/urdf/stretch_description_dex.xacro      |  1 +
 .../urdf/stretch_description_dex.xacro           |  1 +
 16 files changed, 190 insertions(+)
 create mode 100644 stretch_description/batch/guthrie/urdf/stretch_description_dex.xacro
 create mode 100644 stretch_description/batch/guthrie/urdf/stretch_description_standard.xacro
 create mode 100644 stretch_description/batch/hank/urdf/stretch_description_dex.xacro
 create mode 100644 stretch_description/batch/hank/urdf/stretch_description_standard.xacro
 create mode 100644 stretch_description/batch/irma/urdf/stretch_description_dex.xacro
 create mode 100644 stretch_description/batch/irma/urdf/stretch_description_standard.xacro
 create mode 100644 stretch_description/batch/joplin/urdf/stretch_description_dex.xacro
 create mode 100644 stretch_description/batch/joplin/urdf/stretch_description_standard.xacro
 create mode 100644 stretch_description/batch/kendrick/urdf/stretch_description_dex.xacro
 create mode 100644 stretch_description/batch/kendrick/urdf/stretch_description_standard.xacro
 create mode 100644 stretch_description/batch/louis/urdf/stretch_description_dex.xacro
 create mode 100644 stretch_description/batch/louis/urdf/stretch_description_standard.xacro

diff --git a/stretch_description/batch/guthrie/urdf/stretch_description_dex.xacro b/stretch_description/batch/guthrie/urdf/stretch_description_dex.xacro
new file mode 100644
index 0000000..3d2ace7
--- /dev/null
+++ b/stretch_description/batch/guthrie/urdf/stretch_description_dex.xacro
@@ -0,0 +1,16 @@
+<?xml version="1.0"?>
+<robot xmlns:xacro="http://www.ros.org/wiki/xacro" name="stretch_description">
+
+  <xacro:include filename="stretch_dex_wrist.xacro" />
+  <!--<xacro:include filename="stretch_gripper.xacro" /> -->
+  <!--<xacro:include filename="stretch_gripper_with_puller.xacro" />-->
+  <!--<xacro:include filename="stretch_dry_erase_marker.xacro" />-->
+    
+  <xacro:include filename="stretch_main.xacro" />
+  <xacro:include filename="stretch_aruco.xacro" />
+  <xacro:include filename="stretch_d435i.xacro" />
+  <xacro:include filename="stretch_laser_range_finder.xacro" />
+  <xacro:include filename="stretch_base_imu.xacro" />
+  <xacro:include filename="stretch_respeaker.xacro" />
+
+</robot>
diff --git a/stretch_description/batch/guthrie/urdf/stretch_description_standard.xacro b/stretch_description/batch/guthrie/urdf/stretch_description_standard.xacro
new file mode 100644
index 0000000..b6a5fc9
--- /dev/null
+++ b/stretch_description/batch/guthrie/urdf/stretch_description_standard.xacro
@@ -0,0 +1,15 @@
+<?xml version="1.0"?>
+<robot xmlns:xacro="http://www.ros.org/wiki/xacro" name="stretch">
+
+  <xacro:include filename="stretch_gripper.xacro" />
+  <!--<xacro:include filename="stretch_gripper_with_puller.xacro" />-->
+  <!--<xacro:include filename="stretch_dry_erase_marker.xacro" />-->
+    
+  <xacro:include filename="stretch_main.xacro" />
+  <xacro:include filename="stretch_aruco.xacro" />
+  <xacro:include filename="stretch_d435i.xacro" />
+  <xacro:include filename="stretch_laser_range_finder.xacro" />
+  <xacro:include filename="stretch_base_imu.xacro" />
+  <xacro:include filename="stretch_respeaker.xacro" />
+
+</robot>
diff --git a/stretch_description/batch/hank/urdf/stretch_description_dex.xacro b/stretch_description/batch/hank/urdf/stretch_description_dex.xacro
new file mode 100644
index 0000000..3d2ace7
--- /dev/null
+++ b/stretch_description/batch/hank/urdf/stretch_description_dex.xacro
@@ -0,0 +1,16 @@
+<?xml version="1.0"?>
+<robot xmlns:xacro="http://www.ros.org/wiki/xacro" name="stretch_description">
+
+  <xacro:include filename="stretch_dex_wrist.xacro" />
+  <!--<xacro:include filename="stretch_gripper.xacro" /> -->
+  <!--<xacro:include filename="stretch_gripper_with_puller.xacro" />-->
+  <!--<xacro:include filename="stretch_dry_erase_marker.xacro" />-->
+    
+  <xacro:include filename="stretch_main.xacro" />
+  <xacro:include filename="stretch_aruco.xacro" />
+  <xacro:include filename="stretch_d435i.xacro" />
+  <xacro:include filename="stretch_laser_range_finder.xacro" />
+  <xacro:include filename="stretch_base_imu.xacro" />
+  <xacro:include filename="stretch_respeaker.xacro" />
+
+</robot>
diff --git a/stretch_description/batch/hank/urdf/stretch_description_standard.xacro b/stretch_description/batch/hank/urdf/stretch_description_standard.xacro
new file mode 100644
index 0000000..b6a5fc9
--- /dev/null
+++ b/stretch_description/batch/hank/urdf/stretch_description_standard.xacro
@@ -0,0 +1,15 @@
+<?xml version="1.0"?>
+<robot xmlns:xacro="http://www.ros.org/wiki/xacro" name="stretch">
+
+  <xacro:include filename="stretch_gripper.xacro" />
+  <!--<xacro:include filename="stretch_gripper_with_puller.xacro" />-->
+  <!--<xacro:include filename="stretch_dry_erase_marker.xacro" />-->
+    
+  <xacro:include filename="stretch_main.xacro" />
+  <xacro:include filename="stretch_aruco.xacro" />
+  <xacro:include filename="stretch_d435i.xacro" />
+  <xacro:include filename="stretch_laser_range_finder.xacro" />
+  <xacro:include filename="stretch_base_imu.xacro" />
+  <xacro:include filename="stretch_respeaker.xacro" />
+
+</robot>
diff --git a/stretch_description/batch/irma/urdf/stretch_description_dex.xacro b/stretch_description/batch/irma/urdf/stretch_description_dex.xacro
new file mode 100644
index 0000000..3d2ace7
--- /dev/null
+++ b/stretch_description/batch/irma/urdf/stretch_description_dex.xacro
@@ -0,0 +1,16 @@
+<?xml version="1.0"?>
+<robot xmlns:xacro="http://www.ros.org/wiki/xacro" name="stretch_description">
+
+  <xacro:include filename="stretch_dex_wrist.xacro" />
+  <!--<xacro:include filename="stretch_gripper.xacro" /> -->
+  <!--<xacro:include filename="stretch_gripper_with_puller.xacro" />-->
+  <!--<xacro:include filename="stretch_dry_erase_marker.xacro" />-->
+    
+  <xacro:include filename="stretch_main.xacro" />
+  <xacro:include filename="stretch_aruco.xacro" />
+  <xacro:include filename="stretch_d435i.xacro" />
+  <xacro:include filename="stretch_laser_range_finder.xacro" />
+  <xacro:include filename="stretch_base_imu.xacro" />
+  <xacro:include filename="stretch_respeaker.xacro" />
+
+</robot>
diff --git a/stretch_description/batch/irma/urdf/stretch_description_standard.xacro b/stretch_description/batch/irma/urdf/stretch_description_standard.xacro
new file mode 100644
index 0000000..b6a5fc9
--- /dev/null
+++ b/stretch_description/batch/irma/urdf/stretch_description_standard.xacro
@@ -0,0 +1,15 @@
+<?xml version="1.0"?>
+<robot xmlns:xacro="http://www.ros.org/wiki/xacro" name="stretch">
+
+  <xacro:include filename="stretch_gripper.xacro" />
+  <!--<xacro:include filename="stretch_gripper_with_puller.xacro" />-->
+  <!--<xacro:include filename="stretch_dry_erase_marker.xacro" />-->
+    
+  <xacro:include filename="stretch_main.xacro" />
+  <xacro:include filename="stretch_aruco.xacro" />
+  <xacro:include filename="stretch_d435i.xacro" />
+  <xacro:include filename="stretch_laser_range_finder.xacro" />
+  <xacro:include filename="stretch_base_imu.xacro" />
+  <xacro:include filename="stretch_respeaker.xacro" />
+
+</robot>
diff --git a/stretch_description/batch/joplin/urdf/stretch_description_dex.xacro b/stretch_description/batch/joplin/urdf/stretch_description_dex.xacro
new file mode 100644
index 0000000..3d2ace7
--- /dev/null
+++ b/stretch_description/batch/joplin/urdf/stretch_description_dex.xacro
@@ -0,0 +1,16 @@
+<?xml version="1.0"?>
+<robot xmlns:xacro="http://www.ros.org/wiki/xacro" name="stretch_description">
+
+  <xacro:include filename="stretch_dex_wrist.xacro" />
+  <!--<xacro:include filename="stretch_gripper.xacro" /> -->
+  <!--<xacro:include filename="stretch_gripper_with_puller.xacro" />-->
+  <!--<xacro:include filename="stretch_dry_erase_marker.xacro" />-->
+    
+  <xacro:include filename="stretch_main.xacro" />
+  <xacro:include filename="stretch_aruco.xacro" />
+  <xacro:include filename="stretch_d435i.xacro" />
+  <xacro:include filename="stretch_laser_range_finder.xacro" />
+  <xacro:include filename="stretch_base_imu.xacro" />
+  <xacro:include filename="stretch_respeaker.xacro" />
+
+</robot>
diff --git a/stretch_description/batch/joplin/urdf/stretch_description_standard.xacro b/stretch_description/batch/joplin/urdf/stretch_description_standard.xacro
new file mode 100644
index 0000000..b6a5fc9
--- /dev/null
+++ b/stretch_description/batch/joplin/urdf/stretch_description_standard.xacro
@@ -0,0 +1,15 @@
+<?xml version="1.0"?>
+<robot xmlns:xacro="http://www.ros.org/wiki/xacro" name="stretch">
+
+  <xacro:include filename="stretch_gripper.xacro" />
+  <!--<xacro:include filename="stretch_gripper_with_puller.xacro" />-->
+  <!--<xacro:include filename="stretch_dry_erase_marker.xacro" />-->
+    
+  <xacro:include filename="stretch_main.xacro" />
+  <xacro:include filename="stretch_aruco.xacro" />
+  <xacro:include filename="stretch_d435i.xacro" />
+  <xacro:include filename="stretch_laser_range_finder.xacro" />
+  <xacro:include filename="stretch_base_imu.xacro" />
+  <xacro:include filename="stretch_respeaker.xacro" />
+
+</robot>
diff --git a/stretch_description/batch/kendrick/urdf/stretch_description_dex.xacro b/stretch_description/batch/kendrick/urdf/stretch_description_dex.xacro
new file mode 100644
index 0000000..3d2ace7
--- /dev/null
+++ b/stretch_description/batch/kendrick/urdf/stretch_description_dex.xacro
@@ -0,0 +1,16 @@
+<?xml version="1.0"?>
+<robot xmlns:xacro="http://www.ros.org/wiki/xacro" name="stretch_description">
+
+  <xacro:include filename="stretch_dex_wrist.xacro" />
+  <!--<xacro:include filename="stretch_gripper.xacro" /> -->
+  <!--<xacro:include filename="stretch_gripper_with_puller.xacro" />-->
+  <!--<xacro:include filename="stretch_dry_erase_marker.xacro" />-->
+    
+  <xacro:include filename="stretch_main.xacro" />
+  <xacro:include filename="stretch_aruco.xacro" />
+  <xacro:include filename="stretch_d435i.xacro" />
+  <xacro:include filename="stretch_laser_range_finder.xacro" />
+  <xacro:include filename="stretch_base_imu.xacro" />
+  <xacro:include filename="stretch_respeaker.xacro" />
+
+</robot>
diff --git a/stretch_description/batch/kendrick/urdf/stretch_description_standard.xacro b/stretch_description/batch/kendrick/urdf/stretch_description_standard.xacro
new file mode 100644
index 0000000..b6a5fc9
--- /dev/null
+++ b/stretch_description/batch/kendrick/urdf/stretch_description_standard.xacro
@@ -0,0 +1,15 @@
+<?xml version="1.0"?>
+<robot xmlns:xacro="http://www.ros.org/wiki/xacro" name="stretch">
+
+  <xacro:include filename="stretch_gripper.xacro" />
+  <!--<xacro:include filename="stretch_gripper_with_puller.xacro" />-->
+  <!--<xacro:include filename="stretch_dry_erase_marker.xacro" />-->
+    
+  <xacro:include filename="stretch_main.xacro" />
+  <xacro:include filename="stretch_aruco.xacro" />
+  <xacro:include filename="stretch_d435i.xacro" />
+  <xacro:include filename="stretch_laser_range_finder.xacro" />
+  <xacro:include filename="stretch_base_imu.xacro" />
+  <xacro:include filename="stretch_respeaker.xacro" />
+
+</robot>
diff --git a/stretch_description/batch/louis/urdf/stretch_description_dex.xacro b/stretch_description/batch/louis/urdf/stretch_description_dex.xacro
new file mode 100644
index 0000000..3d2ace7
--- /dev/null
+++ b/stretch_description/batch/louis/urdf/stretch_description_dex.xacro
@@ -0,0 +1,16 @@
+<?xml version="1.0"?>
+<robot xmlns:xacro="http://www.ros.org/wiki/xacro" name="stretch_description">
+
+  <xacro:include filename="stretch_dex_wrist.xacro" />
+  <!--<xacro:include filename="stretch_gripper.xacro" /> -->
+  <!--<xacro:include filename="stretch_gripper_with_puller.xacro" />-->
+  <!--<xacro:include filename="stretch_dry_erase_marker.xacro" />-->
+    
+  <xacro:include filename="stretch_main.xacro" />
+  <xacro:include filename="stretch_aruco.xacro" />
+  <xacro:include filename="stretch_d435i.xacro" />
+  <xacro:include filename="stretch_laser_range_finder.xacro" />
+  <xacro:include filename="stretch_base_imu.xacro" />
+  <xacro:include filename="stretch_respeaker.xacro" />
+
+</robot>
diff --git a/stretch_description/batch/louis/urdf/stretch_description_standard.xacro b/stretch_description/batch/louis/urdf/stretch_description_standard.xacro
new file mode 100644
index 0000000..b6a5fc9
--- /dev/null
+++ b/stretch_description/batch/louis/urdf/stretch_description_standard.xacro
@@ -0,0 +1,15 @@
+<?xml version="1.0"?>
+<robot xmlns:xacro="http://www.ros.org/wiki/xacro" name="stretch">
+
+  <xacro:include filename="stretch_gripper.xacro" />
+  <!--<xacro:include filename="stretch_gripper_with_puller.xacro" />-->
+  <!--<xacro:include filename="stretch_dry_erase_marker.xacro" />-->
+    
+  <xacro:include filename="stretch_main.xacro" />
+  <xacro:include filename="stretch_aruco.xacro" />
+  <xacro:include filename="stretch_d435i.xacro" />
+  <xacro:include filename="stretch_laser_range_finder.xacro" />
+  <xacro:include filename="stretch_base_imu.xacro" />
+  <xacro:include filename="stretch_respeaker.xacro" />
+
+</robot>
diff --git a/stretch_description/batch/mitski/urdf/stretch_description_dex.xacro b/stretch_description/batch/mitski/urdf/stretch_description_dex.xacro
index c46eb64..3d2ace7 100644
--- a/stretch_description/batch/mitski/urdf/stretch_description_dex.xacro
+++ b/stretch_description/batch/mitski/urdf/stretch_description_dex.xacro
@@ -10,6 +10,7 @@
   <xacro:include filename="stretch_aruco.xacro" />
   <xacro:include filename="stretch_d435i.xacro" />
   <xacro:include filename="stretch_laser_range_finder.xacro" />
+  <xacro:include filename="stretch_base_imu.xacro" />
   <xacro:include filename="stretch_respeaker.xacro" />
 
 </robot>
diff --git a/stretch_description/batch/nina/urdf/stretch_description_dex.xacro b/stretch_description/batch/nina/urdf/stretch_description_dex.xacro
index c46eb64..3d2ace7 100644
--- a/stretch_description/batch/nina/urdf/stretch_description_dex.xacro
+++ b/stretch_description/batch/nina/urdf/stretch_description_dex.xacro
@@ -10,6 +10,7 @@
   <xacro:include filename="stretch_aruco.xacro" />
   <xacro:include filename="stretch_d435i.xacro" />
   <xacro:include filename="stretch_laser_range_finder.xacro" />
+  <xacro:include filename="stretch_base_imu.xacro" />
   <xacro:include filename="stretch_respeaker.xacro" />
 
 </robot>
diff --git a/stretch_description/batch/otis/urdf/stretch_description_dex.xacro b/stretch_description/batch/otis/urdf/stretch_description_dex.xacro
index c46eb64..3d2ace7 100644
--- a/stretch_description/batch/otis/urdf/stretch_description_dex.xacro
+++ b/stretch_description/batch/otis/urdf/stretch_description_dex.xacro
@@ -10,6 +10,7 @@
   <xacro:include filename="stretch_aruco.xacro" />
   <xacro:include filename="stretch_d435i.xacro" />
   <xacro:include filename="stretch_laser_range_finder.xacro" />
+  <xacro:include filename="stretch_base_imu.xacro" />
   <xacro:include filename="stretch_respeaker.xacro" />
 
 </robot>
diff --git a/stretch_description/urdf/stretch_description_dex.xacro b/stretch_description/urdf/stretch_description_dex.xacro
index c46eb64..3d2ace7 100644
--- a/stretch_description/urdf/stretch_description_dex.xacro
+++ b/stretch_description/urdf/stretch_description_dex.xacro
@@ -10,6 +10,7 @@
   <xacro:include filename="stretch_aruco.xacro" />
   <xacro:include filename="stretch_d435i.xacro" />
   <xacro:include filename="stretch_laser_range_finder.xacro" />
+  <xacro:include filename="stretch_base_imu.xacro" />
   <xacro:include filename="stretch_respeaker.xacro" />
 
 </robot>