From b199c89e27f6ccf25e440113325ec5b73337a8e7 Mon Sep 17 00:00:00 2001 From: Nicogene Date: Mon, 21 May 2018 17:36:53 +0200 Subject: [PATCH] iCubSimulationControl: fix after cleanup interfaces (robotology/yarp#1691) --- .../iCubSimulation/wrapper/iCubSimulationControl.cpp | 5 +++++ .../iCubSimulation/wrapper/iCubSimulationControl.h | 6 ++++++ 2 files changed, 11 insertions(+) diff --git a/src/simulators/iCubSimulation/wrapper/iCubSimulationControl.cpp b/src/simulators/iCubSimulation/wrapper/iCubSimulationControl.cpp index dca84d4bc3..c2437aa5bd 100644 --- a/src/simulators/iCubSimulation/wrapper/iCubSimulationControl.cpp +++ b/src/simulators/iCubSimulation/wrapper/iCubSimulationControl.cpp @@ -1674,6 +1674,11 @@ bool iCubSimulationControl::calibrateRaw(int axis, double p) return NOT_YET_IMPLEMENTED("calibrateRaw"); } +bool iCubSimulationControl::calibrateRaw(int axis, unsigned int type, double p1, double p2, double p3) +{ + return NOT_YET_IMPLEMENTED("calibrateRaw"); +} + bool iCubSimulationControl::doneRaw(int axis) { return NOT_YET_IMPLEMENTED("doneRaw"); diff --git a/src/simulators/iCubSimulation/wrapper/iCubSimulationControl.h b/src/simulators/iCubSimulation/wrapper/iCubSimulationControl.h index 2fea55e5bc..9da03eb282 100644 --- a/src/simulators/iCubSimulation/wrapper/iCubSimulationControl.h +++ b/src/simulators/iCubSimulation/wrapper/iCubSimulationControl.h @@ -38,6 +38,11 @@ #include #include +#ifndef YARP_NO_DEPRECATED //since 3.0.0 +#include +#include +#endif + #include "LogicalJoints.h" //control mode definitions @@ -274,6 +279,7 @@ class yarp::dev::iCubSimulationControl : ////// calibration virtual bool calibrateRaw(int j, double p); + virtual bool calibrateRaw(int axis, unsigned int type, double p1, double p2, double p3); virtual bool doneRaw(int j); /////// Limits