Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

R

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

Snippets Groups Projects

8742af46

Commit 8742af46 authored 10 years ago by Mirko Wächter

Downloads
- Plain Diff

Merge branch 'master' of https://i61wiki.itec.uka.de/git/robot-api

* 'master' of https://i61wiki.itec.uka.de/git/robot-api:
  adapted to simox changes regarding getGlobalPose
  increased simox version

parents b20d2b32 a30e23e0

No related branches found

No related tags found

Loading

Changes 5

Hide whitespace changes

Inline Side-by-side

Showing

CMakeLists.txt 1 addition, 1 deletion

CMakeLists.txt
source/RobotAPI/components/robotstate/SharedRobotServants.cpp 12 additions, 2 deletions

...ce/RobotAPI/components/robotstate/SharedRobotServants.cpp
source/RobotAPI/components/robotstate/SharedRobotServants.h 27 additions, 26 deletions

source/RobotAPI/components/robotstate/SharedRobotServants.h
source/RobotAPI/components/units/TCPControlUnit.cpp 3 additions, 3 deletions

source/RobotAPI/components/units/TCPControlUnit.cpp
source/RobotAPI/interface/core/RobotState.ice 5 additions, 2 deletions

source/RobotAPI/interface/core/RobotState.ice

with 48 additions and 34 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