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.

Sign up for GitHub

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

update setup.sh for human-dynamics profile #257

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
0918b99
update setup.sh for human-dynamics profile
lrapetti Sep 19, 2019
1f466e8
update setup.bat for human-dynamics profile
lrapetti Sep 19, 2019
9c6f139
Update README human-dynamics profile information
lrapetti Sep 19, 2019
e5e2c80
Update README
lrapetti Sep 19, 2019
83d217f
Update removePathsFromUserEnvVariables with Human Dynamics path
lrapetti Sep 19, 2019
724228b
Update addPathsToUserEnvVariables with Human Dynamics path
lrapetti Sep 19, 2019
24fec48
Update README.md
lrapetti Sep 19, 2019
b91705d
Update README.md
lrapetti Sep 19, 2019
da2baa1
Update README.md
lrapetti Sep 19, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions README.md
View file
Open in desktop
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`.
lrapetti marked this conversation as resolved.
Show resolved Hide resolved

## iCub Head

Expand Down Expand Up @@ -543,9 +542,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
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

For some reason the System Dependencies has been duplicated.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

My bad, the information in this replicated System Dependencies previously were in the Configuration section (even if they refering to system dependency). I think we can remove that part.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

removed da2baa1

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`.
lrapetti marked this conversation as resolved.
Show resolved Hide resolved

Dependencies-specific documentation
===================================

Expand Down
5 changes: 5 additions & 0 deletions cmake/template/addPathsToUserEnvVariables.ps1.in
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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