Skip to content

Commit

Permalink
Merge branch 'ros2:rolling' into feature/add-arrow-strip-marker-type
Browse files Browse the repository at this point in the history
  • Loading branch information
rr-tom-noble authored May 4, 2023
2 parents d705231 + 04c024e commit fb2264a
Show file tree
Hide file tree
Showing 28 changed files with 113 additions and 21 deletions.
6 changes: 6 additions & 0 deletions actionlib_msgs/CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,12 @@
Changelog for package actionlib_msgs
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

5.1.0 (2023-04-27)
------------------

5.0.0 (2023-04-11)
------------------

4.7.0 (2023-02-13)
------------------
* Update common_interfaces to C++17. (`#215 <https://github.com/ros2/common_interfaces/issues/215>`_)
Expand Down
2 changes: 1 addition & 1 deletion actionlib_msgs/package.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<?xml-model href="http://download.ros.org/schema/package_format3.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
<package format="3">
<name>actionlib_msgs</name>
<version>4.7.0</version>
<version>5.1.0</version>
<description>A package containing some message definitions used in the implementation of ROS 1 actions.</description>

<maintainer email="[email protected]">Tully Foote</maintainer>
Expand Down
6 changes: 6 additions & 0 deletions common_interfaces/CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,12 @@
Changelog for package common_interfaces
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

5.1.0 (2023-04-27)
------------------

5.0.0 (2023-04-11)
------------------

4.7.0 (2023-02-13)
------------------
* [rolling] Update maintainers - 2022-11-07 (`#210 <https://github.com/ros2/common_interfaces/issues/210>`_)
Expand Down
2 changes: 1 addition & 1 deletion common_interfaces/package.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<?xml-model href="http://download.ros.org/schema/package_format2.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
<package format="2">
<name>common_interfaces</name>
<version>4.7.0</version>
<version>5.1.0</version>
<description>common_interfaces contains messages and services that are widely used by other ROS packages.</description>

<maintainer email="[email protected]">Tully Foote</maintainer>
Expand Down
6 changes: 6 additions & 0 deletions diagnostic_msgs/CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,12 @@
Changelog for package diagnostic_msgs
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

5.1.0 (2023-04-27)
------------------

5.0.0 (2023-04-11)
------------------

4.7.0 (2023-02-13)
------------------
* Update common_interfaces to C++17. (`#215 <https://github.com/ros2/common_interfaces/issues/215>`_)
Expand Down
2 changes: 1 addition & 1 deletion diagnostic_msgs/package.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<?xml-model href="http://download.ros.org/schema/package_format3.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
<package format="3">
<name>diagnostic_msgs</name>
<version>4.7.0</version>
<version>5.1.0</version>
<description>A package containing some diagnostics related message and service definitions.</description>

<maintainer email="[email protected]">Tully Foote</maintainer>
Expand Down
6 changes: 6 additions & 0 deletions geometry_msgs/CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,12 @@
Changelog for package geometry_msgs
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

5.1.0 (2023-04-27)
------------------

5.0.0 (2023-04-11)
------------------

4.7.0 (2023-02-13)
------------------
* Update common_interfaces to C++17. (`#215 <https://github.com/ros2/common_interfaces/issues/215>`_)
Expand Down
2 changes: 1 addition & 1 deletion geometry_msgs/package.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<?xml-model href="http://download.ros.org/schema/package_format3.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
<package format="3">
<name>geometry_msgs</name>
<version>4.7.0</version>
<version>5.1.0</version>
<description>A package containing some geometry related message definitions.</description>

<maintainer email="[email protected]">Tully Foote</maintainer>
Expand Down
6 changes: 6 additions & 0 deletions nav_msgs/CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,12 @@
Changelog for package nav_msgs
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

5.1.0 (2023-04-27)
------------------

5.0.0 (2023-04-11)
------------------

4.7.0 (2023-02-13)
------------------
* Update common_interfaces to C++17. (`#215 <https://github.com/ros2/common_interfaces/issues/215>`_)
Expand Down
2 changes: 1 addition & 1 deletion nav_msgs/package.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<?xml-model href="http://download.ros.org/schema/package_format3.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
<package format="3">
<name>nav_msgs</name>
<version>4.7.0</version>
<version>5.1.0</version>
<description>A package containing some navigation related message and service definitions.</description>

<maintainer email="[email protected]">Tully Foote</maintainer>
Expand Down
9 changes: 9 additions & 0 deletions sensor_msgs/CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,15 @@
Changelog for package sensor_msgs
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

5.1.0 (2023-04-27)
------------------

