Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

R

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

Snippets Groups Projects

3059ed0e

Commit 3059ed0e authored 1 year ago by Peter Albrecht

Downloads
- Plain Diff

Merge branch 'master' into feature/skillMemoryGUI

parents 2351582b 53a9d53b

No related branches found

No related tags found

1 merge request!426Skill Gui QOL

Pipeline #17975 passed 1 year ago

Stage: build-and-test

Changes 5
Pipelines 1

Hide whitespace changes

Inline Side-by-side

Showing

source/RobotAPI/libraries/GraspingUtility/GraspTrajectory.cpp 149 additions, 44 deletions

...ce/RobotAPI/libraries/GraspingUtility/GraspTrajectory.cpp
source/RobotAPI/libraries/GraspingUtility/GraspTrajectory.h 70 additions, 51 deletions

source/RobotAPI/libraries/GraspingUtility/GraspTrajectory.h
source/RobotAPI/libraries/armem_objects/server/instance/Segment.cpp 10 additions, 4 deletions

...otAPI/libraries/armem_objects/server/instance/Segment.cpp
source/RobotAPI/libraries/armem_objects/server/instance/SegmentAdapter.cpp 1 addition, 1 deletion

...ibraries/armem_objects/server/instance/SegmentAdapter.cpp
source/RobotAPI/libraries/aron_component_config/VariantHelperFactory.h 2 additions, 0 deletions

...PI/libraries/aron_component_config/VariantHelperFactory.h

with 232 additions and 100 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