Skip to content

Commit

Permalink
Remove the built-in topics
Browse files Browse the repository at this point in the history
Signed-off-by: tempate <[email protected]>
  • Loading branch information
Tempate committed Nov 2, 2023
1 parent b920c1c commit 7484db7
Show file tree
Hide file tree
Showing 3 changed files with 1 addition and 31 deletions.
1 change: 1 addition & 0 deletions docs/rst/notes/forthcoming_version.rst
Original file line number Diff line number Diff line change
Expand Up @@ -12,3 +12,4 @@ The next release will include the following **Features**:
* :ref:`Manual Topics <user_manual_configuration_dds__manual_topics>`.
* :ref:`Max Reception Rate <user_manual_configuration_dds__max_rx_rate>`.
* :ref:`Downsampling <user_manual_configuration_dds__downsampling>`.
* Remove the support for Built-in Topics.
22 changes: 0 additions & 22 deletions docs/rst/user_manual/configuration.rst
Original file line number Diff line number Diff line change
Expand Up @@ -36,24 +36,6 @@ DDS Configurations
The YAML Configuration supports a ``dds`` **optional** tag that contains certain :term:`DDS` configurations.
The values available to configure are:

.. _user_manual_configuration_dds__builtin_topics:

Built-in Topics
---------------

The discovery phase can be accelerated by listing topics under the ``builtin-topics`` tag.
The |spy| will create the DataWriters and DataReaders for these topics in the |spy| initialization.
The :ref:`Topic QoS <user_manual_configuration_dds__topic_qos>` for these topics can be manually configured with a :ref:`Manual Topic <user_manual_configuration_dds__manual_topics>` and with the :ref:`Specs Topic QoS <user_manual_configuration_specs_topic_qos>`; if a :ref:`Topic QoS <user_manual_configuration_dds__topic_qos>` is not configured, it will take its default value.

The ``builtin-topics`` must specify a ``name`` and ``type`` without wildcard characters.


.. code-block:: yaml
builtin-topics:
- name: HelloWorldTopic
type: HelloWorld
.. _user_manual_configuration_dds__topic_filtering:

Topic Filtering
Expand Down Expand Up @@ -348,10 +330,6 @@ This is a YAML file that uses all supported configurations and set them as defau
- name: "topic_name"
type: "topic_type"
builtin-topics:
- name: "HelloWorldTopic"
type: "HelloWorld"
topics:
- name: "temperature/*"
type: "temperature/types/*"
Expand Down
9 changes: 0 additions & 9 deletions fastddsspy_yaml/src/cpp/YamlReaderConfiguration.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,6 @@ void Configuration::load_configuration_(

/////
// Get optional specs configuration options
// WARNING: Parse builtin topics (dds tag) AFTER specs, as some topic-specific default values are set there
if (YamlReader::is_tag_present(yml, SPECS_TAG))
{
auto specs_yml = YamlReader::get_value_in_tag(yml, SPECS_TAG);
Expand Down Expand Up @@ -146,14 +145,6 @@ void Configuration::load_dds_configuration_(
std::vector<ManualTopic>(manual_topics.begin(), manual_topics.end());
}

/////
// Get optional builtin topics
if (YamlReader::is_tag_present(yml, BUILTIN_TAG))
{
ddspipe_configuration.builtin_topics = YamlReader::get_set<utils::Heritable<DistributedTopic>>(yml, BUILTIN_TAG,
version);
}

// Set the domain in Simple Participant Configuration
if (YamlReader::is_tag_present(yml, DOMAIN_ID_TAG))
{
Expand Down

0 comments on commit 7484db7

Please sign in to comment.