Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

R

RobotAPI
- Activity
- Members
- Labels
- Terraform modules

Snippets Groups Projects

cbc23875

Commit cbc23875 authored 9 years ago by Mirko Wächter

Downloads
- Plain Diff

Merge branch 'master' of https://gitlab.com/ArmarX/RobotAPI

parents 5570aa75 cf1264ee

No related branches found

No related tags found

No related merge requests found

Changes 9

Hide whitespace changes

Inline Side-by-side

Showing

data/RobotAPI/VariantInfo-RobotAPI.xml 3 additions, 1 deletion

data/RobotAPI/VariantInfo-RobotAPI.xml
etc/cmake/ArmarXPackageVersion.cmake 1 addition, 1 deletion

etc/cmake/ArmarXPackageVersion.cmake
source/RobotAPI/components/units/ForceTorqueObserver.cpp 2 additions, 2 deletions

source/RobotAPI/components/units/ForceTorqueObserver.cpp
source/RobotAPI/components/units/ForceTorqueObserver.h 2 additions, 0 deletions

source/RobotAPI/components/units/ForceTorqueObserver.h
source/RobotAPI/components/units/InertialMeasurementUnitObserver.cpp 17 additions, 17 deletions

...tAPI/components/units/InertialMeasurementUnitObserver.cpp
source/RobotAPI/components/units/InertialMeasurementUnitObserver.h 2 additions, 0 deletions

...botAPI/components/units/InertialMeasurementUnitObserver.h
source/RobotAPI/drivers/XsensIMU/XsensIMU.cpp 2 additions, 2 deletions

source/RobotAPI/drivers/XsensIMU/XsensIMU.cpp
source/RobotAPI/gui-plugins/SensorActorWidgetsPlugin/ArmarXPlotter/ArmarXPlotter.cpp 8 additions, 4 deletions

.../SensorActorWidgetsPlugin/ArmarXPlotter/ArmarXPlotter.cpp
source/RobotAPI/libraries/core/OrientedPoint.h 2 additions, 0 deletions

source/RobotAPI/libraries/core/OrientedPoint.h

with 39 additions and 27 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment