Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

R

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

Snippets Groups Projects

16eb6cd5

Commit 16eb6cd5 authored 6 years ago by Mirko Wächter

Downloads
- Plain Diff

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

* 'master' of https://gitlab.com/ArmarX/RobotAPI:
  fixed reporting of gravitytorque
  added feed forward velocity

parents b8a0cdfc 33f8a86d

No related branches found

No related tags found

No related merge requests found

Changes 3

Hide whitespace changes

Inline Side-by-side

Showing

source/RobotAPI/components/units/RobotUnit/SensorValues/SensorValue1DoFActuator.h 1 addition, 1 deletion

...ts/units/RobotUnit/SensorValues/SensorValue1DoFActuator.h
source/RobotAPI/libraries/RobotStatechartHelpers/PositionControllerHelper.cpp 17 additions, 1 deletion

...aries/RobotStatechartHelpers/PositionControllerHelper.cpp
source/RobotAPI/libraries/RobotStatechartHelpers/PositionControllerHelper.h 11 additions, 0 deletions

...braries/RobotStatechartHelpers/PositionControllerHelper.h

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