From 0918b9939aedd8a6d1f9b97cc2a293b757781662 Mon Sep 17 00:00:00 2001 From: Lorenzo Rapetti Date: Thu, 19 Sep 2019 13:37:14 +0200 Subject: [PATCH 1/9] update setup.sh for human-dynamics profile --- cmake/template/setup.sh.in | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/cmake/template/setup.sh.in b/cmake/template/setup.sh.in index 2c398f806..d30d1a780 100644 --- a/cmake/template/setup.sh.in +++ b/cmake/template/setup.sh.in @@ -27,6 +27,11 @@ export GAZEBO_RESOURCE_PATH=${GAZEBO_RESOURCE_PATH}:${ROBOTOLOGY_SUPERBUILD_INST export YARP_DATA_DIRS=$YARP_DATA_DIRS:${ROBOTOLOGY_SUPERBUILD_INSTALL_PREFIX}/share/codyco @endcmakeif ROBOTOLOGY_ENABLE_DYNAMICS +@cmakeif ROBOTOLOGY_ENABLE_HUMAN_DYNAMICS +# ROBOTOLOGY_ENABLE_HUMAN_DYNAMICS-specific lines +export YARP_DATA_DIRS=$YARP_DATA_DIRS:${ROBOTOLOGY_SUPERBUILD_INSTALL_PREFIX}/share/human-gazebo +@endcmakeif ROBOTOLOGY_ENABLE_HUMAN_DYNAMICS + @cmakeif ROBOTOLOGY_USES_PYTHON # Add the python bindings directory to the PYTHON_PATH export PYTHONPATH=${PYTHONPATH}:${ROBOTOLOGY_SUPERBUILD_INSTALL_PREFIX}/lib/python2.7/dist-packages From 1f466e8d230c00968b6bf89ddb8e5a1b919091d6 Mon Sep 17 00:00:00 2001 From: Lorenzo Rapetti Date: Thu, 19 Sep 2019 13:43:03 +0200 Subject: [PATCH 2/9] update setup.bat for human-dynamics profile --- cmake/template/setup.bat.in | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/cmake/template/setup.bat.in b/cmake/template/setup.bat.in index 8020f4c44..8e75d43d5 100644 --- a/cmake/template/setup.bat.in +++ b/cmake/template/setup.bat.in @@ -23,6 +23,11 @@ rem ROBOTOLOGY_ENABLE_DYNAMICS-specific lines set "YARP_DATA_DIRS=%YARP_DATA_DIRS%;%ROBOTOLOGY_SUPERBUILD_INSTALL_PREFIX%/share/codyco" @endcmakeif ROBOTOLOGY_ENABLE_DYNAMICS +@cmakeif ROBOTOLOGY_ENABLE_HUMAN_DYNAMICS +rem ROBOTOLOGY_ENABLE_HUMAN_DYNAMICS-specific lines +set "YARP_DATA_DIRS=%YARP_DATA_DIRS%;%ROBOTOLOGY_SUPERBUILD_INSTALL_PREFIX%/share/human-gazebo" +@endcmakeif ROBOTOLOGY_ENABLE_HUMAN_DYNAMICS + @cmakeif ROBOTOLOGY_USES_PYTHON rem Add the python bindings directory to the PYTHON_PATH set "PYTHONPATH=%PYTHONPATH%;%ROBOTOLOGY_SUPERBUILD_INSTALL_PREFIX%/lib/python2.7/dist-packages" From 9c6f13931d9e380facc214da75b45419fbe28273 Mon Sep 17 00:00:00 2001 From: Lorenzo Rapetti Date: Thu, 19 Sep 2019 13:48:30 +0200 Subject: [PATCH 3/9] Update README human-dynamics profile information --- README.md | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 91e6b49ff..5e16341be 100644 --- a/README.md +++ b/README.md @@ -543,9 +543,13 @@ This profile is enabled by the `ROBOTOLOGY_ENABLE_HUMAN_DYNAMICS` CMake option. ### System Dependencies To run a human dynamics estimation scenario, we need a Windows machine to install the Xsens suit SDK for getting the sensory information of the human motions from [Xsens](https://www.xsens.com/) and [ESD USB CAN driver](https://esd.eu/en/products/can-usb2) to get the FTShoes/FTSkShoes sensory information. Refer to [Xsens](#xsens) and [FTShoes/FTSkShoes](#shoes) for more information about the dependencies. -### Configuration +### System Dependencies The steps necessary to install the system dependencies of the Human Dynamics profile are provided in operating system-specific installation documentation, and no additional system dependency is required. +### Configuration +`$ROBOTOLOGY_SUPERBUILD_INSTALL_PREFIX/share/human-gazebo` must be appended to the `YARP_DATA_DIRS` enviromental variable. +The scripts `$ROBOTOLOGY_SUPERBUILD_INSTALL_PREFIX/share/robotology-superbuild/setup.sh` (Linux, MacOs) or `$ROBOTOLOGY_SUPERBUILD_INSTALL_PREFIX/share/robotology-superbuild/setup.bat` (Windows), will append the necessary path to `YARP_DATA_DIRS`. + Dependencies-specific documentation =================================== From e5e2c8053401db6ed041cdaf50248bc5b51188c8 Mon Sep 17 00:00:00 2001 From: Lorenzo Rapetti Date: Thu, 19 Sep 2019 13:49:41 +0200 Subject: [PATCH 4/9] Update README --- README.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/README.md b/README.md index 5e16341be..922e134de 100644 --- a/README.md +++ b/README.md @@ -487,8 +487,7 @@ Install matio following the [installation instructions](https://github.com/tbeu/ ### Configuration `$ROBOTOLOGY_SUPERBUILD_INSTALL_PREFIX/share/codyco` must be appended to the `YARP_DATA_DIRS` enviromental variable. -If you are using Linux or macOS, the `$ROBOTOLOGY_SUPERBUILD_INSTALL_PREFIX/share/robotology-superbuild/setup.sh` script will append the necessary path to `YARP_DATA_DIRS`. - +The scripts `$ROBOTOLOGY_SUPERBUILD_INSTALL_PREFIX/share/robotology-superbuild/setup.sh` (Linux, MacOs) or `$ROBOTOLOGY_SUPERBUILD_INSTALL_PREFIX/share/robotology-superbuild/setup.bat` (Windows), will append the necessary path to `YARP_DATA_DIRS`. ## iCub Head From 83d217f4e9dda215aafe4960dfd05587b81727c5 Mon Sep 17 00:00:00 2001 From: Lorenzo Rapetti Date: Thu, 19 Sep 2019 14:51:55 +0200 Subject: [PATCH 5/9] Update removePathsFromUserEnvVariables with Human Dynamics path --- cmake/template/removePathsFromUserEnvVariables.ps1.in | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/cmake/template/removePathsFromUserEnvVariables.ps1.in b/cmake/template/removePathsFromUserEnvVariables.ps1.in index b8e7fbc6d..647452b39 100644 --- a/cmake/template/removePathsFromUserEnvVariables.ps1.in +++ b/cmake/template/removePathsFromUserEnvVariables.ps1.in @@ -59,6 +59,11 @@ Remove-ValueFromUserEnvVariable GAZEBO_RESOURCE_PATH $ROBOTOLOGY_SUPERBUILD_INST Remove-ValueFromUserEnvVariable YARP_DATA_DIRS $ROBOTOLOGY_SUPERBUILD_INSTALL_PREFIX"/share/codyco"; @endcmakeif ROBOTOLOGY_ENABLE_DYNAMICS +@cmakeif ROBOTOLOGY_ENABLE_HUMAN_DYNAMICS +# Cleanup ROBOTOLOGY_ENABLE_HUMAN_DYNAMICS-specific lines +Remove-ValueFromUserEnvVariable YARP_DATA_DIRS $ROBOTOLOGY_SUPERBUILD_INSTALL_PREFIX"/share/human-gazebo"; +@endcmakeif ROBOTOLOGY_ENABLE_HUMAN_DYNAMICS + @cmakeif ROBOTOLOGY_USES_PYTHON # Cleanup the python bindings directory from the PYTHON_PATH Remove-ValueFromUserEnvVariable PYTHONPATH $ROBOTOLOGY_SUPERBUILD_INSTALL_PREFIX"/lib/python2.7/dist-packages"; From 724228bbff2993dfd58bdb54884430c7f2facc2e Mon Sep 17 00:00:00 2001 From: Lorenzo Rapetti Date: Thu, 19 Sep 2019 14:54:18 +0200 Subject: [PATCH 6/9] Update addPathsToUserEnvVariables with Human Dynamics path --- cmake/template/addPathsToUserEnvVariables.ps1.in | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/cmake/template/addPathsToUserEnvVariables.ps1.in b/cmake/template/addPathsToUserEnvVariables.ps1.in index cf27aa59b..8a87baf22 100644 --- a/cmake/template/addPathsToUserEnvVariables.ps1.in +++ b/cmake/template/addPathsToUserEnvVariables.ps1.in @@ -56,6 +56,11 @@ Add-ValueToUserEnvVariable GAZEBO_RESOURCE_PATH $ROBOTOLOGY_SUPERBUILD_INSTALL_P Add-ValueToUserEnvVariable YARP_DATA_DIRS $ROBOTOLOGY_SUPERBUILD_INSTALL_PREFIX"/share/codyco"; @endcmakeif ROBOTOLOGY_ENABLE_DYNAMICS +@cmakeif ROBOTOLOGY_ENABLE_HUMAN_DYNAMICS +# ROBOTOLOGY_ENABLE_HUMAN_DYNAMICS-specific lines +Add-ValueToUserEnvVariable YARP_DATA_DIRS $ROBOTOLOGY_SUPERBUILD_INSTALL_PREFIX"/share/human-gazebo"; +@endcmakeif ROBOTOLOGY_ENABLE_HUMAN_DYNAMICS + @cmakeif ROBOTOLOGY_USES_PYTHON # Add the python bindings directory to the PYTHON_PATH Add-ValueToUserEnvVariable PYTHONPATH $ROBOTOLOGY_SUPERBUILD_INSTALL_PREFIX"/lib/python2.7/dist-packages"; From 24fec4811d3c42803ff477d3c8fedefb322ed468 Mon Sep 17 00:00:00 2001 From: Lorenzo Rapetti Date: Thu, 19 Sep 2019 15:06:38 +0200 Subject: [PATCH 7/9] Update README.md Co-Authored-By: Silvio Traversaro --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 922e134de..c44cfafdb 100644 --- a/README.md +++ b/README.md @@ -487,7 +487,7 @@ Install matio following the [installation instructions](https://github.com/tbeu/ ### Configuration `$ROBOTOLOGY_SUPERBUILD_INSTALL_PREFIX/share/codyco` must be appended to the `YARP_DATA_DIRS` enviromental variable. -The scripts `$ROBOTOLOGY_SUPERBUILD_INSTALL_PREFIX/share/robotology-superbuild/setup.sh` (Linux, MacOs) or `$ROBOTOLOGY_SUPERBUILD_INSTALL_PREFIX/share/robotology-superbuild/setup.bat` (Windows), will append the necessary path to `YARP_DATA_DIRS`. +The scripts `$ROBOTOLOGY_SUPERBUILD_INSTALL_PREFIX/share/robotology-superbuild/setup.sh` (Linux, macOS) or `$ROBOTOLOGY_SUPERBUILD_INSTALL_PREFIX/share/robotology-superbuild/setup.bat` (Windows), will append the necessary path to `YARP_DATA_DIRS`. ## iCub Head From b91705d11245e1678c7f0de25644291100265a32 Mon Sep 17 00:00:00 2001 From: Lorenzo Rapetti Date: Thu, 19 Sep 2019 15:07:05 +0200 Subject: [PATCH 8/9] Update README.md Co-Authored-By: Silvio Traversaro --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index c44cfafdb..b5f39929b 100644 --- a/README.md +++ b/README.md @@ -547,7 +547,7 @@ The steps necessary to install the system dependencies of the Human Dynamics pro ### Configuration `$ROBOTOLOGY_SUPERBUILD_INSTALL_PREFIX/share/human-gazebo` must be appended to the `YARP_DATA_DIRS` enviromental variable. -The scripts `$ROBOTOLOGY_SUPERBUILD_INSTALL_PREFIX/share/robotology-superbuild/setup.sh` (Linux, MacOs) or `$ROBOTOLOGY_SUPERBUILD_INSTALL_PREFIX/share/robotology-superbuild/setup.bat` (Windows), will append the necessary path to `YARP_DATA_DIRS`. +The scripts `$ROBOTOLOGY_SUPERBUILD_INSTALL_PREFIX/share/robotology-superbuild/setup.sh` (Linux, macOS) or `$ROBOTOLOGY_SUPERBUILD_INSTALL_PREFIX/share/robotology-superbuild/setup.bat` (Windows), will append the necessary path to `YARP_DATA_DIRS`. Dependencies-specific documentation =================================== From da2baa151f9f0d933c7023c862228c1dda4ff34c Mon Sep 17 00:00:00 2001 From: Lorenzo Rapetti Date: Thu, 19 Sep 2019 15:10:31 +0200 Subject: [PATCH 9/9] Update README.md --- README.md | 3 --- 1 file changed, 3 deletions(-) diff --git a/README.md b/README.md index b5f39929b..fb3448996 100644 --- a/README.md +++ b/README.md @@ -542,9 +542,6 @@ This profile is enabled by the `ROBOTOLOGY_ENABLE_HUMAN_DYNAMICS` CMake option. ### System Dependencies To run a human dynamics estimation scenario, we need a Windows machine to install the Xsens suit SDK for getting the sensory information of the human motions from [Xsens](https://www.xsens.com/) and [ESD USB CAN driver](https://esd.eu/en/products/can-usb2) to get the FTShoes/FTSkShoes sensory information. Refer to [Xsens](#xsens) and [FTShoes/FTSkShoes](#shoes) for more information about the dependencies. -### System Dependencies -The steps necessary to install the system dependencies of the Human Dynamics profile are provided in operating system-specific installation documentation, and no additional system dependency is required. - ### Configuration `$ROBOTOLOGY_SUPERBUILD_INSTALL_PREFIX/share/human-gazebo` must be appended to the `YARP_DATA_DIRS` enviromental variable. The scripts `$ROBOTOLOGY_SUPERBUILD_INSTALL_PREFIX/share/robotology-superbuild/setup.sh` (Linux, macOS) or `$ROBOTOLOGY_SUPERBUILD_INSTALL_PREFIX/share/robotology-superbuild/setup.bat` (Windows), will append the necessary path to `YARP_DATA_DIRS`.