diff --git a/CMakeLists.txt b/CMakeLists.txt index 2dae265ec662ba584cf2d8334dc6c765e1d64283..5c62d9fc8b24cec486e6f714f57a5710a3802749 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -22,7 +22,7 @@ INCLUDE(cmake/python.cmake) # Print initial message MESSAGE(STATUS "${PROJECT_DESCRIPTION}, version ${PROJECT_VERSION}") -MESSAGE(STATUS "Copyright (C) 2018-2020 LAAS-CNRS / University of Edinburgh") +MESSAGE(STATUS "Copyright (C) 2018-2021 LAAS-CNRS, University of Edinburgh") MESSAGE(STATUS "All rights reserved.") MESSAGE(STATUS "Released under the BSD 3-Clause License.") diff --git a/python/example_robot_data/robots_loader.py b/python/example_robot_data/robots_loader.py index 90a1623213e17a945470d35113da3d5adc37492c..b8221b5e3bd334cb610d733705ae4bfec8a3b0ed 100644 --- a/python/example_robot_data/robots_loader.py +++ b/python/example_robot_data/robots_loader.py @@ -162,17 +162,11 @@ class TalosLegsLoader(TalosLoader): for j, M, name, parent, Y in zip(m1.joints, m1.jointPlacements, m1.names, m1.parents, m1.inertias): if j.id < legMaxId: jid = m2.addJoint(parent, getattr(pin, j.shortname())(), M, name) - upperPos = m2.upperPositionLimit - lowerPos = m2.lowerPositionLimit - effort = m2.effortLimit - upperPos[m2.joints[jid].idx_q:m2.joints[jid].idx_q + j.nq] = m1.upperPositionLimit[j.idx_q:j.idx_q + - j.nq] - lowerPos[m2.joints[jid].idx_q:m2.joints[jid].idx_q + j.nq] = m1.lowerPositionLimit[j.idx_q:j.idx_q + - j.nq] - effort[m2.joints[jid].idx_v:m2.joints[jid].idx_v + j.nv] = m1.effortLimit[j.idx_v:j.idx_v + j.nv] - m2.upperPositionLimit = upperPos - m2.lowerPositionLimit = lowerPos - m2.effortLimit = effort + idx_q, idx_v = m2.joints[jid].idx_q, m2.joints[jid].idx_v + m2.upperPositionLimit[idx_q:idx_q + j.nq] = m1.upperPositionLimit[j.idx_q:j.idx_q + j.nq] + m2.lowerPositionLimit[idx_q:idx_q + j.nq] = m1.lowerPositionLimit[j.idx_q:j.idx_q + j.nq] + m2.velocityLimit[idx_v:idx_v + j.nv] = m1.velocityLimit[j.idx_v:j.idx_v + j.nv] + m2.effortLimit[idx_v:idx_v + j.nv] = m1.effortLimit[j.idx_v:j.idx_v + j.nv] assert jid == j.id m2.appendBodyToJoint(jid, Y, pin.SE3.Identity())