Merge pull request robofit#4 from ZdenekM/master

new messages
ZdenekM · May 17, 2018 · 6b8fc69 · 6b8fc69
2 parents 7639445 + 16e03aa
commit 6b8fc69
Show file tree

Hide file tree

Showing 9 changed files with 45 additions and 0 deletions.
diff --git a/art_msgs/CMakeLists.txt b/art_msgs/CMakeLists.txt
@@ -34,10 +34,16 @@ add_message_files(
   Touch.msg
   User.msg
   UserArray.msg
+  CollisionPrimitive.msg
+  CollisionObjects.msg
+  Color.msg
 )
 
 add_service_files(
     FILES
+    AddCollisionPrimitive.srv
+    GetCollisionPrimitives.srv
+    ClearCollisionPrimitives.srv
     getProgram.srv
     getProgramHeaders.srv
     storeProgram.srv
@@ -52,6 +58,8 @@ add_service_files(
     ObjectFlagSet.srv
     ObjectFlagClear.srv
     ReinitArms.srv
+    StringTrigger.srv
+    PoseStampedTrigger.srv
 )
 
 generate_messages(

diff --git a/art_msgs/msg/CollisionObjects.msg b/art_msgs/msg/CollisionObjects.msg
@@ -0,0 +1 @@
+CollisionPrimitive[] primitives
diff --git a/art_msgs/msg/CollisionPrimitive.msg b/art_msgs/msg/CollisionPrimitive.msg
@@ -0,0 +1,4 @@
+string name
+string setup
+shape_msgs/SolidPrimitive bbox
+geometry_msgs/PoseStamped pose
diff --git a/art_msgs/msg/Color.msg b/art_msgs/msg/Color.msg
@@ -0,0 +1,11 @@
+int32 timeout # 0 means infinite
+
+int32 SOLID = 0
+int32 BLINKING = 1
+int32 BREATHING = 2
+int32 FAST_BLINKING = 3
+int32 DISCO = 4
+int32 mode
+float32 r
+float32 g
+float32 b
diff --git a/art_msgs/srv/AddCollisionPrimitive.srv b/art_msgs/srv/AddCollisionPrimitive.srv
@@ -0,0 +1,4 @@
+CollisionPrimitive primitive
+---
+string name
+bool success
diff --git a/art_msgs/srv/ClearCollisionPrimitives.srv b/art_msgs/srv/ClearCollisionPrimitives.srv
@@ -0,0 +1,4 @@
+string setup
+string[] names # when no name is given, it should clear all
+---
+bool success
diff --git a/art_msgs/srv/GetCollisionPrimitives.srv b/art_msgs/srv/GetCollisionPrimitives.srv
@@ -0,0 +1,4 @@
+string setup
+string[] names # when no name is given, it should return all
+---
+CollisionPrimitive[] primitives
diff --git a/art_msgs/srv/PoseStampedTrigger.srv b/art_msgs/srv/PoseStampedTrigger.srv
@@ -0,0 +1,5 @@
+geometry_msgs/PoseStamped ps
+string str
+---
+bool success
+string message
diff --git a/art_msgs/srv/StringTrigger.srv b/art_msgs/srv/StringTrigger.srv
@@ -0,0 +1,4 @@
+string str
+---
+bool success
+string message