Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

update setup.sh for human-dynamics profile #257

Merged
merged 9 commits into from
Sep 19, 2019
Merged
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -544,7 +543,8 @@ This profile is enabled by the `ROBOTOLOGY_ENABLE_HUMAN_DYNAMICS` CMake option.
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
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.
`$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
===================================
Expand Down
5 changes: 5 additions & 0 deletions cmake/template/addPathsToUserEnvVariables.ps1.in
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down
5 changes: 5 additions & 0 deletions cmake/template/removePathsFromUserEnvVariables.ps1.in
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down
5 changes: 5 additions & 0 deletions cmake/template/setup.bat.in
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
5 changes: 5 additions & 0 deletions cmake/template/setup.sh.in
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down