Skip to content

Commit

Permalink
Added ParamsParser to RgbdSensor_nwc_ros2
Browse files Browse the repository at this point in the history
Signed-off-by: Ettore Landini <[email protected]>
  • Loading branch information
elandini84 committed Aug 30, 2024
1 parent e516dca commit 1626bb1
Show file tree
Hide file tree
Showing 6 changed files with 256 additions and 43 deletions.
3 changes: 3 additions & 0 deletions src/devices/rgbdSensor_nwc_ros2/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,14 @@ yarp_prepare_plugin(rgbdSensor_nwc_ros2

if(NOT SKIP_rgbdSensor_nwc_ros2)
yarp_add_plugin(yarp_rgbdSensor_nwc_ros2)
generateDeviceParamsParser(RgbdSensor_nwc_ros2 rgbdSensor_nwc_ros2)

target_sources(yarp_rgbdSensor_nwc_ros2
PRIVATE
RgbdSensor_nwc_ros2.cpp
RgbdSensor_nwc_ros2.h
RgbdSensor_nwc_ros2_ParamsParser.h
RgbdSensor_nwc_ros2_ParamsParser.cpp
)

target_sources(yarp_rgbdSensor_nwc_ros2 PRIVATE $<TARGET_OBJECTS:Ros2RGBDConversionUtils> $<TARGET_OBJECTS:Ros2Utils>)
Expand Down
41 changes: 9 additions & 32 deletions src/devices/rgbdSensor_nwc_ros2/RgbdSensor_nwc_ros2.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -34,42 +34,19 @@ RgbdSensor_nwc_ros2::RgbdSensor_nwc_ros2()

bool RgbdSensor_nwc_ros2::open(yarp::os::Searchable& config)
{
parseParams(config);
m_topic_depth_camera_info = m_depth_topic_name.substr(0, m_depth_topic_name.rfind('/')) + "/camera_info";
m_topic_rgb_camera_info = m_color_topic_name.substr(0, m_color_topic_name.rfind('/')) + "/camera_info";

// node_name check
if (!config.check("node_name")) {
yCError(RGBDSENSOR_NWC_ROS2) << "missing node_name parameter";
return false;
}
m_ros2_node_name = config.find("node_name").asString();


// depth topic base name check
if (!config.check("depth_topic_name")) {
yCError(RGBDSENSOR_NWC_ROS2) << "missing depth_topic_name parameter";
return false;
}
m_topic_depth_image_raw = config.find("depth_topic_name").asString();

m_topic_depth_camera_info = m_topic_depth_image_raw.substr(0, m_topic_depth_image_raw.rfind('/')) + "/camera_info";

// color topic base name check
if (!config.check("color_topic_name")) {
yCError(RGBDSENSOR_NWC_ROS2) << "missing color_topic_name parameter";
return false;
}
m_topic_rgb_image_raw = config.find("color_topic_name").asString();

m_topic_rgb_camera_info = m_topic_rgb_image_raw.substr(0, m_topic_rgb_image_raw.rfind('/')) + "/camera_info";

m_verbose = config.check("verbose");
m_verbose = m_verbose_on == 1;

m_node = NodeCreator::createNode(m_ros2_node_name);
m_node = NodeCreator::createNode(m_node_name);
m_sub1= new Ros2Subscriber<RgbdSensor_nwc_ros2, sensor_msgs::msg::CameraInfo>(m_node, this);
m_sub1->subscribe_to_topic(m_topic_rgb_camera_info);
m_sub1->subscribe_to_topic(m_topic_depth_camera_info);
m_sub2= new Ros2Subscriber<RgbdSensor_nwc_ros2, sensor_msgs::msg::Image>(m_node, this);
m_sub2->subscribe_to_topic(m_topic_rgb_image_raw);
m_sub2->subscribe_to_topic(m_topic_depth_image_raw);
m_sub2->subscribe_to_topic(m_color_topic_name);
m_sub2->subscribe_to_topic(m_depth_topic_name);

m_spinner = new Ros2Spinner(m_node);
m_spinner->start();
Expand All @@ -91,9 +68,9 @@ bool RgbdSensor_nwc_ros2::close()

void RgbdSensor_nwc_ros2::callback(sensor_msgs::msg::Image::SharedPtr msg, std::string topic)
{
if (topic == m_topic_rgb_image_raw) {
if (topic == m_color_topic_name) {
color_raw_callback(msg);
} else if (topic == m_topic_depth_image_raw) {
} else if (topic == m_depth_topic_name) {
depth_raw_callback(msg);
}
}
Expand Down
16 changes: 5 additions & 11 deletions src/devices/rgbdSensor_nwc_ros2/RgbdSensor_nwc_ros2.h
Original file line number Diff line number Diff line change
Expand Up @@ -30,20 +30,16 @@
#include <sensor_msgs/msg/camera_info.hpp>
#include <Ros2Subscriber.h>

#include "RgbdSensor_nwc_ros2_ParamsParser.h"

/**
* @ingroup dev_impl_nwc_ros2
*
* \section rgbdSensor_nwc_ros2_device_parameters Description of input parameters
* This device is an nwc take a stream of data from ros2 and exposes to the user IRGBDSensor interface.
* See its documentation for more details about the interface.
*
* Parameters required by this device are:
* | Parameter name | SubParameter | Type | Units | Default Value | Required | Description | Notes |
* |:----------------------:|:-----------------------:|:-------:|:--------------:|:-------------:|:------------------------------: |:---------------------------------------------------------------------------------------------------:|:-----:|
* | rgb_data_topic | - | string | - | - | no | ros rgb topic | must start with a leading '/' |
* | rgb_info_topic | - | string | - | | no | ros rgb camera info topic | must start with a leading '/' |
* | depth_data_topic | - | string | - | - | no | ros depth topic | must start with a leading '/' |
* | depth_info_topic | - | string | - | - | no | ros depth camera info topic | must start with a leading '/' |
* Parameters required by this device are:shown in class: RgbdSensor_nwc_ros2_ParamsParser
*
* example of configuration file:
*
Expand Down Expand Up @@ -73,7 +69,8 @@ typedef yarp::sig::FlexImage flexImage;
*/
class RgbdSensor_nwc_ros2:
public yarp::dev::DeviceDriver,
public yarp::dev::IRGBDSensor
public yarp::dev::IRGBDSensor,
RgbdSensor_nwc_ros2_ParamsParser
{
private:
// mutex for writing or retrieving images
Expand Down Expand Up @@ -105,10 +102,7 @@ class RgbdSensor_nwc_ros2:

// ros2 variables for topics and subscriptions
std::string m_topic_rgb_camera_info;
std::string m_topic_rgb_image_raw;
std::string m_topic_depth_camera_info;
std::string m_topic_depth_image_raw;
std::string m_ros2_node_name;

// yarp variables
int m_verbose{2};
Expand Down
157 changes: 157 additions & 0 deletions src/devices/rgbdSensor_nwc_ros2/RgbdSensor_nwc_ros2_ParamsParser.cpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,157 @@
/*
* SPDX-FileCopyrightText: 2023-2023 Istituto Italiano di Tecnologia (IIT)
* SPDX-License-Identifier: LGPL-2.1-or-later
*/


// Generated by yarpDeviceParamParserGenerator (1.0)
// This is an automatically generated file. Please do not edit it.
// It will be re-generated if the cmake flag ALLOW_DEVICE_PARAM_PARSER_GERNERATION is ON.

// Generated on: Fri Aug 30 12:59:16 2024


#include "RgbdSensor_nwc_ros2_ParamsParser.h"
#include <yarp/os/LogStream.h>
#include <yarp/os/Value.h>

namespace {
YARP_LOG_COMPONENT(RgbdSensor_nwc_ros2ParamsCOMPONENT, "yarp.device.RgbdSensor_nwc_ros2")
}


RgbdSensor_nwc_ros2_ParamsParser::RgbdSensor_nwc_ros2_ParamsParser()
{
}


std::vector<std::string> RgbdSensor_nwc_ros2_ParamsParser::getListOfParams() const
{
std::vector<std::string> params;
params.push_back("node_name");
params.push_back("color_topic_name");
params.push_back("depth_topic_name");
params.push_back("verbose_on");
return params;
}


bool RgbdSensor_nwc_ros2_ParamsParser::parseParams(const yarp::os::Searchable & config)
{
//Check for --help option
if (config.check("help"))
{
yCInfo(RgbdSensor_nwc_ros2ParamsCOMPONENT) << getDocumentationOfDeviceParams();
}

std::string config_string = config.toString();
yarp::os::Property prop_check(config_string.c_str());
//Parser of parameter node_name
{
if (config.check("node_name"))
{
m_node_name = config.find("node_name").asString();
yCInfo(RgbdSensor_nwc_ros2ParamsCOMPONENT) << "Parameter 'node_name' using value:" << m_node_name;
}
else
{
yCError(RgbdSensor_nwc_ros2ParamsCOMPONENT) << "Mandatory parameter 'node_name' not found!";
yCError(RgbdSensor_nwc_ros2ParamsCOMPONENT) << "Description of the parameter: name of the ros2 node";
return false;
}
prop_check.unput("node_name");
}

//Parser of parameter color_topic_name
{
if (config.check("color_topic_name"))
{
m_color_topic_name = config.find("color_topic_name").asString();
yCInfo(RgbdSensor_nwc_ros2ParamsCOMPONENT) << "Parameter 'color_topic_name' using value:" << m_color_topic_name;
}
else
{
yCError(RgbdSensor_nwc_ros2ParamsCOMPONENT) << "Mandatory parameter 'color_topic_name' not found!";
yCError(RgbdSensor_nwc_ros2ParamsCOMPONENT) << "Description of the parameter: ros rgb topic (it's also the base name for the rgb camera_info topic)";
return false;
}
prop_check.unput("color_topic_name");
}

//Parser of parameter depth_topic_name
{
if (config.check("depth_topic_name"))
{
m_depth_topic_name = config.find("depth_topic_name").asString();
yCInfo(RgbdSensor_nwc_ros2ParamsCOMPONENT) << "Parameter 'depth_topic_name' using value:" << m_depth_topic_name;
}
else
{
yCError(RgbdSensor_nwc_ros2ParamsCOMPONENT) << "Mandatory parameter 'depth_topic_name' not found!";
yCError(RgbdSensor_nwc_ros2ParamsCOMPONENT) << "Description of the parameter: ros depth topic (it's also the base name for the depth camera_info topic)";
return false;
}
prop_check.unput("depth_topic_name");
}

//Parser of parameter verbose_on
{
if (config.check("verbose_on"))
{
m_verbose_on = config.find("verbose_on").asInt64();
yCInfo(RgbdSensor_nwc_ros2ParamsCOMPONENT) << "Parameter 'verbose_on' using value:" << m_verbose_on;
}
else
{
yCInfo(RgbdSensor_nwc_ros2ParamsCOMPONENT) << "Parameter 'verbose_on' using DEFAULT value:" << m_verbose_on;
}
prop_check.unput("verbose_on");
}

/*
//This code check if the user set some parameter which are not check by the parser
//If the parser is set in strict mode, this will generate an error
if (prop_check.size() > 0)
{
bool extra_params_found = false;
for (auto it=prop_check.begin(); it!=prop_check.end(); it++)
{
if (m_parser_is_strict)
{
yCError(RgbdSensor_nwc_ros2ParamsCOMPONENT) << "User asking for parameter: "<<it->name <<" which is unknown to this parser!";
extra_params_found = true;
}
else
{
yCWarning(RgbdSensor_nwc_ros2ParamsCOMPONENT) << "User asking for parameter: "<< it->name <<" which is unknown to this parser!";
}
}
if (m_parser_is_strict && extra_params_found)
{
return false;
}
}
*/
return true;
}


std::string RgbdSensor_nwc_ros2_ParamsParser::getDocumentationOfDeviceParams() const
{
std::string doc;
doc = doc + std::string("\n=============================================\n");
doc = doc + std::string("This is the help for device: RgbdSensor_nwc_ros2\n");
doc = doc + std::string("\n");
doc = doc + std::string("This is the list of the parameters accepted by the device:\n");
doc = doc + std::string("'node_name': name of the ros2 node\n");
doc = doc + std::string("'color_topic_name': ros rgb topic (it's also the base name for the rgb camera_info topic)\n");
doc = doc + std::string("'depth_topic_name': ros depth topic (it's also the base name for the depth camera_info topic)\n");
doc = doc + std::string("'verbose_on': if 1, it enables the verbose mode of the device\n");
doc = doc + std::string("\n");
doc = doc + std::string("Here are some examples of invocation command with yarpdev, with all params:\n");
doc = doc + " yarpdev --device rgbdSensor_nwc_ros2 --node_name <mandatory_value> --color_topic_name <mandatory_value> --depth_topic_name <mandatory_value> --verbose_on 0\n";
doc = doc + std::string("Using only mandatory params:\n");
doc = doc + " yarpdev --device rgbdSensor_nwc_ros2 --node_name <mandatory_value> --color_topic_name <mandatory_value> --depth_topic_name <mandatory_value>\n";
doc = doc + std::string("=============================================\n\n"); return doc;
}
78 changes: 78 additions & 0 deletions src/devices/rgbdSensor_nwc_ros2/RgbdSensor_nwc_ros2_ParamsParser.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,78 @@
/*
* SPDX-FileCopyrightText: 2023-2023 Istituto Italiano di Tecnologia (IIT)
* SPDX-License-Identifier: LGPL-2.1-or-later
*/


// Generated by yarpDeviceParamParserGenerator (1.0)
// This is an automatically generated file. Please do not edit it.
// It will be re-generated if the cmake flag ALLOW_DEVICE_PARAM_PARSER_GERNERATION is ON.

// Generated on: Fri Aug 30 12:59:16 2024


#ifndef RGBDSENSOR_NWC_ROS2_PARAMSPARSER_H
#define RGBDSENSOR_NWC_ROS2_PARAMSPARSER_H

#include <yarp/os/Searchable.h>
#include <yarp/dev/IDeviceDriverParams.h>
#include <string>
#include <cmath>

/**
* This class is the parameters parser for class RgbdSensor_nwc_ros2.
*
* These are the used parameters:
* | Group name | Parameter name | Type | Units | Default Value | Required | Description | Notes |
* |:----------:|:----------------:|:------:|:-----:|:-------------:|:--------:|:-------------------------------------------------------------------------:|:-----------------------------:|
* | - | node_name | string | - | - | 1 | name of the ros2 node | - |
* | - | color_topic_name | string | - | - | 1 | ros rgb topic (it's also the base name for the rgb camera_info topic) | must start with a leading '/' |
* | - | depth_topic_name | string | - | - | 1 | ros depth topic (it's also the base name for the depth camera_info topic) | must start with a leading '/' |
* | - | verbose_on | int | - | 0 | 0 | if 1, it enables the verbose mode of the device | - |
*
* The device can be launched by yarpdev using one of the following examples (with and without all optional parameters):
* \code{.unparsed}
* yarpdev --device rgbdSensor_nwc_ros2 --node_name <mandatory_value> --color_topic_name <mandatory_value> --depth_topic_name <mandatory_value> --verbose_on 0
* \endcode
*
* \code{.unparsed}
* yarpdev --device rgbdSensor_nwc_ros2 --node_name <mandatory_value> --color_topic_name <mandatory_value> --depth_topic_name <mandatory_value>
* \endcode
*
*/

class RgbdSensor_nwc_ros2_ParamsParser : public yarp::dev::IDeviceDriverParams
{
public:
RgbdSensor_nwc_ros2_ParamsParser();
~RgbdSensor_nwc_ros2_ParamsParser() override = default;

public:
const std::string m_device_classname = {"RgbdSensor_nwc_ros2"};
const std::string m_device_name = {"rgbdSensor_nwc_ros2"};
bool m_parser_is_strict = false;
struct parser_version_type
{
int major = 1;
int minor = 0;
};
const parser_version_type m_parser_version = {};

const std::string m_node_name_defaultValue = {""};
const std::string m_color_topic_name_defaultValue = {""};
const std::string m_depth_topic_name_defaultValue = {""};
const std::string m_verbose_on_defaultValue = {"0"};

std::string m_node_name = {}; //This default value is autogenerated. It is highly recommended to provide a suggested value also for mandatory parameters.
std::string m_color_topic_name = {}; //This default value is autogenerated. It is highly recommended to provide a suggested value also for mandatory parameters.
std::string m_depth_topic_name = {}; //This default value is autogenerated. It is highly recommended to provide a suggested value also for mandatory parameters.
int m_verbose_on = {0};

bool parseParams(const yarp::os::Searchable & config) override;
std::string getDeviceClassName() const override { return m_device_classname; }
std::string getDeviceName() const override { return m_device_name; }
std::string getDocumentationOfDeviceParams() const override;
std::vector<std::string> getListOfParams() const override;
};

#endif
4 changes: 4 additions & 0 deletions src/devices/rgbdSensor_nwc_ros2/RgbdSensor_nwc_ros2_params.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
| | node_name | string | - | - | Yes | name of the ros2 node | |
| | color_topic_name | string | - | - | Yes | ros rgb topic (it's also the base name for the rgb camera_info topic) | must start with a leading '/' |
| | depth_topic_name | string | - | - | Yes | ros depth topic (it's also the base name for the depth camera_info topic) | must start with a leading '/' |
| | verbose_on | int | - | 0 | No | if 1, it enables the verbose mode of the device | |

0 comments on commit 1626bb1

Please sign in to comment.