5.0.0 (2023-04-11)
------------------
* update YUV format codes and documentation (`#214 <https://github.com/ros2/common_interfaces/issues/214>`_)
* sensor_msgs/Range lacks variance field (`#181 <https://github.com/ros2/common_interfaces/issues/181>`_)
* Contributors: Christian Rauch, El Jawad Alaa

4.7.0 (2023-02-13)
------------------
* Update common_interfaces to C++17. (`#215 <https://github.com/ros2/common_interfaces/issues/215>`_)
Expand Down
23 changes: 16 additions & 7 deletions sensor_msgs/include/sensor_msgs/image_encodings.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -92,17 +92,22 @@ const char BAYER_BGGR16[] = "bayer_bggr16";
const char BAYER_GBRG16[] = "bayer_gbrg16";
const char BAYER_GRBG16[] = "bayer_grbg16";

// Miscellaneous
// YUV formats
// YUV 4:2:2 encodings with an 8-bit depth
// UYUV version: http://www.fourcc.org/pixel-format/yuv-uyvy
const char YUV422[] = "yuv422";
// YUYV version: http://www.fourcc.org/pixel-format/yuv-yuy2/
const char YUV422_YUY2[] = "yuv422_yuy2";
// https://www.kernel.org/doc/html/latest/userspace-api/media/v4l/pixfmt-packed-yuv.html#id1
// fourcc: UYVY
const char UYVY[] = "uyvy";
const char YUV422[] = "yuv422"; // deprecated
// fourcc: YUYV
const char YUYV[] = "yuyv";
const char YUV422_YUY2[] = "yuv422_yuy2"; // deprecated

// YUV 4:2:0 encodings with an 8-bit depth
// NV21: https://www.kernel.org/doc/html/latest/userspace-api/media/v4l/pixfmt-yuv-planar.html
// NV21: https://www.kernel.org/doc/html/latest/userspace-api/media/v4l/pixfmt-yuv-planar.html#nv12-nv21-nv12m-and-nv21m
const char NV21[] = "nv21";

// YUV 4:4:4 encodings with 8-bit depth
// NV24: https://www.kernel.org/doc/html/latest/userspace-api/media/v4l/pixfmt-yuv-planar.html
// NV24: https://www.kernel.org/doc/html/latest/userspace-api/media/v4l/pixfmt-yuv-planar.html#nv24-and-nv42
const char NV24[] = "nv24";

// Prefixes for abstract image encodings
Expand Down Expand Up @@ -184,6 +189,8 @@ static inline int numChannels(const std::string & encoding)

