Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

R

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

Snippets Groups Projects

835ef6f3

There was a problem fetching the pipeline summary.

Commit 835ef6f3 authored 7 years ago by Fabian Paus

Downloads
- Plain Diff

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

parents 3b9d26df 4b8a7494

No related branches found

No related tags found

No related merge requests found

Pipeline #

Changes 6
Pipelines 1

Hide whitespace changes

Inline Side-by-side

Showing

source/RobotAPI/components/units/RobotUnit/ControlModes.h 5 additions, 0 deletions

source/RobotAPI/components/units/RobotUnit/ControlModes.h
source/RobotAPI/components/units/RobotUnit/ControlTargets/ControlTarget1DoFActuator.h 58 additions, 0 deletions

...nits/RobotUnit/ControlTargets/ControlTarget1DoFActuator.h
source/RobotAPI/components/units/RobotUnit/NJointControllers/NJointCartesianVelocityController.cpp 1 addition, 1 deletion

...t/NJointControllers/NJointCartesianVelocityController.cpp
source/RobotAPI/components/units/RobotUnit/RobotUnit.cpp 47 additions, 27 deletions

source/RobotAPI/components/units/RobotUnit/RobotUnit.cpp
source/RobotAPI/components/units/RobotUnit/RobotUnit.h 1 addition, 0 deletions

source/RobotAPI/components/units/RobotUnit/RobotUnit.h
source/RobotAPI/interface/units/RobotUnit/RobotUnitInterface.ice 1 addition, 0 deletions

...RobotAPI/interface/units/RobotUnit/RobotUnitInterface.ice

with 113 additions and 28 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