Skip to content

Commit

Permalink
Merge pull request #3107 from elandini84/fix/batteryGUI
Browse files Browse the repository at this point in the history
yarpbatterygui now compatible with battery_nwc_yarp
  • Loading branch information
randaz81 authored Jun 3, 2024
2 parents e8ddfd3 + 4703c9c commit 71f6c8b
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 2 deletions.
1 change: 1 addition & 0 deletions doc/release/master.md
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ Fixes

* Configuration files installed by the `yarp_configure_plugins_installation` CMake macro are now relocatable (https://github.com/robotology/yarp/issues/2445, ).
* Improved `ffmpeg` port monitor to allow using different couples of coders/decodes
* `yarpbatterygui` now compatible with battery_nwc_yarp.
* Fixed compilation of portmonitor carrier when a custom non-system swig is used
* Fixed compatibility with ffmpeg 7 (https://github.com/robotology/yarp/pull/3109).

Expand Down
4 changes: 2 additions & 2 deletions src/yarpbatterygui/main.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ int main(int argc, char *argv[])
bool b;
do
{
sprintf(pname, "/batteryMonitor%d:i", trial);
sprintf(pname, "/batteryMonitor%d", trial);
b = yarp::os::Network::exists(pname);
trial++;
} while (b == true);
Expand All @@ -110,7 +110,7 @@ int main(int argc, char *argv[])
yInfo() << "Using local port:" << localPort;

yarp::os::Property options;
options.put("device", "batteryClient");
options.put("device", "battery_nwc_yarp");
options.put("local", localPort);
options.put("remote", remotePort);

Expand Down

0 comments on commit 71f6c8b

Please sign in to comment.