Merge branch 'ros2:master' into hliberacki/spin_until

launch_testing/launch_testing_examples/CHANGELOG.rst

@@ -2,6 +2,9 @@
 Changelog for package launch_testing_examples
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+0.16.0 (2022-04-29)
+-------------------
+
 0.15.0 (2022-03-01)
 -------------------
 

launch_testing/launch_testing_examples/package.xml

@@ -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>launch_testing_examples</name>
-  <version>0.15.0</version>
+  <version>0.16.0</version>
   <description>Examples of simple launch tests</description>
   <maintainer email="[email protected]">Shane Loretz</maintainer>
   <maintainer email="[email protected]">Aditya Pande</maintainer>

launch_testing/launch_testing_examples/setup.py

@@ -4,7 +4,7 @@
 
 setup(
     name=package_name,
-    version='0.15.0',
+    version='0.16.0',
     packages=[package_name],
     data_files=[
         ('share/ament_index/resource_index/packages',

rclcpp/actions/minimal_action_client/CHANGELOG.rst

@@ -2,6 +2,9 @@
 Changelog for package examples_rclcpp_minimal_action_client
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+0.16.0 (2022-04-29)
+-------------------
+
 0.15.0 (2022-03-01)
 -------------------
 

rclcpp/actions/minimal_action_client/package.xml

@@ -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>examples_rclcpp_minimal_action_client</name>
-  <version>0.15.0</version>
+  <version>0.16.0</version>
   <description>Minimal action client examples</description>
   <maintainer email="[email protected]">Shane Loretz</maintainer>
   <maintainer email="[email protected]">Aditya Pande</maintainer>

rclcpp/actions/minimal_action_server/CHANGELOG.rst

@@ -2,6 +2,9 @@
 Changelog for package examples_rclcpp_minimal_action_server
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+0.16.0 (2022-04-29)
+-------------------
+
 0.15.0 (2022-03-01)
 -------------------
 

rclcpp/actions/minimal_action_server/package.xml

@@ -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>examples_rclcpp_minimal_action_server</name>
-  <version>0.15.0</version>
+  <version>0.16.0</version>
   <description>Minimal action server examples</description>
   <maintainer email="[email protected]">Shane Loretz</maintainer>
   <maintainer email="[email protected]">Aditya Pande</maintainer>

rclcpp/composition/minimal_composition/CHANGELOG.rst

@@ -2,6 +2,9 @@
 Changelog for package examples_rclcpp_minimal_composition
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+0.16.0 (2022-04-29)
+-------------------
+
 0.15.0 (2022-03-01)
 -------------------
 

rclcpp/composition/minimal_composition/package.xml

@@ -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>examples_rclcpp_minimal_composition</name>
-  <version>0.15.0</version>
+  <version>0.16.0</version>
   <description>Minimalist examples of composing nodes in the same
   process</description>
   <maintainer email="[email protected]">Shane Loretz</maintainer>

rclcpp/executors/cbg_executor/CHANGELOG.rst

@@ -2,6 +2,9 @@
 Changelog for package examples_rclcpp_cbg_executor
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+0.16.0 (2022-04-29)
+-------------------
+
 0.15.0 (2022-03-01)
 -------------------
 * Improve scheduling configuration of examples_rclcpp_cbg_executor package (`#331 <https://github.com/ros2/examples/issues/331>`_)

rclcpp/executors/cbg_executor/package.xml

@@ -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>examples_rclcpp_cbg_executor</name>
-  <version>0.15.0</version>
+  <version>0.16.0</version>
   <description>Example for multiple Executor instances in one process, using the callback-group-level interface of the Executor class.</description>
   <maintainer email="[email protected]">Ralph Lange</maintainer>
   <license>Apache License 2.0</license>

rclcpp/executors/multithreaded_executor/CHANGELOG.rst

@@ -2,6 +2,9 @@
 Changelog for package examples_rclcpp_multithreaded_executor
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+0.16.0 (2022-04-29)
+-------------------
+
 0.15.0 (2022-03-01)
 -------------------
 

rclcpp/executors/multithreaded_executor/package.xml

@@ -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>examples_rclcpp_multithreaded_executor</name>
-  <version>0.15.0</version>
+  <version>0.16.0</version>
   <description>Package containing example of how to implement a multithreaded executor</description>
   <maintainer email="[email protected]">Shane Loretz</maintainer>
   <maintainer email="[email protected]">Aditya Pande</maintainer>

rclcpp/services/async_client/CHANGELOG.rst

@@ -2,6 +2,9 @@
 Changelog for package examples_rclcpp_async_client
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+0.16.0 (2022-04-29)
+-------------------
+
 0.15.0 (2022-03-01)
 -------------------
 

rclcpp/services/async_client/package.xml

@@ -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>examples_rclcpp_async_client</name>
-  <version>0.15.0</version>
+  <version>0.16.0</version>
   <description>Example of an async service client</description>
   <maintainer email="[email protected]">Shane Loretz</maintainer>
   <maintainer email="[email protected]">Aditya Pande</maintainer>

rclcpp/services/minimal_client/CHANGELOG.rst

@@ -2,6 +2,9 @@
 Changelog for package examples_rclcpp_minimal_client
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+0.16.0 (2022-04-29)
+-------------------
+
 0.15.0 (2022-03-01)
 -------------------
 

rclcpp/services/minimal_client/package.xml

@@ -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>examples_rclcpp_minimal_client</name>
-  <version>0.15.0</version>
+  <version>0.16.0</version>
   <description>Examples of minimal service clients</description>
   <maintainer email="[email protected]">Shane Loretz</maintainer>
   <maintainer email="[email protected]">Aditya Pande</maintainer>

rclcpp/services/minimal_service/CHANGELOG.rst

@@ -2,6 +2,9 @@
 Changelog for package examples_rclcpp_minimal_service
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+0.16.0 (2022-04-29)
+-------------------
+
 0.15.0 (2022-03-01)
 -------------------
 

rclcpp/services/minimal_service/package.xml

@@ -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>examples_rclcpp_minimal_service</name>
-  <version>0.15.0</version>
+  <version>0.16.0</version>
   <description>A minimal service server which adds two numbers</description>
   <maintainer email="[email protected]">Shane Loretz</maintainer>
   <maintainer email="[email protected]">Aditya Pande</maintainer>

rclcpp/timers/minimal_timer/CHANGELOG.rst

@@ -2,6 +2,9 @@
 Changelog for package examples_rclcpp_minimal_timer
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+0.16.0 (2022-04-29)
+-------------------
+
 0.15.0 (2022-03-01)
 -------------------
 

rclcpp/timers/minimal_timer/package.xml

@@ -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>examples_rclcpp_minimal_timer</name>
-  <version>0.15.0</version>
+  <version>0.16.0</version>
   <description>Examples of minimal nodes which have timers</description>
   <maintainer email="[email protected]">Shane Loretz</maintainer>
   <maintainer email="[email protected]">Aditya Pande</maintainer>

rclcpp/topics/minimal_publisher/CHANGELOG.rst

@@ -2,6 +2,9 @@
 Changelog for package examples_rclcpp_minimal_publisher
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+0.16.0 (2022-04-29)
+-------------------
+
 0.15.0 (2022-03-01)
 -------------------
 * Add an example about how to use wait_for_all_acked (`#316 <https://github.com/ros2/examples/issues/316>`_)

rclcpp/topics/minimal_publisher/package.xml

@@ -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>examples_rclcpp_minimal_publisher</name>
-  <version>0.15.0</version>
+  <version>0.16.0</version>
   <description>Examples of minimal publisher nodes</description>
   <maintainer email="[email protected]">Shane Loretz</maintainer>
   <maintainer email="[email protected]">Aditya Pande</maintainer>

rclcpp/topics/minimal_subscriber/CHANGELOG.rst

@@ -2,6 +2,11 @@
 Changelog for package examples_rclcpp_minimal_subscriber
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+0.16.0 (2022-04-29)
+-------------------
+* add ContentFilteredTopic example. (`#341 <https://github.com/ros2/examples/issues/341>`_)
+* Contributors: Tomoya Fujita
+
 0.15.0 (2022-03-01)
 -------------------
 * Use `const&` signature for read-only sub callbacks (`#337 <https://github.com/ros2/examples/issues/337>`_)

rclcpp/topics/minimal_subscriber/CMakeLists.txt

@@ -33,6 +33,8 @@ ament_target_dependencies(subscriber_member_function_with_unique_network_flow_en
 add_executable(subscriber_not_composable not_composable.cpp)
 ament_target_dependencies(subscriber_not_composable rclcpp std_msgs)
 
+add_executable(subscriber_content_filtering content_filtering.cpp)
+ament_target_dependencies(subscriber_content_filtering rclcpp std_msgs)
 
 add_library(wait_set_subscriber_library SHARED
     wait_set_subscriber.cpp
@@ -65,6 +67,7 @@ install(TARGETS
   subscriber_member_function_with_type_adapter
   subscriber_member_function_with_unique_network_flow_endpoints
   subscriber_not_composable
+  subscriber_content_filtering
   DESTINATION lib/${PROJECT_NAME})
 
 if(BUILD_TESTING)

rclcpp/topics/minimal_subscriber/README.md

@@ -8,6 +8,7 @@ This package contains a few different strategies for creating nodes which receiv
  * `static_wait_set_subscriber.cpp` uses a `rclcpp::StaticWaitSet` to wait and poll for data
  * `time_triggered_wait_set_subscriber.cpp` uses a `rclcpp::Waitset` and a timer to poll for data
    periodically
+ * `content_filtering.cpp` uses the content filtering feature for Subscriptions
 
 Note that `not_composable.cpp` instantiates a `rclcpp::Node` _without_ subclassing it.
 This was the typical usage model in ROS 1, but this style of coding is not compatible with composing multiple nodes into a single process.
@@ -20,3 +21,5 @@ We provide multiple examples of different coding styles which achieve this behav
 The following examples `wait_set_subscriber.cpp`, `static_wait_set_subscriber.cpp` and `time_triggered_wait_set_subscriber.cpp` show how to use a subscription in a node using a `rclcpp` wait-set.
 This is not a common use case in ROS 2 so this is not the recommended strategy to  use by-default.
 This strategy makes sense in some specific situations, for example when the developer needs to have more control over callback order execution, to create custom triggering conditions or to use the timeouts provided by the  wait-sets.   
+
+The example `content_filtering.cpp` shows how to use the content filtering feature for Subscriptions.

rclcpp/topics/minimal_subscriber/content_filtering.cpp

@@ -0,0 +1,103 @@
+// Copyright 2022 Open Source Robotics Foundation, Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#include <functional>
+#include <memory>
+#include <string>
+
+#include "rclcpp/rclcpp.hpp"
+#include "std_msgs/msg/string.hpp"
+
+using std::placeholders::_1;
+
+class MinimalContentFilteringSubscriber : public rclcpp::Node
+{
+public:
+  MinimalContentFilteringSubscriber()
+  : Node("minimal_contentfiltering_subscriber"),
+    current_filtering_expression_("data = %0"),
+    current_expression_parameter_("'Hello, world! 1'"),
+    count_(10)
+  {
+    rclcpp::SubscriptionOptions sub_options;
+    current_expression_parameter_ = "'Hello, world! " + std::to_string(count_) + "'";
+    sub_options.content_filter_options.filter_expression = current_filtering_expression_;
+    sub_options.content_filter_options.expression_parameters = {
+      current_expression_parameter_
+    };
+
+    subscription_ = this->create_subscription<std_msgs::msg::String>(
+      "topic", 10, std::bind(&MinimalContentFilteringSubscriber::topic_callback, this, _1),
+      sub_options);
+
+    if (!subscription_->is_cft_enabled()) {
+      RCLCPP_WARN(
+        this->get_logger(), "Content filter is not enabled since it's not supported");
+    } else {
+      RCLCPP_INFO(
+        this->get_logger(),
+        "Subscribed to topic \"%s\" with content filtering", subscription_->get_topic_name());
+      print_expression_parameter();
+    }
+  }
+
+private:
+  void topic_callback(const std_msgs::msg::String & msg)
+  {
+    RCLCPP_INFO(this->get_logger(), "I heard: '%s'", msg.data.c_str());
+    // update filtering expression parameter
+    if (subscription_->is_cft_enabled()) {
+      count_ = count_ + 10;
+      current_expression_parameter_ = "'Hello, world! " + std::to_string(count_) + "'";
+      try {
+        subscription_->set_content_filter(
+          current_filtering_expression_, {current_expression_parameter_}
+        );
+      } catch (const std::exception & e) {
+        RCLCPP_ERROR(this->get_logger(), "%s", e.what());
+      }
+    }
+    print_expression_parameter();
+  }
+
+  void print_expression_parameter(void) const
+  {
+    // print filtering expression and parameter stored in subscription
+    if (subscription_->is_cft_enabled()) {
+      rclcpp::ContentFilterOptions options;
+      try {
+        options = subscription_->get_content_filter();
+        RCLCPP_INFO(
+          this->get_logger(),
+          "Content filtering expression and parameter are \"%s\" and \"%s\"",
+          options.filter_expression.c_str(), options.expression_parameters[0].c_str());
+      } catch (const std::exception & e) {
+        RCLCPP_ERROR(this->get_logger(), "%s", e.what());
+      }
+    }
+  }
+
+  rclcpp::Subscription<std_msgs::msg::String>::SharedPtr subscription_;
+  std::string current_filtering_expression_;
+  std::string current_expression_parameter_;
+  size_t count_;
+};
+
+int main(int argc, char * argv[])
+{
+  rclcpp::init(argc, argv);
+  rclcpp::spin(std::make_shared<MinimalContentFilteringSubscriber>());
+  rclcpp::shutdown();
+  return 0;
+}

rclcpp/topics/minimal_subscriber/package.xml

@@ -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>examples_rclcpp_minimal_subscriber</name>
-  <version>0.15.0</version>
+  <version>0.16.0</version>
   <description>Examples of minimal subscribers</description>
   <maintainer email="[email protected]">Shane Loretz</maintainer>
   <maintainer email="[email protected]">Aditya Pande</maintainer>

rclcpp/wait_set/CHANGELOG.rst

@@ -2,6 +2,9 @@
 Changelog for package examples_rclcpp_wait_set
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+0.16.0 (2022-04-29)
+-------------------
+
 0.15.0 (2022-03-01)
 -------------------
 

rclcpp/wait_set/package.xml

@@ -4,7 +4,7 @@
   schematypens="http://www.w3.org/2001/XMLSchema"?>
 <package format="2">
   <name>examples_rclcpp_wait_set</name>
-  <version>0.15.0</version>
+  <version>0.16.0</version>
   <description>Example of how to use the rclcpp::WaitSet directly.</description>
   <maintainer email="[email protected]">William Woodall</maintainer>
   <license>Apache License 2.0</license>