Merge branch 'release/0.12.0'

ihmcrobotics · Dec 4, 2018 · 403364a · 403364a
2 parents ed48894 + 7f728aa
commit 403364a
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 43 deletions.
diff --git a/controller_msgs/CMakeLists.txt b/controller_msgs/CMakeLists.txt
@@ -132,6 +132,7 @@ find_package(catkin REQUIRED COMPONENTS
    QuadrupedBodyHeightMessage.msg
    QuadrupedBodyOrientationMessage.msg
    QuadrupedBodyPathPlanMessage.msg
+   QuadrupedBodyTrajectoryMessage.msg
    QuadrupedFootstepStatusMessage.msg
    QuadrupedGroundPlaneMessage.msg
    QuadrupedRequestedSteppingStateMessage.msg

diff --git a/controller_msgs/msg/QuadrupedBodyTrajectoryMessage.msg b/controller_msgs/msg/QuadrupedBodyTrajectoryMessage.msg
@@ -0,0 +1,11 @@
+# Unique ID used to identify this message, should preferably be consecutively increasing.
+uint32 sequence_id
+
+# If true, the times are expressed in absolute time relative to the robot start
+# Field default value True
+bool is_expressed_in_absolute_time
+
+# The position/orientation trajectory information.
+controller_msgs/SE3TrajectoryMessage se3_trajectory
+
+
diff --git a/controller_msgs/msg/QuadrupedControllerStateChangeMessage.msg b/controller_msgs/msg/QuadrupedControllerStateChangeMessage.msg
diff --git a/controller_msgs/msg/QuadrupedRequestedControllerStateMessage.msg b/controller_msgs/msg/QuadrupedRequestedControllerStateMessage.msg
diff --git a/controller_msgs/package.xml b/controller_msgs/package.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <package>
     <name>controller_msgs</name>
-    <version>0.1.0</version>
+    <version>0.12.0</version>
     <description>The controller_msgs package defines the IHMC ROS API</description>
 
     <maintainer email="dstephen@ihmc.us">Doug Stephen</maintainer>
@@ -20,4 +20,4 @@
     <run_depend>message_runtime</run_depend>
     <run_depend>std_msgs</run_depend>
 
-</package>
+</package>