Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

R

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

Snippets Groups Projects

0d625472

Commit 0d625472 authored 4 years ago by You Zhou

Downloads
- Plain Diff

Merge remote-tracking branch 'origin/master-demo'

parents 7e6205ed 3773a92a

No related branches found

No related tags found

2 merge requests!127Update armem/dev to master,!126Armar6 demo

Changes 2

Hide whitespace changes

Inline Side-by-side

Showing

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 24 additions and 3 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