if (encoding == YUV422 ||
encoding == YUV422_YUY2 ||
encoding == UYVY ||
encoding == YUYV ||
encoding == NV21 ||
encoding == NV24)
{
Expand Down Expand Up @@ -234,6 +241,8 @@ static inline int bitDepth(const std::string & encoding)

if (encoding == YUV422 ||
encoding == YUV422_YUY2 ||
encoding == UYVY ||
encoding == YUYV ||
encoding == NV21 ||
encoding == NV24)
{
Expand Down
2 changes: 1 addition & 1 deletion sensor_msgs/package.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<?xml-model href="http://download.ros.org/schema/package_format3.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
<package format="3">
<name>sensor_msgs</name>
<version>4.7.0</version>
<version>5.1.0</version>
<description>A package containing some sensor data related message and service definitions.</description>

<maintainer email="[email protected]">Tully Foote</maintainer>
Expand Down
8 changes: 8 additions & 0 deletions sensor_msgs_py/CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,14 @@
Changelog for package sensor_msgs_py
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

5.1.0 (2023-04-27)
------------------

5.0.0 (2023-04-11)
------------------
* Add missing dep for sensor_msgs_py (`#217 <https://github.com/ros2/common_interfaces/issues/217>`_)
* Contributors: Yadu

4.7.0 (2023-02-13)
------------------
* [rolling] Update maintainers - 2022-11-07 (`#210 <https://github.com/ros2/common_interfaces/issues/210>`_)
Expand Down
2 changes: 1 addition & 1 deletion sensor_msgs_py/package.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<?xml-model href="http://download.ros.org/schema/package_format3.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
<package format="3">
<name>sensor_msgs_py</name>
<version>4.7.0</version>
<version>5.1.0</version>
<description>A package for easy creation and reading of PointCloud2 messages in Python.</description>

<maintainer email="[email protected]">Tully Foote</maintainer>
Expand Down
2 changes: 1 addition & 1 deletion sensor_msgs_py/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

setup(
name=package_name,
version='4.7.0',
version='5.1.0',
packages=[package_name],
data_files=[
('share/ament_index/resource_index/packages',
Expand Down
6 changes: 6 additions & 0 deletions shape_msgs/CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,12 @@
Changelog for package shape_msgs
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

5.1.0 (2023-04-27)
------------------

5.0.0 (2023-04-11)
------------------

4.7.0 (2023-02-13)
------------------
* Update common_interfaces to C++17. (`#215 <https://github.com/ros2/common_interfaces/issues/215>`_)
Expand Down
2 changes: 1 addition & 1 deletion shape_msgs/package.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<?xml-model href="http://download.ros.org/schema/package_format3.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
<package format="3">
<name>shape_msgs</name>
<version>4.7.0</version>
<version>5.1.0</version>
<description>A package containing some message definitions which describe geometric shapes.</description>

<maintainer email="[email protected]">Tully Foote</maintainer>
Expand Down
6 changes: 6 additions & 0 deletions std_msgs/CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,12 @@
Changelog for package std_msgs
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

5.1.0 (2023-04-27)
------------------

5.0.0 (2023-04-11)
------------------

4.7.0 (2023-02-13)
------------------
* Update common_interfaces to C++17. (`#215 <https://github.com/ros2/common_interfaces/issues/215>`_)
Expand Down
2 changes: 1 addition & 1 deletion std_msgs/package.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<?xml-model href="http://download.ros.org/schema/package_format3.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
<package format="3">
<name>std_msgs</name>
<version>4.7.0</version>
<version>5.1.0</version>
<description>A package containing some standard message definitions.</description>

<maintainer email="[email protected]">Tully Foote</maintainer>
Expand Down
6 changes: 6 additions & 0 deletions std_srvs/CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,12 @@
Changelog for package std_srvs
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

5.1.0 (2023-04-27)
------------------

5.0.0 (2023-04-11)
------------------

4.7.0 (2023-02-13)
------------------
* Update common_interfaces to C++17. (`#215 <https://github.com/ros2/common_interfaces/issues/215>`_)
Expand Down
2 changes: 1 addition & 1 deletion std_srvs/package.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<?xml-model href="http://download.ros.org/schema/package_format3.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
<package format="3">
<name>std_srvs</name>
<version>4.7.0</version>
<version>5.1.0</version>
<description>A package containing some standard service definitions.</description>

<maintainer email="[email protected]">Tully Foote</maintainer>
Expand Down
6 changes: 6 additions & 0 deletions stereo_msgs/CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,12 @@
Changelog for package stereo_msgs
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

5.1.0 (2023-04-27)
------------------

5.0.0 (2023-04-11)
------------------

4.7.0 (2023-02-13)
------------------
* Update common_interfaces to C++17. (`#215 <https://github.com/ros2/common_interfaces/issues/215>`_)
Expand Down
2 changes: 1 addition & 1 deletion stereo_msgs/package.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<?xml-model href="http://download.ros.org/schema/package_format3.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
<package format="3">
<name>stereo_msgs</name>
<version>4.7.0</version>
<version>5.1.0</version>
<description>A package containing some stereo camera related message definitions.</description>

<maintainer email="[email protected]">Tully Foote</maintainer>
Expand Down
6 changes: 6 additions & 0 deletions trajectory_msgs/CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,12 @@
Changelog for package trajectory_msgs
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

5.1.0 (2023-04-27)
------------------

5.0.0 (2023-04-11)
------------------

4.7.0 (2023-02-13)
------------------
* Update common_interfaces to C++17. (`#215 <https://github.com/ros2/common_interfaces/issues/215>`_)
Expand Down
2 changes: 1 addition & 1 deletion trajectory_msgs/package.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<?xml-model href="http://download.ros.org/schema/package_format3.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
<package format="3">
<name>trajectory_msgs</name>
<version>4.7.0</version>
<version>5.1.0</version>
<description>A package containing some robot trajectory message definitions.</description>

<maintainer email="[email protected]">Tully Foote</maintainer>
Expand Down
6 changes: 6 additions & 0 deletions visualization_msgs/CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,12 @@
Changelog for package visualization_msgs
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

5.1.0 (2023-04-27)
------------------

5.0.0 (2023-04-11)
------------------

4.7.0 (2023-02-13)
------------------
* Update common_interfaces to C++17. (`#215 <https://github.com/ros2/common_interfaces/issues/215>`_)
Expand Down
2 changes: 1 addition & 1 deletion visualization_msgs/package.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<?xml-model href="http://download.ros.org/schema/package_format3.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
<package format="3">
<name>visualization_msgs</name>
<version>4.7.0</version>
<version>5.1.0</version>
<description>A package containing some visualization and interaction related message definitions.</description>

<maintainer email="[email protected]">Tully Foote</maintainer>
Expand Down

0 comments on commit fb2264a

Please sign in to comment.