added log/extra cleanup

robotology · Feb 5, 2024 · 144f07c · 144f07c
1 parent 4cf10f8
commit 144f07c
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 6 deletions.
diff --git 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)
+* 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
diff --git 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
@@ -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  |
+ |            | 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  |
+
diff --git 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 :