Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

R

RobotAPI
- Activity
- Members
- Labels
- Terraform modules

Snippets Groups Projects

a2156296

Commit a2156296 authored 1 year ago by Fabian Reister

Downloads
- Plain Diff

Merge branch 'armar7-unit' into 'master'

Armar7 unit / integration

See merge request sw/armarx/robot-api!389

parents 66015096 334086a2

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/NJointControllers/NJointCartesianWaypointController.cpp 8 additions, 9 deletions

...t/NJointControllers/NJointCartesianWaypointController.cpp
source/RobotAPI/components/units/RobotUnit/NJointControllers/NJointCartesianWaypointController.h 1 addition, 2 deletions

...nit/NJointControllers/NJointCartesianWaypointController.h
source/RobotAPI/components/units/RobotUnit/RobotUnitModules/RobotUnitModuleDevices.cpp 1 addition, 1 deletion

...its/RobotUnit/RobotUnitModules/RobotUnitModuleDevices.cpp
source/RobotAPI/components/units/RobotUnit/RobotUnitModules/RobotUnitModuleLogging.cpp 5 additions, 2 deletions

...its/RobotUnit/RobotUnitModules/RobotUnitModuleLogging.cpp
source/RobotAPI/components/units/RobotUnit/RobotUnitModules/RobotUnitModuleSelfCollisionChecker.cpp 82 additions, 7 deletions

.../RobotUnitModules/RobotUnitModuleSelfCollisionChecker.cpp
source/RobotAPI/gui-plugins/HandUnitPlugin/HandUnitConfigDialog.cpp 2 additions, 2 deletions

...otAPI/gui-plugins/HandUnitPlugin/HandUnitConfigDialog.cpp

with 99 additions and 23 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