tue-robotics · ar13pit · May 17, 2019 · May 17, 2019 · May 17, 2019 · May 17, 2019
diff --git a/people_recognition_msgs/CMakeLists.txt b/people_recognition_msgs/CMakeLists.txt
@@ -11,16 +11,15 @@ find_package(catkin REQUIRED COMPONENTS
 # Generate messages in the 'msg' folder
 add_message_files(
   FILES
-  Person2D.msg
-  Person3D.msg
-  People3D.msg
+  Person.msg
+  People.msg
+  RGBD.msg
 )
 
 # Generate services in the 'srv' folder
 add_service_files(
   FILES
-  RecognizePeople2D.srv
-  RecognizePeople3D.srv
+  RecognizePeople.srv
 )
 
 # Generate added messages and services with any dependencies listed here

diff --git a/people_recognition_msgs/msg/People.msg b/people_recognition_msgs/msg/People.msg
@@ -0,0 +1 @@
+Person[] people
diff --git a/people_recognition_msgs/msg/People3D.msg b/people_recognition_msgs/msg/People3D.msg
diff --git a/people_recognition_msgs/msg/Person3D.msg → people_recognition_msgs/msg/Person.msg b/people_recognition_msgs/msg/Person3D.msg → people_recognition_msgs/msg/Person.msg
diff --git a/people_recognition_msgs/msg/Person2D.msg b/people_recognition_msgs/msg/Person2D.msg
diff --git a/people_recognition_msgs/msg/RGBD.msg b/people_recognition_msgs/msg/RGBD.msg
@@ -0,0 +1,3 @@
+sensor_msgs/Image image_rgb
+sensor_msgs/Image image_depth
+sensor_msgs/CameraInfo camera_info_depth
diff --git a/people_recognition_msgs/srv/RecognizePeople.srv b/people_recognition_msgs/srv/RecognizePeople.srv
@@ -0,0 +1,8 @@
+# Interface that can request a people message from an input RGB-D image and
+# camera_info
+
+# RGB-D camera message
+RGBD rgbd
+---
+# People message
+People people
diff --git a/people_recognition_msgs/srv/RecognizePeople2D.srv b/people_recognition_msgs/srv/RecognizePeople2D.srv
diff --git a/people_recognition_msgs/srv/RecognizePeople3D.srv b/people_recognition_msgs/srv/RecognizePeople3D.srv