Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

R

RobotAPI
- Activity
- Members
- Labels
- Terraform modules

Snippets Groups Projects

d574b1e0

Commit d574b1e0 authored 6 years ago by Raphael Grimm

Downloads
- Plain Diff

Merge remote-tracking branch 'origin/master' into RobotUnit_v3

Conflicts:
	source/RobotAPI/components/units/RobotUnit/RobotUnit.cpp

parents 2f66da69 05b5824e

No related branches found

No related tags found

No related merge requests found

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

source/RobotAPI/components/units/RobotUnit/CMakeLists.txt 2 additions, 0 deletions

source/RobotAPI/components/units/RobotUnit/CMakeLists.txt
source/RobotAPI/components/units/RobotUnit/NJointControllers/NJointHolonomicPlatformRelativePositionController.cpp 122 additions, 0 deletions

...ers/NJointHolonomicPlatformRelativePositionController.cpp
source/RobotAPI/components/units/RobotUnit/NJointControllers/NJointHolonomicPlatformRelativePositionController.h 108 additions, 0 deletions

...llers/NJointHolonomicPlatformRelativePositionController.h
source/RobotAPI/components/units/RobotUnit/Units/PlatformSubUnit.cpp 9 additions, 1 deletion

...tAPI/components/units/RobotUnit/Units/PlatformSubUnit.cpp
source/RobotAPI/components/units/RobotUnit/Units/PlatformSubUnit.h 2 additions, 0 deletions

...botAPI/components/units/RobotUnit/Units/PlatformSubUnit.h
source/RobotAPI/libraries/RobotAPINJointControllers/DMPController/NJointBimanualCCDMPController.cpp 2 additions, 2 deletions

...ntrollers/DMPController/NJointBimanualCCDMPController.cpp

with 245 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