Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

R

RobotAPI
- Activity
- Members
- Labels
- Terraform modules

Snippets Groups Projects

a1e9b66b

Commit a1e9b66b authored 6 years ago by Simon Ottenhaus

Downloads
- Plain Diff

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

parents 6124de20 7ffd4e58

No related branches found

No related tags found

No related merge requests found

Changes 5

Hide whitespace changes

Inline Side-by-side

Showing

source/RobotAPI/components/units/RobotUnit/RobotUnitModules/RobotUnitModuleRobotData.cpp 12 additions, 0 deletions

...s/RobotUnit/RobotUnitModules/RobotUnitModuleRobotData.cpp
source/RobotAPI/components/units/RobotUnit/RobotUnitModules/RobotUnitModuleRobotData.h 3 additions, 0 deletions

...its/RobotUnit/RobotUnitModules/RobotUnitModuleRobotData.h
source/RobotAPI/components/units/RobotUnit/RobotUnitModules/RobotUnitModuleUnits.cpp 5 additions, 3 deletions

...units/RobotUnit/RobotUnitModules/RobotUnitModuleUnits.cpp
source/RobotAPI/libraries/core/CartesianPositionController.cpp 2 additions, 1 deletion

...e/RobotAPI/libraries/core/CartesianPositionController.cpp
source/RobotAPI/libraries/core/CartesianVelocityController.cpp 7 additions, 2 deletions

...e/RobotAPI/libraries/core/CartesianVelocityController.cpp

with 29 additions and 6 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