...
 
Commits (6)
......@@ -56,7 +56,6 @@ SUBDIR+= pal-hardware-gazebo-melodic
SUBDIR+= pal-hardware-interfaces
SUBDIR+= pal-msgs
SUBDIR+= pal-navigation-sm
SUBDIR+= pal-statistics
SUBDIR+= pal-transmissions
SUBDIR+= pal-wsg-gripper
SUBDIR+= parametric-curves
......@@ -67,8 +66,6 @@ SUBDIR+= pmb2-simulation
SUBDIR+= prf-gazebo-ros-pkgs
SUBDIR+= prf-gazebo-ros-pkgs-melodic
SUBDIR+= prf-roboticsgroup-gazebo-plugins
SUBDIR+= prf-ros-control
SUBDIR+= prf-ros-controllers
SUBDIR+= prf-teleop-tools
SUBDIR+= py-bmtools
SUBDIR+= py-casadi
......@@ -99,7 +96,10 @@ SUBDIR+= py-mraa
SUBDIR+= py-multicontact-api
SUBDIR+= py-ospi
SUBDIR+= py-pal
SUBDIR+= py-pal-statistics
SUBDIR+= py-parametric-curves
SUBDIR+= py-prf-ros-control
SUBDIR+= py-prf-ros-controllers
SUBDIR+= py-qpoases
SUBDIR+= py-qt-gepetto-pythonqt
SUBDIR+= py-quadprog
......
......@@ -25,7 +25,7 @@ include ../../lang/ros-message-generation/depend.mk
include ../../lang/ros-message-runtime/depend.mk
include ../../math/ros-geometry/depend.mk
include ../../wip/backward-ros/depend.mk
include ../../wip/pal-statistics/depend.mk
include ../../wip/py-pal-statistics/depend.mk
include ../../mk/language/c++.mk
include ../../mk/language/c.mk
......
......@@ -37,9 +37,9 @@ include ../../lang/ros-message-generation/depend.mk
include ../../lang/ros-message-runtime/depend.mk
include ../../middleware/ros-comm/depend.mk
include ../../wip/pal-hardware-interfaces/depend.mk
include ../../wip/pal-statistics/depend.mk
include ../../wip/py-pal-statistics/depend.mk
include ../../wip/prf-gazebo-ros-pkgs-melodic/depend.mk
include ../../wip/prf-ros-control/depend.mk
include ../../wip/py-prf-ros-control/depend.mk
include ../../wip/dynamic-introspection/depend.mk
include ../../motion/ros-control-toolbox/depend.mk
include ../../mk/language/c++.mk
......
......@@ -35,9 +35,9 @@ include ../../lang/ros-message-generation/depend.mk
include ../../lang/ros-message-runtime/depend.mk
include ../../middleware/ros-comm/depend.mk
include ../../wip/pal-hardware-interfaces/depend.mk
include ../../wip/pal-statistics/depend.mk
include ../../wip/py-pal-statistics/depend.mk
include ../../wip/prf-gazebo-ros-pkgs/depend.mk
include ../../wip/prf-ros-control/depend.mk
include ../../wip/py-prf-ros-control/depend.mk
include ../../wip/dynamic-introspection/depend.mk
include ../../motion/ros-control-toolbox/depend.mk
include ../../mk/language/c++.mk
......
......@@ -41,10 +41,10 @@ ifeq (erbium,${PREFER.pal-distro})
ifeq (palerbium,${PALDISTRO})
CMAKE_PREFIX_PATH+=/opt/pal/erbium
else
include ../../wip/prf-ros-control/depend.mk
include ../../wip/py-prf-ros-control/depend.mk
endif
else
include ../../wip/prf-ros-control/depend.mk
include ../../wip/py-prf-ros-control/depend.mk
endif
include ../../mk/language/c++.mk
include ../../mk/language/c.mk
......
# robotpkg depend.mk for: wip/pal-statistics
# Created: Olivier Stasse on Thu, 30 Mar 2017
#
DEPEND_DEPTH:= ${DEPEND_DEPTH}+
PAL_STATISTICS_DEPEND_MK:= ${PAL_STATISTICS_DEPEND_MK}+
ifeq (+,$(DEPEND_DEPTH))
DEPEND_PKG+= pal-statistics
endif
ifeq (+,$(PAL_STATISTICS_DEPEND_MK)) # ---------------------------------
PREFER.pal-statistics?= robotpkg
DEPEND_USE+= pal-statistics
DEPEND_ABI.pal-statistics?=\
pal-statistics>=1.1.0
DEPEND_DIR.pal-statistics?=\
../../wip/pal-statistics
SYSTEM_SEARCH.pal-statistics=\
'include/pal_statistics/pal_statistics.h' \
'share/pal_statistics/cmake/pal_statisticsConfig.cmake' \
'share/pal_statistics/package.xml:/<version>/s/[^0-9.]//gp' \
'lib/pkgconfig/pal_statistics.pc:/Version/s/[^0-9.]//gp'
endif # PAL_STATISTICS_DEPEND_MK ---------------------------------------
DEPEND_DEPTH:= ${DEPEND_DEPTH:+=}
......@@ -34,7 +34,7 @@ include ../../interfaces/ros-std-msgs/depend.mk
include ../../lang/ros-message-generation/depend.mk
include ../../lang/ros-message-runtime/depend.mk
include ../../middleware/ros-comm/depend.mk
include ../../wip/prf-ros-control/depend.mk
include ../../wip/py-prf-ros-control/depend.mk
include ../../mk/language/c++.mk
include ../../mk/language/c.mk
include ../../mk/robotpkg.mk
......@@ -39,7 +39,7 @@ include ../../wip/sysdep/ubuntu-distro.mk
ifeq (bionic,${UBUNTUDISTRO})
include ../../wip/ros-moveit/depend.mk
endif
include ../../wip/prf-ros-control/depend.mk
include ../../wip/py-prf-ros-control/depend.mk
include ../../mk/language/c++.mk
include ../../mk/language/c.mk
include ../../mk/robotpkg.mk
......@@ -51,7 +51,7 @@ include ../../middleware/ros-actionlib/depend.mk
include ../../middleware/ros-comm/depend.mk
include ../../motion/ros-control-toolbox/depend.mk
include ../../sysutils/ros-diagnostics/depend.mk
include ../../wip/prf-ros-control/depend.mk
include ../../wip/py-prf-ros-control/depend.mk
include ../../mk/sysdep/gazebo.mk
include ../../mk/sysdep/libogre.mk
include ../../mk/language/c++.mk
......
......@@ -52,7 +52,7 @@ include ../../middleware/ros-actionlib/depend.mk
include ../../middleware/ros-comm/depend.mk
include ../../motion/ros-control-toolbox/depend.mk
include ../../sysutils/ros-diagnostics/depend.mk
include ../../wip/prf-ros-control/depend.mk
include ../../wip/py-prf-ros-control/depend.mk
include ../../mk/sysdep/gazebo.mk
include ../../mk/sysdep/libogre.mk
include ../../mk/language/c++.mk
......
......@@ -32,7 +32,7 @@ CMAKE_PREFIX_PATH+= ${PREFIX}
include ../../devel/boost-headers/depend.mk
include ../../devel/boost-libs/depend.mk
include ../../wip/prf-ros-control/depend.mk
include ../../wip/py-prf-ros-control/depend.mk
include ../../devel/ros-catkin/depend.mk
include ../../devel/ros-pluginlib/depend.mk
include ../../devel/ros-ros/depend.mk
......
# robotpkg Makefile for: wip/pal-statistics
# Created: Olivier Stasse on Thu, 12 Dec 2018
# Created: Guilhem Saurel on Mon, 23 Mar 2020
#
ORG= pal-robotics
VERSION= 1.3.1
PKGBASE= pal-statistics
PKGNAME= ${PKGBASE}-${VERSION}
DISTNAME= ${VERSION}
ROSNAME= $(subst -,_,${PKGBASE})
WRKSRC= ${WRKDIR}/${ROSNAME}-${VERSION}
DIST_SUBDIR= ${PKGBASE}
PKGREVISION= 2
CATEGORIES= wip
ORG= pal-robotics
VERSION= 1.3.1
PKGBASE= pal-statistics
PKGNAME= ${PKGTAG.python-}${PKGBASE}-${VERSION}
DISTNAME= ${VERSION}
ROSNAME= $(subst -,_,${PKGBASE})
WRKSRC= ${WRKDIR}/${ROSNAME}-${VERSION}
DIST_SUBDIR= ${PKGBASE}
PKGREVISION= 3
# old package name and other Python versions
CONFLICTS= ${PKGBBASE}-[0-9]*
CONFLICTS+= py[0-9][0-9]-${PKGBBASE}-[0-9]*
CATEGORIES= wip
MASTER_REPOSITORY= ${MASTER_REPOSITORY_GITHUB}${ORG}/${NAME}.git
CHECKOUT_VCS_OPTS+= --recursive
HOMEPAGE= ${MASTER_SITE_GITHUB:=${ORG}/${ROSNAME}}
MASTER_SITES= ${HOMEPAGE}/archive/
COMMENT= Provides statistics
LICENSE= gnu-gpl-v3
USE_BOOST_LIBS= thread
HOMEPAGE= ${MASTER_SITE_GITHUB:=${ORG}/${ROSNAME}}
MASTER_SITES= ${HOMEPAGE}/archive/
COMMENT= Provides statistics
LICENSE= gnu-gpl-v3
ROS_METAPKG= yes
USE_BOOST_LIBS= thread
ROS_METAPKG= yes
USE_BOOST_LIBS= thread
CMAKE_PREFIX_PATH+=${PREFIX}
include ../../devel/boost-headers/depend.mk
......@@ -36,6 +39,7 @@ include ../../lang/ros-message-generation/depend.mk
include ../../lang/ros-message-runtime/depend.mk
include ../../middleware/ros-comm/depend.mk
include ../../mk/sysdep/googletest.mk
include ../../mk/sysdep/python.mk
include ../../mk/language/c++.mk
include ../../mk/language/c.mk
include ../../mk/robotpkg.mk
......@@ -8,7 +8,7 @@ include/pal_statistics_msgs/Statistic.h
include/pal_statistics_msgs/Statistics.h
include/pal_statistics_msgs/StatisticsNames.h
include/pal_statistics_msgs/StatisticsValues.h
lib/libpal_statistics${PYTHON_EXT_SUFFIX}
lib/libpal_statistics.so
lib/pal_carbon_collector/carbon_collector_node.py
lib/pkgconfig/pal_carbon_collector.pc
lib/pkgconfig/pal_statistics.pc
......
# robotpkg depend.mk for: wip/py-pal-statistics
# Created: Guilhem Saurel on Mon, 23 Mar 2020
#
DEPEND_DEPTH:= ${DEPEND_DEPTH}+
PY_PAL_STATISTICS_DEPEND_MK:= ${PY_PAL_STATISTICS_DEPEND_MK}+
ifeq (+,$(DEPEND_DEPTH))
DEPEND_PKG+= py-pal-statistics
endif
ifeq (+,$(PY_PAL_STATISTICS_DEPEND_MK)) # ---------------------------------
PREFER.py-pal-statistics?= robotpkg
DEPEND_USE+= py-pal-statistics
DEPEND_ABI.py-pal-statistics?= ${PKGTAG.python-}pal-statistics>=1.1.0
DEPEND_DIR.py-pal-statistics?= ../../wip/py-pal-statistics
SYSTEM_SEARCH.py-pal-statistics=\
'include/pal_statistics/pal_statistics.h' \
'share/pal_statistics/cmake/pal_statisticsConfig.cmake' \
'share/pal_statistics/package.xml:/<version>/s/[^0-9.]//gp' \
'lib/pkgconfig/pal_statistics.pc:/Version/s/[^0-9.]//gp' \
'${PYTHON_SYSLIBSEARCH}/pal_statistics/__init__.py'
include ../../mk/sysdep/python.mk
endif # PY_PAL_STATISTICS_DEPEND_MK ---------------------------------------
DEPEND_DEPTH:= ${DEPEND_DEPTH:+=}
......@@ -2,3 +2,4 @@ SHA1 (pal-statistics/1.3.1.tar.gz) = ffbf1fec732cb39af874859b9db39e6cbd57aa95
RMD160 (pal-statistics/1.3.1.tar.gz) = 442798405509c712b3289f5eb2fa5fc500c20046
Size (pal-statistics/1.3.1.tar.gz) = 329941 bytes
SHA1 (patch-aa) = 334e32f45341e7b778485ce42e6ebefea8c720fb
SHA1 (patch-ab) = 310a4e8a97abe16dd6e0792517592deb69b6263f
--- pal_carbon_collector/scripts/carbon_collector_node.py.orig 2019-08-28 13:19:58.000000000 +0200
+++ pal_carbon_collector/scripts/carbon_collector_node.py 2020-03-23 20:58:55.764363209 +0100
@@ -10,7 +10,7 @@
rospy.init_node('carbon_collector_node')
if not rospy.has_param('~topics'):
- print "No topics were specified"
+ print("No topics were specified")
sys.exit(1)
topics = rospy.get_param('~topics')
--- pal_carbon_collector/src/pal_carbon_collector/carbon_collector.py.orig 2019-08-28 13:19:58.000000000 +0200
+++ pal_carbon_collector/src/pal_carbon_collector/carbon_collector.py 2020-03-23 20:58:58.974351827 +0100
@@ -25,7 +25,7 @@
result = self.gs.send_list(stats, timestamp.to_sec())
if self.dry_run:
- print result
+ print(result)
return result
# robotpkg Makefile for: wip/pdf-ros-control
# robotpkg Makefile for: wip/py-prf-ros-control
# Created: Olivier Stasse on Wed, 27 Apr 2018
#
ORG= pal-robotics-forks
VERSION= 0.2.8
PRFNAME= ros-control
PKGBASE= prf-${PRFNAME}
PKGNAME= ${PKGBASE}-${VERSION}
DISTNAME= ${VERSION}
ROSNAME= $(subst -,_,${PRFNAME})
WRKSRC= ${WRKDIR}/${ROSNAME}-${VERSION}
DIST_SUBDIR= ${PKGBASE}
CATEGORIES= wip
MASTER_REPOSITORY= ${MASTER_REPOSITORY_GITHUB}${ORG}/${NAME}.git
CHECKOUT_VCS_OPTS+= --recursive
ORG= pal-robotics-forks
VERSION= 0.2.8
PRFNAME= ros-control
PKGBASE= prf-${PRFNAME}
PKGNAME= ${PKGTAG.python-}${PKGBASE}-${VERSION}
DISTNAME= ${VERSION}
ROSNAME= $(subst -,_,${PRFNAME})
WRKSRC= ${WRKDIR}/${ROSNAME}-${VERSION}
DIST_SUBDIR= ${PKGBASE}
PKGREVISION= 1
# old package name and other Python versions
CONFLICTS= ${PKGBBASE}-[0-9]*
CONFLICTS+= py[0-9][0-9]-${PKGBBASE}-[0-9]*
CONFLICTS+= ros-control-[0-9]*
HOMEPAGE= ${MASTER_SITE_GITHUB:=${ORG}/${ROSNAME}}
MASTER_SITES= ${HOMEPAGE}/archive/
CATEGORIES= wip
COMMENT= ros_control package with torque sensors
LICENSE= 2-clause-bsd
MASTER_REPOSITORY= ${MASTER_REPOSITORY_GITHUB}${ORG}/${NAME}.git
CHECKOUT_VCS_OPTS+= --recursive
CONFLICTS+= ros-control-[0-9]*
HOMEPAGE= ${MASTER_SITE_GITHUB:=${ORG}/${ROSNAME}}
MASTER_SITES= ${HOMEPAGE}/archive/
COMMENT= ros_control package with torque sensors
LICENSE= 2-clause-bsd
ROS_METAPKG= yes
USE_BOOST_LIBS= thread
ROS_METAPKG= yes
USE_BOOST_LIBS= thread
include ../../devel/boost-headers/depend.mk
include ../../devel/boost-libs/depend.mk
......@@ -44,6 +49,7 @@ include ../../middleware/ros-comm/depend.mk
include ../../motion/ros-control-toolbox/depend.mk
include ../../net/ros-resource-retriever/depend.mk
include ../../sysutils/py-rospkg/depend.mk
include ../../mk/sysdep/python.mk
include ../../mk/language/c++.mk
include ../../mk/language/c.mk
include ../../mk/robotpkg.mk
# robotpkg depend.mk for: wip/prf-ros-control
# robotpkg depend.mk for: wip/py-prf-ros-control
# Created: Olivier Stasse on Wed, 29 Mar 2017
#
DEPEND_DEPTH:= ${DEPEND_DEPTH}+
ROS_CONTROL_DEPEND_MK:= ${ROS_CONTROL_DEPEND_MK}+
PY_PRF_ROS_CONTROL_DEPEND_MK:= ${PY_PRF_ROS_CONTROL_DEPEND_MK}+
ifeq (+,$(DEPEND_DEPTH))
DEPEND_PKG+= prf-ros-control
DEPEND_PKG+= py-prf-ros-control
endif
ifeq (+,$(ROS_CONTROL_DEPEND_MK)) # ----------------------------------
ifeq (+,$(PY_PRF_ROS_CONTROL_DEPEND_MK)) # ----------------------------------
PREFER.prf-ros-control?= robotpkg
PREFER.py-prf-ros-control?= robotpkg
DEPEND_USE+= prf-ros-control
DEPEND_USE+= py-prf-ros-control
DEPEND_ABI.prf-ros-control?= prf-ros-control>=0.2
DEPEND_DIR.prf-ros-control?= ../../wip/prf-ros-control
DEPEND_ABI.py-prf-ros-control?= ${PKGTAG.python-}prf-ros-control>=0.2
DEPEND_DIR.py-prf-ros-control?= ../../wip/py-prf-ros-control
SYSTEM_SEARCH.prf-ros-control=\
SYSTEM_SEARCH.py-prf-ros-control=\
'include/controller_manager/controller_loader.h' \
'include/controller_interface/controller.h' \
'include/controller_interface/controller_base.h' \
......@@ -93,6 +93,7 @@ SYSTEM_SEARCH.prf-ros-control=\
'lib/libtransmission_interface_loader_plugins.so' \
'lib/libtransmission_interface_parser.so' \
'share/ros_control/package.xml:/<version>/s/[^0-9.]//gp' \
'${PYTHON_SYSLIBSEARCH}/controller_manager/__init__.py' \
$(foreach _, \
controller_interface \
rqt_controller_manager \
......@@ -106,6 +107,8 @@ SYSTEM_SEARCH.prf-ros-control=\
'share/$_/cmake/$_Config.cmake' \
'lib/pkgconfig/$_.pc:/Version/s/[^0-9.]//gp')
endif # ROS_CONTROL_DEPEND_MK ----------------------------------------
include ../../mk/sysdep/python.mk
endif # PY_PRF_ROS_CONTROL_DEPEND_MK ----------------------------------------
DEPEND_DEPTH:= ${DEPEND_DEPTH:+=}
# robotpkg Makefile for: wip/prf-ros-controllers
# robotpkg Makefile for: wip/py-prf-ros-controllers
# Created: Olivier Stasse on Wed, 29 Mar 2017
#
ORG= pal-robotics-forks
VERSION= 0.3.15
PRFNAME= ros-controllers
PKGBASE= prf-${PRFNAME}
PKGNAME= ${PKGBASE}-${VERSION}
DISTNAME= ${VERSION}
ROSNAME= $(subst -,_,${PRFNAME})
WRKSRC= ${WRKDIR}/${ROSNAME}-${VERSION}
CATEGORIES= wip
ORG= pal-robotics-forks
VERSION= 0.3.15
PRFNAME= ros-controllers
PKGBASE= prf-${PRFNAME}
PKGNAME= ${PKGTAG.python-}${PKGBASE}-${VERSION}
DISTNAME= ${VERSION}
ROSNAME= $(subst -,_,${PRFNAME})
WRKSRC= ${WRKDIR}/${ROSNAME}-${VERSION}
PKGREVISION= 1
# old package name and other Python versions
CONFLICTS= ${PKGBBASE}-[0-9]*
CONFLICTS+= py[0-9][0-9]-${PKGBBASE}-[0-9]*
CONFLICTS= talos-ros-controllers
CATEGORIES= wip
MASTER_REPOSITORY= ${MASTER_REPOSITORY_GITHUB}${ORG}/${NAME}.git
CHECKOUT_VCS_OPTS+= --recursive
HOMEPAGE= ${MASTER_SITE_GITHUB:=${ORG}/${ROSNAME}}
MASTER_SITES= ${HOMEPAGE}/archive/
COMMENT= Library of ros controllers
LICENSE= 2-clause-bsd
HOMEPAGE= ${MASTER_SITE_GITHUB:=${ORG}/${ROSNAME}}
MASTER_SITES= ${HOMEPAGE}/archive/
COMMENT= Library of ros controllers
LICENSE= 2-clause-bsd
ROS_METAPKG= yes
ROS_METAPKG= yes
CONFLICTS= talos-ros-controllers
# Allows to have robotpkg ros packages with the highest priority
# over system ros packages.
......@@ -32,7 +38,7 @@ CMAKE_PREFIX_PATH+= /opt/ros/melodic
include ../../devel/boost-headers/depend.mk
include ../../devel/boost-libs/depend.mk
include ../../wip/prf-ros-control/depend.mk
include ../../wip/py-prf-ros-control/depend.mk
include ../../devel/ros-catkin/depend.mk
include ../../devel/ros-cmake-modules/depend.mk
include ../../devel/ros-pluginlib/depend.mk
......
# robotpkg depend.mk for: wip/ros-controllers
# robotpkg depend.mk for: wip/py-prf-ros-controllers
# Created: Olivier Stasse on Wed, 29 Mar 2017
#
DEPEND_DEPTH:= ${DEPEND_DEPTH}+
ROS_CONTROLLERS_DEPEND_MK:= ${ROS_CONTROLLERS_DEPEND_MK}+
PY_PRF_ROS_CONTROLLERS_DEPEND_MK:= ${PY_PRF_ROS_CONTROLLERS_DEPEND_MK}+
ifeq (+,$(DEPEND_DEPTH))
DEPEND_PKG+= prf-ros-controllers
DEPEND_PKG+= py-prf-ros-controllers
endif
ifeq (+,$(ROS_CONTROLLERS_DEPEND_MK)) # ----------------------------------
ifeq (+,$(PY_PRF_ROS_CONTROLLERS_DEPEND_MK)) # ----------------------------------
PREFER.ros-controllers?= robotpkg
DEPEND_USE+= prf-ros-controllers
DEPEND_USE+= py-prf-ros-controllers
DEPEND_ABI.prf-ros-controllers?= prf-ros-controllers>=0.2.8
DEPEND_DIR.prf-ros-controllers?= ../../wip/prf-ros-controllers
DEPEND_ABI.py-prf-ros-controllers?= ${PKGTAG.python-}prf-ros-controllers>=0.2.8
DEPEND_DIR.py-prf-ros-controllers?= ../../wip/py-prf-ros-controllers
SYSTEM_SEARCH.prf-ros-controllers=\
SYSTEM_SEARCH.py-prf-ros-controllers=\
'include/joint_state_controller/joint_state_controller.h' \
'lib/libjoint_state_controller.so' \
'lib/libjoint_state_controller.so' \
'share/joint_state_controller/package.xml:/<version>/s/[^0-9.]//gp' \
'lib/pkgconfig/joint_state_controller.pc:/Version/s/[^0-9.]//gp' \
'share/controller_interface/cmake/controller_interfaceConfig.cmake'
'lib/pkgconfig/joint_state_controller.pc:/Version/s/[^0-9.]//gp' \
'share/controller_interface/cmake/controller_interfaceConfig.cmake' \
'${PYTHON_SYSLIBSEARCH}/diff_drive_controller/__init__.py'
endif # ROS_CONTROLLERS_DEPEND_MK ----------------------------------------
include ../../mk/sysdep/python.mk
endif # PY_PRF_ROS_CONTROLLERS_DEPEND_MK ----------------------------------------
DEPEND_DEPTH:= ${DEPEND_DEPTH:+=}
SHA1 (0.3.15.tar.gz) = bfd6696e961f05a7a0957d2a3a28880071cd3318
RMD160 (0.3.15.tar.gz) = 1d93e609e8d022d9d60f891dfc687fabe71e5346
Size (0.3.15.tar.gz) = 484646 bytes
SHA1 (patch-ab) = 6071abb0ea9918238ade52ebf0d145d8d8587b45
--- rqt_joint_trajectory_controller/src/rqt_joint_trajectory_controller/joint_trajectory_controller.py.orig 2019-09-09 10:34:01.000000000 +0200
+++ rqt_joint_trajectory_controller/src/rqt_joint_trajectory_controller/joint_trajectory_controller.py 2020-03-24 09:12:19.974060717 +0100
@@ -25,6 +25,8 @@
# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
# POSSIBILITY OF SUCH DAMAGE.
+from __future__ import print_function
+
import os
import rospy
import rospkg
@@ -328,7 +330,7 @@
except:
# TODO: Can we do better than swallow the exception?
from sys import exc_info
- print 'Unexpected error:', exc_info()[0]
+ print('Unexpected error:', exc_info()[0])
# Enter monitor mode (sending commands disabled)
self._on_jtc_enabled(False)
......@@ -60,13 +60,13 @@ ifeq (erbium,${PREFER.pal-distro})
PKG_CONFIG_DIRS=/opt/pal/erbium/lib/pkgconfig
else
include ../../wip/pal-hardware-interfaces/depend.mk
include ../../wip/prf-ros-control/depend.mk
include ../../wip/prf-ros-controllers/depend.mk
include ../../wip/py-prf-ros-control/depend.mk
include ../../wip/py-prf-ros-controllers/depend.mk
endif
else
include ../../wip/pal-hardware-interfaces/depend.mk
include ../../wip/prf-ros-control/depend.mk
include ../../wip/prf-ros-controllers/depend.mk
include ../../wip/py-prf-ros-control/depend.mk
include ../../wip/py-prf-ros-controllers/depend.mk
endif
......
......@@ -14,7 +14,7 @@ ifeq (+,$(PY_TSID_DEPEND_MK)) # ------------------------------------------
PREFER.py-tsid?= robotpkg
SYSTEM_SEARCH.py-tsid=\
'${PYTHON_SYSLIBSEARCH}/tsid.so'
'${PYTHON_SYSLIBSEARCH}/tsid/__init__.py'
DEPEND_USE+= py-tsid
......
......@@ -5,7 +5,7 @@ include/sot/talos_balance/warning.hh
lib/cmake/sot-talos-balance/sot-talos-balanceConfig.cmake
lib/cmake/sot-talos-balance/sot-talos-balanceConfigVersion.cmake
lib/cmake/sot-talos-balance/sot-talos-balanceTargets-release.cmake
l
lib/cmake/sot-talos-balance/sot-talos-balanceTargets.cmake
lib/dynamic-graph-plugins/libadmittance-controller-end-effector.so
lib/dynamic-graph-plugins/libadmittance-controller-end-effector.so.${PKGVERSION}
lib/dynamic-graph-plugins/libankle-admittance-controller.so
......@@ -88,7 +88,6 @@ lib/pkgconfig/sot-talos-balance.pc
share/sot-talos-balance/package.xml
share/sot_talos_balance/data/TestKajita2003StraightWalking64/10cm/CoM.dat
share/sot_talos_balance/data/TestKajita2003StraightWalking64/10cm/LeftFoot.dat
share/sot_talos_balance/data/TestKajita2003StraightWalking64/10cm/LeftFoot.dat
share/sot_talos_balance/data/TestKajita2003StraightWalking64/10cm/Phase.dat
share/sot_talos_balance/data/TestKajita2003StraightWalking64/10cm/Rho.dat
share/sot_talos_balance/data/TestKajita2003StraightWalking64/10cm/RightFoot.dat
......
......@@ -12,7 +12,7 @@ META_PACKAGE= yes
include ../../interfaces/humanoid-nav-msgs/depend.mk
include ../../wip/py-sot-talos/depend.mk
include ../../wip/prf-ros-control/depend.mk
include ../../wip/py-prf-ros-control/depend.mk
include ../../wip/sysdep/ubuntu-distro.mk
ifeq (xenial,${UBUNTUDISTRO})
......
......@@ -43,7 +43,7 @@ ifeq (erbium,${PREFER.pal-distro})
CMAKE_PREFIX_PATH+=/opt/pal/erbium
else
include ../../wip/pal-hardware-interfaces/depend.mk
include ../../wip/prf-ros-controllers/depend.mk
include ../../wip/py-prf-ros-controllers/depend.mk
include ../../motion/ros-control-toolbox/depend.mk
endif
......@@ -53,7 +53,7 @@ displaytalosmetapkg:
else
include ../../wip/pal-hardware-interfaces/depend.mk
include ../../wip/prf-ros-controllers/depend.mk
include ../../wip/py-prf-ros-controllers/depend.mk
include ../../motion/ros-control-toolbox/depend.mk
displaytalosmetapkg:
......
......@@ -62,7 +62,7 @@ endif
include ../../wip/talos-robot/depend.mk
include ../../wip/talos-moveit-config/depend.mk
include ../../wip/prf-roboticsgroup-gazebo-plugins/depend.mk
include ../../wip/prf-ros-controllers/depend.mk
include ../../wip/py-prf-ros-controllers/depend.mk
ifeq (xenial,${UBUNTUDISTRO})
include ../../wip/pal-gazebo-plugins/depend.mk
else
......
......@@ -3,7 +3,7 @@
#
ORG= stack-of-tasks
VERSION= 1.0.3
VERSION= 1.0.4
PKGBASE= tiago-data
DISTNAME= ${VERSION}
PKGNAME= ${PKGBASE}-${VERSION}
......
SHA1 (tiago-data/1.0.3.tar.gz) = 97167b6fc48ed4ad4bbddcd7fcad80545ea492ea
RMD160 (tiago-data/1.0.3.tar.gz) = e84ff3d7c05bfd0cc108850792dfcd4a77b1dbc1
Size (tiago-data/1.0.3.tar.gz) = 5376628 bytes
SHA1 (tiago-data/1.0.4.tar.gz) = 354fa91f23ec7df08486966988e57d76c883a730
RMD160 (tiago-data/1.0.4.tar.gz) = b2e033ffe5c0030c7fe47418c121f64d1cbf2122
Size (tiago-data/1.0.4.tar.gz) = 5376657 bytes
......@@ -41,7 +41,7 @@ else
include ../../wip/pal-gazebo-plugins-melodic/depend.mk
include ../../wip/pal-hardware-gazebo-melodic/depend.mk
endif
include ../../wip/prf-ros-controllers/depend.mk
include ../../wip/py-prf-ros-controllers/depend.mk
include ../../wip/tiago-moveit-config/depend.mk
include ../../wip/play-motion/depend.mk
include ../../mk/language/c++.mk
......
......@@ -42,7 +42,7 @@ ifeq (erbium,${PREFER.pal-distro})
CMAKE_PREFIX_PATH+=/opt/pal/erbium
else
include ../../wip/pal-hardware-interfaces/depend.mk
include ../../wip/prf-ros-controllers/depend.mk
include ../../wip/py-prf-ros-controllers/depend.mk
include ../../motion/ros-control-toolbox/depend.mk
endif
......@@ -52,7 +52,7 @@ displaytiagometapkg:
else
include ../../wip/pal-hardware-interfaces/depend.mk
include ../../wip/prf-ros-controllers/depend.mk
include ../../wip/py-prf-ros-controllers/depend.mk
include ../../motion/ros-control-toolbox/depend.mk
displaytiagometapkg:
......
......@@ -43,7 +43,7 @@ else
include ../../wip/pal-hardware-gazebo-melodic/depend.mk
endif
include ../../wip/pal-gazebo-worlds/depend.mk
include ../../wip/prf-ros-controllers/depend.mk
include ../../wip/py-prf-ros-controllers/depend.mk
include ../../wip/tiago-moveit-config/depend.mk
include ../../wip/tiago-description-calibration/depend.mk
include ../../wip/simple-grasping-action/depend.mk
......
......@@ -45,7 +45,7 @@ else
endif
include ../../wip/pal-msgs/depend.mk
include ../../wip/play-motion/depend.mk
include ../../wip/prf-ros-controllers/depend.mk
include ../../wip/py-prf-ros-controllers/depend.mk
include ../../wip/tiago-moveit-config/depend.mk
include ../../wip/play-motion/depend.mk
include ../../mk/language/c++.mk
......