Skip to content

Commit c27a515

Browse files
committed
Merge branch 'master' of https://github.com/unisa-acg/control_msgs into feature/joint_wrench_msgs
2 parents 635fc77 + 22824d0 commit c27a515

File tree

8 files changed

+53
-3
lines changed

8 files changed

+53
-3
lines changed

README.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ If you are new to the project, please read the [contributing guide](https://cont
1919
| Kilted | [master](https://github.com/ros-controls/control_msgs/tree/master) | see above <br> [![build.ros2.org](https://build.ros2.org/buildStatus/icon?job=Kdev__control_msgs__ubuntu_noble_amd64&subject=build.ros2.org)](https://build.ros2.org/job/Kdev__control_msgs__ubuntu_noble_amd64/) | [![Package Build](https://build.ros2.org/buildStatus/icon?job=Kbin_uN64__control_msgs__ubuntu_noble_amd64__binary)](https://build.ros2.org/job/Kbin_uN64__control_msgs__ubuntu_noble_amd64__binary/) |
2020
| Jazzy | [jazzy](https://github.com/ros-controls/control_msgs/tree/jazzy) | [![Jazzy Binary Build](https://github.com/ros-controls/control_msgs/actions/workflows/jazzy-build.yml/badge.svg?branch=jazzy)](https://github.com/ros-controls/control_msgs/actions/workflows/jazzy-build.yml) <br> [![build.ros2.org](https://build.ros2.org/buildStatus/icon?job=Jdev__control_msgs__ubuntu_noble_amd64&subject=build.ros2.org)](https://build.ros2.org/job/Jdev__control_msgs__ubuntu_noble_amd64/) | [![Package Build](https://build.ros2.org/buildStatus/icon?job=Jbin_uN64__control_msgs__ubuntu_noble_amd64__binary)](https://build.ros2.org/job/Jbin_uN64__control_msgs__ubuntu_noble_amd64__binary/) |
2121
| Humble | [humble](https://github.com/ros-controls/control_msgs/tree/humble) | [![Humble Binary Build](https://github.com/ros-controls/control_msgs/actions/workflows/humble-build.yml/badge.svg)](https://github.com/ros-controls/control_msgs/actions/workflows/humble-build.yml) <br> [![build.ros2.org](https://build.ros2.org/buildStatus/icon?job=Hdev__control_msgs__ubuntu_jammy_amd64&subject=build.ros2.org)](https://build.ros2.org/job/Hdev__control_msgs__ubuntu_jammy_amd64/) | [![Package Build](https://build.ros2.org/buildStatus/icon?job=Hbin_uJ64__control_msgs__ubuntu_jammy_amd64__binary)](https://build.ros2.org/job/Hbin_uJ64__control_msgs__ubuntu_jammy_amd64__binary/) |
22-
| Noetic | [kinetic-devel](https://github.com/ros-controls/control_msgs/tree/kinetic-devel) | [Build status](https://travis-ci.org/ros-controls/control_msgs) | n/a |
2322

2423
## Acknowledgements
2524

control_msgs/CHANGELOG.rst

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,12 @@
22
Changelog for package control_msgs
33
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
44

5+
6.4.0 (2025-07-19)
6+
------------------
7+
* Add messages for motion primitives (`#228 <https://github.com/ros-controls/control_msgs/issues/228>`_)
8+
* Add message to control a robot via linear velocity and steering position (`#217 <https://github.com/ros-controls/control_msgs/issues/217>`_)
9+
* Contributors: Felix Exner, wittenator
10+
511
6.3.0 (2025-06-11)
612
------------------
713
* Add indices to FollowJointTrajectory to store trajectory index being executed (`#67 <https://github.com/ros-controls/control_msgs/issues/67>`_)

control_msgs/CMakeLists.txt

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,9 @@ set(msg_files
2626
msg/JointWrenchTrajectory.msg
2727
msg/JointWrenchTrajectoryPoint.msg
2828
msg/MecanumDriveControllerState.msg
29+
msg/MotionArgument.msg
30+
msg/MotionPrimitive.msg
31+
msg/MotionPrimitiveSequence.msg
2932
msg/MultiDOFCommand.msg
3033
msg/MultiDOFStateStamped.msg
3134
msg/PidState.msg
@@ -37,11 +40,12 @@ set(msg_files
3740
)
3841

3942
set(action_files
40-
action/ParallelGripperCommand.action
43+
action/ExecuteMotionPrimitiveSequence.action
4144
action/FollowJointTrajectory.action
4245
action/GripperCommand.action
4346
action/JointTrajectory.action
4447
action/FollowJointWrenchTrajectory.action
48+
action/ParallelGripperCommand.action
4549
action/PointHead.action
4650
action/SingleJointPosition.action
4751
)
Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
# A list of MotionPrimitive messages that are executed in sequence. They don't have to be of the
2+
# same type, as long as the robot supports executing them one after another.
3+
MotionPrimitiveSequence trajectory
4+
---
5+
int32 SUCCESSFUL = 0
6+
int32 INVALID_GOAL = -1
7+
int32 OLD_HEADER_TIMESTAMP = -3
8+
9+
int32 error_code
10+
string error_string
11+
---
12+
# Index of the currently executed motion primitive in the sequence.
13+
uint8 current_primitive_index
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
# Key Value pair to be used in MotionPrimitive messages
2+
3+
string name
4+
float64 value
Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
int8 UNKNOWN=-1
2+
int8 LINEAR_JOINT=0 # Often referred as PTP
3+
int8 LINEAR_CARTESIAN=50 # Often referred as LIN
4+
int8 CIRCULAR_CARTESIAN=51 # Often referred as CIRC
5+
# potentially more, such as spline motion
6+
7+
int8 type -1 # one of the above
8+
9+
float64 blend_radius
10+
11+
# MotionArguments are meant to be used as vendor-specific or use-case-specific arguments to
12+
# MotionPrimitive messages. This is to avoid bloating the MotionPrimitive message with all possible
13+
# uses cases but rather add specific data using as a list of key-value pairs, which is what this
14+
# message represents.
15+
MotionArgument[] additional_arguments # (max) velocity, (max) acceleration, efficiency
16+
17+
# Targets should be either specified through joint configurations or Cartesian poses.
18+
# Depending on the motion type and implementation, there might be multiple poses allowed.
19+
# For example, circular motions are often specified as via and target
20+
# Usually one of these is empty, in some edge cases even both can be empty, when all input is given
21+
# in the more flexible MotionArgument[] field.
22+
geometry_msgs/PoseStamped[] poses
23+
float64[] joint_positions
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
MotionPrimitive[] motions

control_msgs/package.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<?xml-model href="http://download.ros.org/schema/package_format3.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
33
<package format="3">
44
<name>control_msgs</name>
5-
<version>6.3.0</version>
5+
<version>6.4.0</version>
66
<description>
77
control_msgs contains base messages and actions useful for
88
controlling robots. It provides representations for controller

0 commit comments

Comments
 (0)