diff --git a/devices/YarpRobotLoggerDevice/app/robots/ergoCubSN001/blf-yarp-robot-logger-interfaces/ft_clients.xml b/devices/YarpRobotLoggerDevice/app/robots/ergoCubSN001/blf-yarp-robot-logger-interfaces/ft_clients.xml index 56329018bd..74f6346816 100644 --- a/devices/YarpRobotLoggerDevice/app/robots/ergoCubSN001/blf-yarp-robot-logger-interfaces/ft_clients.xml +++ b/devices/YarpRobotLoggerDevice/app/robots/ergoCubSN001/blf-yarp-robot-logger-interfaces/ft_clients.xml @@ -4,7 +4,7 @@ - + /ergocub/left_leg/FT diff --git a/devices/YarpRobotLoggerDevice/app/robots/ergoCubSN001/blf-yarp-robot-logger-interfaces/imu_clients.xml b/devices/YarpRobotLoggerDevice/app/robots/ergoCubSN001/blf-yarp-robot-logger-interfaces/imu_clients.xml index ea6c1da71c..d665d647fe 100644 --- a/devices/YarpRobotLoggerDevice/app/robots/ergoCubSN001/blf-yarp-robot-logger-interfaces/imu_clients.xml +++ b/devices/YarpRobotLoggerDevice/app/robots/ergoCubSN001/blf-yarp-robot-logger-interfaces/imu_clients.xml @@ -21,19 +21,19 @@ - + - + /ergocub/left_foot_heel_tiptoe/imu diff --git a/devices/YarpRobotLoggerDevice/app/robots/ergoCubSN001/blf-yarp-robot-logger-interfaces/mas-remapper.xml b/devices/YarpRobotLoggerDevice/app/robots/ergoCubSN001/blf-yarp-robot-logger-interfaces/mas-remapper.xml index 1bb6cf384b..9f6ee80d80 100644 --- a/devices/YarpRobotLoggerDevice/app/robots/ergoCubSN001/blf-yarp-robot-logger-interfaces/mas-remapper.xml +++ b/devices/YarpRobotLoggerDevice/app/robots/ergoCubSN001/blf-yarp-robot-logger-interfaces/mas-remapper.xml @@ -6,34 +6,34 @@ 10 - (waist_imu_0, l_arm_ft_imu, r_arm_ft_imu, l_foot_front_ft_imu, l_foot_rear_ft_imu, r_foot_front_ft_imu, r_foot_rear_ft_imu, l_leg_ft_imu, r_leg_ft_imu) + (waist_imu_0, l_foot_front_ft_imu, l_foot_rear_ft_imu, r_foot_front_ft_imu, r_foot_rear_ft_imu, l_leg_ft_imu, r_leg_ft_imu) - (waist_imu_0, l_arm_ft_imu, r_arm_ft_imu, l_foot_front_ft_imu, l_foot_rear_ft_imu, r_foot_front_ft_imu, r_foot_rear_ft_imu, l_leg_ft_imu, r_leg_ft_imu) + (waist_imu_0, l_foot_front_ft_imu, l_foot_rear_ft_imu, r_foot_front_ft_imu, r_foot_rear_ft_imu, l_leg_ft_imu, r_leg_ft_imu) - (waist_imu_0, l_arm_ft_imu, r_arm_ft_imu, l_foot_front_ft_imu, l_foot_rear_ft_imu, r_foot_front_ft_imu, r_foot_rear_ft_imu, l_leg_ft_imu, r_leg_ft_imu) + (waist_imu_0, l_foot_front_ft_imu, l_foot_rear_ft_imu, r_foot_front_ft_imu, r_foot_rear_ft_imu, l_leg_ft_imu, r_leg_ft_imu) - (waist_imu_0, l_arm_ft_imu, r_arm_ft_imu, l_foot_front_ft_imu, l_foot_rear_ft_imu, r_foot_front_ft_imu, r_foot_rear_ft_imu, l_leg_ft_imu, r_leg_ft_imu) + (waist_imu_0, l_foot_front_ft_imu, l_foot_rear_ft_imu, r_foot_front_ft_imu, r_foot_rear_ft_imu, l_leg_ft_imu, r_leg_ft_imu) - (l_foot_front_ft, l_foot_rear_ft, r_foot_front_ft, r_foot_rear_ft, l_leg_ft, r_leg_ft, r_arm_ft, l_arm_ft) + (l_foot_front_ft, l_foot_rear_ft, r_foot_front_ft, r_foot_rear_ft, l_leg_ft, r_leg_ft) - (l_foot_front_ft, l_foot_rear_ft, r_foot_front_ft, r_foot_rear_ft, l_leg_ft, r_leg_ft, r_arm_ft, l_arm_ft) + (l_foot_front_ft, l_foot_rear_ft, r_foot_front_ft, r_foot_rear_ft, l_leg_ft, r_leg_ft) - left_arm_ft_client - right_arm_ft_client + + left_leg_ft_client right_leg_ft_client waist_imu_client - left_arm_imu_client - right_arm_imu_client + left_foot_imu_client right_foot_imu_client left_leg_imu_client diff --git a/devices/YarpRobotLoggerDevice/app/robots/ergoCubSN001/launch-yarp-robot-logger.xml b/devices/YarpRobotLoggerDevice/app/robots/ergoCubSN001/launch-yarp-robot-logger.xml index b6c440edad..d5469d0dd1 100644 --- a/devices/YarpRobotLoggerDevice/app/robots/ergoCubSN001/launch-yarp-robot-logger.xml +++ b/devices/YarpRobotLoggerDevice/app/robots/ergoCubSN001/launch-yarp-robot-logger.xml @@ -13,7 +13,7 @@ BSD-3-Clause license. --> - + diff --git a/devices/YarpRobotLoggerDevice/app/robots/ergoCubSN001/yarp-robot-logger.xml b/devices/YarpRobotLoggerDevice/app/robots/ergoCubSN001/yarp-robot-logger.xml index 43ea7684ff..d0d7a0da81 100644 --- a/devices/YarpRobotLoggerDevice/app/robots/ergoCubSN001/yarp-robot-logger.xml +++ b/devices/YarpRobotLoggerDevice/app/robots/ergoCubSN001/yarp-robot-logger.xml @@ -7,8 +7,8 @@ BSD-3-Clause license. --> ergocub 0.01 - (20) - ("video") + () + () () () @@ -77,7 +77,7 @@ BSD-3-Clause license. --> - true + false ("jabra") () @@ -100,11 +100,11 @@ BSD-3-Clause license. --> - (l_foot_front_ft, l_foot_rear_ft, r_foot_front_ft, r_foot_rear_ft, l_leg_ft, r_leg_ft, r_arm_ft, l_arm_ft) + (l_foot_front_ft, l_foot_rear_ft, r_foot_front_ft, r_foot_rear_ft, l_leg_ft, r_leg_ft) - (l_foot_front_ft, l_foot_rear_ft, r_foot_front_ft, r_foot_rear_ft, l_leg_ft, r_leg_ft, r_arm_ft, l_arm_ft) + (l_foot_front_ft, l_foot_rear_ft, r_foot_front_ft, r_foot_rear_ft, l_leg_ft, r_leg_ft) @@ -112,10 +112,10 @@ BSD-3-Clause license. --> - (waist_imu_0, l_foot_front_ft_imu, l_foot_rear_ft_imu, r_foot_front_ft_imu, r_foot_rear_ft_imu, l_leg_ft_imu, r_leg_ft_imu, r_arm_ft_imu, l_arm_ft_imu) - (waist_imu_0, l_foot_front_ft_imu, l_foot_rear_ft_imu, r_foot_front_ft_imu, r_foot_rear_ft_imu, l_leg_ft_imu, r_leg_ft_imu, r_arm_ft_imu, l_arm_ft_imu) - (waist_imu_0, l_foot_front_ft_imu, l_foot_rear_ft_imu, r_foot_front_ft_imu, r_foot_rear_ft_imu, l_leg_ft_imu, r_leg_ft_imu, r_arm_ft_imu, l_arm_ft_imu) - (waist_imu_0, l_foot_front_ft_imu, l_foot_rear_ft_imu, r_foot_front_ft_imu, r_foot_rear_ft_imu, l_leg_ft_imu, r_leg_ft_imu, r_arm_ft_imu, l_arm_ft_imu) + (waist_imu_0, l_foot_front_ft_imu, l_foot_rear_ft_imu, r_foot_front_ft_imu, r_foot_rear_ft_imu, l_leg_ft_imu, r_leg_ft_imu) + (waist_imu_0, l_foot_front_ft_imu, l_foot_rear_ft_imu, r_foot_front_ft_imu, r_foot_rear_ft_imu, l_leg_ft_imu, r_leg_ft_imu) + (waist_imu_0, l_foot_front_ft_imu, l_foot_rear_ft_imu, r_foot_front_ft_imu, r_foot_rear_ft_imu, l_leg_ft_imu, r_leg_ft_imu) + (waist_imu_0, l_foot_front_ft_imu, l_foot_rear_ft_imu, r_foot_front_ft_imu, r_foot_rear_ft_imu, l_leg_ft_imu, r_leg_ft_imu) @@ -134,7 +134,7 @@ BSD-3-Clause license. --> left_arm_wrench_client mas-remapper - jabra + diff --git a/utilities/joint-position-tracking/src/Main.cpp b/utilities/joint-position-tracking/src/Main.cpp index 0b5f0477ce..be299d5fdf 100644 --- a/utilities/joint-position-tracking/src/Main.cpp +++ b/utilities/joint-position-tracking/src/Main.cpp @@ -25,7 +25,7 @@ int main(int argc, char* argv[]) // prepare and configure the resource finder yarp::os::ResourceFinder& rf = yarp::os::ResourceFinder::getResourceFinderSingleton(); - rf.setDefaultConfigFile("jointPositionTrackingOptions.ini"); + rf.setDefaultConfigFile("blf-joint-position-tracking-options.ini"); rf.configure(argc, argv); diff --git a/utilities/joint-position-tracking/src/Module.cpp b/utilities/joint-position-tracking/src/Module.cpp index 814d7dce94..93886f85f4 100644 --- a/utilities/joint-position-tracking/src/Module.cpp +++ b/utilities/joint-position-tracking/src/Module.cpp @@ -185,7 +185,7 @@ bool Module::configure(yarp::os::ResourceFinder& rf) m_initTrajectoryTime = yarp::os::Time::now(); // switch in position direct control - if (!m_robotControl.setControlMode(RobotInterface::IRobotControl::ControlMode::PositionDirect)) + if (!m_robotControl.setControlMode(RobotInterface::IRobotControl::ControlMode::Velocity)) { log()->error("[Module::configure] Unable to switch in position direct control."); return false; @@ -236,8 +236,8 @@ bool Module::updateModule() } // set the reference - if (!m_robotControl.setReferences(m_spline.getOutput().position, - RobotInterface::IRobotControl::ControlMode::PositionDirect, + if (!m_robotControl.setReferences(m_spline.getOutput().velocity, + RobotInterface::IRobotControl::ControlMode::Velocity, m_currentJointPos)) { log()->error("{} Unable to set the reference.", logPrefix);