fixed conflict

robotology · Feb 14, 2023 · f17ebe7 · f17ebe7
2 parents 84a46c9 + 4178507
commit f17ebe7
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/doc/release/yarp_3_7/cbw_remote_vars.md b/doc/release/yarp_3_7/cbw_remote_vars.md
@@ -0,0 +1,8 @@
+cbw_remote_vars {#yarp_3_7}
+-------------------
+
+### Devices
+
+#### `controlBoard_nws_yarp`
+
+* Fix handling of `IRemoteVariables` messages via RPC.
diff --git a/src/devices/controlBoardWrapper/RPCMessagesParser.cpp b/src/devices/controlBoardWrapper/RPCMessagesParser.cpp
@@ -1232,10 +1232,10 @@ void RPCMessagesParser::handlePWMMsg(const yarp::os::Bottle& cmd, yarp::os::Bott
 
 void RPCMessagesParser::handleRemoteVariablesMsg(const yarp::os::Bottle& cmd, yarp::os::Bottle& response, bool* rec, bool* ok)
 {
-    yCTrace(CONTROLBOARD, "Handling IRemoteCalibrator message");
+    yCTrace(CONTROLBOARD, "Handling IRemoteVariables message");
 
-    if (!rpc_IRemoteCalibrator) {
-        yCError(CONTROLBOARD, "I do not have a valid IRemoteCalibrator interface");
+    if (!rpc_IVar) {
+        yCError(CONTROLBOARD, "controlBoardWrapper: I do not have a valid IRemoteVariables interface");
         *ok = false;
         return;
     }