...
 
Commits (30)
......@@ -4,14 +4,11 @@
ORG= loco-3d
NAME= curves
VERSION= 0.3.2
VERSION= 0.3.3
CATEGORIES= wip
COMMENT= Library for creating curves
LICENSE= 2-clause-bsd
MAINTAINER= gepetto@laas.fr
CMAKE_ARGS+= -DBUILD_PYTHON_INTERFACE=OFF
include ../../devel/jrl-cmakemodules/Makefile.common
......
......@@ -30,4 +30,7 @@ include/curves/serialization/fwd.hpp
include/curves/serialization/registeration.hpp
include/curves/so3_linear.h
include/curves/warning.hh
lib/cmake/curves/curvesConfig.cmake
lib/cmake/curves/curvesConfigVersion.cmake
lib/cmake/curves/curvesTargets.cmake
lib/pkgconfig/curves.pc
......@@ -15,11 +15,12 @@ PREFER.curves?= robotpkg
DEPEND_USE+= curves
DEPEND_ABI.curves?= curves>=0.3.1
DEPEND_ABI.curves?= curves>=0.3.3
DEPEND_DIR.curves?= ../../wip/curves
SYSTEM_SEARCH.curves=\
include/curves/config.hh \
'include/curves/config.hh:/CURVES_VERSION /s/[^0-9.]//gp' \
'lib/cmake/curves/curvesConfigVersion.cmake:/PACKAGE_VERSION/s/[^0-9.]//gp' \
'lib/pkgconfig/curves.pc:/Version/s/[^0-9.]//gp'
endif # CURVES_DEPEND_MK --------------------------------------------
......
SHA1 (curves-0.3.2.tar.gz) = ac9a2cb9e362be644535e361c044b45e7302571c
RMD160 (curves-0.3.2.tar.gz) = f671c43ddce6b853b3b586a304d4d5fc1c039cb4
Size (curves-0.3.2.tar.gz) = 1601538 bytes
SHA1 (curves-0.3.3.tar.gz) = eb9c39d3bb6e0f021696c383ab8324c8d971cead
RMD160 (curves-0.3.3.tar.gz) = 6e93160c2033071737adf909864300481b0f906a
Size (curves-0.3.3.tar.gz) = 1634744 bytes
......@@ -4,14 +4,11 @@
ORG= stack-of-tasks
NAME= ddp-actuator-solver
VERSION= 1.0.0
VERSION= 1.1.0
CATEGORIES= wip
COMMENT= Differentiable Dynamics Programming for one actuator
LICENSE= 2-clause-bsd
MAINTAINER= gepetto-soft@laas.fr
CMAKE_ARGS+= -DBUILD_PYTHON_INTERFACE=OFF
CMAKE_ARGS+= -DqpOASES_PREFIX=${PREFIX.qpoases}
USE_BOOST_LIBS= unit_test_framework
......
@comment Thu May 9 18:26:37 CEST 2019
include/ddp-actuator-solver/config.hh
include/ddp-actuator-solver/costfunction.hh
include/ddp-actuator-solver/ddpsolver.hh
include/ddp-actuator-solver/deprecated.hh
include/ddp-actuator-solver/dynamicmodel.hh
include/ddp-actuator-solver/examples/costfunctionromeoactuator.hh
include/ddp-actuator-solver/examples/costtemp.hh
include/ddp-actuator-solver/examples/dctemp.hh
include/ddp-actuator-solver/examples/romeosimpleactuator.hh
include/ddp-actuator-solver/examples/romeotorqueactuator.hh
include/ddp/actuator/solver/config.hh
include/ddp/actuator/solver/deprecated.hh
include/ddp/actuator/solver/warning.hh
lib/libddp-actuator-solver-examples.so
include/ddp-actuator-solver/pyrene_actuator/pyreneActuator.hh
include/ddp-actuator-solver/pyrene_actuator/pyreneCostFunction.hh
include/ddp-actuator-solver/romeo_actuator/costfunctionromeoactuator.hh
include/ddp-actuator-solver/romeo_actuator/romeosimpleactuator.hh
include/ddp-actuator-solver/romeo_actuator/romeotorqueactuator.hh
include/ddp-actuator-solver/temperature_control/costtemp.hh
include/ddp-actuator-solver/temperature_control/dctemp.hh
include/ddp-actuator-solver/warning.hh
lib/cmake/ddp-actuator-solver/ddp-actuator-solverConfig.cmake
lib/cmake/ddp-actuator-solver/ddp-actuator-solverConfigVersion.cmake
lib/cmake/ddp-actuator-solver/ddp-actuator-solverTargets-release.cmake
lib/cmake/ddp-actuator-solver/ddp-actuator-solverTargets.cmake
lib/libddp-actuator-solver.so
lib/libddp-actuator-solver.so.${PKGVERSION}
lib/pkgconfig/ddp-actuator-solver.pc
SHA1 (ddp-actuator-solver-1.0.0.tar.gz) = 18209bbd513a51fd42bdbbe07097b9abd689fade
RMD160 (ddp-actuator-solver-1.0.0.tar.gz) = f418d47a0bc4e833c7dacb24ed269809f70e311e
Size (ddp-actuator-solver-1.0.0.tar.gz) = 875901 bytes
SHA1 (patch-aa) = 64661238e6ecaaf8b14afb0db11902cfe098d5eb
SHA1 (ddp-actuator-solver-1.1.0.tar.gz) = 6e7e9378f94e0aeee463c941dcf067d32c642a34
RMD160 (ddp-actuator-solver-1.1.0.tar.gz) = 38ce067499638c85eabc3605b816694097217c7b
Size (ddp-actuator-solver-1.1.0.tar.gz) = 845129 bytes
--- CMakeLists.txt
+++ CMakeLists.txt
@@ -15,7 +15,10 @@ SET(PROJECT_URL "https://github.com/stack-of-tasks/ddp-actuator-solver")
SETUP_PROJECT()
-ADD_REQUIRED_DEPENDENCY("qpOASES")
+SET(CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/cmake/find-external/qpOASES")
+FIND_PACKAGE("qpOASES" REQUIRED)
+INCLUDE_DIRECTORIES(SYSTEM ${qpOASES_INCLUDE_DIRS})
+
# Add eigen3 as another needed dependency
ADD_REQUIRED_DEPENDENCY("eigen3 >= 3.0.5")
--- cmake/find-external/qpOASES/FindqpOASES.cmake.orig 2019-03-29 11:37:27.000000000 +0100
+++ cmake/find-external/qpOASES/FindqpOASES.cmake 2019-12-02 18:27:09.903628419 +0100
@@ -27,11 +27,11 @@
FIND_PATH(qpOASES_INCLUDE_DIR
NAMES qpOASES.hpp
- PATHS ${qpOASES_PREFIX}
+ PATHS ${qpOASES_PREFIX} ${qpOASES_PREFIX}/include
)
FIND_LIBRARY(qpOASES_LIBRARY
NAMES libqpOASES.so
- PATHS ${qpOASES_PREFIX}
+ PATHS ${qpOASES_PREFIX} ${qpOASES_PREFIX}/lib
)
SET(qpOASES_LIBRARIES ${qpOASES_LIBRARY})
......@@ -4,12 +4,10 @@
ORG= stack-of-tasks
NAME= dynamic-graph-tutorial
VERSION= 1.2.0
VERSION= 1.2.1
CATEGORIES= wip
COMMENT= Tutorial for the dynamic-graph
LICENSE= 2-clause-bsd
MAINTAINER= gepetto-soft@laas.fr
CMAKE_ARGS+= -DBUILD_PYTHON_INTERFACE=OFF
......
......@@ -4,5 +4,11 @@ include/dynamic-graph/tutorial/deprecated.hh
include/dynamic-graph/tutorial/feedback-controller.hh
include/dynamic-graph/tutorial/inverted-pendulum.hh
include/dynamic-graph/tutorial/warning.hh
lib/cmake/dynamic-graph-tutorial/dynamic-graph-tutorialConfig.cmake
lib/cmake/dynamic-graph-tutorial/dynamic-graph-tutorialConfigVersion.cmake
lib/cmake/dynamic-graph-tutorial/dynamic-graph-tutorialTargets-release.cmake
lib/cmake/dynamic-graph-tutorial/dynamic-graph-tutorialTargets.cmake
lib/libdynamic-graph-tutorial.so
lib/libdynamic-graph-tutorial.so.${PKGVERSION}
lib/pkgconfig/dynamic-graph-tutorial.pc
share/dynamic-graph-tutorial/package.xml
......@@ -14,13 +14,15 @@ ifeq (+,$(DYNAMIC_GRAPH_TUTORIAL_DEPEND_MK)) # ---------------------------------
PREFER.dynamic-graph-tutorial?= robotpkg
SYSTEM_SEARCH.dynamic-graph-tutorial=\
'include/dynamic-graph/tutorial/config.hh:/DYNAMIC_GRAPH_TUTORIAL_VERSION/s/[^0-9.]//gp' \
'lib/libdynamic-graph-tutorial.so' \
'lib/pkgconfig/dynamic-graph-tutorial.pc:/Version/s/[^0-9.]//gp'
'include/dynamic-graph/tutorial/config.hh:/DYNAMIC_GRAPH_TUTORIAL_VERSION /s/[^0-9.]//gp' \
'lib/libdynamic-graph-tutorial.so' \
'lib/cmake/dynamic-graph-tutorial/dynamic-graph-tutorialConfigVersion.cmake:/PACKAGE_VERSION/s/[^0-9.]//gp' \
'lib/pkgconfig/dynamic-graph-tutorial.pc:/Version/s/[^0-9.]//gp' \
'share/dynamic-graph-tutorial/package.xml:/<version>/s/[^0-9.]//gp'
DEPEND_USE+= dynamic-graph-tutorial
DEPEND_ABI.dynamic-graph-tutorial?= dynamic-graph-tutorial>=1.1.0
DEPEND_ABI.dynamic-graph-tutorial?= dynamic-graph-tutorial>=1.2.1
DEPEND_DIR.dynamic-graph-tutorial?= ../../wip/dynamic-graph-tutorial
endif # DYNAMIC_GRAPH_TUTORIAL_DEPEND_MK ------------------------------------------------
......
SHA1 (dynamic-graph-tutorial-1.2.0.tar.gz) = 39d1a546c13eff7f2da3a917cf4b75cd7113b48e
RMD160 (dynamic-graph-tutorial-1.2.0.tar.gz) = 557ea32710dd669c3d57971350a711159b1dbafd
Size (dynamic-graph-tutorial-1.2.0.tar.gz) = 793699 bytes
SHA1 (dynamic-graph-tutorial-1.2.1.tar.gz) = 068a6f39241bebaeccef2e48a1165d9b22341a24
RMD160 (dynamic-graph-tutorial-1.2.1.tar.gz) = 01435d4e460ed5e56ad14479e481500db72c07e7
Size (dynamic-graph-tutorial-1.2.1.tar.gz) = 846721 bytes
......@@ -4,28 +4,20 @@
ORG= stack-of-tasks
NAME= dynamic-graph
VERSION= 3.8.1
VERSION= 4.0.0
DISTNAME= ${NAME}-v3-${VERSION}
PKGNAME= ${NAME}-v3-${VERSION}
MASTER_SITES= ${MASTER_SITE_OPENROBOTS:=${NAME}/}
MASTER_REPOSITORY= ${MASTER_REPOSITORY_GITHUB}${ORG}/${NAME}.git
CHECKOUT_VCS_OPTS+= --recursive
CATEGORIES= wip
COMMENT= Efficient data-flow C++ library for robotics
LICENSE= 2-clause-bsd
MAINTAINER= gepetto-soft@laas.fr
CONFLICTS+= ${NAME}
CMAKE_ARGS+= -DBUILD_PYTHON_INTERFACE=OFF
CMAKE_ARGS+= -DCMAKE_INSTALL_LIBDIR=lib
CMAKE_ARGS+= -DCXX_DISABLE_WERROR=yes
DYNAMIC_PLIST_DIRS+= share/doc/${NAME}
CMAKE_ARGS+= -DCXX_DISABLE_WERROR=ON
CMAKE_ARGS+= -DINSTALL_DOCUMENTATION=OFF
include ../../devel/jrl-cmakemodules/Makefile.common
include ../../math/eigen3/depend.mk
include ../../pkgtools/pkg-config/depend.mk
include ../../mk/sysdep/cmake.mk
......
......@@ -26,8 +26,8 @@ include/dynamic-graph/factory.h
include/dynamic-graph/fwd.hh
include/dynamic-graph/linear-algebra.h
include/dynamic-graph/logger.h
include/dynamic-graph/null-ptr.hh
include/dynamic-graph/pool.h
include/dynamic-graph/real-time-logger-def.h
include/dynamic-graph/real-time-logger.h
include/dynamic-graph/signal-array.h
include/dynamic-graph/signal-base.h
......@@ -49,9 +49,11 @@ lib/cmake/dynamic-graph/dynamic-graphConfig.cmake
lib/cmake/dynamic-graph/dynamic-graphConfigVersion.cmake
lib/cmake/dynamic-graph/dynamic-graphTargets-release.cmake
lib/cmake/dynamic-graph/dynamic-graphTargets.cmake
lib/dynamic-graph-plugins/libtracer-real-time.so
lib/dynamic-graph-plugins/libtracer-real-time.so.${PKGVERSION}
lib/dynamic-graph-plugins/libtracer.so
lib/dynamic-graph-plugins/libtracer.so.${PKGVERSION}
lib/libdynamic-graph.so
lib/libdynamic-graph.so.${PKGVERSION}
lib/pkgconfig/dynamic-graph.pc
lib/plugin/tracer-real-time.so
lib/plugin/tracer.so
share/dynamic-graph/package.xml
SHA1 (dynamic-graph-v3-3.8.1.tar.gz) = c1d8491259db0ad99b1f9f02c41ed29581c0dd8b
RMD160 (dynamic-graph-v3-3.8.1.tar.gz) = 376c4e36f49fae01ecf2eee07f3504606d0f0170
Size (dynamic-graph-v3-3.8.1.tar.gz) = 1314995 bytes
SHA1 (dynamic-graph-v3-4.0.0.tar.gz) = dedcd37242b5b82f327f5e651bd6a1000bdec7cd
RMD160 (dynamic-graph-v3-4.0.0.tar.gz) = f8fd7bbc3b1f2c4222be508964343b4e766bf535
Size (dynamic-graph-v3-4.0.0.tar.gz) = 1339885 bytes
......@@ -4,7 +4,7 @@
ORG= stack-of-tasks
NAME= eiquadprog
VERSION= 1.1.2
VERSION= 1.1.3
CATEGORIES= wip
COMMENT= algorithm of Goldfarb and Idnani for the solution of a QP
......
SHA1 (eiquadprog-1.1.2.tar.gz) = 323a86048ef19c451b4b57f75589b71b680d287d
RMD160 (eiquadprog-1.1.2.tar.gz) = d765a8e38e313f13753c7cd44f3c76e7523161ee
Size (eiquadprog-1.1.2.tar.gz) = 859998 bytes
SHA1 (eiquadprog-1.1.3.tar.gz) = e4b6491448ee230c16106b1620d6047b4f62416e
RMD160 (eiquadprog-1.1.3.tar.gz) = a68fecf85fb263358693c8a7c1a082ddaf92654f
Size (eiquadprog-1.1.3.tar.gz) = 854342 bytes
......@@ -13,8 +13,6 @@ MAINTAINER= gepetto@laas.fr
CMAKE_ARGS+= -DBUILD_PYTHON_INTERFACE=OFF
DEPEND_ABI.cmake+= cmake>=3.0.0
include ../../devel/jrl-cmakemodules/Makefile.common
include ../../pkgtools/pkg-config/depend.mk
include ../../mk/sysdep/cmake.mk
......
......@@ -4,15 +4,12 @@
ORG= stack-of-tasks
NAME= jrl-walkgen
VERSION= 4.2.0
PKGREVISION= 1
VERSION= 4.2.1
PKGNAME= ${NAME}-v3-${VERSION}
CATEGORIES= wip
COMMENT= Walk pattern generator for the HRP-2 humanoid robot.
LICENSE= 2-clause-bsd
MAINTAINER= gepetto-soft@laas.fr
CONFLICTS+= ${NAME}
......
@comment Fri Mar 1 14:23:47 CET 2013
include/jrl/walkgen/config.hh
include/jrl/walkgen/deprecated.hh
include/jrl/walkgen/warning.hh
lib/pkgconfig/jrl-walkgen.pc
include/jrl/walkgen/patterngeneratorinterface.hh
include/jrl/walkgen/pgtypes.hh
include/jrl/walkgen/pinocchiorobot.hh
lib/libjrl-walkgen.so.${PKGVERSION}
include/jrl/walkgen/warning.hh
lib/cmake/jrl-walkgen/jrl-walkgenConfig.cmake
lib/cmake/jrl-walkgen/jrl-walkgenConfigVersion.cmake
lib/cmake/jrl-walkgen/jrl-walkgenTargets-release.cmake
lib/cmake/jrl-walkgen/jrl-walkgenTargets.cmake
lib/libjrl-walkgen.so
lib/libjrl-walkgen.so.${PKGVERSION}
lib/pkgconfig/jrl-walkgen.pc
share/jrl-walkgen/package.xml
share/jrl/dynamics/examples/CommonTools.cpp
share/jrl/dynamics/examples/CommonTools.hh
share/jrl/dynamics/examples/TestFootPrintPGInterface.cpp
share/jrl/dynamics/examples/TestFootPrintPGInterfaceData.cpp
share/jrl/dynamics/examples/TestFootPrintPGInterfaceData.h
share/jrl/dynamics/examples/TestFootPrintPGInterface.cpp
share/jrl/dynamics/examples/TestHerdt2010.cpp
share/jrl/dynamics/examples/CommonTools.cpp
share/jrl/dynamics/examples/CommonTools.hh
share/jrl/dynamics/examples/examples.CMakeList
SHA1 (jrl-walkgen-4.2.0.tar.gz) = 94e2bbd57f17fbe4af110c53026ca56fd3261a49
RMD160 (jrl-walkgen-4.2.0.tar.gz) = c2897d2322906e8aa80842b48fea4204c4edc607
Size (jrl-walkgen-4.2.0.tar.gz) = 15500455 bytes
SHA1 (patch-aa) = 4d002ea5167ee0965be69e88396d0fab44a9457c
SHA1 (jrl-walkgen-4.2.1.tar.gz) = be766fa03a354212f8d82615361de9a884e0908c
RMD160 (jrl-walkgen-4.2.1.tar.gz) = eea27089c44f5676455dd28946c55a3ac1269daf
Size (jrl-walkgen-4.2.1.tar.gz) = 15556238 bytes
--- tests/TestObject.cpp.orig 2019-07-29 10:33:00.000000000 +0200
+++ tests/TestObject.cpp 2019-09-12 15:54:26.363661314 +0200
@@ -29,6 +29,9 @@
// System include for floating point errors
#include <fenv.h>
+// Include Pinocchio before boost
+#include <pinocchio/fwd.hpp>
+
// Boost includes to parse XML files
#include <boost/property_tree/ptree.hpp>
#include <boost/property_tree/xml_parser.hpp>
......@@ -16,8 +16,6 @@ CATEGORIES= wip
MASTER_REPOSITORY= ${MASTER_REPOSITORY_GITHUB}${ORG}/${NAME}.git
CHECKOUT_VCS_OPTS+= --recursive
ONLY_FOR_PLATFORM= Ubuntu-18.04-%
HOMEPAGE= ${MASTER_SITE_GITHUB:=${ORG}/${ROSNAME}}
MASTER_SITES= ${HOMEPAGE}/archive/
COMMENT= Common Gazebo v1.9+ plugins used by the PAL Robotics robots
......
......@@ -24,10 +24,10 @@ LICENSE= gnu-lgpl-v3
include ../../devel/ros-catkin/depend.mk
include ../../devel/ros-roscpp-core/depend.mk
include ../../wip/sysdep/ubuntu-distro.mk
ifeq (bionic,${UBUNTUDISTRO})
include ../../wip/prf-gazebo-ros-pkgs-melodic/depend.mk
else
ifeq (xenial,${UBUNTUDISTRO})
include ../../wip/prf-gazebo-ros-pkgs/depend.mk
else
include ../../wip/prf-gazebo-ros-pkgs-melodic/depend.mk
endif
include ../../mk/language/c++.mk
......
......@@ -17,8 +17,6 @@ CATEGORIES= wip
MASTER_REPOSITORY= ${MASTER_REPOSITORY_GITHUB}${ORG}/${NAME}.git
CHECKOUT_VCS_OPTS+= --recursive
ONLY_FOR_PLATFORM= Ubuntu-18.04-%
# Source file from pal-robotics website
HOMEPAGE = ${MASTER_SITE_GITHUB:=${ORG}/${ROSNAME}}
MASTER_SITES= ${HOMEPAGE}/archive/
......
......@@ -26,8 +26,6 @@ USE_BOOST_LIBS= thread
ROS_METAPKG= yes
USE_BOOST_LIBS= thread
ONLY_FOR_PLATFORM= Ubuntu-16.04-% Ubuntu-18.04-%
CMAKE_PREFIX_PATH+=${PREFIX}
include ../../devel/boost-headers/depend.mk
include ../../devel/boost-libs/depend.mk
......
......@@ -15,8 +15,6 @@ CATEGORIES= wip
MASTER_REPOSITORY= ${MASTER_REPOSITORY_GITHUB}${ORG}/${NAME}.git
CHECKOUT_VCS_OPTS+= --recursive
ONLY_FOR_PLATFORM= Ubuntu-18.04-%
HOMEPAGE= ${MASTER_SITE_GITHUB:=${ORG}/${ROSNAME}}
MASTER_SITES= ${HOMEPAGE}/archive/
......
SHA1 (prf-gazebo-ros-pkgs-melodic/3.0.1.tar.gz) = abc1d1188a8f85cccd3f7aae02ad5025f961a502
RMD160 (prf-gazebo-ros-pkgs-melodic/3.0.1.tar.gz) = c455e72a1385144d02293285d6310051f81ca393
Size (prf-gazebo-ros-pkgs-melodic/3.0.1.tar.gz) = 1858951 bytes
SHA1 (patch-aa) = 47fb92ee7215c46780ebb50d863cb02a7d19c968
fix build on gazebo 10. ref:
https://osrf-distributions.s3.amazonaws.com/gazebo/api/dev/deprecated.html#_deprecated000019
https://github.com/ros-simulation/gazebo_ros_pkgs/pull/744/files
--- gazebo_plugins/src/gazebo_ros_vacuum_gripper.cpp.orig 2019-11-05 16:53:46.000000000 +0100
+++ gazebo_plugins/src/gazebo_ros_vacuum_gripper.cpp 2020-03-15 00:02:19.149443882 +0100
@@ -203,13 +203,9 @@
double norm = diff.Pos().Length();
if (norm < 0.05) {
#if GAZEBO_MAJOR_VERSION >= 8
- links[j]->SetLinearAccel(link_->WorldLinearAccel());
- links[j]->SetAngularAccel(link_->WorldAngularAccel());
links[j]->SetLinearVel(link_->WorldLinearVel());
links[j]->SetAngularVel(link_->WorldAngularVel());
#else
- links[j]->SetLinearAccel(link_->GetWorldLinearAccel());
- links[j]->SetAngularAccel(link_->GetWorldAngularAccel());
links[j]->SetLinearVel(link_->GetWorldLinearVel());
links[j]->SetAngularVel(link_->WorldAngularVel());
#endif
......@@ -41,10 +41,10 @@ include ../../middleware/ros-actionlib/depend.mk
include ../../middleware/ros-comm/depend.mk
include ../../motion/ros-control-toolbox/depend.mk
include ../../wip/sysdep/ubuntu-distro.mk
ifeq (bionic,${UBUNTUDISTRO})
include ../../wip/prf-gazebo-ros-pkgs-melodic/depend.mk
else
ifeq (xenial,${UBUNTUDISTRO})
include ../../wip/prf-gazebo-ros-pkgs/depend.mk
else
include ../../wip/prf-gazebo-ros-pkgs-melodic/depend.mk
endif
include ../../wip/pal-hardware-interfaces/depend.mk
include ../../mk/sysdep/gazebo.mk
......
......@@ -3,42 +3,35 @@
ORG= stack-of-tasks
NAME= dynamic-graph-bridge
VERSION= 3.3.0
VERSION= 3.3.1
ROSNAME= $(subst -,_,${NAME})
DISTNAME= ${ROSNAME}-v3-${VERSION}
DISTNAME= ${ROSNAME}-${VERSION}
PKGNAME= ${PKGTAG.python-}${NAME}-v3-${VERSION}
# Specifying the source repository
MASTER_SITES= ${MASTER_SITE_OPENROBOTS:=${NAME}/}
MASTER_REPOSITORY= ${MASTER_REPOSITORY_GITHUB}${ORG}/${ROSNAME}.git
CHECKOUT_VCS_OPTS+= --recursive
CATEGORIES= wip
COMMENT= This ROS package binds together the ROS framework with the dynamic-graph real-time control architecture.
LICENSE= 2-clause-bsd
MAINTAINER= gepetto-soft@laas.fr
CONFLICTS+= ${ROSNAME}
CONFLICTS+= py[0-9][0-9]-${ROSNAME}
CMAKE_ARGS+= -DINSTALL_DOCUMENTATION=OFF
# Needed for robotpkg to install in site-packages
CMAKE_ARGS+= -DSETUPTOOLS_DEB_LAYOUT=OFF
# Needed for dynamic_graph_bridge to be installed in site-packages
CMAKE_ARGS+= -DPYTHON_STANDARD_LAYOUT=ON
USE_PYTHON= true
CMAKE_ARGS+= -DCXX_DISABLE_WERROR=ON
DYNAMIC_PLIST_DIRS+= share/doc/doxygen-html
DYNAMIC_PLIST_DIRS+= share/gennodejs/ros/${ROSNAME}
DYNAMIC_PLIST_DIRS+= share/roseus/ros/${ROSNAME}
DYNAMIC_PLIST_DIRS+= share/commonlisp/ros/${ROSNAME}
DYNAMIC_PLIST_DIRS+= share/doc/${ROSNAME}
include ../../devel/jrl-cmakemodules/Makefile.common
include ../../devel/ros-catkin/depend.mk
include ../../devel/ros-realtime-tools/depend.mk
include ../../devel/ros-roscpp-core/depend.mk
include ../../interfaces/ros-common-msgs/depend.mk
include ../../math/pinocchio/depend.mk
include ../../math/py-pinocchio/depend.mk
include ../../path/hpp-fcl/depend.mk
include ../../path/py-hpp-fcl/depend.mk
include ../../math/ros-geometry2/depend.mk
include ../../math/ros-geometry/depend.mk
include ../../motion/dynamic-graph-bridge-msgs/depend.mk
......@@ -50,5 +43,5 @@ include ../../wip/sot-core-v3/depend.mk
include ../../mk/sysdep/bullet.mk
include ../../mk/sysdep/cmake.mk
include ../../mk/language/c.mk
include ../../mk/language/c++.mk
include ../../mk/language/c++11.mk
include ../../mk/robotpkg.mk
@comment Tue Sep 4 16:54:15 CEST 2018
include/dynamic_graph_bridge/RunPythonFile.h
include/dynamic_graph_bridge/RunPythonFileRequest.h
include/dynamic_graph_bridge/RunPythonFileResponse.h
bin/geometric_simu
include/dynamic_graph_bridge/config.hh
include/dynamic_graph_bridge/deprecated.hh
include/dynamic_graph_bridge/ros_init.hh
......@@ -9,15 +7,21 @@ include/dynamic_graph_bridge/ros_interpreter.hh
include/dynamic_graph_bridge/sot_loader.hh
include/dynamic_graph_bridge/sot_loader_basic.hh
include/dynamic_graph_bridge/warning.hh
include/src/converter.hh
include/src/sot_to_ros.hh
lib/cmake/dynamic_graph_bridge/dynamic_graph_bridgeConfig.cmake
lib/cmake/dynamic_graph_bridge/dynamic_graph_bridgeConfigVersion.cmake
lib/cmake/dynamic_graph_bridge/dynamic_graph_bridgeTargets-release.cmake
lib/cmake/dynamic_graph_bridge/dynamic_graph_bridgeTargets.cmake
lib/dynamic-graph-plugins/libros_publish.so
lib/dynamic-graph-plugins/libros_queued_subscribe.so
lib/dynamic-graph-plugins/libros_subscribe.so
lib/dynamic-graph-plugins/libros_tf_listener.so
lib/dynamic-graph-plugins/libros_time.so
lib/libros_bridge.so
lib/libros_interpreter.so
lib/libsot_loader.so
lib/pkgconfig/dynamic_graph_bridge.pc
lib/plugin/ros_publish.so
lib/plugin/ros_queued_subscribe.so
lib/plugin/ros_subscribe.so
lib/plugin/ros_tf_listener.so
lib/plugin/ros_time.so
${PYTHON_SITELIB}/dynamic_graph/ros/__init__.py
${PYTHON_SITELIB}/dynamic_graph/ros/dgcompleter.py
${PYTHON_SITELIB}/dynamic_graph/ros/ros.py
......@@ -31,21 +35,8 @@ ${PYTHON_SITELIB}/dynamic_graph/ros/ros_tf_listener/__init__.py
${PYTHON_SITELIB}/dynamic_graph/ros/ros_tf_listener/wrap.so
${PYTHON_SITELIB}/dynamic_graph/ros/ros_time/__init__.py
${PYTHON_SITELIB}/dynamic_graph/ros/ros_time/wrap.so
${PYTHON_SITELIB}/dynamic_graph_bridge/__init__.py
${PYTHON_SITELIB}/dynamic_graph_bridge/srv/_RunPythonFile.py
${PYTHON_SITELIB}/dynamic_graph_bridge/srv/__init__.py
share/common-lisp/ros/dynamic_graph_bridge/srv/RunPythonFile.lisp
share/common-lisp/ros/dynamic_graph_bridge/srv/_package.lisp
share/common-lisp/ros/dynamic_graph_bridge/srv/_package_RunPythonFile.lisp
share/common-lisp/ros/dynamic_graph_bridge/srv/dynamic_graph_bridge-srv.asd
share/dynamic_graph_bridge/cmake/dynamic_graph_bridge-msg-extras.cmake
share/dynamic_graph_bridge/cmake/dynamic_graph_bridge-msg-paths.cmake
share/dynamic_graph_bridge/cmake/dynamic_graph_bridgeConfig-version.cmake
share/dynamic_graph_bridge/cmake/dynamic_graph_bridgeConfig.cmake
share/dynamic_graph_bridge/geometric_simu
share/dynamic_graph_bridge/manifest.xml
share/dynamic_graph_bridge/package.xml
share/dynamic_graph_bridge/robot_pose_publisher
share/dynamic_graph_bridge/run_command
share/dynamic_graph_bridge/srv/RunPythonFile.srv
share/dynamic_graph_bridge/tf_publisher
......@@ -19,10 +19,10 @@ DEPEND_ABI.py-dynamic-graph-bridge-v3?= ${PKGTAG.python-}dynamic-graph-bridge-v
DEPEND_DIR.py-dynamic-graph-bridge-v3?= ../../wip/py-dynamic-graph-bridge-v3
SYSTEM_SEARCH.py-dynamic-graph-bridge-v3=\
'include/dynamic_graph_bridge/config.hh' \
'lib/pkgconfig/dynamic_graph_bridge.pc:/Version/s/[^0-9.]//gp' \
'share/dynamic_graph_bridge/robot_pose_publisher' \
'share/dynamic_graph_bridge/cmake/dynamic_graph_bridgeConfig.cmake' \
'include/dynamic_graph_bridge/config.hh:/DYNAMIC_GRAPH_BRIDGE_VERSION /s/[^0-9.]//gp' \
'lib/pkgconfig/dynamic_graph_bridge.pc:/Version/s/[^0-9.]//gp' \
'lib/cmake/dynamic_graph_bridge/dynamic_graph_bridgeConfigVersion.cmake:/PACKAGE_VERSION/s/[^0-9.]//gp' \
'share/dynamic_graph_bridge/robot_pose_publisher' \
'${PYTHON_SITELIB}/dynamic_graph/ros/ros.py'
......
SHA1 (dynamic_graph_bridge-v3-3.3.0.tar.gz) = d3e19eaf0598bf4c445ed40d70d96e7423986a4a
RMD160 (dynamic_graph_bridge-v3-3.3.0.tar.gz) = d5f4680f0031560c17c4ae9e7800901722e7cd90
Size (dynamic_graph_bridge-v3-3.3.0.tar.gz) = 813447 bytes
SHA1 (dynamic_graph_bridge-3.3.1.tar.gz) = 8467c345a2e14ddb472a80090557e5c2e4c26ec1
RMD160 (dynamic_graph_bridge-3.3.1.tar.gz) = 6a448263e4b11769e500e7c363e93d7ef98aa570
Size (dynamic_graph_bridge-3.3.1.tar.gz) = 851450 bytes
......@@ -4,12 +4,10 @@
ORG= stack-of-tasks
NAME= dynamic-graph-tutorial
VERSION= 1.2.0
VERSION= 1.2.1
CATEGORIES= wip
COMMENT= Tutorial for the dynamic-graph
LICENSE= 2-clause-bsd
MAINTAINER= gepetto-soft@laas.fr
USE_PYTHON_ONLY= true
......
SHA1 (dynamic-graph-tutorial-1.2.0.tar.gz) = 39d1a546c13eff7f2da3a917cf4b75cd7113b48e
RMD160 (dynamic-graph-tutorial-1.2.0.tar.gz) = 557ea32710dd669c3d57971350a711159b1dbafd
Size (dynamic-graph-tutorial-1.2.0.tar.gz) = 793699 bytes
SHA1 (dynamic-graph-tutorial-1.2.1.tar.gz) = 068a6f39241bebaeccef2e48a1165d9b22341a24
RMD160 (dynamic-graph-tutorial-1.2.1.tar.gz) = 01435d4e460ed5e56ad14479e481500db72c07e7
Size (dynamic-graph-tutorial-1.2.1.tar.gz) = 846721 bytes
......@@ -4,14 +4,12 @@
ORG= stack-of-tasks
NAME= dynamic-graph-python
VERSION= 3.5.0
VERSION= 3.5.1
PKGNAME= ${PKGTAG.python-}dynamic-graph-v3-${VERSION}
CATEGORIES= wip
COMMENT= Efficient data-flow C++ library for robotics (python bindings)
LICENSE= 2-clause-bsd
MAINTAINER= gepetto-soft@laas.fr
CONFLICTS+= py[0-9][0-9]-${NAME}
CONFLICTS+= py[0-9][0-9]-${NAME}-v3 # there is stuff not in ${PYTHON_SITELIB}
......
......@@ -7,7 +7,6 @@ include/dynamic-graph/python/dynamic-graph-py.hh
include/dynamic-graph/python/exception-python.hh
include/dynamic-graph/python/exception.hh
include/dynamic-graph/python/interpreter.hh
include/dynamic-graph/python/link-to-python.hh
include/dynamic-graph/python/python-compat.hh
include/dynamic-graph/python/signal-wrapper.hh
include/dynamic-graph/python/warning.hh
......
SHA1 (dynamic-graph-python-3.5.0.tar.gz) = 13f265e7fdad6988bb37f26b4436b85fd4c61bc3
RMD160 (dynamic-graph-python-3.5.0.tar.gz) = f066d3357053ffc44fbc27bbaf2fe9682041d6d2
Size (dynamic-graph-python-3.5.0.tar.gz) = 863267 bytes
SHA1 (dynamic-graph-python-3.5.1.tar.gz) = ab960d31baf77485940313f0de429a9229e752ff
RMD160 (dynamic-graph-python-3.5.1.tar.gz) = 46b6f174d00c5e68d3b0e48a6dbcc408dacd0adc
Size (dynamic-graph-python-3.5.1.tar.gz) = 902956 bytes
......@@ -13,8 +13,6 @@ MAINTAINER= gepetto@laas.fr
USE_PYTHON_ONLY= true
DEPEND_ABI.cmake+= cmake>=3.0.0
include ../../devel/jrl-cmakemodules/Makefile.common
include ../../${CATEGORIES}/${NAME}/depend.mk
......
......@@ -3,7 +3,7 @@
#
ORG= stack-of-tasks
VERSION= 0.3.0
VERSION= 0.4.0
NAME= roscontrol-sot
PKGNAME= ${PKGTAG.python-}${NAME}-${VERSION}
ROSNAME= $(subst -,_,${NAME})
......@@ -14,10 +14,8 @@ DIST_SUBDIR= ${NAME}
CATEGORIES= wip
COMMENT= This ROS package binds together the ROS control framework with the dynamic-graph real-time control architecture.
LICENSE= 2-clause-bsd
MAINTAINER= hpp@laas.fr
CMAKE_ARGS+= -DINSTALL_DOCUMENTATION=OFF
CMAKE_ARGS+= -DINSTALL_DOCUMENTATION=OFF
# disable -Werror because of x86_64 warnings (must be fixed upstream) and
# boost + gcc that don't cohabit well depending on their respective versions
......@@ -32,6 +30,8 @@ CMAKE_ARGS+= -DMANDIR=${PREFIX}/${PKGMANDIR}
CMAKE_PREFIX_PATH+= ${PREFIX}
USE_PYTHON= true
DYNAMIC_PLIST_DIRS+= share/doc/${ROSNAME}
include ../../devel/jrl-cmakemodules/Makefile.common
include ../../sysutils/ros-rospack/depend.mk
......@@ -58,7 +58,6 @@ ifeq (erbium,${PREFER.pal-distro})
SYSTEM_PREFIX+=/opt/pal/erbium
CXXFLAGS+="-I/opt/pal/erbium/include"
PKG_CONFIG_DIRS=/opt/pal/erbium/lib/pkgconfig
include ../../motion/ros-control-toolbox/depend.mk
else
include ../../wip/pal-hardware-interfaces/depend.mk
include ../../wip/prf-ros-control/depend.mk
......
......@@ -3,14 +3,16 @@ bin/roscontrol-sot-parse-log
include/roscontrol/sot/config.hh
include/roscontrol/sot/deprecated.hh
include/roscontrol/sot/warning.hh
lib/cmake/roscontrol_sot/roscontrol_sotConfig.cmake
lib/cmake/roscontrol_sot/roscontrol_sotConfigVersion.cmake
lib/cmake/roscontrol_sot/roscontrol_sotTargets-release.cmake
lib/cmake/roscontrol_sot/roscontrol_sotTargets.cmake
lib/librcsot_controller.so
lib/libsot-test-controller.so
lib/libsot-test-device.so
lib/pkgconfig/roscontrol_sot.pc
${PYTHON_SITELIB}/dynamic_graph/sot/test/sot_test_device/__init__.py
${PYTHON_SITELIB}/dynamic_graph/sot/test/sot_test_device/wrap.so
share/roscontrol_sot/cmake/roscontrol_sotConfig-version.cmake
share/roscontrol_sot/cmake/roscontrol_sotConfig.cmake
share/roscontrol_sot/config/roscontrol_sot_controller_plugins.xml
share/roscontrol_sot/config/rosdoc.yaml
share/roscontrol_sot/config/sot_test_params.yaml
......
SHA1 (roscontrol-sot/roscontrol_sot-0.3.0.tar.gz) = ccbfbbdf5507cc135526387243adcc708dc6cc1a
RMD160 (roscontrol-sot/roscontrol_sot-0.3.0.tar.gz) = 377bd857672d35954e62864268f074f657299dfe
Size (roscontrol-sot/roscontrol_sot-0.3.0.tar.gz) = 1277625 bytes
SHA1 (roscontrol-sot/roscontrol_sot-0.4.0.tar.gz) = bb9778ced3daa912537d61929b3d9605162b27d5
RMD160 (roscontrol-sot/roscontrol_sot-0.4.0.tar.gz) = 2f25d0b2edbf903ab5e90d6dc214e29e1293d8b8
Size (roscontrol-sot/roscontrol_sot-0.4.0.tar.gz) = 1313384 bytes
SHA1 (patch-aa) = 9840e176448c23fcd29a1b2e8fd59084fffbc910
--- CMakeLists.txt.orig 2020-03-19 22:29:08.000000000 +0100
+++ CMakeLists.txt 2020-03-20 01:46:50.075110462 +0100
@@ -80,6 +80,7 @@
add_definitions(-DTEMPERATURE_SENSOR_CONTROLLER)
endif(temperature_sensor_controller_FOUND)
+LINK_DIRECTORIES(${catkin_LIBRARY_DIRS})
add_library(rcsot_controller
src/roscontrol-sot-controller.cpp
src/log.cpp
......@@ -14,7 +14,7 @@ ifeq (+,$(PY_SOT_APPLICATION_V3_DEPEND_MK)) # ----------------------------------
PREFER.py-sot-application-v3?= robotpkg
SYSTEM_SEARCH.py-sot-application-v3=\
'${PYTHON_SYSLIBSEARCH}/dynamic_graph/sot/dynamics_pinocchio/dynamic/wrap.so'
'${PYTHON_SYSLIBSEARCH}/dynamic_graph/sot/dynamic_pinocchio/dynamic/wrap.so'
DEPEND_USE+= py-sot-application-v3
......
......@@ -4,14 +4,12 @@
ORG= stack-of-tasks
NAME= sot-core
VERSION= 4.8.0
VERSION= 4.8.1
PKGNAME= ${PKGTAG.python-}${NAME}-v3-${VERSION}
CATEGORIES= wip
COMMENT= Hierarchical task based control of humanoid robots (python bindings)
LICENSE= 2-clause-bsd
MAINTAINER= gepetto-soft@laas.fr
CONFLICTS+= py[0-9][0-9]-${NAME}
......
SHA1 (sot-core-4.8.0.tar.gz) = 2eb6b2bbd35cacbff5f8a3937953ee22ef3c6edd
RMD160 (sot-core-4.8.0.tar.gz) = bdefa99519d44ce898b5aedca3473ac17c885f8e
Size (sot-core-4.8.0.tar.gz) = 1128586 bytes
SHA1 (patch-aa) = 051b53d1ba73c8d456d024b9d0aedcf78eddbcc4
SHA1 (sot-core-4.8.1.tar.gz) = 54077a666ed76f984502f3aadb3fd16365916eb3
RMD160 (sot-core-4.8.1.tar.gz) = 77769d17eac2b2326b0ab219f621fb319dff76f6
Size (sot-core-4.8.1.tar.gz) = 1120970 bytes
--- CMakeLists.txt.orig 2020-02-09 18:41:51.000000000 +0100
+++ CMakeLists.txt 2020-02-21 18:11:14.545037860 +0100
@@ -42,10 +42,6 @@
# to avoid name collision when installing dynamic-graph in /usr.
SET(PLUGINDIR "${CMAKE_INSTALL_FULL_LIBDIR}/plugin")
-# Extra macros for sot-core
-install(FILES "src/sot-coreMacros.cmake"
- DESTINATION "${CONFIG_INSTALL_DIR}")
-
set(PACKAGE_EXTRA_MACROS "${PACKAGE_EXTRA_MACROS}
include(\"\${CMAKE_CURRENT_LIST_DIR}/sot-coreMacros.cmake\")")
......@@ -4,16 +4,13 @@
ORG= stack-of-tasks
NAME= sot-dynamic-pinocchio
VERSION= 3.4.2
PKGREVISION= 1
VERSION= 3.4.5
DISTNAME= ${NAME}-v3-${VERSION}
PKGNAME= ${PKGTAG.python-}${NAME}-v3-${VERSION}
CATEGORIES= wip
COMMENT= Create entities to compute a robot dynamics properties using pinocchio (python bindings)
LICENSE= 2-clause-bsd
MAINTAINER= gepetto-soft@laas.fr
CONFLICTS+= py[0-9][0-9]-${NAME}
......
@comment Fri Dec 6 09:25:38 CET 2013
${PYTHON_SITELIB}/dynamic_graph/sot/dynamics_pinocchio/__init__.py
${PYTHON_SITELIB}/dynamic_graph/sot/dynamics_pinocchio/angle_estimator/__init__.py
${PYTHON_SITELIB}/dynamic_graph/sot/dynamics_pinocchio/angle_estimator/wrap.so
${PYTHON_SITELIB}/dynamic_graph/sot/dynamics_pinocchio/dynamic/__init__.py
${PYTHON_SITELIB}/dynamic_graph/sot/dynamics_pinocchio/dynamic/wrap.so
${PYTHON_SITELIB}/dynamic_graph/sot/dynamics_pinocchio/force_compensation/__init__.py
${PYTHON_SITELIB}/dynamic_graph/sot/dynamics_pinocchio/force_compensation/wrap.so
${PYTHON_SITELIB}/dynamic_graph/sot/dynamics_pinocchio/humanoid_robot.py
${PYTHON_SITELIB}/dynamic_graph/sot/dynamics_pinocchio/integrator_force/__init__.py
${PYTHON_SITELIB}/dynamic_graph/sot/dynamics_pinocchio/integrator_force/wrap.so
${PYTHON_SITELIB}/dynamic_graph/sot/dynamics_pinocchio/integrator_force_exact/__init__.py
${PYTHON_SITELIB}/dynamic_graph/sot/dynamics_pinocchio/integrator_force_exact/wrap.so
${PYTHON_SITELIB}/dynamic_graph/sot/dynamics_pinocchio/integrator_force_rk4/__init__.py
${PYTHON_SITELIB}/dynamic_graph/sot/dynamics_pinocchio/integrator_force_rk4/wrap.so
${PYTHON_SITELIB}/dynamic_graph/sot/dynamics_pinocchio/mass_apparent/__init__.py
${PYTHON_SITELIB}/dynamic_graph/sot/dynamics_pinocchio/mass_apparent/wrap.so
${PYTHON_SITELIB}/dynamic_graph/sot/dynamics_pinocchio/parser.py
${PYTHON_SITELIB}/dynamic_graph/sot/dynamics_pinocchio/tools.py
${PYTHON_SITELIB}/dynamic_graph/sot/dynamics_pinocchio/waist_attitude_from_sensor/__init__.py
${PYTHON_SITELIB}/dynamic_graph/sot/dynamics_pinocchio/waist_attitude_from_sensor/wrap.so
${PYTHON_SITELIB}/dynamic_graph/sot/dynamics_pinocchio/zmp_from_forces/__init__.py
${PYTHON_SITELIB}/dynamic_graph/sot/dynamics_pinocchio/zmp_from_forces/wrap.so
${PYTHON_SITELIB}/dynamic_graph/sot/dynamics_pinocchio/zmpreffromcom/__init__.py
${PYTHON_SITELIB}/dynamic_graph/sot/dynamics_pinocchio/zmpreffromcom/wrap.so
${PYTHON_SITELIB}/dynamic_graph/sot/dynamic_pinocchio/__init__.py
${PYTHON_SITELIB}/dynamic_graph/sot/dynamic_pinocchio/angle_estimator/__init__.py
${PYTHON_SITELIB}/dynamic_graph/sot/dynamic_pinocchio/angle_estimator/wrap.so
${PYTHON_SITELIB}/dynamic_graph/sot/dynamic_pinocchio/dynamic/__init__.py
${PYTHON_SITELIB}/dynamic_graph/sot/dynamic_pinocchio/dynamic/wrap.so
${PYTHON_SITELIB}/dynamic_graph/sot/dynamic_pinocchio/force_compensation/__init__.py
${PYTHON_SITELIB}/dynamic_graph/sot/dynamic_pinocchio/force_compensation/wrap.so
${PYTHON_SITELIB}/dynamic_graph/sot/dynamic_pinocchio/humanoid_robot.py
${PYTHON_SITELIB}/dynamic_graph/sot/dynamic_pinocchio/integrator_force/__init__.py
${PYTHON_SITELIB}/dynamic_graph/sot/dynamic_pinocchio/integrator_force/wrap.so
${PYTHON_SITELIB}/dynamic_graph/sot/dynamic_pinocchio/integrator_force_exact/__init__.py
${PYTHON_SITELIB}/dynamic_graph/sot/dynamic_pinocchio/integrator_force_exact/wrap.so
${PYTHON_SITELIB}/dynamic_graph/sot/dynamic_pinocchio/integrator_force_rk4/__init__.py
${PYTHON_SITELIB}/dynamic_graph/sot/dynamic_pinocchio/integrator_force_rk4/wrap.so
${PYTHON_SITELIB}/dynamic_graph/sot/dynamic_pinocchio/kine_romeo.py
${PYTHON_SITELIB}/dynamic_graph/sot/dynamic_pinocchio/kine_romeo_small.py
${PYTHON_SITELIB}/dynamic_graph/sot/dynamic_pinocchio/mass_apparent/__init__.py
${PYTHON_SITELIB}/dynamic_graph/sot/dynamic_pinocchio/mass_apparent/wrap.so
${PYTHON_SITELIB}/dynamic_graph/sot/dynamic_pinocchio/parser.py
${PYTHON_SITELIB}/dynamic_graph/sot/dynamic_pinocchio/tools.py
${PYTHON_SITELIB}/dynamic_graph/sot/dynamic_pinocchio/waist_attitude_from_sensor/__init__.py
${PYTHON_SITELIB}/dynamic_graph/sot/dynamic_pinocchio/waist_attitude_from_sensor/wrap.so
${PYTHON_SITELIB}/dynamic_graph/sot/dynamic_pinocchio/zmp_from_forces/__init__.py
${PYTHON_SITELIB}/dynamic_graph/sot/dynamic_pinocchio/zmp_from_forces/wrap.so
${PYTHON_SITELIB}/dynamic_graph/sot/dynamic_pinocchio/zmpreffromcom/__init__.py
${PYTHON_SITELIB}/dynamic_graph/sot/dynamic_pinocchio/zmpreffromcom/wrap.so
${PYTHON_SITELIB}/dynamic_graph/tutorial/kine_romeo.py
${PYTHON_SITELIB}/dynamic_graph/tutorial/kine_romeo_small.py
......@@ -14,7 +14,7 @@ ifeq (+,$(PY_SOT_DYNAMIC_PINOCCHIO_V3_DEPEND_MK)) # ----------------------------
PREFER.py-sot-dynamic-pinocchio-v3?= robotpkg
SYSTEM_SEARCH.py-sot-dynamic-pinocchio-v3=\
'${PYTHON_SYSLIBSEARCH}/dynamic_graph/sot/dynamics_pinocchio/dynamic/wrap.so'
'${PYTHON_SYSLIBSEARCH}/dynamic_graph/sot/dynamic_pinocchio/dynamic/wrap.so'
DEPEND_USE+= py-sot-dynamic-pinocchio-v3
......
SHA1 (sot-dynamic-pinocchio-v3-3.4.2.tar.gz) = 8158c9dd94b05bf5b5f17610594f733a5734bb49
RMD160 (sot-dynamic-pinocchio-v3-3.4.2.tar.gz) = 8a3decfd2618a28ec131e8e17a5eaabcdcd866ff
Size (sot-dynamic-pinocchio-v3-3.4.2.tar.gz) = 884766 bytes
SHA1 (patch-aa) = 3eabfe06e428cfbdf4d115a8fe8b95819cc945b5
SHA1 (sot-dynamic-pinocchio-v3-3.4.5.tar.gz) = 6fc911d507639f4a039afdcd639c750107e79320
RMD160 (sot-dynamic-pinocchio-v3-3.4.5.tar.gz) = 950fc8969480752bd5f5998de4568e8e3cc1ccba
Size (sot-dynamic-pinocchio-v3-3.4.5.tar.gz) = 917364 bytes
python-module-py.cpp includes sot/core/debug.hh
--- src/CMakeLists.txt.orig 2020-01-10 16:44:19.000000000 +0100
+++ src/CMakeLists.txt 2020-01-13 17:30:56.395667437 +0100
@@ -64,6 +64,7 @@
"src/python-module-py.cpp"
)
PKG_CONFIG_USE_DEPENDENCY(sot-dynamic-pinocchio-${PYTHON_LIBRARY_NAME}-wrap pinocchio)
+ PKG_CONFIG_USE_DEPENDENCY(sot-dynamic-pinocchio-${PYTHON_LIBRARY_NAME}-wrap sot-core)
ENDIF(BUILD_PYTHON_INTERFACE)
ENDFOREACH(lib)
......@@ -4,14 +4,12 @@
ORG= stack-of-tasks
NAME= sot-pattern-generator
VERSION= 3.2.2
VERSION= 3.2.3
PKGNAME= ${PKGTAG.python-}${NAME}-v3-${VERSION}
CATEGORIES= wip
COMMENT= Walking Pattern Generator (python bindings)
LICENSE= 2-clause-bsd
MAINTAINER= gepetto@laas.fr
CONFLICTS+= py[0-9][0-9]-${NAME}
......@@ -30,5 +28,5 @@ include ../../mk/sysdep/cmake.mk
include ../../mk/sysdep/doxygen.mk
include ../../mk/sysdep/python.mk
include ../../mk/language/c.mk
include ../../mk/language/c++.mk
include ../../mk/language/c++11.mk
include ../../mk/robotpkg.mk
SHA1 (sot-pattern-generator-3.2.2.tar.gz) = 85f9369987f7a4d665d85e55b3c53c1a0a5a0ade
RMD160 (sot-pattern-generator-3.2.2.tar.gz) = 27f7ca462e44bba04c7063aa0f49307bb2f63d3c
Size (sot-pattern-generator-3.2.2.tar.gz) = 851750 bytes
SHA1 (sot-pattern-generator-3.2.3.tar.gz) = 98d4618db6fd9c36fd5db10430d89c55acf46b4b
RMD160 (sot-pattern-generator-3.2.3.tar.gz) = a381bf27009b71da249cf51f8482499ba5b89196
Size (sot-pattern-generator-3.2.3.tar.gz) = 909222 bytes
......@@ -2,16 +2,14 @@
# Created: Olivier Stasse on Sat May 25 23:01:40 CET 2019
#
ORG= stack-of-tasks
NAME= sot-talos-balance
VERSION= 1.8.0
ORG= stack-of-tasks
NAME= sot-talos-balance
VERSION= 1.8.1
CATEGORIES= wip
COMMENT= Balance for TALOS humanoid robot (python bindings)
LICENSE= 2-clause-bsd
MAINTAINER= gepetto-soft@laas.fr
CATEGORIES= wip
COMMENT= Balance for TALOS humanoid robot (python bindings)
USE_PYTHON_ONLY= true
USE_PYTHON_ONLY= true
include ../../${CATEGORIES}/${NAME}/depend.mk
include ../../devel/jrl-cmakemodules/Makefile.common
......
@comment Fri Jul 12 15:51:53 CEST 2019
${PYTHON_SITELIB}/sot_talos_balance/__init__.py
${PYTHON_SITELIB}/sot_talos_balance/admittance_controller_end_effector/__init__.py
${PYTHON_SITELIB}/sot_talos_balance/admittance_controller_end_effector/wrap${PYTHON_EXT_SUFFIX}
${PYTHON_SITELIB}/sot_talos_balance/admittance_controller_end_effector/wrap.so
${PYTHON_SITELIB}/sot_talos_balance/ankle_admittance_controller/__init__.py
${PYTHON_SITELIB}/sot_talos_balance/ankle_admittance_controller/wrap${PYTHON_EXT_SUFFIX}
${PYTHON_SITELIB}/sot_talos_balance/ankle_admittance_controller/wrap.so
${PYTHON_SITELIB}/sot_talos_balance/ankle_joint_selector/__init__.py
${PYTHON_SITELIB}/sot_talos_balance/ankle_joint_selector/wrap${PYTHON_EXT_SUFFIX}
${PYTHON_SITELIB}/sot_talos_balance/ankle_joint_selector/wrap.so
${PYTHON_SITELIB}/sot_talos_balance/boolean_identity/__init__.py
${PYTHON_SITELIB}/sot_talos_balance/boolean_identity/wrap${PYTHON_EXT_SUFFIX}
${PYTHON_SITELIB}/sot_talos_balance/boolean_identity/wrap.so
${PYTHON_SITELIB}/sot_talos_balance/com_admittance_controller/__init__.py
${PYTHON_SITELIB}/sot_talos_balance/com_admittance_controller/wrap${PYTHON_EXT_SUFFIX}
${PYTHON_SITELIB}/sot_talos_balance/com_admittance_controller/wrap.so
${PYTHON_SITELIB}/sot_talos_balance/coupled_admittance_controller/__init__.py
${PYTHON_SITELIB}/sot_talos_balance/coupled_admittance_controller/wrap${PYTHON_EXT_SUFFIX}
${PYTHON_SITELIB}/sot_talos_balance/coupled_admittance_controller/wrap.so
${PYTHON_SITELIB}/sot_talos_balance/create_entities_utils.py
${PYTHON_SITELIB}/sot_talos_balance/dcm_com_controller/__init__.py
${PYTHON_SITELIB}/sot_talos_balance/dcm_com_controller/wrap${PYTHON_EXT_SUFFIX}
${PYTHON_SITELIB}/sot_talos_balance/dcm_com_controller/wrap.so
${PYTHON_SITELIB}/sot_talos_balance/dcm_controller/__init__.py
${PYTHON_SITELIB}/sot_talos_balance/dcm_controller/wrap${PYTHON_EXT_SUFFIX}
${PYTHON_SITELIB}/sot_talos_balance/dcm_controller/wrap.so
${PYTHON_SITELIB}/sot_talos_balance/dcm_estimator/__init__.py
${PYTHON_SITELIB}/sot_talos_balance/dcm_estimator/wrap${PYTHON_EXT_SUFFIX}
${PYTHON_SITELIB}/sot_talos_balance/dcm_estimator/wrap.so
${PYTHON_SITELIB}/sot_talos_balance/delay/__init__.py
${PYTHON_SITELIB}/sot_talos_balance/delay/wrap${PYTHON_EXT_SUFFIX}
${PYTHON_SITELIB}/sot_talos_balance/delay/wrap.so
${PYTHON_SITELIB}/sot_talos_balance/distribute_wrench/__init__.py
${PYTHON_SITELIB}/sot_talos_balance/distribute_wrench/wrap${PYTHON_EXT_SUFFIX}
${PYTHON_SITELIB}/sot_talos_balance/distribute_wrench/wrap.so
${PYTHON_SITELIB}/sot_talos_balance/dummy_dcm_estimator/__init__.py
${PYTHON_SITELIB}/sot_talos_balance/dummy_dcm_estimator/wrap${PYTHON_EXT_SUFFIX}
${PYTHON_SITELIB}/sot_talos_balance/dummy_dcm_estimator/wrap.so
${PYTHON_SITELIB}/sot_talos_balance/dummy_walking_pattern_generator/__init__.py
${PYTHON_SITELIB}/sot_talos_balance/dummy_walking_pattern_generator/wrap${PYTHON_EXT_SUFFIX}
${PYTHON_SITELIB}/sot_talos_balance/dummy_walking_pattern_generator/wrap.so
${PYTHON_SITELIB}/sot_talos_balance/euler_to_quat/__init__.py
${PYTHON_SITELIB}/sot_talos_balance/euler_to_quat/wrap${PYTHON_EXT_SUFFIX}
${PYTHON_SITELIB}/sot_talos_balance/euler_to_quat/wrap.so
${PYTHON_SITELIB}/sot_talos_balance/example/__init__.py
${PYTHON_SITELIB}/sot_talos_balance/example/wrap${PYTHON_EXT_SUFFIX}
${PYTHON_SITELIB}/sot_talos_balance/example/wrap.so
${PYTHON_SITELIB}/sot_talos_balance/foot_force_difference_controller/__init__.py
${PYTHON_SITELIB}/sot_talos_balance/foot_force_difference_controller/wrap${PYTHON_EXT_SUFFIX}
${PYTHON_SITELIB}/sot_talos_balance/foot_force_difference_controller/wrap.so
${PYTHON_SITELIB}/sot_talos_balance/ft_calibration/__init__.py
${PYTHON_SITELIB}/sot_talos_balance/ft_calibration/wrap${PYTHON_EXT_SUFFIX}
${PYTHON_SITELIB}/sot_talos_balance/ft_calibration/wrap.so
${PYTHON_SITELIB}/sot_talos_balance/ft_wrist_calibration/__init__.py
${PYTHON_SITELIB}/sot_talos_balance/ft_wrist_calibration/wrap${PYTHON_EXT_SUFFIX}
${PYTHON_SITELIB}/sot_talos_balance/ft_wrist_calibration/wrap.so
${PYTHON_SITELIB}/sot_talos_balance/hip_flexibility_compensation/__init__.py
${PYTHON_SITELIB}/sot_talos_balance/hip_flexibility_compensation/wrap${PYTHON_EXT_SUFFIX}
${PYTHON_SITELIB}/sot_talos_balance/hip_flexibility_compensation/wrap.so
${PYTHON_SITELIB}/sot_talos_balance/int_identity/__init__.py
${PYTHON_SITELIB}/sot_talos_balance/int_identity/wrap${PYTHON_EXT_SUFFIX}
${PYTHON_SITELIB}/sot_talos_balance/int_identity/wrap.so
${PYTHON_SITELIB}/sot_talos_balance/joint_position_controller/__init__.py
${PYTHON_SITELIB}/sot_talos_balance/joint_position_controller/wrap${PYTHON_EXT_SUFFIX}
${PYTHON_SITELIB}/sot_talos_balance/joint_position_controller/wrap.so
${PYTHON_SITELIB}/sot_talos_balance/main.py
${PYTHON_SITELIB}/sot_talos_balance/meta_task_config.py
${PYTHON_SITELIB}/sot_talos_balance/meta_task_joint.py
${PYTHON_SITELIB}/sot_talos_balance/meta_task_pose.py
${PYTHON_SITELIB}/sot_talos_balance/motor_parameters.py
${PYTHON_SITELIB}/sot_talos_balance/nd_trajectory_generator/__init__.py
${PYTHON_SITELIB}/sot_talos_balance/nd_trajectory_generator/wrap${PYTHON_EXT_SUFFIX}
${PYTHON_SITELIB}/sot_talos_balance/nd_trajectory_generator/wrap.so
${PYTHON_SITELIB}/sot_talos_balance/pose_quaternion_to_matrix_homo/__init__.py
${PYTHON_SITELIB}/sot_talos_balance/pose_quaternion_to_matrix_homo/wrap${PYTHON_EXT_SUFFIX}
${PYTHON_SITELIB}/sot_talos_balance/pose_quaternion_to_matrix_homo/wrap.so
${PYTHON_SITELIB}/sot_talos_balance/qualisys_client/__init__.py
${PYTHON_SITELIB}/sot_talos_balance/qualisys_client/wrap${PYTHON_EXT_SUFFIX}
${PYTHON_SITELIB}/sot_talos_balance/qualisys_client/wrap.so
${PYTHON_SITELIB}/sot_talos_balance/quat_to_euler/__init__.py
${PYTHON_SITELIB}/sot_talos_balance/quat_to_euler/wrap${PYTHON_EXT_SUFFIX}
${PYTHON_SITELIB}/sot_talos_balance/quat_to_euler/wrap.so
${PYTHON_SITELIB}/sot_talos_balance/round_double_to_int/__init__.py
${PYTHON_SITELIB}/sot_talos_balance/round_double_to_int/wrap${PYTHON_EXT_SUFFIX}
${PYTHON_SITELIB}/sot_talos_balance/round_double_to_int/wrap.so
${PYTHON_SITELIB}/sot_talos_balance/saturation/__init__.py
${PYTHON_SITELIB}/sot_talos_balance/saturation/wrap${PYTHON_EXT_SUFFIX}
${PYTHON_SITELIB}/sot_talos_balance/saturation/wrap.so
${PYTHON_SITELIB}/sot_talos_balance/simple_admittance_controller/__init__.py
${PYTHON_SITELIB}/sot_talos_balance/simple_admittance_controller/wrap${PYTHON_EXT_SUFFIX}
${PYTHON_SITELIB}/sot_talos_balance/simple_admittance_controller/wrap.so
${PYTHON_SITELIB}/sot_talos_balance/simple_controller_6d/__init__.py
${PYTHON_SITELIB}/sot_talos_balance/simple_controller_6d/wrap${PYTHON_EXT_SUFFIX}
${PYTHON_SITELIB}/sot_talos_balance/simple_controller_6d/wrap.so
${PYTHON_SITELIB}/sot_talos_balance/simple_distribute_wrench/__init__.py
${PYTHON_SITELIB}/sot_talos_balance/simple_distribute_wrench/wrap${PYTHON_EXT_SUFFIX}
${PYTHON_SITELIB}/sot_talos_balance/simple_distribute_wrench/wrap.so
${PYTHON_SITELIB}/sot_talos_balance/simple_pid/__init__.py
${PYTHON_SITELIB}/sot_talos_balance/simple_pid/wrap${PYTHON_EXT_SUFFIX}
${PYTHON_SITELIB}/sot_talos_balance/simple_pid/wrap.so
${PYTHON_SITELIB}/sot_talos_balance/simple_pidd/__init__.py
${PYTHON_SITELIB}/sot_talos_balance/simple_pidd/wrap${PYTHON_EXT_SUFFIX}
${PYTHON_SITELIB}/sot_talos_balance/simple_pidd/wrap.so
${PYTHON_SITELIB}/sot_talos_balance/simple_reference_frame/__init__.py
${PYTHON_SITELIB}/sot_talos_balance/simple_reference_frame/wrap${PYTHON_EXT_SUFFIX}
${PYTHON_SITELIB}/sot_talos_balance/simple_reference_frame/wrap.so
${PYTHON_SITELIB}/sot_talos_balance/simple_state_integrator/__init__.py
${PYTHON_SITELIB}/sot_talos_balance/simple_state_integrator/wrap${PYTHON_EXT_SUFFIX}
${PYTHON_SITELIB}/sot_talos_balance/simple_state_integrator/wrap.so
${PYTHON_SITELIB}/sot_talos_balance/simple_zmp_estimator/__init__.py
${PYTHON_SITELIB}/sot_talos_balance/simple_zmp_estimator/wrap${PYTHON_EXT_SUFFIX}
${PYTHON_SITELIB}/sot_talos_balance/simple_zmp_estimator/wrap.so
${PYTHON_SITELIB}/sot_talos_balance/state_transformation/__init__.py
${PYTHON_SITELIB}/sot_talos_balance/state_transformation/wrap${PYTHON_EXT_SUFFIX}
${PYTHON_SITELIB}/sot_talos_balance/state_transformation/wrap.so
${PYTHON_SITELIB}/sot_talos_balance/talos/__init__.py
${PYTHON_SITELIB}/sot_talos_balance/talos/admittance_ctrl_conf.py
${PYTHON_SITELIB}/sot_talos_balance/talos/balance_ctrl_conf.py
......@@ -98,9 +98,9 @@ ${PYTHON_SITELIB}/sot_talos_balance/talos/joint_torque_controller_conf.py
${PYTHON_SITELIB}/sot_talos_balance/talos/joint_torque_controller_sim_conf.py
${PYTHON_SITELIB}/sot_talos_balance/talos/parameter_server_conf.py
${PYTHON_SITELIB}/sot_talos_balance/talos_base_estimator/__init__.py
${PYTHON_SITELIB}/sot_talos_balance/talos_base_estimator/wrap${PYTHON_EXT_SUFFIX}
${PYTHON_SITELIB}/sot_talos_balance/talos_base_estimator/wrap.so
${PYTHON_SITELIB}/sot_talos_balance/talos_control_manager/__init__.py
${PYTHON_SITELIB}/sot_talos_balance/talos_control_manager/wrap${PYTHON_EXT_SUFFIX}
${PYTHON_SITELIB}/sot_talos_balance/talos_control_manager/wrap.so
${PYTHON_SITELIB}/sot_talos_balance/test/__init__.py
${PYTHON_SITELIB}/sot_talos_balance/test/appli_COMTraj.py
${PYTHON_SITELIB}/sot_talos_balance/test/appli_admittance_end_effector.py
......@@ -147,4 +147,4 @@ ${PYTHON_SITELIB}/sot_talos_balance/utils/gazebo_utils.py
${PYTHON_SITELIB}/sot_talos_balance/utils/plot_utils.py
${PYTHON_SITELIB}/sot_talos_balance/utils/run_test_utils.py
${PYTHON_SITELIB}/sot_talos_balance/utils/sot_utils.py
${PYTHON_SITELIB}/sot_talos_balance/wrap${PYTHON_EXT_SUFFIX}
${PYTHON_SITELIB}/sot_talos_balance/wrap.so
SHA1 (sot-talos-balance-1.8.0.tar.gz) = 00f9af3c296c1401b8d0dac3bd565e0a00bf88bf
RMD160 (sot-talos-balance-1.8.0.tar.gz) = 18fb8468df6e0d2deb8801772c15294189606959
Size (sot-talos-balance-1.8.0.tar.gz) = 23571657 bytes
SHA1 (patch-aa) = dde15096bd7af13e82b736c0af7f74f3746a6b58
SHA1 (sot-talos-balance-1.8.1.tar.gz) = 2149b3706acee11d767401fc9cb29685a1548ff2
RMD160 (sot-talos-balance-1.8.1.tar.gz) = 5b9d24cca867f4ddb825d47a41b0edd7f2799a11
Size (sot-talos-balance-1.8.1.tar.gz) = 33008894 bytes
From 72b2578d2db23b3e2c739be278c86270c4a1431c Mon Sep 17 00:00:00 2001
From: Guilhem Saurel <guilhem.saurel@laas.fr>
Date: Mon, 17 Feb 2020 09:34:13 +0100
Subject: [PATCH] declare eigenpy.switchToNumpyMatrix() for now
---
unittest/python/test_com_estimation.py | 3 +++
unittest/python/test_dcm_controller_talos.py | 3 +++
unittest/python/test_dcm_distribute.py | 3 +++
unittest/python/test_dcm_estimator.py | 3 +++
unittest/python/test_dummy_wpgen.py | 3 +++
unittest/python/test_ft_calibration.py | 3 +++
unittest/python/test_round_double_to_int.py | 3 +++
unittest/python/test_simple_state_integrator.py | 3 +++
unittest/python/test_simple_zmp_estimator.py | 3 +++
unittest/python/test_state_transformation.py | 3 +++
10 files changed, 30 insertions(+)
diff --git a/unittest/python/test_com_estimation.py b/unittest/python/test_com_estimation.py
index 4523d54..88cc0c9 100644
--- unittest/python/test_com_estimation.py
+++ unittest/python/test_com_estimation.py
@@ -8,6 +8,9 @@ import sot_talos_balance.talos.parameter_server_conf as param_server_conf
from sot_talos_balance.create_entities_utils import (DcmEstimator, EulerToQuat, TalosBaseEstimator,
create_parameter_server, plug)
+import eigenpy
+eigenpy.switchToNumpyMatrix()
+
# --- General ---
print("--- General ---")
diff --git a/unittest/python/test_dcm_controller_talos.py b/unittest/python/test_dcm_controller_talos.py
index 1c71879..ab08d85 100644
--- unittest/python/test_dcm_controller_talos.py
+++ unittest/python/test_dcm_controller_talos.py
@@ -8,6 +8,9 @@ from rospkg import RosPack
import sot_talos_balance.talos.parameter_server_conf as param_server_conf
from sot_talos_balance.create_entities_utils import DcmController, create_parameter_server
+import eigenpy
+eigenpy.switchToNumpyMatrix()
+
# --- General ---
print("--- General ---")
diff --git a/unittest/python/test_dcm_distribute.py b/unittest/python/test_dcm_distribute.py
index cb96602..4f2f688 100644
--- unittest/python/test_dcm_distribute.py
+++ unittest/python/test_dcm_distribute.py
@@ -10,6 +10,9 @@ import sot_talos_balance.talos.parameter_server_conf as param_server_conf
from sot_talos_balance.create_entities_utils import (DcmController, create_distribute_wrench, create_parameter_server,
plug)
+import eigenpy
+eigenpy.switchToNumpyMatrix()
+
# --- General ---
print("--- General ---")
diff --git a/unittest/python/test_dcm_estimator.py b/unittest/python/test_dcm_estimator.py
index f4ba8f7..ee4a8d6 100644
--- unittest/python/test_dcm_estimator.py
+++ unittest/python/test_dcm_estimator.py
@@ -8,6 +8,9 @@ from rospkg import RosPack
import sot_talos_balance.talos.parameter_server_conf as parameter_server_conf
from sot_talos_balance.create_entities_utils import Bunch, DcmEstimator, ParameterServer
+import eigenpy
+eigenpy.switchToNumpyMatrix()
+
dt = 0.001
conf = Bunch()
robot_name = 'robot'
diff --git a/unittest/python/test_dummy_wpgen.py b/unittest/python/test_dummy_wpgen.py
index 3794301..183c483 100644
--- unittest/python/test_dummy_wpgen.py
+++ unittest/python/test_dummy_wpgen.py
@@ -9,6 +9,9 @@ import sot_talos_balance.talos.parameter_server_conf as param_server_conf
from sot_talos_balance.create_entities_utils import (DummyWalkingPatternGenerator, SimpleReferenceFrame,
create_parameter_server, plug)
+import eigenpy
+eigenpy.switchToNumpyMatrix()
+
# --- General ---
print("--- General ---")
diff --git a/unittest/python/test_ft_calibration.py b/unittest/python/test_ft_calibration.py
index 1c14b61..f5d10c6 100644
--- unittest/python/test_ft_calibration.py
+++ unittest/python/test_ft_calibration.py
@@ -1,9 +1,12 @@
+import eigenpy
import numpy as np
from numpy.testing import assert_almost_equal as assertApprox
import sot_talos_balance.talos.ft_calibration_conf as conf
from sot_talos_balance.ft_calibration import FtCalibration
+eigenpy.switchToNumpyArray()
+
robot_name = 'robot'
ftc = FtCalibration('ftc')
ftc.init(robot_name)
diff --git a/unittest/python/test_round_double_to_int.py b/unittest/python/test_round_double_to_int.py
index 1b59672..b9dd24b 100644
--- unittest/python/test_round_double_to_int.py
+++ unittest/python/test_round_double_to_int.py
@@ -4,6 +4,9 @@ import numpy as np
from sot_talos_balance.round_double_to_int import RoundDoubleToInt
+import eigenpy
+eigenpy.switchToNumpyMatrix()
+
rd = RoundDoubleToInt('round')
time = 0
diff --git a/unittest/python/test_simple_state_integrator.py b/unittest/python/test_simple_state_integrator.py
index cd05174..35ea134 100644
--- unittest/python/test_simple_state_integrator.py
+++ unittest/python/test_simple_state_integrator.py
@@ -5,6 +5,9 @@ from numpy.testing import assert_almost_equal as assertApprox
from sot_talos_balance.simple_state_integrator import SimpleStateIntegrator
+import eigenpy
+eigenpy.switchToNumpyMatrix()
+
dt = 1e-3
initstate = [0.]*9
diff --git a/unittest/python/test_simple_zmp_estimator.py b/unittest/python/test_simple_zmp_estimator.py
index 58faeee..c59e594 100644
--- unittest/python/test_simple_zmp_estimator.py
+++ unittest/python/test_simple_zmp_estimator.py
@@ -6,6 +6,9 @@ from numpy.testing import assert_almost_equal as assertApprox
from sot_talos_balance.simple_zmp_estimator import SimpleZmpEstimator
+import eigenpy
+eigenpy.switchToNumpyMatrix()
+
# --- Create estimator
print("--- Create estimator ---")
diff --git a/unittest/python/test_state_transformation.py b/unittest/python/test_state_transformation.py
index 820c20c..b9e2eaf 100644
--- unittest/python/test_state_transformation.py
+++ unittest/python/test_state_transformation.py
@@ -1,3 +1,4 @@
+import eigenpy
import numpy as np
import pinocchio as pin
from numpy.testing import assert_almost_equal as assertApprox
@@ -9,6 +10,8 @@ from sot_talos_balance.create_entities_utils import (DcmEstimator, SimpleReferen
TalosBaseEstimator, create_parameter_server, plug)
from sot_talos_balance.euler_to_quat import EulerToQuat
+eigenpy.switchToNumpyMatrix()
+
# --- General ---
print("--- General ---")
--
2.17.1
--- unittest/python/CMakeLists.txt.orig 2019-12-25 23:28:51.000000000 +0100
+++ unittest/python/CMakeLists.txt 2020-02-17 09:56:29.082684085 +0100
@@ -22,7 +22,6 @@
test_simple_distribute
test_simple_zmp_estimator
test_simple_state_integrator
- test_state_transformation
)
FOREACH(TEST ${${PROJECT_NAME}_PYTHON_TESTS})
......@@ -4,19 +4,17 @@
ORG= stack-of-tasks
NAME= sot-talos
VERSION= 1.1.0
VERSION= 1.1.1
CATEGORIES= wip
COMMENT= This packages provides a generic Stack Of Tasks library for the humanoid robot Pyrene.
LICENSE= 2-clause-bsd
MAINTAINER= ostasse@laas.fr
USE_PYTHON= true
include ../../devel/jrl-cmakemodules/Makefile.common
include ../../wip/talos-data/depend.mk
include ../../wip/pyrene-motions/depend.mk
include ../../wip/py-sot-application-v3/depend.mk
#include ../../wip/sot-dyninv-v3/depend.mk
include ../../motion/dynamic-graph-bridge-msgs/depend.mk
include ../../wip/py-dynamic-graph-bridge-v3/depend.mk
include ../../wip/sot-dynamic-pinocchio-v3/depend.mk
......@@ -28,6 +26,7 @@ include ../../wip/py-dynamic-graph-v3/depend.mk
include ../../wip/dynamic-graph-v3/depend.mk
include ../../math/pinocchio/depend.mk
include ../../path/hpp-fcl/depend.mk
include ../../path/py-hpp-fcl/depend.mk
include ../../mapping/octomap/depend.mk
include ../../math/py-pinocchio/depend.mk
include ../../math/py-eigenpy/depend.mk
......
@comment Tue May 9 23:59:20 CEST 2017
include/sot-talos/config.hh
include/sot-talos/deprecated.hh
include/sot-talos/warning.hh
include/sot/talos/config.hh
include/sot/talos/deprecated.hh
include/sot/talos/warning.hh
lib/cmake/sot-talos/sot-talosConfig.cmake
lib/cmake/sot-talos/sot-talosConfigVersion.cmake
lib/cmake/sot-talos/sot-talosTargets-release.cmake
lib/cmake/sot-talos/sot-talosTargets.cmake
lib/libsot-pyrene-controller.so
lib/libsot-talos-device.so
lib/pkgconfig/sot-talos.pc
......@@ -12,7 +16,10 @@ ${PYTHON_SITELIB}/dynamic_graph/sot/talos/__init__.py
${PYTHON_SITELIB}/dynamic_graph/sot/talos/sot_talos_device/__init__.py
${PYTHON_SITELIB}/dynamic_graph/sot/talos/sot_talos_device/wrap.so
${PYTHON_SITELIB}/dynamic_graph/sot/talos/talos.py
share/sot-talos/package.xml
share/sot-talos/tests/appli-test-simple-seq-play.py
share/sot-talos/tests/appli.py
share/sot-talos/tests/katana_holding.py
share/sot-talos/tests/kinetalos.py
share/sot-talos/tests/test-simple-seq-play.py
share/sot-talos/tests/test.py
......@@ -16,7 +16,7 @@ include ../../mk/sysdep/python.mk
PREFER.py-sot-talos?= robotpkg
SYSTEM_SEARCH.py-sot-talos=\
include/sot-talos/config.hh \
include/sot/talos/config.hh \
'lib/pkgconfig/sot-talos.pc:/Version/s/[^0-9.]//gp'
DEPEND_USE+= py-sot-talos
......
SHA1 (sot-talos-1.1.0.tar.gz) = bf78a5bb2c076cba1575d1313fb19a2c69356640
RMD160 (sot-talos-1.1.0.tar.gz) = c3c7a2f05fbb2438a9afd83c2d8a78da18976558
Size (sot-talos-1.1.0.tar.gz) = 810645 bytes
SHA1 (patch-aa) = 23797e17cad85334b2f862b70609b2322266996e
SHA1 (sot-talos-1.1.1.tar.gz) = 420e9929c0277da00f614006461e681ab8b8d763
RMD160 (sot-talos-1.1.1.tar.gz) = 240b01f0dba43c90c5cf401cc1310bfa9ce128c7
Size (sot-talos-1.1.1.tar.gz) = 841841 bytes
fix for eigenpy v2: use np.array instead of np.matrix
--- src/dynamic_graph/sot/talos/talos.py.orig 2019-11-05 13:00:02.000000000 +0100
+++ src/dynamic_graph/sot/talos/talos.py 2020-02-18 14:58:34.163678024 +0100
@@ -90,12 +90,12 @@
# TODO For position limit, we remove the first value to get
# a vector of the good size because SoT use euler angles and not
# quaternions...
- self.device.setPositionBounds(self.pinocchioModel.lowerPositionLimit.T.tolist()[0][1:],
- self.pinocchioModel.upperPositionLimit.T.tolist()[0][1:])
- self.device.setVelocityBounds((-self.pinocchioModel.velocityLimit).T.tolist()[0],
- self.pinocchioModel.velocityLimit.T.tolist()[0])
- self.device.setTorqueBounds((-self.pinocchioModel.effortLimit).T.tolist()[0],
- self.pinocchioModel.effortLimit.T.tolist()[0])
+ self.device.setPositionBounds(self.pinocchioModel.lowerPositionLimit.tolist()[1:],
+ self.pinocchioModel.upperPositionLimit.tolist()[1:])
+ self.device.setVelocityBounds((-self.pinocchioModel.velocityLimit).tolist(),
+ self.pinocchioModel.velocityLimit.tolist())
+ self.device.setTorqueBounds((-self.pinocchioModel.effortLimit).tolist(),
+ self.pinocchioModel.effortLimit.tolist())
self.halfSitting = initialConfig
self.device.set(self.halfSitting)
plug(self.device.state, self.dynamic.position)
......@@ -4,14 +4,12 @@
ORG= stack-of-tasks
NAME= sot-tools
VERSION= 2.2.0
VERSION= 2.2.2
PKGNAME= ${PKGTAG.python-}${NAME}-v3-${VERSION}
CATEGORIES= wip
COMMENT= tools for the sot-core package (python bindings)
LICENSE= 2-clause-bsd
MAINTAINER= gepetto-soft@laas.fr
CONFLICTS+= py[0-9][0-9]-${NAME}
......@@ -23,6 +21,11 @@ include ../../wip/sot-core-v3/depend.mk
include ../../wip/py-sot-core-v3/depend.mk
include ../../wip/dynamic-graph-v3/depend.mk
include ../../wip/py-dynamic-graph-v3/depend.mk
include ../../math/pinocchio/depend.mk
include ../../math/py-pinocchio/depend.mk
include ../../math/py-eigenpy/depend.mk
include ../../path/hpp-fcl/depend.mk
include ../../path/py-hpp-fcl/depend.mk
include ../../pkgtools/pkg-config/depend.mk
include ../../mk/sysdep/cmake.mk
include ../../mk/sysdep/doxygen.mk
......
SHA1 (sot-tools-2.2.0.tar.gz) = 24bba437f50e4e895f4681a3bb288d30489284cd
RMD160 (sot-tools-2.2.0.tar.gz) = 8f3e58fd22b9f8a52c8b49e9b27e34c74d3395a5
Size (sot-tools-2.2.0.tar.gz) = 796458 bytes
SHA1 (sot-tools-2.2.2.tar.gz) = e1ee33fc8dae5364b5b90dca8665fa6b9083aea1
RMD160 (sot-tools-2.2.2.tar.gz) = 58689bc6501883b93c751c5ebc0d3b6093c85828
Size (sot-tools-2.2.2.tar.gz) = 2046985 bytes
......@@ -2,18 +2,16 @@
# Created: Olivier Stasse on Wed Feb 21 18:07:40 CET 2018
#
ORG= stack-of-tasks
NAME= sot-torque-control
VERSION= 1.5.0
ORG= stack-of-tasks
NAME= sot-torque-control
VERSION= 1.5.2
CATEGORIES= wip
COMMENT= Torque control for humanoids (python bindings)
LICENSE= 2-clause-bsd
MAINTAINER= gepetto-soft@laas.fr
CATEGORIES= wip
COMMENT= Torque control for humanoids (python bindings)