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

Add legs FT IMU frames - address review #113

Closed
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
18 changes: 9 additions & 9 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,13 +31,13 @@ env:
- BOT_USER_NAME="LOC2Bot"

# For all dependencies, we use fixed releases to avoid regression due to
# changes in the dependencies. In particular, we use the latest released
# version as of 16 Septembter 2019, except for some dependencies that use
# changes in the dependencies. In particular, we use the latest released
# version as of 16 Septembter 2019, except for some dependencies that use
# specific commits, more details are provided in inline comments

before_script:
- if [ "$TRAVIS_OS_NAME" == "linux" ]; then sudo add-apt-repository ppa:nschloe/eigen-backports -y; fi
- if [ "$TRAVIS_OS_NAME" == "linux" ]; then sudo apt-get update; fi
- if [ "$TRAVIS_OS_NAME" == "linux" ]; then sudo add-apt-repository ppa:nschloe/eigen-backports -y; fi
- if [ "$TRAVIS_OS_NAME" == "linux" ]; then sudo apt-get update; fi
- if [ "$TRAVIS_OS_NAME" == "linux" ]; then sudo apt-get install libeigen3-dev; fi
# Force gcc-5
- if [ "$TRAVIS_OS_NAME" == "linux" ]; then if [ "$CC" == "gcc" ]; then export CC=gcc-5; export CXX=g++-5; fi; fi
Expand All @@ -54,7 +54,7 @@ before_script:
- git clone $URDF_PARSER_PY_REPOSITORY_URL
- cd urdf_parser_py
# workaround for https://github.com/robotology/simmechanics-to-urdf/issues/36
- git checkout 31474b9baaf7c3845b40e5a9aa87d5900a2282c3
- git checkout 31474b9baaf7c3845b40e5a9aa87d5900a2282c3
- export URDF_PARSER_PY_COMMIT=`git rev-parse HEAD`
- sudo python setup.py install
- cd ../
Expand Down Expand Up @@ -102,8 +102,8 @@ before_script:
## console_bridge
- git clone https://github.com/ros/console_bridge
- cd console_bridge
# Go the commit of the 7th Septmber 2018 for
# console_bridge, urdfdom_headers and urdfdom, see
# Go the commit of the 7th Septmber 2018 for
# console_bridge, urdfdom_headers and urdfdom, see
# https://travis-ci.org/robotology/icub-model-generator/builds/425819092?utm_source=github_status&utm_medium=notification
- git checkout ad25f7307da76be2857545e7e5c2a20727eee542
- mkdir build
Expand Down Expand Up @@ -139,7 +139,7 @@ before_script:
- cmake -DIDYNTREE_USES_KDL:BOOL=ON ..
- sudo cmake --build . --target install
- cd ../..
# ycm
# ycm
- git clone https://github.com/robotology/ycm.git
- cd ycm
- mkdir build
Expand All @@ -159,7 +159,7 @@ before_script:
- cmake -D ICUB_MODELS_SOURCE_DIR=$ICUB_MODELS_SOURCE_DIR ..

script:
- make VERBOSE=1
- make VERBOSE=1
- sudo cmake --build .
- ctest --output-on-failure
- sudo cmake --build . --target copy-models-to-icub-models
Expand Down
43 changes: 43 additions & 0 deletions simmechanics/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -139,6 +139,7 @@ macro(generate_icub_simmechanics)
frameReferenceLink: root_link
exportedFrameName: root_link_imu_frame
")
set(FT_IMU_SENSORS "")
set(XSENS_IMU_SENSOR
" - frameName: SCSYS_ROOT_LINK_XSENS_IMU
linkName: root_link
Expand Down Expand Up @@ -173,6 +174,48 @@ macro(generate_icub_simmechanics)
set(ANKLE_PITCH_ROM "-35,35")
set(CUSTOM_EPSILON "")
set(XSENS_IMU_FRAME "")
set(FT_IMU_SENSORS
" - frameName: SCSYS_R_UPPER_LEG_FT-IMU_3B11
linkName: r_hip_2
sensorName: r_upper_leg_ft_acc_3b11
sensorType: \"accelerometer\"
sensorBlobs: \"\"
- frameName: SCSYS_R_UPPER_LEG_FT-IMU_3B11
linkName: r_hip_2
sensorName: r_upper_leg_ft_gyro_3b11
sensorType: \"gyroscope\"
sensorBlobs: \"\"
- frameName: SCSYS_R_FOOT_FT-IMU_3B14
linkName: r_ankle_2
sensorName: r_foot_ft_acc_3b14
sensorType: \"accelerometer\"
sensorBlobs: \"\"
- frameName: SCSYS_R_FOOT_FT-IMU_3B14
linkName: r_ankle_2
sensorName: r_foot_ft_gyro_3b14
sensorType: \"gyroscope\"
sensorBlobs: \"\"
- frameName: SCSYS_L_UPPER_LEG_FT-IMU_3B12
linkName: l_hip_2
sensorName: l_upper_leg_ft_acc_3b12
sensorType: \"accelerometer\"
sensorBlobs: \"\"
- frameName: SCSYS_L_UPPER_LEG_FT-IMU_3B12
linkName: l_hip_2
sensorName: l_upper_leg_ft_gyro_3b12
sensorType: \"gyroscope\"
sensorBlobs: \"\"
- frameName: SCSYS_L_FOOT_FT-IMU_3B13
linkName: l_ankle_2
sensorName: l_foot_ft_acc_3b13
sensorType: \"accelerometer\"
sensorBlobs: \"\"
- frameName: SCSYS_L_FOOT_FT-IMU_3B13
linkName: l_ankle_2
sensorName: l_foot_ft_gyro_3b13
sensorType: \"gyroscope\"
sensorBlobs: \"\"
")
set(XSENS_IMU_SENSOR "")
set(REVERSE_ROTATION_AXIS
"reverseRotationAxis:
Expand Down
Loading