Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

R

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

Snippets Groups Projects

861ccee7

Commit 861ccee7 authored 1 year ago by Fabian Reister

Downloads
- Plain Diff

Merge branch 'feature/end-effector-trajectories' of...

Merge branch 'feature/end-effector-trajectories' of git.h2t.iar.kit.edu:sw/armarx/robot-api into feature/end-effector-trajectories

parents ff6a5c78 b87155a2

No related branches found

No related tags found

Loading

Changes 5

Hide whitespace changes

Inline Side-by-side

Showing

source/RobotAPI/libraries/GraspingUtility/GraspTrajectory.cpp 74 additions, 14 deletions

...ce/RobotAPI/libraries/GraspingUtility/GraspTrajectory.cpp
source/RobotAPI/libraries/GraspingUtility/GraspTrajectory.h 5 additions, 0 deletions

source/RobotAPI/libraries/GraspingUtility/GraspTrajectory.h
source/RobotAPI/libraries/armem_gui/instance/tree_visitors/TreeTypedJSONConverter.cpp 258 additions, 62 deletions

...mem_gui/instance/tree_visitors/TreeTypedJSONConverter.cpp
source/RobotAPI/libraries/armem_gui/instance/tree_visitors/TreeTypedJSONConverter.h 1 addition, 0 deletions

...armem_gui/instance/tree_visitors/TreeTypedJSONConverter.h
source/RobotAPI/libraries/aron/core/data/visitor/variant/VariantVisitor.cpp 1 addition, 1 deletion

...braries/aron/core/data/visitor/variant/VariantVisitor.cpp

with 339 additions and 77 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