Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

R

RobotAPI
- Activity
- Members
- Labels
- Terraform modules

Snippets Groups Projects

ffad5ee6

Commit ffad5ee6 authored 6 years ago by Raphael Grimm

Downloads
- Plain Diff

Merge remote-tracking branch 'origin/master' into Ice3.7

parents 7f45c475 277ef79f

No related branches found

No related tags found

Loading

Changes 4

Hide whitespace changes

Inline Side-by-side

Showing

source/RobotAPI/drivers/CyberGloveUnit/serial.tgz 0 additions, 0 deletions

source/RobotAPI/drivers/CyberGloveUnit/serial.tgz
source/RobotAPI/interface/units/RobotUnit/NJointTaskSpaceDMPController.ice 0 additions, 5 deletions

...nterface/units/RobotUnit/NJointTaskSpaceDMPController.ice
source/RobotAPI/libraries/RobotAPINJointControllers/DMPController/NJointTSDMPController.cpp 71 additions, 136 deletions

...NJointControllers/DMPController/NJointTSDMPController.cpp
source/RobotAPI/libraries/RobotAPINJointControllers/DMPController/NJointTSDMPController.h 13 additions, 13 deletions

...PINJointControllers/DMPController/NJointTSDMPController.h

with 84 additions and 154 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