From 144f07c7a52d15b5235d90a929bf588ded5b2d8f Mon Sep 17 00:00:00 2001 From: Marco Randazzo Date: Mon, 5 Feb 2024 20:31:39 +0100 Subject: [PATCH] added log/extra cleanup --- doc/release/master.md | 10 +++++++++- .../deviceBundler/DeviceBundler_ParamsParser.cpp | 2 +- src/devices/deviceBundler/DeviceBundler_params.md | 3 ++- src/devices/map2DStorage/map2DStorage.h | 3 --- 4 files changed, 12 insertions(+), 6 deletions(-) diff --git a/doc/release/master.md b/doc/release/master.md index a8317fccdfe..f646cf6762c 100644 --- a/doc/release/master.md +++ b/doc/release/master.md @@ -22,6 +22,7 @@ Deprecations and removals * Removed library `libYARP_wire_rep_utils`. * Removed `extern/md5` * Removed `extern/ros` messages and examples. +* The syntax yarpdev --device xxx --subdevice yyy has been deprecated. See discussion: https://github.com/robotology/yarp/discussions/3078 Fixes ----- @@ -31,4 +32,11 @@ Fixes New Features ------------ -* Added new command line tool `yarpDeviceParamParserGenerator`. See official yarp documentation (cmd_yarpDeviceParamParserGenerator.dox) \ No newline at end of file +* Added new command line tool `yarpDeviceParamParserGenerator`. See official yarp documentation (cmd_yarpDeviceParamParserGenerator.dox) + +### Devices + +#### deviceBundler + +* Added new device `deviceBundler` which can be useful to open two devices and attach them while using a single yarpdev command line. + See https://github.com/robotology/yarp/discussions/3078 \ No newline at end of file diff --git a/src/devices/deviceBundler/DeviceBundler_ParamsParser.cpp b/src/devices/deviceBundler/DeviceBundler_ParamsParser.cpp index d1a8f0444d2..84cf2c1d4f0 100644 --- a/src/devices/deviceBundler/DeviceBundler_ParamsParser.cpp +++ b/src/devices/deviceBundler/DeviceBundler_ParamsParser.cpp @@ -35,7 +35,7 @@ bool DeviceBundler_ParamsParser::parseParams(const yarp::os::Searchable & c //Check for --help option if (config.check("help")) { - yCInfo(DeviceBundlerParamsCOMPONENT) << getDocumentationOfDeviceParams(); + yCInfo(DeviceBundlerParamsCOMPONENT) << getDocumentationOfDeviceParams(); } std::string config_string = config.toString(); diff --git a/src/devices/deviceBundler/DeviceBundler_params.md b/src/devices/deviceBundler/DeviceBundler_params.md index 283b7a48bc4..bc4fa6faf38 100644 --- a/src/devices/deviceBundler/DeviceBundler_params.md +++ b/src/devices/deviceBundler/DeviceBundler_params.md @@ -2,4 +2,5 @@ |:----------:|:---------------:|:------:|:-----:|:--------------:|:--------:|:---------------------------------------------------------------------:|:-----------------------------------------------------:| | | wrapper_device | string | - | device_name1 | Yes | Name of the wrapper device | This device must derive from yarp::dev::IWrapper | | | attached_device | string | - | device_name2 | Yes | Name of the subdevice that will be attached to the wrapper device | | - | | doNotAttach | bool | - | false | No | If set to true, the two devices are opened, but not attached | It should not be used, except for debugging purposes | \ No newline at end of file + | | doNotAttach | bool | - | false | No | If set to true, the two devices are opened, but not attached | It should not be used, except for debugging purposes | + \ No newline at end of file diff --git a/src/devices/map2DStorage/map2DStorage.h b/src/devices/map2DStorage/map2DStorage.h index 9594a87f47b..da88da87b65 100644 --- a/src/devices/map2DStorage/map2DStorage.h +++ b/src/devices/map2DStorage/map2DStorage.h @@ -47,9 +47,6 @@ * |:--------------:|:--------------:|:-------:|:--------------:|:----------------:|:-----------: |:-----------------------------------------------------------------:|:-----:| * | name | - | string | - | /mapServer/rpc | No | Full name of the rpc port opened by the Map2DServer device. | | * | mapCollection | - | string | - | - | No | The name of .ini file containing a map collection. | | - - * \section Notes: - * Integration with ROS map server is currently under development. */ class Map2DStorage :