Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

R

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

Snippets Groups Projects

673bc331

Commit 673bc331 authored 4 years ago by Fabian Tërnava

Downloads
- Plain Diff

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

parents 1aa02492 afd68e41

Loading

Changes 5

Hide whitespace changes

Inline Side-by-side

Showing

source/RobotAPI/components/RobotState/RobotStateComponent.cpp 455 additions, 662 deletions

...ce/RobotAPI/components/RobotState/RobotStateComponent.cpp
source/RobotAPI/components/RobotState/RobotStateComponent.h 62 additions, 32 deletions

source/RobotAPI/components/RobotState/RobotStateComponent.h
source/RobotAPI/interface/core/RobotState.ice 5 additions, 5 deletions

source/RobotAPI/interface/core/RobotState.ice
source/RobotAPI/interface/units/RobotUnit/NJointTaskSpaceDMPController.ice 1 addition, 0 deletions

...nterface/units/RobotUnit/NJointTaskSpaceDMPController.ice
source/RobotAPI/libraries/RobotAPINJointControllers/DMPController/NJointPeriodicTSDMPCompliantController.cpp 23 additions, 3 deletions

.../DMPController/NJointPeriodicTSDMPCompliantController.cpp

with 546 additions and 702 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