Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

R

RobotAPI
- Activity
- Members
- Labels
- Container Registry
- Model registry

Snippets Groups Projects

d0878033

Commit d0878033 authored 10 years ago by Christian Mandery

Downloads
- Plain Diff

Merge branch 'master' into StatechartCodeGenerator

Conflicts:
	data/VariantInfo-RobotAPI.xml

parents db1ee9c9 24f62769

No related branches found

No related tags found

No related merge requests found

Changes 8

Hide whitespace changes

Inline Side-by-side

Showing

.gitignore 1 addition, 0 deletions

.gitignore
scenarios/WeissHapticSensorsUnitTest/tactile.html 2 additions, 1 deletion

scenarios/WeissHapticSensorsUnitTest/tactile.html
source/RobotAPI/interface/units/ForceTorqueUnit.ice 6 additions, 15 deletions

source/RobotAPI/interface/units/ForceTorqueUnit.ice
source/RobotAPI/libraries/robotstate/remote/ArmarPose.cpp 6 additions, 1 deletion

source/RobotAPI/libraries/robotstate/remote/ArmarPose.cpp
source/RobotAPI/libraries/units/ForceTorqueObserver.h 1 addition, 9 deletions

source/RobotAPI/libraries/units/ForceTorqueObserver.h
source/RobotAPI/libraries/units/HeadIKUnit.cpp 2 additions, 1 deletion

source/RobotAPI/libraries/units/HeadIKUnit.cpp
source/RobotAPI/statecharts/operations/RobotControl.cpp 28 additions, 0 deletions

source/RobotAPI/statecharts/operations/RobotControl.cpp
source/RobotAPI/statecharts/operations/RobotControl.h 17 additions, 1 deletion

source/RobotAPI/statecharts/operations/RobotControl.h

with 63 additions and 28 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