Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

R

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

Snippets Groups Projects

de9df4d7

Commit de9df4d7 authored 2 years ago by Fabian Tërnava

Downloads
- Plain Diff

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

parents 813ec304 93eaa7a6

No related branches found

No related tags found

1 merge request!270aron uses new time. completely removed time type in aron and added easy way to...

Changes 4

Hide whitespace changes

Inline Side-by-side

Showing

source/RobotAPI/interface/CMakeLists.txt 4 additions, 0 deletions

source/RobotAPI/interface/CMakeLists.txt
source/RobotAPI/interface/units/RobotUnit/NJointActiveImpedanceController.ice 49 additions, 0 deletions

...rface/units/RobotUnit/NJointActiveImpedanceController.ice
source/RobotAPI/interface/units/RobotUnit/NJointCurrentController.ice 47 additions, 0 deletions

...API/interface/units/RobotUnit/NJointCurrentController.ice
source/RobotAPI/interface/units/RobotUnit/NjointZeroTorqueController.ice 46 additions, 0 deletions

.../interface/units/RobotUnit/NjointZeroTorqueController.ice

with 146 additions and 0 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